diff --git a/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php
index b8fb81c6..05abbc8d 100644
--- a/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php
@@ -17,6 +17,8 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Models\Order;
 
 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -30,17 +32,21 @@ class ApproveShippingInvoiceTransactionProcessor
     /** @var CreatesFiles */
     private $createsFiles;
 
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
 
     /**
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFiles
      */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->createsDocument = $createsDocument;
         $this->createsFiles = $createsFiles;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -50,7 +56,6 @@ class ApproveShippingInvoiceTransactionProcessor
      */
     public function execute(PackingList $packingList)
     {
-
         /** @var Transaction $invoice_transaction */
         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
 
@@ -75,6 +80,11 @@ class ApproveShippingInvoiceTransactionProcessor
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
 
+        $order = $packingList->owner()->first();
+        if($order instanceof Order){
+            $this->storageInvoiceTransactionProcessor->executeOrder($order);
+        }
+
         return;
     }
 
diff --git a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
index 840dca8d..d619eb17 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
@@ -19,31 +19,36 @@
                             <p class="no-margin fs-10 all-caps">Amount</p>
                             <div>MYR {{ item.amount.toFixed(2) }}</div>
                         </div>
-                        <div class="col-3" v-if="item.remarks.length">
-                            <p class="no-margin fs-10 all-caps">Billing Question</p>
-                            <div>
-                                {{  getLatestComment(item).content }}
-                                <span class="btn requestModal no-border" v-if="item.remarks.length" size="large" data-type="chatmodal">
-                                    <i class="fa fa-comment-o"></i>
-                                </span>
+                        <div class="col-2">
+                            <div v-if="item.remarks.length">
+                                <p class="no-margin fs-10 all-caps">Billing Question</p>
+                                <div>
+                                    {{  getLatestComment(item).content }}
+                                    <span class="btn requestModal no-border" v-if="item.remarks.length" size="large" data-type="chatmodal">
+                                        <i class="fa fa-comment-o"></i>
+                                    </span>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="chatmodal">
+                                    <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
+                                </modal-component>
                             </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="chatmodal">
-                                <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
-                            </modal-component>
-                        </div>
-                        <div class="col-3" v-else>
-                            <p class="no-margin fs-10 all-caps invisible">Billing Question</p>
-                            <div>
-                                <span class="btn requestModal no-border invisible">
-                                    <i class="fa fa-edit"></i>
-                                </span>
+                            <div v-else>
+                                <p class="no-margin fs-10 all-caps invisible">Billing Question</p>
+                                <div>
+                                    <span class="btn requestModal no-border invisible">
+                                        <i class="fa fa-edit"></i>
+                                    </span>
+                                </div>
                             </div>
                         </div>
-                        <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center">
-                            <div :class="[{'invisible': [5, 6, 3].includes(item.status)}]">
+                        <div class="col-2 p-l-0 p-r-0 d-flex justify-content-center align-items-center">
+                            <div v-if="item.type === 1"  :class="[{'invisible': [5, 6, 3].includes(item.status)}]">
                                 <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
                             </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingRemark">
+                            <div v-else class="invisible">
+                                <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                            </div>
+                            <modal-component v-if="item.type === 1" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingRemark">
                                 <customer-invoice-remark-form-component module_type="Transaction" :data="item" :section="section"></customer-invoice-remark-form-component>
                             </modal-component>
                             <div v-if="item.documents.length">
@@ -63,7 +68,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                        <div class="col-1 p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
                             <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
                                 <i class="fa fa-close"></i>
                             </span>
@@ -71,7 +76,7 @@
                                 <delete-invoice-form-component :data="item" :section="section"></delete-invoice-form-component>
                             </modal-component>
                         </div>
-                        <div class="col-auto hide">
+                        <div class="col-1 hide">
                             <div class="btn btn-sm all-caps b-rad-none btn-block" :class="{'btn-success': !expanded, 'btn-default': expanded}" @click="expanded = !expanded">
                                 {{ expanded ? 'Cancel' : 'Make Payment' }}</div>
                         </div>