From 983aa56531e637739cd8a28951387924c33d4f17 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Wed, 18 Jan 2023 10:50:48 +0100 Subject: [PATCH 1/3] Contact: fix activity value --- app/Enums/Contact/ContactActivityEnum.php | 2 +- app/Http/Requests/Fo/Contact/ContactRequest.php | 4 ++-- resources/views/fo/pages/contact.blade.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Enums/Contact/ContactActivityEnum.php b/app/Enums/Contact/ContactActivityEnum.php index 78fc884..f255afd 100644 --- a/app/Enums/Contact/ContactActivityEnum.php +++ b/app/Enums/Contact/ContactActivityEnum.php @@ -22,7 +22,7 @@ final class ContactActivityEnum extends BaseEnum protected static function values(): array { return [ - 'Distributeur' => 1, + 'distributeur' => 1, 'restaurationSociale' => 2, 'restaurationCommerciale' => 3, 'boulangeriePatisserie' => 4, diff --git a/app/Http/Requests/Fo/Contact/ContactRequest.php b/app/Http/Requests/Fo/Contact/ContactRequest.php index 7c51bf9..9a92683 100644 --- a/app/Http/Requests/Fo/Contact/ContactRequest.php +++ b/app/Http/Requests/Fo/Contact/ContactRequest.php @@ -28,7 +28,7 @@ class ContactRequest extends FormRequest { try { $this->merge([ - 'activityEnum' => ContactActivityEnum::make($this->activity) + 'activityEnum' => ContactActivityEnum::toArray()[$this->activity] ]); } catch (\Exception $e) { $this->merge([ @@ -37,7 +37,7 @@ class ContactRequest extends FormRequest } try { $this->merge([ - 'callTimeEnum' => ContactTimeEnum::make($this->activity) + 'callTimeEnum' => ContactTimeEnum::toArray()[$this->callTime] ]); } catch (\Exception $e) { $this->merge([ diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index cfb1343..7eb01d7 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -74,10 +74,10 @@ @include('fo.modules.input-error', ['inputName' => 'callTime'])
- @foreach(App\Enums\Contact\ContactTimeEnum::toArray() as $contactTime) + @foreach(App\Enums\Contact\ContactTimeEnum::toArray() as $key => $contactTime)
value) checked @endif> + value="{{ $key }}" name="callTime" @if (old('callTime') == $contactTime->value) checked @endif> From ae1fecc24b4b6763fbb6af0babb0f293b17f74d0 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Wed, 18 Jan 2023 10:59:26 +0100 Subject: [PATCH 2/3] Contact: fix html structure for tabulation --- resources/views/fo/pages/contact.blade.php | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 7eb01d7..6c212f1 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -25,8 +25,20 @@
@include('fo.modules.input-error', ['inputName' => 'firstname']) +
+
+ + @include('fo.modules.input-error', ['inputName' => 'lastname']) +
+
@include('fo.modules.input-error', ['inputName' => 'email']) +
+
+ + @include('fo.modules.input-error', ['inputName' => 'phone']) +
+
@include('fo.modules.input-error', ['inputName' => 'activity']) +
+
+ + @include('fo.modules.input-error', ['inputName' => 'society']) +
+
@include('fo.modules.input-error', ['inputName' => 'postcode'])
- - @include('fo.modules.input-error', ['inputName' => 'lastname']) - - @include('fo.modules.input-error', ['inputName' => 'phone']) - - @include('fo.modules.input-error', ['inputName' => 'society']) @include('fo.modules.input-error', ['inputName' => 'city'])
From 6ea5256a59004ebf2173d871bef29a47f92b84d7 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Wed, 18 Jan 2023 11:08:14 +0100 Subject: [PATCH 3/3] Contact: fix message if there is no selected products --- resources/ts/components/fo/ContactListProducts.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/ts/components/fo/ContactListProducts.vue b/resources/ts/components/fo/ContactListProducts.vue index d2c15dc..0ebf689 100644 --- a/resources/ts/components/fo/ContactListProducts.vue +++ b/resources/ts/components/fo/ContactListProducts.vue @@ -2,12 +2,13 @@
-
+
{{ __("Vous n'avez aucun produits dans votre panier.") }}