From f8140c9ee36d32523cbc175a478caa38d784d96c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 22 Jun 2021 15:29:56 +0800
Subject: [PATCH] fix incorrect address format for invoice documents

---
 resources/views/pages/pdfs/deliver_order.blade.php | 11 +++++------
 resources/views/pages/pdfs/invoice.blade.php       | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 3c38d9e5..445e6cf6 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -52,15 +52,14 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->default();
+                        $addresses = $supplier->addresses()->first();
                     @endphp
-
                     {{ $addresses->street_one }}
-                    {{ $addresses->street_two }},
-                    {{ $addresses->district->name }},
+                    {{ $addresses->street_two }} ,
+                    {{ $addresses->district()->first()->name }},
                     {{ $addresses->post_code }}
-                    {{ $addresses->state->name }},
-                    {{ $addresses->country->name }}
+                    {{ $addresses->state()->first()->name }},
+                    {{ $addresses->country()->first()->name }}
                 </div>
                 <div>
                     Phone: {{ $supplier->contacts()->first()->phone }}
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 2c315ddc..69fb52a7 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -51,15 +51,14 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->default();
+                        $addresses = $supplier->addresses()->first();
                     @endphp
-
                     {{ $addresses->street_one }}
-                    {{ $addresses->street_two }},
-                    {{ $addresses->district->name }},
+                    {{ $addresses->street_two }} ,
+                    {{ $addresses->district()->first()->name }},
                     {{ $addresses->post_code }}
-                    {{ $addresses->state->name }},
-                    {{ $addresses->country->name }}
+                    {{ $addresses->state()->first()->name }},
+                    {{ $addresses->country()->first()->name }}
                 </div>
                 <div>
                     Phone: {{ $supplier->contacts()->first()->phone }}