From 47fc3e250a0fb4e76b4d843a1462d9d2fe248f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 8 Dec 2023 18:55:31 +0100 Subject: [PATCH] Register add country to account creation --- .../Fo/Auth/RegisterController.php | 1 - .../Fo/Customers/CreateAccountRequest.php | 26 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Fo/Auth/RegisterController.php b/app/Http/Controllers/Fo/Auth/RegisterController.php index f67e718..1e76d5b 100644 --- a/app/Http/Controllers/Fo/Auth/RegisterController.php +++ b/app/Http/Controllers/Fo/Auth/RegisterController.php @@ -99,7 +99,6 @@ class RegisterController extends Controller */ protected function create(array $data): Customer { - $data['country'] = Country::france(); $data['ok_cgv'] = \request()->boolean('ok_cgv'); $data['phone'] = $data['phone'] ?? null; $data['opt_in'] = ($data['opt_in'] ?? false) ? true : false; diff --git a/app/Http/Requests/Fo/Customers/CreateAccountRequest.php b/app/Http/Requests/Fo/Customers/CreateAccountRequest.php index f664a99..a4ae144 100644 --- a/app/Http/Requests/Fo/Customers/CreateAccountRequest.php +++ b/app/Http/Requests/Fo/Customers/CreateAccountRequest.php @@ -5,7 +5,9 @@ namespace App\Http\Requests\Fo\Customers; use App\Rules\IsAdult; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Auth; +use Illuminate\Validation\Rule; use Illuminate\Validation\Rules\Password; +use Kwaadpepper\Enum\Rules\EnumIsValidRule; use LDC\LDCCRM\Enums\Country; use LDC\LDCCRM\Models\Customer as CrmCustomer; @@ -49,6 +51,10 @@ class CreateAccountRequest extends FormRequest 'postcode' => 'required|string|min:1|postal_code:FR', 'city' => 'required|string|min:1|max:255', 'birth_date' => ['required', new IsAdult(trans('Vous devez être majeur pour vous inscrire.'))], + 'country' => [ + 'required', new EnumIsValidRule(Country::class), + Rule::in(Country::getValidCountries()) + ], 'email' => [ 'required', 'email:rfc,dns,spoof', 'max:255', // * Does email already exists in CRM ? @@ -77,15 +83,17 @@ class CreateAccountRequest extends FormRequest public function attributes() { return [ - 'lastname' => trans('nom'), - 'firstname' => trans('prénom'), - 'phone' => trans('téléphone'), - 'address' => trans('adresse'), - 'postcode' => trans('code postal'), - 'city' => trans('ville'), - 'birth_date' => trans('date de naissance'), - 'email' => trans('email'), - 'password' => trans('mot de passe'), + 'lastname' => trans('validation.attributes.first_name'), + 'firstname' => trans('validation.attributes.first_name'), + 'phone' => trans('validation.attributes.phone'), + 'address' => trans('validation.attributes.address'), + 'country' => trans('validation.attributes.country'), + 'postcode' => trans('validation.custom.postal_code'), + 'city' => trans('validation.attributes.city'), + 'birth_date' => trans('validation.attributes.date_of_birth'), + 'email' => trans('validation.attributes.email'), + 'password' => trans('validation.attributes.password'), + 'password_confirmation' => trans('validation.attributes.password_confirmation'), 'ok_cgv' => trans('conditions d\'utilisation'), 'opt_in' => trans('newsletter'), ];