diff --git a/app/Http/Requests/Front/Contact/ContactRequest.php b/app/Http/Requests/Front/Contact/ContactRequest.php index db74b3f5..6e96bdc3 100644 --- a/app/Http/Requests/Front/Contact/ContactRequest.php +++ b/app/Http/Requests/Front/Contact/ContactRequest.php @@ -105,8 +105,8 @@ class ContactRequest extends FormRequest ContactFormType::export->equals(ContactFormType::make($typeContactForm)) ) { $rules = array_merge($rules, [ - 'type' => ['array', 'min:1'], - 'type.*' => [Rule::enum(ExportAskingType::class)], + 'typeExport' => ['array', 'min:1'], + 'typeExport.*' => [Rule::enum(ExportAskingType::class)], ]); } diff --git a/app/Models/MailContactData.php b/app/Models/MailContactData.php index 4802274d..c7000616 100644 --- a/app/Models/MailContactData.php +++ b/app/Models/MailContactData.php @@ -5,6 +5,7 @@ namespace App\Models; use App\Enums\Contact\BreedType; use App\Enums\Contact\ContactFormType; use App\Enums\Contact\CustomerAskingType; +use App\Enums\Contact\ExportAskingType; use App\Enums\Contact\PressType; use App\Enums\Department; use Illuminate\Database\Eloquent\Casts\AsEnumArrayObject; @@ -28,6 +29,7 @@ use Illuminate\Database\Eloquent\Model; * @property string $postalcode The customer's postalcode. * @property boolean $newsletter The customer's optin response. * @property \App\Enums\Contact\CustomerAskingType[] $type The customer's type asking + * @property \App\Enums\Contact\ExportAskingType[] $typeExport The customer's type asking * @property \App\Enums\Contact\PressType $subject The message's subject * @property-read \Carbon\Carbon $created_at Created date. * @property-read \Carbon\Carbon $updated_at Updated date. @@ -60,6 +62,7 @@ class MailContactData extends Model 'town', 'postalcode', 'type', + 'typeExport', 'subject', 'newsletter', ]; @@ -74,6 +77,7 @@ class MailContactData extends Model 'typeelevage' => AsEnumArrayObject::class . ':' . BreedType::class, 'zonegeo' => AsEnumArrayObject::class . ':' . Department::class, 'type' => AsEnumArrayObject::class . ':' . CustomerAskingType::class, + 'typeExport' => AsEnumArrayObject::class . ':' . ExportAskingType::class, 'subject' => PressType::class, ]; diff --git a/lang/en/front.php b/lang/en/front.php index 068c003b..f00d88dc 100644 --- a/lang/en/front.php +++ b/lang/en/front.php @@ -72,6 +72,10 @@ return [ 'label' => 'Type', 'placeholder' => 'Dropdown list' ], + 'exportAskingType' => [ + 'label' => 'Type', + 'placeholder' => 'Dropdown list' + ], 'company' => [ 'label' => 'Company', 'placeholder' => 'Your company' diff --git a/lang/fr/front.php b/lang/fr/front.php index 21332e56..378fa9bf 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -73,6 +73,10 @@ return [ 'label' => 'Type', 'placeholder' => 'Liste déroulante' ], + 'exportAskingType' => [ + 'label' => 'Type', + 'placeholder' => 'Liste déroulante' + ], 'company' => [ 'label' => 'Société', 'placeholder' => 'Votre société' diff --git a/resources/views/emails/contact-text.blade.php b/resources/views/emails/contact-text.blade.php index 668389c2..e9dc460c 100644 --- a/resources/views/emails/contact-text.blade.php +++ b/resources/views/emails/contact-text.blade.php @@ -20,14 +20,14 @@ Téléphone : {{ $data->phone }} @endif @if (\App\Enums\Contact\ContactFormType::breeder->equals($data->enumType)) -@if (is_array($data->typeelevage)) +@if (is_iterable($data->typeelevage)) Type d'élevage : @foreach($data->typeelevage as $breeding) {{ $breeding->label() }} @endforeach @endif -@if (is_array($data->zonegeo)) +@if (is_iterable($data->zonegeo)) Zone géographique : @foreach($data->zonegeo as $zone) {{ $zone->label() }} @@ -39,14 +39,20 @@ Zone géographique : Société : {{ $data->company }} @endif -@if (is_array($data->type) && \App\Enums\Contact\ContactFormType::restauration->equals($data->enumType) || - \App\Enums\Contact\ContactFormType::export->equals($data->enumType)) +@if (is_iterable($data->type) && \App\Enums\Contact\ContactFormType::restauration->equals($data->enumType)) Type de demande : @foreach($data->type as $t) {{ $t->label() }} @endforeach @endif +@if (is_iterable($data->typeExport) && \App\Enums\Contact\ContactFormType::export->equals($data->enumType)) +Type de demande : +@foreach($data->typeExport as $t) +{{ $t->label() }} +@endforeach +@endif + @if (\App\Enums\Contact\ContactFormType::press->equals($data->enumType)) Sujet : {{ $data->subject->label() }} @endif diff --git a/resources/views/emails/contact.blade.php b/resources/views/emails/contact.blade.php index 272c5f7d..571bfd2a 100644 --- a/resources/views/emails/contact.blade.php +++ b/resources/views/emails/contact.blade.php @@ -30,7 +30,7 @@ {{-- BREEDER --}} @if (\App\Enums\Contact\ContactFormType::breeder->equals($data->enumType)) - @if (is_array($data->typeelevage)) + @if (is_iterable($data->typeelevage))
Type d'élevage :
Zone géographique :
Société : {{ $data->company }}
@endif - @if (is_array($data->type) && \App\Enums\Contact\ContactFormType::restauration->equals($data->enumType)) + @if (is_iterable($data->type) && \App\Enums\Contact\ContactFormType::restauration->equals($data->enumType))Type de demande :
Type de demande :