From 0cab8e64561c90138e6b3c2754cfff40b60d5f9d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 14 Sep 2020 16:14:06 +0800 Subject: [PATCH] order module (code needs cleaning up) --- .../Controllers/Orders/OrderController.php | 6 +++--- resources/views/pages/pdf/qr.blade.php | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Orders/OrderController.php b/app/Http/Controllers/Orders/OrderController.php index a7fd42a4..e2eb9836 100644 --- a/app/Http/Controllers/Orders/OrderController.php +++ b/app/Http/Controllers/Orders/OrderController.php @@ -69,14 +69,14 @@ class OrderController $data = [ 'order' => $order, 'company' => $order->importer(), - 'delivery_address' => $order->address(), + 'delivery_address' => $order->address, 'warehouse_address' => $warehouseAddress, 'warehouse_contact' => $warehouseContact ]; -// return view('pages.pdf.qr', $data); + return view('pages.pdf.qr', $data); - return $this->pdf->loadView('pages.pdf.qr', $data)->stream(); +// return $this->pdf->loadView('pages.pdf.qr', $data)->stream(); } } \ No newline at end of file diff --git a/resources/views/pages/pdf/qr.blade.php b/resources/views/pages/pdf/qr.blade.php index 2ae2eddc..fa46b19e 100644 --- a/resources/views/pages/pdf/qr.blade.php +++ b/resources/views/pages/pdf/qr.blade.php @@ -1,7 +1,7 @@ - order-qr-{{$order->marking}} + order-qr-{{$order->order_number}}