From 75ebd4e47ce87a6073b9a01371bcc21f80cf42f1 Mon Sep 17 00:00:00 2001
From: soufiane <soufiane@cubedesigners.com>
Date: Tue, 10 Oct 2023 16:14:32 +0200
Subject: [PATCH] wait #6389 @0:15

---
 app/Http/Controllers/AjaxController.php | 8 +++++---
 resources/views/pages/sign_in.blade.php | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index c8833ff..e6e7ee2 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -520,7 +520,7 @@ class AjaxController extends CubistFrontController
             'firstname' => 'required|string|max:255',
             'phone' => 'required|numeric',
             'company' => 'required|string',
-            'vat' => 'required|string|min:13|max:13|regex:/^[a-zA-Z]{2}\d{11}$/',
+            'vat' => 'nullable|string|min:13|max:13|regex:/^[a-zA-Z]{2}\d{11}$/',
             'siren' => 'required|string|min:9|max:9',
             'address.*.address' => 'required|string|max:255',
             'address.*.zipcode' => 'required|numeric',
@@ -533,8 +533,10 @@ class AjaxController extends CubistFrontController
         $data = $this->validation_form($request, $validation);
         $page = Page::find($request['page'])->getPageData();
 
-        if (!strstr($data['vat'], $data['siren']) || substr($data['vat'], '-9') !== $data['siren']) {
-            throw ValidationException::withMessages(['siren' => __('Le numero de siren est incorrect')]);
+        if($data['vat']) {
+            if (!strstr($data['vat'], $data['siren']) || substr($data['vat'], '-9') !== $data['siren']) {
+                throw ValidationException::withMessages(['siren' => __('Le numero de siren est incorrect')]);
+            }
         }
 
         /**
diff --git a/resources/views/pages/sign_in.blade.php b/resources/views/pages/sign_in.blade.php
index c70f996..9066925 100644
--- a/resources/views/pages/sign_in.blade.php
+++ b/resources/views/pages/sign_in.blade.php
@@ -145,8 +145,8 @@
                             <input class="py-3 mt-3" type="text" required="required" name="company" />
                         </label>
                         <label class="form-input mb-6 text-navy">
-                            {{ __('Numéro de TVA intracommunautaire') }}<span>*</span>
-                            <input class="py-3 mt-3" type="text" v-mask="'SS###########'" required="required" name="vat" />
+                            {{ __('Numéro de TVA intracommunautaire') }}
+                            <input class="py-3 mt-3" type="text" v-mask="'SS###########'" name="vat" />
                         </label>
                         <label class="form-input text-navy">
                             {{ __('Siren') }}<span>*</span>
-- 
2.39.5