diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index acc6a8dc..7ee3319d 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -477,7 +477,7 @@ class OrdersController extends Controller $order = Order::where('reference', '=', $reference)->firstOrFail(); //1 seul magasin en base pour le moment - $magasin = Magasin::first(); + $magasin = Magasin::find($order->timeslot->magasin->id); return view('sales.confirm', compact('activestep', 'order', 'magasin')); } diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 65fc4e58..b8d07d65 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -16,7 +16,7 @@ class ContactController extends Controller { $status = $request->session()->get('status'); - //1 seul magasin en base pour le moment + //1er magasin en base pour le moment $magasin = Magasin::first(); $content = Content::where('key', 'contact')->first(); diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 5bb73bf5..258e45ee 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -389,7 +389,7 @@ class CustomerController extends Controller $order = Order::where('reference', '=', $reference) ->where('customer_id', Auth::guard('customer')->user()->id) ->firstOrFail(); - $magasin = Magasin::first(); + $magasin = Magasin::find($order->timeslot->magasin->id); return view('customer.order-detail', compact('order', 'magasin')); } diff --git a/app/Mail/OrderConfirmAdminMail.php b/app/Mail/OrderConfirmAdminMail.php index 3e6e28e7..cdfd7ac7 100644 --- a/app/Mail/OrderConfirmAdminMail.php +++ b/app/Mail/OrderConfirmAdminMail.php @@ -32,7 +32,7 @@ class OrderConfirmAdminMail extends Mailable public function build() { $order = $this->order; - $magasin = Magasin::first(); + $magasin = Magasin::find($order->timeslot->magasin->id); return $this->subject("Nouvelle Commande - " . config('theme.site_name'))->view('emails.order-confirm-admin', compact('order', 'magasin')); } diff --git a/app/Mail/OrderConfirmMail.php b/app/Mail/OrderConfirmMail.php index 9aa451be..368ff228 100644 --- a/app/Mail/OrderConfirmMail.php +++ b/app/Mail/OrderConfirmMail.php @@ -32,7 +32,7 @@ class OrderConfirmMail extends Mailable public function build() { $order = $this->order; - $magasin = Magasin::first(); + $magasin = Magasin::find($order->timeslot->magasin->id); return $this->subject("Votre commande - " . config('theme.site_name'))->view('mails.order-confirm', compact('order', 'magasin')); } diff --git a/app/Mail/OrderStatusMail.php b/app/Mail/OrderStatusMail.php index 4759c69a..8b47eaf6 100644 --- a/app/Mail/OrderStatusMail.php +++ b/app/Mail/OrderStatusMail.php @@ -32,7 +32,7 @@ class OrderStatusMail extends Mailable public function build() { $order = $this->order; - $magasin = Magasin::first(); + $magasin = Magasin::find($order->timeslot->magasin->id); return $this->subject("Votre commande - " . config('theme.site_name'))->view('mails.order-status', compact('order', 'magasin')); }