large commit

This commit is contained in:
Omair Saleh
2019-10-18 10:10:01 +08:00
parent 6a91664c9d
commit e717a7105d
2 changed files with 4 additions and 4 deletions
@@ -75,7 +75,7 @@ class OrderController extends Controller
public function download(String $orderId, String $type){
$order = order::findOrFail($orderId);
$warehouse = OrderWarehouse::where('order_id', $orderId)->firstOrFail();
$warehouseAddress = AddressBook::where('type', 2)->where('reference_id', $warehouse->warehouse_id)->firstOrFail();
$warehouseAddress = AddressBook::where('reference_id', $warehouse->warehouse_id)->firstOrFail();
$warehouseContact = Contact::where('type', 2)->where('reference_id', $warehouse->warehouse_id)->get();
$data = [
@@ -86,9 +86,9 @@ class OrderController extends Controller
'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();
}
}
+1 -1
View File
@@ -46,7 +46,7 @@
<tbody>
<tr>
<td style="border-bottom: solid 2px #000000;">
<h2 style="margin-top: 0px !important; margin-bottom: 10px !important;">@if(strtolower($delivery_address->state) === 'sabah') SB/ @elseif(strtolower($delivery_address->state) === 'sarawak') SRW/ @endif{{$company->marking}}</h2>
<h3 style="margin-top: 0px !important; margin-bottom: 10px !important;">@if(strtolower($delivery_address->state) === 'sabah') SB/ @elseif(strtolower($delivery_address->state) === 'sarawak') SRW/ @endif{{$company->marking}}/{{$order->marking}}</h3>
</td>
</tr>
<tr>