@hmcts/ccpay-web-component 6.2.3-beta5 → 6.2.3-beta7

package/fesm2022/hmcts-ccpay-web-component.mjs

@@ -2138,7 +2138,7 @@ class CaseTransactionsComponent {
                 this.calculateOrderFeesAmounts();
                 this.calculateRefundAmount();
                 this.calculateAmountDueTo();
-                this.calculateOverpayment();
+                this.calculateOverpaymentBasedOnRemission();
                 this.validateAmountDueTo();
                 this.calculateOverpaymentBaseOnAcceptedRefund();
                 if (this.isFromServiceRequestPage) {
@@ -2166,7 +2166,7 @@ class CaseTransactionsComponent {
                 this.calculateAmounts();
                 this.calculateOrderFeesAmounts();
                 this.calculateAmountDueTo();
-                this.calculateOverpayment();
+                this.calculateOverpaymentBasedOnRemission();
                 this.validateAmountDueTo();
                 this.calculateOverpaymentBaseOnAcceptedRefund();
                 this.totalRefundAmount = this.calculateRefundAmount();
@@ -2256,7 +2256,7 @@ class CaseTransactionsComponent {
                 paymentGroup.fees.forEach(fee => {
                     this.orderFeesTotal = this.orderFeesTotal + fee.calculated_amount;
                     this.overPaymentAmount = this.overPaymentAmount + fee.over_payment;
-                    this.paymentLibComponent.balanceToBePaid = this.overPaymentAmount;
+                    this.paymentLibComponent.overPaymentAmount = this.overPaymentAmount;
                 });
             }
             if (paymentGroup.remissions) {
@@ -2269,7 +2269,7 @@ class CaseTransactionsComponent {
                 paymentGroup.payments.forEach(payment => {
                     if (isFeeOverPaymentExist) {
                         this.overPaymentAmount = this.overPaymentAmount + payment.over_payment;
-                        this.paymentLibComponent.balanceToBePaid = this.overPaymentAmount;
+                        this.paymentLibComponent.overPaymentAmount = this.overPaymentAmount;
                     }
                     if (payment.status.toUpperCase() === 'SUCCESS') {
                         this.orderTotalPayments = this.orderTotalPayments + payment.amount;
@@ -2456,12 +2456,13 @@ class CaseTransactionsComponent {
         });
         return result;
     }
-    calculateOverpayment() {
+    calculateOverpaymentBasedOnRemission() {
+        // This sept is done to calculate a possible over payment due to remissions on fees.
         if (this.isThereRemissions()) {
             let newValue = this.totalPayments - (this.orderFeesTotal - this.totalRemissions);
             if (newValue > 0) {
                 this.overPaymentAmount = newValue;
-                this.paymentLibComponent.balanceToBePaid = this.overPaymentAmount;
+                this.paymentLibComponent.overPaymentAmount = this.overPaymentAmount;
             }
         }
     }
@@ -2480,6 +2481,7 @@ class CaseTransactionsComponent {
         }
     }
     calculateOverpaymentBaseOnAcceptedRefund() {
+        // This sept is done to re calculate the final over payments values based on accepted refunds.
         this.paymentGroups.forEach(paymentGroup => {
             if (paymentGroup.refunds != null && paymentGroup.refunds.length > 0) {
                 this.paymentLibComponent.refunds = paymentGroup.refunds;
@@ -2493,7 +2495,7 @@ class CaseTransactionsComponent {
                             this.overPaymentAmount = newValue;
                         }
                     }
-                    this.paymentLibComponent.balanceToBePaid = this.overPaymentAmount;
+                    this.paymentLibComponent.overPaymentAmount = this.overPaymentAmount;
                 });
             }
         });
@@ -2666,7 +2668,7 @@ class CaseTransactionsComponent {
         this.paymentLibComponent.paymentReference = paymentGroup.paymentReference;
         this.paymentLibComponent.viewName = 'payment-view';
         this.paymentLibComponent.paymentGroup = this.paymentGroup;
-        this.paymentLibComponent.balanceToBePaid = this.overPaymentAmount;
+        this.paymentLibComponent.overPaymentAmount = this.overPaymentAmount;
     }
     goToPayementView(paymentGroupReference, paymentReference, paymentMethod) {
         this.goToPaymentViewComponent({ paymentGroupReference, paymentReference, paymentMethod });
@@ -3047,25 +3049,25 @@ class ServiceRequestComponent {
             if (this.chkIsIssueRefundBtnEnable(payment)) {
                 this.paymentViewService.getApportionPaymentDetails(payment.reference).subscribe(paymentGroup => {
                     paymentGroup.payments = paymentGroup.payments.filter(paymentGroupObj => paymentGroupObj['reference'].includes(payment.reference));
-                    // No refund and no over payment
+                    // No refund and no over payment --> showIssueRefundPage()
                     if (!this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() == 0) {
                         this.showIssueRefundPage(paymentGroup, payment);
                         return;
                     }
-                    // No refund and over payment
+                    // No refund and over payment --> showOverPayment()
                     if (!this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() > 0) {
                         this.showOverPayment(paymentGroup, payment);
                         return;
                     }
-                    // Refunds means and No over payment --> refunds accepted.
+                    // Refunds > 0  and overPayment == 0 ---> refunds accepted. showIssueRefundPage()
                     if (this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() == 0) {
                         this.showIssueRefundPage(paymentGroup, payment);
                         return;
                     }
-                    // Refunds means and No over payment --> refunds in process or Rejected.
+                    // Refunds > 0 and overPayment > 0 --> refunds in process or Rejected.
                     if (this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() > 0) {
-                        let refund = this.getRefundByFeeID(paymentGroup.fees.at(0).id.toString());
-                        if (refund.refund_status.name === 'Rejected') {
+                        // rejected by fee refunds === refunds by fee it means that refund for the current fee is rejected.
+                        if (this.isTheCurrentRefundRejectedForTheFee(paymentGroup.fees.at(0).id.toString())) {
                             this.showOverPayment(paymentGroup, payment);
                             return;
                         }
@@ -3077,6 +3079,15 @@ class ServiceRequestComponent {
             }
         }
     }
+    isTheCurrentRefundRejectedForTheFee(feeCode) {
+        let refundsByFee = this.paymentLibComponent.refunds.filter(refund => refund.fee_ids === feeCode);
+        let refundsByFeeAndRejected = this.paymentLibComponent.refunds.filter(refund => refund.refund_status.name === 'Rejected');
+        // Refunds > 0  and overPayment --> refunds in process or Rejected.
+        if (refundsByFee.length === refundsByFeeAndRejected.length) {
+            return true;
+        }
+        return false;
+    }
     isAnyRefundsForThisCase() {
         return (this.paymentLibComponent.refunds != null) && (this.paymentLibComponent.refunds.length > 0);
     }
@@ -3101,15 +3112,7 @@ class ServiceRequestComponent {
         this.isFromServiceRequestPage = false;
     }
     getBalanceToBePaid() {
-        return this.paymentLibComponent.balanceToBePaid;
-    }
-    getRefundByFeeID(feeCode) {
-        for (const refund of this.paymentLibComponent.refunds) {
-            if (refund.fee_ids === feeCode) {
-                return refund;
-            }
-        }
-        return null;
+        return this.paymentLibComponent.overPaymentAmount;
     }
     goToPayementView(paymentGroupReference, paymentReference, paymentMethod) {
         this.goToPaymentViewComponent({ paymentGroupReference, paymentReference, paymentMethod });
@@ -3158,12 +3161,21 @@ class ServiceRequestComponent {
     }
     chkIsAddRemissionBtnEnable(fee) {
         if (fee !== null && fee !== undefined) {
-            return fee.add_remission && fee.remission_enable;
+            return fee.add_remission && fee.remission_enable && this.isTheCurrentRefundInProcessForThisFee(fee);
         }
         else {
             return false;
         }
     }
+    // This method is going to check if the current refund has been rejected.
+    // If this is the case the button should be disable.
+    isTheCurrentRefundInProcessForThisFee(fee) {
+        // No refunds
+        if (this.paymentLibComponent.refunds == null || this.paymentLibComponent.refunds.length === 0) {
+            return false;
+        }
+        return !this.isTheCurrentRefundRejectedForTheFee(fee.id.toString());
+    }
     resetOrderData() {
         this.OrderslistService.setOrderRef(null);
         this.OrderslistService.setorderCCDEvent(null);
@@ -3252,7 +3264,7 @@ class ServiceRequestComponent {
         this.paymentGroupList.fees.forEach(fee => {
             feesOverPayment += fee.over_payment;
         });
-        return feesOverPayment > 0 ? feesOverPayment : this.paymentLibComponent.balanceToBePaid;
+        return feesOverPayment > 0 ? feesOverPayment : this.paymentLibComponent.overPaymentAmount;
     }
     getTemplateInstructionType(payment) {
         if (payment == undefined || payment == null) {
@@ -4410,7 +4422,7 @@ class AddRemissionComponent {
                 return remission.overall_balance.toString();
             }
             else {
-                return this.paymentLibComponent.balanceToBePaid.toString();
+                return this.paymentLibComponent.overPaymentAmount.toString();
             }
         }
         return "undefined";
@@ -4707,7 +4719,7 @@ class PaymentViewComponent {
         this.paymentGroup.fees.forEach(fee => {
             feesOverPayment += fee.over_payment;
         });
-        return feesOverPayment > 0 ? feesOverPayment : this.paymentLibComponent.balanceToBePaid;
+        return feesOverPayment > 0 ? feesOverPayment : this.paymentLibComponent.overPaymentAmount;
     }
     goToServiceRequestPage() {
         this.paymentLibComponent.viewName = 'case-transactions';
@@ -4815,25 +4827,25 @@ class PaymentViewComponent {
     issueRefund(paymentgrp) {
         if (paymentgrp !== null && paymentgrp !== undefined) {
             if (this.chkIsIssueRefundBtnEnable(paymentgrp.payments[0])) {
-                // No refund and no over payment
+                // No refund and no over payment --> showIssueRefundPage()
                 if (!this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() == 0) {
                     this.showIssueRefundPage(paymentgrp);
                     return;
                 }
-                // No refund and over payment
+                // No refund and over payment --> showOverPayment()
                 if (!this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() > 0) {
                     this.showOverPayment();
                     return;
                 }
-                // Refunds means and No over payment --> refunds accepted.
+                // Refunds > 0  and overPayment == 0 ---> refunds accepted. showIssueRefundPage(s)
                 if (this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() == 0) {
                     this.showIssueRefundPage(paymentgrp);
                     return;
                 }
-                // Refunds means and No over payment --> refunds in process or Rejected.
+                // Refunds > 0 and overPayment > 0 --> refunds in process or Rejected.
                 if (this.isAnyRefundsForThisCase() && this.getBalanceToBePaid() > 0) {
-                    let refund = this.getRefundByFeeID(this.paymentFees.at(0).id.toString());
-                    if (refund.refund_status.name === 'Rejected') {
+                    // rejected by fee refunds === refunds by fee it means that refund for the current fee is rejected.
+                    if (this.isTheCurrentRefundRejectedForTheFee(this.paymentFees.at(0).id.toString())) {
                         this.showOverPayment();
                         return;
                     }
@@ -4844,6 +4856,15 @@ class PaymentViewComponent {
             }
         }
     }
+    isTheCurrentRefundRejectedForTheFee(feeCode) {
+        let refundsByFee = this.paymentLibComponent.refunds.filter(refund => refund.fee_ids === feeCode);
+        let refundsByFeeAndRejected = this.paymentLibComponent.refunds.filter(refund => refund.refund_status.name === 'Rejected');
+        // Refunds > 0  and overPayment --> refunds in process or Rejected.
+        if (refundsByFee.length === refundsByFeeAndRejected.length) {
+            return true;
+        }
+        return false;
+    }
     isAnyRefundsForThisCase() {
         return (this.paymentLibComponent.refunds != null) && (this.paymentLibComponent.refunds.length > 0);
     }
@@ -4859,15 +4880,7 @@ class PaymentViewComponent {
         this.isFromServiceRequestPage = false;
     }
     getBalanceToBePaid() {
-        return this.paymentLibComponent.balanceToBePaid;
-    }
-    getRefundByFeeID(feeCode) {
-        for (const refund of this.paymentLibComponent.refunds) {
-            if (refund.fee_ids === feeCode) {
-                return refund;
-            }
-        }
-        return null;
+        return this.paymentLibComponent.overPaymentAmount;
     }
     getRemissionByFeeCode(feeCode, remissions) {
         if (remissions && remissions.length > 0) {
@@ -4908,12 +4921,21 @@ class PaymentViewComponent {
     }
     chkIsAddRemissionBtnEnable(fee) {
         if (fee !== null && fee !== undefined) {
-            return fee.add_remission && fee.remission_enable;
+            return fee.add_remission && fee.remission_enable && this.isTheCurrentRefundInProcessForThisFee(fee);
         }
         else {
             return false;
         }
     }
+    // This method is going to check if the current refund has been rejected.
+    // If this is the case the button should be disable.
+    isTheCurrentRefundInProcessForThisFee(fee) {
+        // No refunds
+        if (this.paymentLibComponent.refunds == null || this.paymentLibComponent.refunds.length === 0) {
+            return false;
+        }
+        return !this.isTheCurrentRefundRejectedForTheFee(fee.id.toString());
+    }
     selectPymentOption(paymentType) {
         this.paymentType = paymentType;
         this.isContinueBtnDisabled = false;
@@ -7579,7 +7601,7 @@ class PaymentLibComponent {
     orderTotalPayments = 0.00;
     orderPendingPayments = 0.00;
     paymentGroup;
-    balanceToBePaid = 0.00;
+    overPaymentAmount = 0.00;
     refunds;
     constructor(paymentLibService, cd, OrderslistService) {
         this.paymentLibService = paymentLibService;