diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
index cda9e10b..c97ff13a 100644
--- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -25,7 +25,7 @@ class CreatesBillplzBill
                 'name' => $name,
                 'email' => $email,
                 'description' => $description,
-                'amount' => round($amount, 2) * 100,
+                'amount' => $this->finalizeAmount($amount),
                 'redirect_url' => route('online_payment.redirect'),
                 'callback_url' => route('api.online_payment.callback'),
                 'reference_1_label' => 'Bank Code',
@@ -47,4 +47,9 @@ class CreatesBillplzBill
             throw new MalformedRequestException('Unable to get correct response from billplz server' . $exception->getMessage());
         }
     }
+
+    protected function finalizeAmount($amount){
+        $number = round($amount, 2) * 100;
+        return (string) $number;
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 4f25ae3d..80199df9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -42,7 +42,7 @@ class BookingResource extends JsonResource
                 'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
                 'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
                 'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
-                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->first()),
+                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
             ],
             'status' => $this->status,
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index a82dd719..0cd7148f 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -122,6 +122,7 @@
             <div class="row" v-if="submitted && data.status !== 3">
                 <div class="col-12 col-md-7">
                     <button class="btn btn-xs btn-success b-rad-none" v-if="$store.getters.isAdmin && data.purchase_order.status === 1" @click="submit(route('api.booking.po.approval', data.id), 'post', section, true, true)">Approve Purchase Order</button>
+                    <button class="btn btn-xs btn-warning b-rad-none" v-if="data.documents.proforma_invoice" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Regenerate Proforma Invoice</button>
                     <div class="row">
                         <div class="col-12 col-lg-6">
                             <document-file-viewer-component :file="data.documents.proforma_invoice.files[0]" v-if="data.documents.proforma_invoice">
@@ -149,7 +150,7 @@
                             </div>
                         </div>
                         <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest w-100" @click="submitted = false">Edit Purchase Order</button>
-                        <button class="btn btn-xs all-caps b-rad-none btn-success w-100 m-t-5" v-if="!data.documents.proforma_invoice" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Generate Proforma Invoice</button>
+                        <button class="btn btn-xs all-caps b-rad-none btn-success w-100 m-t-5" v-if="!data.documents.proforma_invoice && data.outstanding_amount != 0" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Generate Proforma Invoice</button>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 37fc1d67..3eb7576e 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -52,7 +52,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 4c3e28b6..581773fe 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -51,7 +51,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php
index 3615a2b7..7d2c77c7 100644
--- a/resources/views/pages/pdfs/proforma_invoice.blade.php
+++ b/resources/views/pages/pdfs/proforma_invoice.blade.php
@@ -51,7 +51,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index a925112c..d190f285 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -42,7 +42,7 @@
                 <br>
                 <span class="address">
                    @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }} 
                     {{ $addresses->street_two }}