diff --git a/app/Dto/DiscountProductDto.php b/app/Dto/DiscountProductDto.php index ce592521..432866d7 100644 --- a/app/Dto/DiscountProductDto.php +++ b/app/Dto/DiscountProductDto.php @@ -15,6 +15,7 @@ final readonly class DiscountProductDto implements \JsonSerializable, Arrayable public function __construct( public string $id, public string $name, + public ?string $picture, ) { } @@ -23,6 +24,7 @@ final readonly class DiscountProductDto implements \JsonSerializable, Arrayable return new self( id: (string) $product->id, name: (string) $product->name, + picture: $product->picture, ); } @@ -33,8 +35,9 @@ final readonly class DiscountProductDto implements \JsonSerializable, Arrayable public function toArray(): array { return [ - 'id' => $this->id, - 'name' => $this->name, + 'id' => $this->id, + 'name' => $this->name, + 'picture' => $this->picture, ]; } diff --git a/app/Http/Requests/Fo/ContactFormRequest.php b/app/Http/Requests/Fo/ContactFormRequest.php index c22769dc..d7fcb469 100644 --- a/app/Http/Requests/Fo/ContactFormRequest.php +++ b/app/Http/Requests/Fo/ContactFormRequest.php @@ -79,4 +79,13 @@ class ContactFormRequest extends FormRequest file: $attachedFile, ); } + + /** @return array */ + #[\Override] + public function attributes(): array + { + return [ + 'subject' => trans('validation.custom.attributes.object'), + ]; + } } diff --git a/app/Queries/Discounts/GetDiscountFormDataQuery.php b/app/Queries/Discounts/GetDiscountFormDataQuery.php index 40d105ce..3975f1d3 100644 --- a/app/Queries/Discounts/GetDiscountFormDataQuery.php +++ b/app/Queries/Discounts/GetDiscountFormDataQuery.php @@ -29,14 +29,14 @@ final readonly class GetDiscountFormDataQuery implements Query if ($input->discount !== null) { $selectedProds = Product::query() - ->select(['id', 'name']) + ->select(['id', 'name', 'picture']) ->where('discount_id', $input->discount->id) ->orderBy('name') ->get() ->map(fn (Product $p): DiscountProductDto => DiscountProductDto::fromModel($p)); $existingProds = Product::query() - ->select(['id', 'name']) + ->select(['id', 'name', 'picture']) ->whereNotIn('id', $selectedProds->pluck('id')) ->orderBy('name') ->get() @@ -46,7 +46,7 @@ final readonly class GetDiscountFormDataQuery implements Query } else { $selectedProds = collect(); $existingProds = Product::query() - ->select(['id', 'name']) + ->select(['id', 'name', 'picture']) ->orderBy('name') ->get() ->map(fn (Product $p): DiscountProductDto => DiscountProductDto::fromModel($p)); diff --git a/lang/en.json b/lang/en.json index 5dcad6a0..df22da51 100644 --- a/lang/en.json +++ b/lang/en.json @@ -867,5 +867,6 @@ "Your password has been changed on :appname": "Your password has been changed on :appname", "Your password has been changed. If you are not at the origin of this change, please contact us as soon as possible using the contact form or by contacting your manager.": "Your password has been changed. If you are not at the origin of this change, please contact us as soon as possible using the contact form or by contacting your manager.", "your_message": "your_message", - "Zip code": "Zip code" -} \ No newline at end of file + "Zip code": "Zip code", + "Your search": "Your search" +} diff --git a/lang/fr.json b/lang/fr.json index e3a8be61..3e1c47e9 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -17,7 +17,7 @@ ":title Pick up your order :/title :desc :/desc": ":title Retirez :/title :desc votre commande :/desc", ":title Save money :/title :desc Get even more out of our gourmet products by buying directly :/desc": ":title Des économies :/title :desc Profitez encore plus de nos produits gourmands en achetant en direct :/desc", ":title Select :/title :desc your products online :/desc": ":title Sélectionnez :/title :desc vos produits en ligne :/desc", - ":title Select :/title :desc your time slot :/desc": ":title Choisissez :/title :desc votre créneau horaire :/desc", + ":title Select :/title :desc your pickup day :/desc": ":title Choisissez :/title :desc votre jour de retrait :/desc", "A confirmation has just been sent to your email address": "Une confirmation vient de vous être envoyée sur votre adresse e-mail", "A decryption key is required.": "Une clé de déchiffrement est requise.", "A fresh verification link has been sent to your email address.": "Un nouveau lien de vérification a été envoyé à votre adresse e-mail.", @@ -854,5 +854,6 @@ "Your password has been changed on :appname": "Votre mot de passe a été changé sur :appname", "Your password has been changed. If you are not at the origin of this change, please contact us as soon as possible using the contact form or by contacting your manager.": "Votre mot de passe a été changé. Si vous n'êtes pas à l'origine de ceci, veuillez nous contacter au plus vite en utilisant le formulaire de contact ou en vous rapprochant de votre responsable.", "your_message": "Votre message", - "Zip code": "Code postal" -} \ No newline at end of file + "Zip code": "Code postal", + "Your search": "Votre recherche" +} diff --git a/lang/fr/validation.php b/lang/fr/validation.php index 1f40bee3..1a7347ec 100644 --- a/lang/fr/validation.php +++ b/lang/fr/validation.php @@ -350,6 +350,7 @@ return [ 'nv_serving_size_g' => 'Taille d\'une portion (g)', 'nv_serving_sugar_g' => 'Sucres par portion (g)', 'nv_sugar_g' => 'Sucres (g)', + 'object' => 'objet', 'ok_cgv' => 'conditions générales de vente', 'optin' => 'inscription à la newsletter', 'order' => 'ordre', diff --git a/resources/assets/images/icons/step_2.png b/resources/assets/images/icons/step_2.png index 44ac3d61..8c73f40f 100644 Binary files a/resources/assets/images/icons/step_2.png and b/resources/assets/images/icons/step_2.png differ diff --git a/resources/sass/fo/utilities/_bootstrap-custom.scss b/resources/sass/fo/utilities/_bootstrap-custom.scss index 2feeb6fe..80e8c024 100644 --- a/resources/sass/fo/utilities/_bootstrap-custom.scss +++ b/resources/sass/fo/utilities/_bootstrap-custom.scss @@ -21,3 +21,16 @@ .stretched-link::after { cursor: pointer; } + +.btn-tertiary { + border-color: var(--bs-dark) !important; +} + +.focus-ring-dark { + --bs-focus-ring-color: rgb(var(--bs-dark-rgb), 0.25) !important; +} + + +.btn-tertiary:hover { + background-color: rgb(var(--bs-light-rgb), 0.85) !important; +} diff --git a/resources/sass/fo/utilities/_bootstrap-variables.scss b/resources/sass/fo/utilities/_bootstrap-variables.scss index 2fc03614..98debd60 100644 --- a/resources/sass/fo/utilities/_bootstrap-variables.scss +++ b/resources/sass/fo/utilities/_bootstrap-variables.scss @@ -2,6 +2,7 @@ $primary: $color-primary; $secondary: $color-secondary; +$tertiary: $color-tertiary; $success: $color-success; $info: $color-info; $warning: $color-warning; @@ -11,6 +12,7 @@ $dark: $color-dark; $custom-theme-colors: ( primary: $primary, secondary: $secondary, + tertiary: $tertiary, success: $success, info: $info, warning: $warning, diff --git a/resources/sass/fo/utilities/_variables.scss b/resources/sass/fo/utilities/_variables.scss index cf609509..cb8cb021 100644 --- a/resources/sass/fo/utilities/_variables.scss +++ b/resources/sass/fo/utilities/_variables.scss @@ -10,6 +10,7 @@ $color-secondary: #5c636a; $color-info: #045487; $color-warning: #ffc454; $color-primary: $color-cocotte; +$color-tertiary: #f8f6ed; // * BODY $body-bg: #f8f9fa; diff --git a/resources/ts/bo/components/ProductDragAndDropComponent.vue b/resources/ts/bo/components/ProductDragAndDropComponent.vue index c96f611d..b1d2f245 100644 --- a/resources/ts/bo/components/ProductDragAndDropComponent.vue +++ b/resources/ts/bo/components/ProductDragAndDropComponent.vue @@ -1,58 +1,61 @@