large commit

This commit is contained in:
Omair Saleh
2019-12-26 12:41:28 +08:00
parent 1645b89b4b
commit eb9c8e7401
2 changed files with 6 additions and 13 deletions
@@ -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){
@@ -49,18 +49,6 @@
<h3 style="margin-top: 0px !important; margin-bottom: 10px !important;">@if(strtolower($data['delivery_address']->state) === 'sabah') SB/ @elseif(strtolower($data['delivery_address']->state) === 'sarawak') SRW/ @endif{{$data['company']->marking}}/{{$data['order']->marking}}</h3>
</td>
</tr>
{{--<tr>--}}
{{--<td style="border-bottom: solid 1px #000000;">--}}
{{--<h5 style="margin-top: 10px !important; margin-bottom: 10px !important; word-wrap: break-word">{{$data['delivery_address']->street_one.' '.$data['delivery_address']->street_two.' '.$data['delivery_address']->city.' '.$data['delivery_address']->post_code.' '.$data['delivery_address']->state}}</h5>--}}
{{--</td>--}}
{{--</tr>--}}
<tr>
<td>
<p style="font-size: 12px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
<p style="margin-top: 5px !important; margin-bottom: 5px !important; word-wrap: break-word; font-size: 16px;">{{$data['warehouse_address']->street_one.' '.$data['warehouse_address']->street_two.' '.$data['warehouse_address']->city.' '.$data['warehouse_address']->state.' 邮编:'.$data['warehouse_address']->post_code}}</p>
<p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 12px;">联系:{{$data['warehouse_contact'][0]->contact.' '.$data['warehouse_contact'][0]->name}} / {{$data['warehouse_contact'][1]->contact.' '.$data['warehouse_contact'][1]->name}}</p>
</td>
</tr>
</tbody>
</table>