From b5067b9197000f78ec5c829a123d0674c8555cea Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Tue, 11 Jul 2023 13:23:27 +0200 Subject: [PATCH] move the Cart destroy to the confirmOrder method and refactor .env --- .env.example | 10 +++++----- app/Http/Controllers/OrderTunnelController.php | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index c0ee5e02..197a3721 100644 --- a/.env.example +++ b/.env.example @@ -22,16 +22,16 @@ SESSION_DRIVER=file SESSION_LIFETIME=120 REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null +REDIS_PASSWORD= REDIS_PORT=6379 MAIL_MAILER=smtp MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null +MAIL_USERNAME= +MAIL_PASSWORD= +MAIL_ENCRYPTION= +MAIL_FROM_ADDRESS= MAIL_FROM_NAME="${APP_NAME}" MAIL_ADMIN=equipe.web@ldc.fr diff --git a/app/Http/Controllers/OrderTunnelController.php b/app/Http/Controllers/OrderTunnelController.php index 40fec7f7..0659ee00 100644 --- a/app/Http/Controllers/OrderTunnelController.php +++ b/app/Http/Controllers/OrderTunnelController.php @@ -109,8 +109,6 @@ class OrderTunnelController extends Controller $order_line->save(); } //end foreach - // Empty cart. - Cart::destroy(); // Then redirect. return redirect()->route('sales.pick-slot', ['reference' => $order->reference]); } @@ -447,6 +445,9 @@ class OrderTunnelController extends Controller // 1 seul magasin en base pour le moment $magasin = Magasin::find($order->timeslot->magasin->id); + // Empty cart. + Cart::instance('panier')->destroy(); + return view('sales.confirm', compact('activestep', 'order', 'magasin')); } }