diff --git a/app/Http/Requests/Bo/Shops/StoreShopRequest.php b/app/Http/Requests/Bo/Shops/StoreShopRequest.php index 42464b2..b6fb49d 100644 --- a/app/Http/Requests/Bo/Shops/StoreShopRequest.php +++ b/app/Http/Requests/Bo/Shops/StoreShopRequest.php @@ -37,14 +37,6 @@ class StoreShopRequest extends FormRequest 'numeric', new EnumIsValidRule(Country::class), 'in:' . Country::france()->value - ], - 'latitude' => [ - 'required', - 'regex:/^([0-8]?\d)°([0-5]?\d)\'([0-5]?\d\.\d)"(N|S)$/i' - ], - 'longitude' => [ - 'required', - 'regex:/^([0-1]?[0-8]\d|\d?\d)°([0-5]?\d)\'([0-5]?\d\.\d)"(E|W|O)$/i' ] ]; } @@ -62,23 +54,7 @@ class StoreShopRequest extends FormRequest 'postal_code' => trans('code postal'), 'city' => trans('ville'), 'country' => trans('pays'), - 'latitude' => trans('latitude'), - 'longitude' => trans('longitude'), - 'gmaps_placeid' => trans('Map place ID'), - 'gmaps_link_href' => trans('Lien direct'), 'gmaps_embed_href' => trans('Embed href'), ]; } - - /** - * Get custom messages for validator errors. - * @return array - */ - public function messages() - { - return [ - 'latitude.between' => trans('Vous devez renseigner ":attribute" avec le format degrés minutes secondes'), - 'longitude.between' => trans('Vous devez renseigner ":attribute" avec le format degrés minutes secondes'), - ]; - } } diff --git a/app/Models/Shop.php b/app/Models/Shop.php index 499a9db..6ec4813 100644 --- a/app/Models/Shop.php +++ b/app/Models/Shop.php @@ -59,10 +59,6 @@ class Shop extends Model 'city', 'country', 'phone', - 'latitude', - 'longitude', - 'gmaps_placeid', - 'gmaps_link_href', 'gmaps_embed_href', ]; diff --git a/database/migrations/2023_02_21_093325_remove_unused_shops_parameters.php b/database/migrations/2023_02_21_093325_remove_unused_shops_parameters.php new file mode 100644 index 0000000..9972d1d --- /dev/null +++ b/database/migrations/2023_02_21_093325_remove_unused_shops_parameters.php @@ -0,0 +1,44 @@ +dropColumn('latitude'); + $table->dropColumn('longitude'); + $table->dropColumn('gmaps_embed_href'); + $table->dropColumn('gmaps_placeid'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('shops', function (Blueprint $table) { + $table->double('latitude')->after('phone_country')->nullable() + ->comment('Coordonnée latitude décimale'); + $table->double('longitude')->after('latitude')->nullable() + ->comment('Coordonnée longitude décimale'); + $table->string('gmaps_embed_href', 350)->after('gmaps_link_href')->nullable() + ->comment('Lien direct de la société sur google maps pour être utilisé dans une iframe.'); + $table->string('gmaps_placeid', 100)->after('gmaps_embed_href')->nullable() + ->comment( + 'Google maps place ID style : ChIJMarzFNKI4kcRf-B9akxdAmk, nécessite une clé d\'api' + ); + }); + } +} diff --git a/resources/views/pages/shops/form.blade.php b/resources/views/pages/shops/form.blade.php index 6fb455a..29dcaee 100644 --- a/resources/views/pages/shops/form.blade.php +++ b/resources/views/pages/shops/form.blade.php @@ -93,38 +93,6 @@ -
-
-
- {{ __('Coordonnées GPS') }} -
-
- @include('back::partials.inputs.varchar', [ - 'id' => 'shopLatitude', - 'label' => __('Latitude'), - 'name' => 'latitude', - 'required' => true, - 'model' => $shopModel ?? null, - 'placeholder' => __('ex : 8°09\'53.4"N'), - 'helper' => __('Latitude en Degré ° Minutes \' Secondes " N(ord) ou S(ud)'), - ]) -
-
- @include('back::partials.inputs.varchar', [ - 'id' => 'shopLongitude', - 'label' => __('Longitude'), - 'name' => 'longitude', - 'required' => true, - 'model' => $shopModel ?? null, - 'placeholder' => __('ex : 122°30\'07.1"E'), - 'helper' => __('Longitude en Degré ° Minutes \' Secondes " E(st) ou O(uest)'), - ]) -
-
-
-
-
-
@@ -143,28 +111,6 @@ 'helper' => __('Url cible pour les iframes.') ])
-
- @include('back::partials.inputs.varchar', [ - 'id' => 'shopLinkHref', - 'label' => __('Lien direct'), - 'name' => 'gmaps_link_href', - 'model' => $shopModel ?? null, - 'required' => true, - 'placeholder' => __('https://goo.gl/maps/Q8VL1B3Wxy...'), - 'helper' => __('Url vers google maps') - ]) -
-
- @include('back::partials.inputs.varchar', [ - 'id' => 'shopPlaceId', - 'label' => __('Map place ID'), - 'name' => 'gmaps_placeid', - 'model' => $shopModel ?? null, - 'required' => true, - 'placeholder' => __('ChIJMarzFNKI4kcRf-B9ak...'), - 'helper' => __('Google map place ID (necessite une clé d\'API)".') - ]) -