cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-28 00:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/46.9-warehouse-storage-charges-fixes' into development

Browse Source
This commit is contained in:
Dillon Ngo
2024-03-09 01:22:29 +08:00
parent ff9cb8a9b6 5dd2df02fd
commit a829bec73e
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue
+15 -1
View File
@@ -277,7 +277,7 @@
<div class="font-heading fs-12">MYR {{(Math.round((totalOutstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
</div>
</div>
<div class="row m-t-20" v-if="totalOutstanding - totalFloating > 0.009">
<div class="row m-t-20" v-if="totalOutstanding - totalFloating > 0.009 && !groupPaymentPending">
<div class="col">
<div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
@@ -345,6 +345,20 @@
});
return ids;
},
groupPaymentPending(){
if (Array.isArray(this.items)) {
for (let i = 0; i < this.items.length; i++) {
for (let j = 0; j < this.items[i].groups_payment_history.length; j++) {
const item = this.items[i].groups_payment_history[j];
// console.log('item', JSON.stringify(item));
if (item.payment_transaction && item.payment_transaction.status === 1) {
return true;
}
}
}
}
return false;
}
},
methods: {
getLatestComment(item) {