digipay-utility-payment 0.0.20 → 0.0.22

package/fesm2022/digipay-utility-payment.mjs

@@ -1922,6 +1922,7 @@ class BillWorkflowComponent {
     allWorkflowData = {};
     selectedProduct = null;
     PRODUCT_PRICE_TYPE = PRODUCT_PRICE_TYPE;
+    isInitialized = false;
     constructor(topupAndBillpaymentService, toasterService, fb, translationService, router, cdr, sdkState) {
         this.topupAndBillpaymentService = topupAndBillpaymentService;
         this.toasterService = toasterService;
@@ -1950,42 +1951,57 @@ class BillWorkflowComponent {
                 this.currentScreenIndex = index;
             }
         });
+        this.topupAndBillpaymentService.workflowData.pipe(takeUntil(this.destroy$)).subscribe((data) => {
+            if (isNotNull(data)) {
+                this.allWorkflowData = data;
+            }
+        });
         this.topupAndBillpaymentService.workflowScreens.pipe(takeUntil(this.destroy$)).subscribe((screens) => {
             if (isNotNull(screens)) {
                 this.workflowScreens = screens;
-                if (this.workflowScreens.length > 0 && this.currentScreenIndex < this.workflowScreens.length) {
+                if (this.isInitialized &&
+                    this.workflowScreens.length > 0 &&
+                    this.currentScreenIndex < this.workflowScreens.length) {
                     this.loadCurrentScreen();
                 }
             }
         });
-        this.topupAndBillpaymentService.workflowData.pipe(takeUntil(this.destroy$)).subscribe((data) => {
-            if (isNotNull(data)) {
-                this.allWorkflowData = data;
-            }
-        });
         // Create form with updateOn: 'change' for real-time validation
         this.detailsForm = this.fb.group({}, { updateOn: 'change' });
     }
     ngOnInit() {
-        if (this.workflowScreens.length === 0) {
-            if (this.billData) {
-                this.checkWorkflowForBill(this.billData);
-            }
-            else if (this.selectedBill) {
-                this.checkWorkflowForBill(this.selectedBill);
+        this.syncSelectedBillFromInputs();
+        if (this.workflowScreens.length > 0) {
+            if (this.getSelectedBill()) {
+                this.loadCurrentScreen();
             }
         }
+        else if (this.billData) {
+            this.checkWorkflowForBill(this.billData);
+        }
+        else if (this.selectedBill) {
+            this.checkWorkflowForBill(this.selectedBill);
+        }
+        this.isInitialized = true;
     }
     ngAfterViewInit() {
         // Detect changes after view initialization to prevent ExpressionChangedAfterItHasBeenCheckedError
         this.cdr.detectChanges();
     }
     ngOnChanges(changes) {
+        const billFromInput = changes['billData']?.currentValue ?? changes['selectedBill']?.currentValue;
+        if (billFromInput) {
+            this.selectedBill = billFromInput;
+            if (this.isInitialized && this.workflowScreens.length > 0) {
+                this.loadCurrentScreen();
+                return;
+            }
+        }
         if (this.workflowScreens.length === 0) {
-            if (changes['billData'] && changes['billData'].currentValue) {
+            if (changes['billData']?.currentValue) {
                 this.checkWorkflowForBill(changes['billData'].currentValue);
             }
-            if (changes['selectedBill'] && changes['selectedBill'].currentValue) {
+            else if (changes['selectedBill']?.currentValue) {
                 this.checkWorkflowForBill(changes['selectedBill'].currentValue);
             }
         }
@@ -2431,6 +2447,24 @@ class BillWorkflowComponent {
                     };
                 }
             }
+            if (isAmountField) {
+                const billAmount = this.getBillAmount();
+                if (billAmount !== null) {
+                    customValidators = {
+                        ...customValidators,
+                        billAmountMax: {
+                            expression: (control) => {
+                                const enteredAmount = this.parseFormAmount(control?.value);
+                                if (enteredAmount === null) {
+                                    return true;
+                                }
+                                return enteredAmount <= billAmount;
+                            },
+                            message: () => this.translationService.translate("COMMON_LABEL_AMOUNT_MUST_NOT_EXCEED_BILL_AMOUNT"),
+                        },
+                    };
+                }
+            }
             const validations = field?.field_validation || [];
             const normalizedFieldType = this.normalizeFieldType(field?.field_type);
             const normalizedValidations = this.normalizeValidations(validations);
@@ -2518,6 +2552,31 @@ class BillWorkflowComponent {
         }
         return null;
     }
+    getBillAmount() {
+        const billAmount = Number(this.getSelectedBill()?.bill_amount);
+        if (isNaN(billAmount) || billAmount <= 0) {
+            return null;
+        }
+        return billAmount;
+    }
+    parseFormAmount(value) {
+        if (value === null || value === undefined || value === "") {
+            return null;
+        }
+        const amount = typeof value === "number" ? value : parseFloat(String(value));
+        return isNaN(amount) ? null : amount;
+    }
+    syncSelectedBillFromInputs() {
+        if (this.billData) {
+            this.selectedBill = this.billData;
+        }
+        else if (this.allWorkflowData?.selectedBill) {
+            this.selectedBill = this.allWorkflowData.selectedBill;
+        }
+    }
+    getSelectedBill() {
+        return this.allWorkflowData?.selectedBill ?? this.billData ?? this.selectedBill ?? null;
+    }
     ngOnDestroy() {
         this.destroy$.next(true);
         this.destroy$.unsubscribe();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "digipay-utility-payment",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "peerDependencies": {
     "@angular/common": "^20.0.0",
     "@angular/core": "^20.0.0",