From 121c7c7e364c1c05c0346976c62f4c66f56d5b9f Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 10 Oct 2019 19:37:31 +0530
Subject: [PATCH] Issue #1585 fixed

---
 .../views/sales/invoices/pdf.blade.php        | 17 ++++++---
 .../customers/account/orders/pdf.blade.php    | 36 ++++++++++++-------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
index 74d82f9eb..1d69d82c4 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
@@ -103,7 +103,9 @@
                         <thead>
                             <tr>
                                 <th style="width: 50%">{{ __('admin::app.sales.invoices.bill-to') }}</th>
-                                <th>{{ __('admin::app.sales.invoices.ship-to') }}</th>
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('admin::app.sales.invoices.ship-to') }}</th>
+                                @endif
                             </tr>
                         </thead>
 
@@ -138,7 +140,10 @@
                         <thead>
                             <tr>
                                 <th style="width: 50%">{{ __('admin::app.sales.orders.payment-method') }}</th>
-                                <th>{{ __('admin::app.sales.orders.shipping-method') }}</th>
+
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('admin::app.sales.orders.shipping-method') }}</th>
+                                @endif
                             </tr>
                         </thead>
 
@@ -148,9 +153,11 @@
                                     {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
                                 </td>
 
-                                <td>
-                                    {{ $invoice->order->shipping_title }}
-                                </td>
+                                @if ($invoice->order->shipping_address)
+                                    <td>
+                                        {{ $invoice->order->shipping_title }}
+                                    </td>
+                                @endif
                             </tr>
                         </tbody>
                     </table>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
index 236f5eeb4..3ce020082 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
@@ -105,7 +105,9 @@
                         <thead>
                             <tr>
                                 <th style="width: 50%">{{ __('shop::app.customer.account.order.view.bill-to') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('shop::app.customer.account.order.view.ship-to') }}</th>
+                                @endif
                             </tr>
                         </thead>
 
@@ -123,14 +125,16 @@
                                     {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
                                 </td>
                                 
-                                <td>
-                                    <p>{{ $invoice->order->shipping_address->name }}</p>
-                                    <p>{{ $invoice->order->shipping_address->address1 }}</p>
-                                    <p>{{ $invoice->order->shipping_address->city }}</p>
-                                    <p>{{ $invoice->order->shipping_address->state }}</p>
-                                    <p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
-                                    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
-                                </td>
+                                @if ($invoice->order->shipping_address)
+                                    <td>
+                                        <p>{{ $invoice->order->shipping_address->name }}</p>
+                                        <p>{{ $invoice->order->shipping_address->address1 }}</p>
+                                        <p>{{ $invoice->order->shipping_address->city }}</p>
+                                        <p>{{ $invoice->order->shipping_address->state }}</p>
+                                        <p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
+                                        {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }}
+                                    </td>
+                                @endif
                             </tr>
                         </tbody>
                     </table>
@@ -141,7 +145,10 @@
                         <thead>
                             <tr>
                                 <th style="width: 50%">{{ __('shop::app.customer.account.order.view.payment-method') }}</th>
-                                <th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
+
+                                @if ($invoice->order->shipping_address)
+                                    <th>{{ __('shop::app.customer.account.order.view.shipping-method') }}</th>
+                                @endif
                             </tr>
                         </thead>
 
@@ -150,9 +157,12 @@
                                 <td>
                                     {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
                                 </td>
-                                <td>
-                                    {{ $invoice->order->shipping_title }}
-                                </td>
+
+                                @if ($invoice->order->shipping_address)
+                                    <td>
+                                        {{ $invoice->order->shipping_title }}
+                                    </td>
+                                @endif
                             </tr>
                         </tbody>
                     </table>