From 6175573150f03ffbd4ffc039ff8eed151987eccf Mon Sep 17 00:00:00 2001 From: soufiane Date: Wed, 14 Jun 2023 19:24:52 +0200 Subject: [PATCH] =?utf8?q?wip=20#6030=20@1:00=20ajouter=20le=20message=20d?= =?utf8?q?e=20confirmation=20(petite=20difficult=C3=A9=20rencontr=C3=A9e?= =?utf8?q?=20dans=20la=20mise=20en=20place=20de=20la=20modal)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AjaxController.php | 2 +- app/Http/Controllers/ClientForgotPassword.php | 3 ++- resources/js/app.js | 3 +++ resources/views/pages/forgot_password.blade.php | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index c893edf..ea570df 100644 --- 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 eecc016..5fd2e79 100644 --- 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 f7b50f4..eaed7d9 100644 --- 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 e09210f..7d6d3aa 100644 --- a/resources/views/pages/forgot_password.blade.php +++ b/resources/views/pages/forgot_password.blade.php @@ -36,4 +36,10 @@ + @if(Session::get('message')) +
+ +

{{ Session::get('message') }}

+
+ @endisset @endsection -- 2.39.5