diff --git a/app/Models/Shop.php b/app/Models/Shop.php index f68fa97..34eb907 100644 --- a/app/Models/Shop.php +++ b/app/Models/Shop.php @@ -28,14 +28,6 @@ class Shop extends Model 'longitude', ]; - /** - * Initialize shop model. - */ - public function __construct() - { - $this->distance = 0; - } - /** * Map attribute names to enum classes. * diff --git a/database/migrations/2023_04_20_091926_add_distance_column_shops_table.php b/database/migrations/2023_04_20_091926_add_distance_column_shops_table.php deleted file mode 100644 index c3e4030..0000000 --- a/database/migrations/2023_04_20_091926_add_distance_column_shops_table.php +++ /dev/null @@ -1,34 +0,0 @@ -integer('distance') - ->comment('Valeur à 0, sert pour l\'affichage et le calcul des distances') - ->default(0); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('shops', function (Blueprint $table) { - $table->dropColumn('distance'); - }); - } -} diff --git a/resources/ts/fo/components/GeocodageComponent.vue b/resources/ts/fo/components/GeocodageComponent.vue index 4c1ca4d..9892b7f 100644 --- a/resources/ts/fo/components/GeocodageComponent.vue +++ b/resources/ts/fo/components/GeocodageComponent.vue @@ -318,7 +318,7 @@ export default defineComponent({ shop.address + ", " + shop.postcode + " " + shop.city; // Display the distance let unit = " km"; - if (shop.distance < 1) { + if (shop.distance === undefined) { unit = " mètres"; shop.distance = shop.distance * 1000; } diff --git a/resources/views/bo/pages/shops/indexList.blade.php b/resources/views/bo/pages/shops/indexList.blade.php index 94ca446..d0d4801 100644 --- a/resources/views/bo/pages/shops/indexList.blade.php +++ b/resources/views/bo/pages/shops/indexList.blade.php @@ -25,7 +25,7 @@ {{ $shopModel->name }} - {{ App\Enums\SignsEnum::toArray()[$shopModel->signs->value]->label }} + {{ App\Enums\SignsEnum::toArray()[$shopModel->signs->value - 1]->label }} {{ $shopModel->address }}, {{ $shopModel->postcode }} {{ $shopModel->city }}