Merge branch '22-ts-1260' into 'develop'
Resolve "ts-1260" See merge request ldc-web/projets/boutique-cnc-sable!35
This commit is contained in:
commit
35b35296b3
2 changed files with 8 additions and 7 deletions
10
.env.example
10
.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
|
||||
|
|
|
|||
|
|
@ -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'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue