diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index a4df7e4f..cfcd8389 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -21,11 +21,11 @@ class AddressResource extends JsonResource
 
         $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
         $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
-        $postcodeArea = in_array($this->postcode, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : '';
+        $postcodeArea = in_array($this->postcode, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : null;
         
         $outstationPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::OUTSTATION_POSTCODE)->get();
         $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
-        in_array($this->postcode, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : '';
+        in_array($this->postcode, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : null;
 
         return [
             'id' => $this->id,
@@ -34,6 +34,7 @@ class AddressResource extends JsonResource
             'street_two' => $this->street_two,
             'district' => $this->district,
             'state' => $this->state,
+            'postcode' => $this->postcode,
             'post_code' => $this->postcode,
             'post_code_area' => $postcodeArea,
             'country' => $this->country,
diff --git a/app/Http/Resources/CompanyModuleResource.php b/app/Http/Resources/CompanyModuleResource.php
index 51c651f7..13f4eb6a 100644
--- a/app/Http/Resources/CompanyModuleResource.php
+++ b/app/Http/Resources/CompanyModuleResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\BankAccountType;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\DocumentType;
@@ -41,6 +42,7 @@ class CompanyModuleResource extends JsonResource
             'name' => $this->name,
             'reference' => $this->reference,
             'address' => new AddressResource($defaultAddress),
+            'billingAddress' => new AddressResource($this->addresses()->where('type', AddressType::BILLING)->first()),
             'company' => new CompanyResource($this->whenLoaded('company')),
             'remarks' => RemarkResource::collection($this->remarks),
             'marking' => $marking,
diff --git a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
index a56c9f2d..806a8ff8 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
@@ -51,18 +51,24 @@
                             <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
-                            <div v-if="item.order"> <!-- used to filter out 'Unclaimed Packing List' -->
-                                <div v-if="!item.shippng_transaction"> <!-- only show this on 'PENDING INVOICE' and 'PENDING APPROVAL' tab -->
-                                    <!-- <div v-if="item.order.address"> -->
-                                    <div v-if="!item.order.address"> <!-- if order does not have address --> 
-                                        <div class="btn btn-primary btn-lg pointer requestModal" data-type="billingAddressComponent">Add Delivery Address</div>
+                            <div v-if="!item.shippng_transaction">
+                                <div v-if="item.order">
+                                    <div v-if="!item.order.company_module.billingAddress">
+                                        <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
                                         <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
-                                            <billing-address-form-component :section="section" :data="data"></billing-address-form-component>
+                                            <address-form-component :id="item.order.company_module.id" section="addressList" :type=1></address-form-component>
                                         </modal-component>
                                     </div>
-                                    <div v-else>
-                                        <div class="btn btn-outline-primary btn-lg pointer" @click="generateInvoice()">Generate Invoice</div>
+                                    <div v-if="!item.order.address.post_code_area">
+                                        <div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
+                                        <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
+                                            <declare-postcode-area-form-component :data="item.order.address"></declare-postcode-area-form-component>
+                                        </modal-component>
                                     </div>
+                                    <div v-if="item.order.company_module.billingAddress && item.order.address.post_code_area" class="btn btn-outline-primary btn-lg pointer" @click="generateInvoice()">Generate Invoice</div>
+                                </div>
+                                <div v-else>
+                                    <div class="btn btn-outline-primary btn-lg pointer invisible">Generate Invoice</div>
                                 </div>
                             </div>
                             <div class="btn bg-grey no-border muted requestModal" v-if="item.shippng_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
diff --git a/resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue b/resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue
index a822b542..840c2009 100644
--- a/resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue
@@ -102,7 +102,7 @@
                 <div class="col bg-master-lightest p-1 p-sm-4">
                     <div class="row tabsContainer tabContent" tab-name="pendingInvoice">
                         <div class="col">
-                            <list-component section="pendingInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{does_not_have_transaction_type: 1, owner_id_not_in: [1], type: 2}">
+                            <list-component section="pendingInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{does_not_have_transaction_type: 1, type: 2}">
                                 <template slot="list" slot-scope="{data}">
                                     <admin-payments-billing-component :data="data" invoice_status="Pending Invoice" section="pendingInvoiceSection" ></admin-payments-billing-component>
                                 </template>