diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php index b67db312..ef0560e7 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierBillGroupLogic.php @@ -150,7 +150,9 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic } //create bill refund - foreach ($supplierRefunds as $supplierRefund) { + $amount += $service_charges; + + foreach ($supplierRefunds as $supplierRefund) { $refund = Transaction::find($supplierRefund['id']); $deductedRefunds = $refund->transactions()->where('type', TransactionType::BILL_REFUND)->where('status', ApprovalStatus::APPROVED)->get(); $refundDeductableAmount = $refund->amount - $deductedRefunds->sum('amount'); diff --git a/resources/assets/vue/components/bookings/elements/SupplierRefundComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierRefundComponent.vue index 6626ce56..1a42fe6c 100644 --- a/resources/assets/vue/components/bookings/elements/SupplierRefundComponent.vue +++ b/resources/assets/vue/components/bookings/elements/SupplierRefundComponent.vue @@ -19,6 +19,9 @@
Amount
+
{{item.currency.short_code}} {{((Math.round(( item.amount + Number.EPSILON) * 100) / 100)).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
@@ -39,6 +42,10 @@ type: String, required: true }, + is1688Supplier:{ + type: Boolean, + required: true + }, payments:{ type: Array, required: true diff --git a/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue index 5b28e017..9b7f8eb1 100644 --- a/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue @@ -48,10 +48,10 @@
Bill Refund Total:
-
- CNY {{ parameters.payment_total }}
+
- {{ this.supplierRefunds.length > 0 ? this.supplierRefunds[0].currency.short_code : 'MYR' }} {{ this.inputPaymentTotal > 0 ? refundTotal > this.inputPaymentTotal ? this.inputPaymentTotal : formatNumber(refundTotal) : '0.00' }}
-
- MYR {{ formatNumber(refundTotal > paymentTotal ? paymentTotal : refundTotal) }}
+
- {{ this.supplierRefunds[0].currency.short_code }} {{ formatNumber(refundTotal > paymentTotal ? paymentTotal : refundTotal) }}
@@ -59,10 +59,18 @@
Payment Total:
-
MYR {{ parameters.payment_total }}
+
MYR {{ formatNumber(this.inputPaymentTotal) }}
-
MYR {{ formatNumber(paymentTotal) }}
+
MYR {{ formatNumber(paymentTotal - refundTotal > 0 ? (paymentTotal - refundTotal) : 0) }}
+
+ +
+
+
Payment Total After Refund:
+
+
+
{{ this.supplierRefunds.length > 0 ? this.supplierRefunds[0].currency.short_code : 'MYR' }} {{ refundTotal > this.inputPaymentTotal ? '0.00' : formatNumber(this.inputPaymentTotal - refundTotal) }}
@@ -102,7 +110,7 @@ @@ -166,6 +174,9 @@ } }, computed: { + inputPaymentTotal(){ + return parseFloat(this.parameters.payment_total.replaceAll(',', '')); + }, originalTotal(){ return this.payments.reduce(function (total, currentValue) { return total + currentValue.original_amount; @@ -192,7 +203,7 @@ }, 0); }, billGroupCurrencyRate(){ - const paymentTotal = parseFloat(this.parameters.payment_total.replaceAll(',', '')); + const paymentTotal = this.inputPaymentTotal; return this.originalTotal && paymentTotal > 0 ? (this.originalTotal / paymentTotal).toFixed(5) : 1; }, is1688Supplier(){