From e9a55aec94047c0f50ab5d20d6c242a1a9ec892f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 Dec 2017 16:36:35 +0200
Subject: [PATCH] Check we're using the shipping address with the delivery note

---
 app/Http/Controllers/InvoiceController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index c380430fd9dc..01594fa5a89b 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -603,6 +603,12 @@ class InvoiceController extends BaseController
         ];
         $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 = [
             'invoice' => $invoice,
             'invoiceDesigns' => InvoiceDesign::getDesigns(),