wip #5789 @1:30 Gestion des erreurs

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 5fb925795f721318cfcc325d71c8dee63e8825b6..00b5e655e6bf6a56530ccf4b3ce7287975229955 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -292,6 +292,7 @@ class AjaxController extends CubistFrontController
             'email.email' => __('Veuillez indiquer une adresse email valide'),
             'email.unique' => __('Cette adresse existe déjà'),
             'password.min' => __('Mot de passe trop court, minimum 8 caractères'),
+            'password.confirmed' => __('Les mots de passes ne sont pas identiques'),
             'firstname.max' => __("Maximum 255 caractères"),
             'phone.numeric' => __("Numéro de téléphone invalide"),
             'vat.min' => __("Numéro de TVA intracommunautaire trop court"),
@@ -384,7 +385,7 @@ class AjaxController extends CubistFrontController
             }elseif(in_array($key,['phone'])){
                 $validation[$key] = 'required|numeric';
             }elseif ($key === "actually_password"){
-                $validation[$key] = 'required|missing';
+                $validation[$key] = 'required|missing|current_password';
             }elseif ($key === "password"){
                 $validation[$key] = 'required|confirmed|min:8';
             }
@@ -393,14 +394,14 @@ class AjaxController extends CubistFrontController
         $data = $this->validation_form($request, $validation);
 
         $data['password'] = Hash::make($data['password']);
-        $password = $data['actually_password'];
-        $actuallyPassword = Auth::guard('web-clients')->user()->password;
+        /*$password = $data['actually_password'];
+        $actuallyPassword = Auth::guard('web-clients')->user()->password;*/
         $email = Auth::guard('web-clients')->user()->email;
 
-        if (!Hash::check($password,$actuallyPassword)) {
+        /*if (!Hash::check($password,$actuallyPassword)) {
             throw ValidationException::withMessages(['password' => __('Le mot de passe est incorrect')]);
         }
-        unset($data['actually_password']);
+        unset($data['actually_password']);*/
 
         $client = Client::where('email',$email)->update($data);
     }

diff --git a/resources/js/app.js b/resources/js/app.js
index b067e2ca0ad82041f6b5c157431a22f9ef85fe55..3dc5338f853b491e9ed66b7bf6702780fe7f13b0 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -219,12 +219,12 @@ const app = new Vue({
                     console.log(error)
                 })
         },
-        signup() {
+        async  signup() {
             let root = this,
                 form = document.getElementById('signup-form'),
                 data = new FormData(form)
 
-            axios.post('/ajax/signup', data)
+            await axios.post('/ajax/signup', data)
                 .then(function (response) {
                     //
                     root.removeErrors()
@@ -242,7 +242,7 @@ const app = new Vue({
                     if (error.response) {
                         let errors = error.response.data.errors
                         root.errorsForm = errors
-                        console.log(errors)
+
                         root.removeErrors()
 
                         for (let k in errors) {
@@ -255,9 +255,8 @@ const app = new Vue({
                                         k = keys[i]
                                     }
                                 }
-                                console.log(k)
                             }
-                            let el = document.querySelector('[name=' + k + ']')
+                            let el = document.querySelector('[name*="' + k + '"]')
                             el.classList.add('error')
                         }
                     }

diff --git a/resources/views/pages/sign_in.blade.php b/resources/views/pages/sign_in.blade.php
index 9996223126abafac1871a24d8f7714463f72d694..0dd163635a9100035934c64aa9030ec8d88cfe6d 100644 (file)
--- a/resources/views/pages/sign_in.blade.php
+++ b/resources/views/pages/sign_in.blade.php
@@ -77,9 +77,9 @@
                 <div class="form-info text-navy mb-10">
                     <h1 class="text-4xl m-0">{{ __("Créer un compte") }}</h1>
                 </div>
-                <div class="signup-form-errors mb-10" v-if="errorsForm.length > 0">
+                <div class="signup-form-errors mb-10" v-if="Object.keys(errorsForm).length > 0">
                     <ul class="list-disc list-inside text-red">
-                        <li class="leading-5" v-for="(errorName,errorKey) in errorsForm">
+                        <li class="leading-5" v-for="(errorName,errorKey) in errorsForm" :key="errorKey">
                             @{{ errorName[0] }}
                         </li>
                     </ul>