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'))
- +