Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check we're using the shipping address with the delivery note

Browse Source
This commit is contained in:
Hillel Coren 2017-12-31 16:36:35 +02:00
parent 62ba989043
commit e9a55aec94
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/InvoiceController.php
View File

@ -603,6 +603,12 @@ class InvoiceController extends BaseController
]; ];
$invoice->invoice_type_id = intval($invoice->invoice_type_id); $invoice->invoice_type_id = intval($invoice->invoice_type_id);
if ($invoice->client->shipping_address1) {
foreach (['address1', 'address2', 'city', 'state', 'postal_code', 'country_id'] as $field) {
$invoice->client->$field = $invoice->client->{'shipping_' . $field};
}
}
$data = [ $data = [
'invoice' => $invoice, 'invoice' => $invoice,
'invoiceDesigns' => InvoiceDesign::getDesigns(), 'invoiceDesigns' => InvoiceDesign::getDesigns(),