diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 8273060f..97ba9c55 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -151,10 +151,17 @@ class CustomerController extends Controller /** @var Customers|null */ $customer = Customers::where('email', $request->email)->first(); + if ($customer && $customer->isNoLongerEmployed()) { + $customer->remember_token = null; + $customer->saveOrFail(); + return back()->withErrors( + 'Compte bloqué. Veuillez contacter votre RH ou le standard St Laurent au 02 43 62 70 00' + ); + } + try { /** @var \LDC\LDCCRM\CrmApiV2 */ $crm = app('crmAPI'); - // * Ne devrait pas survenir, $crm->login throws ApiError::authFailed() if (!$crm->login($request->email, $request->password)) { // * mauvais identifiants @@ -275,7 +282,7 @@ class CustomerController extends Controller Mail::to($email)->send(new PasswordResetMail($token)); return back()->with( 'success', - __("La procédure pour changer votre mot de passe a été envoyé sur votre email.") + __("La procédure pour changer votre mot de passe a été envoyée sur votre email.") ); } else { return back()->withErrors(__("Cette adresse email n'est pas enregistrée dans nos services.")); diff --git a/app/Http/Controllers/OrderTunnelController.php b/app/Http/Controllers/OrderTunnelController.php index 0659ee00..c226451e 100644 --- a/app/Http/Controllers/OrderTunnelController.php +++ b/app/Http/Controllers/OrderTunnelController.php @@ -30,6 +30,13 @@ class OrderTunnelController extends Controller */ public function recapOrder() { + if (auth()->user()->isNoLongerEmployed()) { + auth()->logout(); + return redirect()->route('auth.connexion')->withErrors( + 'Compte bloqué. Veuillez contacter votre RH ou le standard St Laurent au 02 43 62 70 00' + ); + } + $activestep = 1; Cart::instance('panier'); $cart = Cart::content(); diff --git a/app/Models/Customers.php b/app/Models/Customers.php index f317908f..48b75273 100644 --- a/app/Models/Customers.php +++ b/app/Models/Customers.php @@ -8,6 +8,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use App\Models\Salarie; use LDC\LDCCRM\Exceptions\CrmException; use LDC\LDCCRM\Models\Customer as CrmCustomer; +use Carbon\Carbon; class Customers extends Authenticatable { @@ -113,4 +114,17 @@ class Customers extends Authenticatable return parent::toArray(); } } + + /** + * Check if customer is no longer employed + * + * @return boolean + */ + public function isNoLongerEmployed() + { + if (!$this->salarie->end_date) { + return false; + } + return Carbon::parse($this->salarie->end_date)->lessThanOrEqualTo(Carbon::now()); + } } diff --git a/resources/views/front/sable/auth/passwords/reset-ok.blade.php b/resources/views/front/sable/auth/passwords/reset-ok.blade.php index e3504387..92b617d0 100644 --- a/resources/views/front/sable/auth/passwords/reset-ok.blade.php +++ b/resources/views/front/sable/auth/passwords/reset-ok.blade.php @@ -13,7 +13,7 @@
Votre mot de passe a bien été modifié.