From c34606e22829e8e4c0c4797cf4a82778968839c8 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Wed, 12 Oct 2022 15:03:44 +0200 Subject: [PATCH 1/2] add axios csrf header for re7 and production servers --- resources/views/front/sable/js/app.js | 14 ++++++++++++++ resources/views/front/sable/layouts/head.blade.php | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/views/front/sable/js/app.js b/resources/views/front/sable/js/app.js index 072276aa..c0abc6d1 100644 --- a/resources/views/front/sable/js/app.js +++ b/resources/views/front/sable/js/app.js @@ -62,6 +62,20 @@ const store = new Vuex.Store({ } }); +const metaCSRFToken = document.querySelector( + "meta[name='csrf-token']" +) + +if (!metaCSRFToken) { + throw new Error("Missing meta CSRF token"); +} + +Axios.defaults.headers.common = { + Accept: "application/json, text/plain, */*", + "X-Requested-With": "XMLHttpRequest", + "X-CSRF-TOKEN": metaCSRFToken.getAttribute("content"), +}; + window.axios = Axios; const app = new Vue({ diff --git a/resources/views/front/sable/layouts/head.blade.php b/resources/views/front/sable/layouts/head.blade.php index 4d5f27cf..3db58ef5 100644 --- a/resources/views/front/sable/layouts/head.blade.php +++ b/resources/views/front/sable/layouts/head.blade.php @@ -26,7 +26,7 @@ - + From bdd86c0118d0ab6c96c4335791fe7b1d561c22c9 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Fri, 14 Oct 2022 14:52:56 +0200 Subject: [PATCH 2/2] second retours --- app/Enums/ProductBrand.php | 2 +- app/Http/Resources/ProductResource.php | 8 ++-- app/Providers/AppServiceProvider.php | 9 ++++ .../views/front/sable/auth/activate.blade.php | 2 +- .../views/front/sable/auth/login-bo.blade.php | 2 +- .../views/front/sable/auth/login.blade.php | 2 +- .../sable/auth/passwords/forgot.blade.php | 2 +- .../sable/auth/passwords/reset-ok.blade.php | 2 +- .../sable/auth/passwords/reset.blade.php | 2 +- .../sable/auth/register-success.blade.php | 2 +- .../views/front/sable/auth/register.blade.php | 8 ++-- .../front/sable/breadcrumb/layout.blade.php | 39 ++++++++-------- resources/views/front/sable/home.blade.php | 27 ++++++------ .../sable/js/components/BasketButtons.vue | 32 +++++++++++++- .../front/sable/js/components/BasketPanel.vue | 2 +- .../sable/js/components/FilterComponent.vue | 26 ++++++----- resources/views/front/sable/js/fo/cart.js | 15 +++++++ .../views/front/sable/layouts/head.blade.php | 2 + .../front/sable/layouts/layout.blade.php | 1 + .../front/sable/layouts/navbar.blade.php | 24 +++++++--- .../front/sable/partials/cookie.blade.php | 2 +- resources/views/front/sable/product.blade.php | 20 ++++++--- resources/views/front/sable/ranges.blade.php | 3 +- .../front/sable/sass/fo/pages/_products.scss | 44 +++++++++---------- .../sable/sass/vendor/_ldcweb-cookies.scss | 6 ++- routes/breadcrumbs.php | 16 ++----- routes/web-fo.php | 5 ++- 27 files changed, 192 insertions(+), 113 deletions(-) diff --git a/app/Enums/ProductBrand.php b/app/Enums/ProductBrand.php index b82ebd93..be9119ca 100644 --- a/app/Enums/ProductBrand.php +++ b/app/Enums/ProductBrand.php @@ -30,7 +30,7 @@ class ProductBrand extends BaseEnumRoutable 'loue' => 'Loué', 'legaulois' => 'Le Gaulois', 'marie' => 'Marie', - 'tregalette' => 'Tregalette', + 'tregalette' => 'Regalette', 'esprirestauration' => 'Espri Restauration', ]; } diff --git a/app/Http/Resources/ProductResource.php b/app/Http/Resources/ProductResource.php index d051a243..4a13eebe 100644 --- a/app/Http/Resources/ProductResource.php +++ b/app/Http/Resources/ProductResource.php @@ -16,12 +16,11 @@ class ProductResource extends JsonResource 'slug' => '', 'name' => '', 'description' => '', - 'price' => 0, - 'discountedPriceHt' => 0, 'picture' => '', 'orderable_start' => '', 'orderable_end' => '', - 'weight_variable' => '' + 'weight_variable' => false, + 'sell_unit' => '' ]; /** @@ -49,7 +48,8 @@ class ProductResource extends JsonResource $this->product->toArray(), self::$skeleton ), - ['discountedPriceHt' => $this->product->discountedPriceHt], + ['priceTtc' => $this->product->priceTtc], + ['discountedPriceTtc' => $this->product->discountedPriceTtc], ['promotion' => (isset($this->product->promotions[0])) ? $this->product->promotions : null], [ 'nutriscore' => (isset($this->product->foodProduct->nutriscore)) ? diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4954f322..d593dfba 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -79,6 +79,15 @@ class AppServiceProvider extends ServiceProvider } ?>"; }); + Blade::directive('fmt_currency_without_ttc', function ($expression) { + return ""; + }); + Blade::directive('fmt_sellunit', function ($expression) { if (config('bosettings.sell_unit_management') == "strict") { return "label); } ?>"; diff --git a/resources/views/front/sable/auth/activate.blade.php b/resources/views/front/sable/auth/activate.blade.php index 8b605e0e..69cde64d 100644 --- a/resources/views/front/sable/auth/activate.blade.php +++ b/resources/views/front/sable/auth/activate.blade.php @@ -7,7 +7,7 @@
-

Activation de votre compte

+

Activation de votre compte

{{ $message }}

diff --git a/resources/views/front/sable/auth/login-bo.blade.php b/resources/views/front/sable/auth/login-bo.blade.php index c9170e08..40bebc52 100644 --- a/resources/views/front/sable/auth/login-bo.blade.php +++ b/resources/views/front/sable/auth/login-bo.blade.php @@ -7,7 +7,7 @@
-

Connexion

+

Connexion

@csrf @if ($errors->any()) diff --git a/resources/views/front/sable/auth/login.blade.php b/resources/views/front/sable/auth/login.blade.php index ada4a960..a87d8b06 100644 --- a/resources/views/front/sable/auth/login.blade.php +++ b/resources/views/front/sable/auth/login.blade.php @@ -7,7 +7,7 @@
-

Connexion

+

Connexion

@csrf @if ($errors->any()) diff --git a/resources/views/front/sable/auth/passwords/forgot.blade.php b/resources/views/front/sable/auth/passwords/forgot.blade.php index 8ef75196..3763236c 100644 --- a/resources/views/front/sable/auth/passwords/forgot.blade.php +++ b/resources/views/front/sable/auth/passwords/forgot.blade.php @@ -7,7 +7,7 @@
-

Mot de passe oublié

+

Mot de passe oublié

@csrf @if ($errors->any()) diff --git a/resources/views/front/sable/auth/passwords/reset-ok.blade.php b/resources/views/front/sable/auth/passwords/reset-ok.blade.php index e469a7f5..e3504387 100644 --- a/resources/views/front/sable/auth/passwords/reset-ok.blade.php +++ b/resources/views/front/sable/auth/passwords/reset-ok.blade.php @@ -7,7 +7,7 @@
-

Changement de votre mot de passe

+

Changement de votre mot de passe

Votre mot de passe a bien été modifié.

diff --git a/resources/views/front/sable/auth/passwords/reset.blade.php b/resources/views/front/sable/auth/passwords/reset.blade.php index d8ad13df..bb7149bf 100644 --- a/resources/views/front/sable/auth/passwords/reset.blade.php +++ b/resources/views/front/sable/auth/passwords/reset.blade.php @@ -7,7 +7,7 @@
-

Connexion

+

Connexion

@csrf @if ($errors->any()) diff --git a/resources/views/front/sable/auth/register-success.blade.php b/resources/views/front/sable/auth/register-success.blade.php index 31f01d2f..9a9bbccc 100644 --- a/resources/views/front/sable/auth/register-success.blade.php +++ b/resources/views/front/sable/auth/register-success.blade.php @@ -7,7 +7,7 @@
-

Création de votre compte

+

Création de votre compte

Félicitations

diff --git a/resources/views/front/sable/auth/register.blade.php b/resources/views/front/sable/auth/register.blade.php index 6f17bfd5..e01e5f7f 100644 --- a/resources/views/front/sable/auth/register.blade.php +++ b/resources/views/front/sable/auth/register.blade.php @@ -7,7 +7,7 @@
-

Inscription

+

Inscription

@if (session('success'))
@@ -34,7 +34,7 @@ @if (config('bosettings.register_salaries') && config('bosettings.register_public'))
- +