diff --git a/app/Models/Address.php b/app/Models/Address.php
index 47a615b2..f61a6f3e 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 
 /**
  * Class Address
@@ -58,4 +59,13 @@ class Address extends AbstractModel
     {
         return $this->BelongsTo(District::class, 'district_id', 'id');
     }
+
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeDefault(Builder $query)
+    {
+        return $query->where('default', '=',true)->first();
+    }
 }
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 7cf26d47..3c38d9e5 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -52,12 +52,15 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->default();
                     @endphp
-                    {{ $addresses->street_one }} 
-                    {{ $addresses->street_two }} 
-                    {{ $addresses->state()->first()->name }}
-                    {{ $addresses->district()->first()->name }}
+
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }},
+                    {{ $addresses->district->name }},
+                    {{ $addresses->post_code }}
+                    {{ $addresses->state->name }},
+                    {{ $addresses->country->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 0c721442..2c315ddc 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -51,12 +51,15 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->default();
                     @endphp
-                    {{ $addresses->street_one }} 
-                    {{ $addresses->street_two }} 
-                    {{ $addresses->state()->first()->name }}
-                    {{ $addresses->district()->first()->name }}
+
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }},
+                    {{ $addresses->district->name }},
+                    {{ $addresses->post_code }}
+                    {{ $addresses->state->name }},
+                    {{ $addresses->country->name }}
                 </div>
                 <div>
                     Phone: {{ $supplier->contacts()->first()->phone }}