diff --git a/app/Http/Controllers/Orders/OrderController.php b/app/Http/Controllers/Orders/OrderController.php index 8a1727b..826daf9 100644 --- a/app/Http/Controllers/Orders/OrderController.php +++ b/app/Http/Controllers/Orders/OrderController.php @@ -74,7 +74,12 @@ class OrderController extends Controller public function print(String $orderId){ $order = order::findOrFail($orderId); - return $this->pdf->loadView('pages.pdf.qr', $order)->stream(); + $data = [ + 'order' => $order, + 'company' => Company::findOrFail($order->company_id), + 'delivery_address' => AddressBook::where('id', $order->address_id)->first() + ]; + return $this->pdf->loadView('pages.pdf.qr', compact('data'))->stream(); } public function download(String $orderId, String $type){ diff --git a/resources/views/pages/pdf/warehouse_qr.blade.php b/resources/views/pages/pdf/warehouse_qr.blade.php index 83e8372..42b668e 100644 --- a/resources/views/pages/pdf/warehouse_qr.blade.php +++ b/resources/views/pages/pdf/warehouse_qr.blade.php @@ -49,18 +49,6 @@

@if(strtolower($data['delivery_address']->state) === 'sabah') SB/ @elseif(strtolower($data['delivery_address']->state) === 'sarawak') SRW/ @endif{{$data['company']->marking}}/{{$data['order']->marking}}

- {{----}} - {{----}} - {{--
{{$data['delivery_address']->street_one.' '.$data['delivery_address']->street_two.' '.$data['delivery_address']->city.' '.$data['delivery_address']->post_code.' '.$data['delivery_address']->state}}
--}} - {{----}} - {{----}} - - -

仓库地址:

-

{{$data['warehouse_address']->street_one.' '.$data['warehouse_address']->street_two.' '.$data['warehouse_address']->city.' '.$data['warehouse_address']->state.' 邮编:'.$data['warehouse_address']->post_code}}

-

联系:{{$data['warehouse_contact'][0]->contact.' '.$data['warehouse_contact'][0]->name}} / {{$data['warehouse_contact'][1]->contact.' '.$data['warehouse_contact'][1]->name}}

- -