diff --git a/app/Enums/SignsEnum.php b/app/Enums/SignsEnum.php index 3d14d14..6acd672 100644 --- a/app/Enums/SignsEnum.php +++ b/app/Enums/SignsEnum.php @@ -58,6 +58,7 @@ final class SignsEnum extends BaseEnum protected static function stickers(): array { return [ + 'pasDenseigne' => \asset('build/assets/images/signs/logo-default.png'), 'leclerc' => \asset('build/assets/images/signs/logo-leclerc.png'), 'systemeU' => \asset('build/assets/images/signs/logo-systemeu.png'), 'carrefour' => \asset('build/assets/images/signs/logo-carrefour.png'), @@ -76,4 +77,12 @@ final class SignsEnum extends BaseEnum } return parent::__get($attribute); } + + /** + * @return array + */ + public static function getStickers() + { + return array_values(static::stickers()); + } } diff --git a/app/Http/Controllers/Bo/ShopController.php b/app/Http/Controllers/Bo/ShopController.php index 8a49c20..294e910 100644 --- a/app/Http/Controllers/Bo/ShopController.php +++ b/app/Http/Controllers/Bo/ShopController.php @@ -173,7 +173,7 @@ class ShopController extends Controller $longitude = $request->input('longitude'); $raw = DB::raw( 'ROUND ((6371*acos(cos(radians(' . $latitude . '))*cos(radians(latitude))*cos(radians(longitude) - - radians(' . $longitude . '))+sin(radians(' . $latitude . '))*sin(radians(latitude))))) + - radians(' . $longitude . '))+sin(radians(' . $latitude . '))*sin(radians(latitude)))), 2) AS distance' ); $results = DB::table("shops")->select('*')->addSelect($raw)->orderBy('distance', 'ASC')->limit(5)->get(); diff --git a/config/app.php b/config/app.php index 41d8063..5051e98 100644 --- a/config/app.php +++ b/config/app.php @@ -231,7 +231,11 @@ return [ 'Str' => Illuminate\Support\Str::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class + 'View' => Illuminate\Support\Facades\View::class, + /** + * Enums aliases + */ + 'SignsEnum' => App\Enums\SignsEnum::class, ], ]; diff --git a/resources/assets/images/signs/logo-leclerc.png b/resources/assets/images/signs/logo-leclerc.png new file mode 100644 index 0000000..82bbed7 Binary files /dev/null and b/resources/assets/images/signs/logo-leclerc.png differ diff --git a/resources/ts/fo/components/GeocodageComponent.vue b/resources/ts/fo/components/GeocodageComponent.vue index 83f00a1..02d3829 100644 --- a/resources/ts/fo/components/GeocodageComponent.vue +++ b/resources/ts/fo/components/GeocodageComponent.vue @@ -7,13 +7,13 @@