wip #6030 @1:00 ajouter le message de confirmation (petite difficulté rencontrée...

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index c893edfd951b1885f1d8b00378b4c0561cfdde7d..ea570df888635b4000e3480bbb8b481e4259e176 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -376,7 +376,7 @@ class AjaxController extends CubistFrontController
 
             return json_encode(['success']);
         } else {
-            throw ValidationException::withMessages(['password' => __('Erreur lors de la validation du formulaire')]);
+            throw ValidationException::withMessages(['password' => __('Votre e-mail ou mot de passe ne correspondent à aucun compte existant')]);
         }
     }
 

diff --git a/app/Http/Controllers/ClientForgotPassword.php b/app/Http/Controllers/ClientForgotPassword.php
index eecc0162b9ce541fca18a44817bc64b035d6aa66..5fd2e795830a9da5b7b4bb9bc4f1438fe4e262c8 100644 (file)
--- a/app/Http/Controllers/ClientForgotPassword.php
+++ b/app/Http/Controllers/ClientForgotPassword.php
@@ -37,8 +37,9 @@ class ClientForgotPassword extends CubistPageController
             $request->only('email')
         );
 
+        $message = __("Vous allez recevoir un e-mail vous permettant de réinitialiser votre mot de passe");
         return $status === Password::RESET_LINK_SENT
-            ? back()->with(['status' => __($status)])
+            ? back()->with(['status' => __($status), 'message' => $message])
             : back()->withErrors(['email' => __($status)]);
     }
 

diff --git a/resources/js/app.js b/resources/js/app.js
index f7b50f48a4a7d8b398863c020ecbf31e9c7b0a8b..eaed7d9e7814b1be054dbf20dbeed1febd20f849 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -123,6 +123,7 @@ const app = new Vue({
         this.price = parseFloat(this.$refs.optprice ?.dataset.default).toFixed(2)
         this.statusText = this.$refs.statusConfig ?.dataset.incomplete
         this.discount = this.$refs.discount ?.dataset.value
+        this.validateAction = this.$refs.forgotpwd ?.dataset.status
     },
 
     watch: {
@@ -666,6 +667,8 @@ function checkScroll() {
 
 checkScroll();
 
+eventBus.$emit('detect-modal');
+
 $(document).on('click', 'button.cart-add', function () {
     $(this).addClass('btn-no-hover').addClass('bg-navy');
     $(this).find('.add').addClass('hidden');

diff --git a/resources/views/pages/forgot_password.blade.php b/resources/views/pages/forgot_password.blade.php
index e09210f61e71f35bb7d4c791e304af2012dd9903..7d6d3aaad11cd064d4eb141cf124e73bb302d706 100644 (file)
--- a/resources/views/pages/forgot_password.blade.php
+++ b/resources/views/pages/forgot_password.blade.php
@@ -36,4 +36,10 @@
             </div>
         </div>
     </div>
+    @if(Session::get('message'))
+        <div ref="forgotpwd" data-status="true"></div>
+        <modal-confirm>
+            <p>{{ Session::get('message') }}</p>
+        </modal-confirm>
+    @endisset
 @endsection