@hmcts/ccpay-web-component 5.2.9-beta02 → 5.2.10

package/fesm2015/hmcts-ccpay-web-component.js

@@ -4,7 +4,7 @@ import { BehaviorSubject, throwError } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpClient, HttpHeaders, HttpClientModule } from '@angular/common/http';
 import { Location, formatDate, CommonModule } from '@angular/common';
-import { catchError, switchMap } from 'rxjs/operators';
+import { catchError } from 'rxjs/operators';
 import * as i5 from '@angular/platform-browser';
 import { Meta, DomSanitizer } from '@angular/platform-browser';
 import { FormControl, Validators, FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -3678,7 +3678,6 @@ class UnprocessedPaymentsComponent {
         this.paymentLibComponent = paymentLibComponent;
         this.paymentViewService = paymentViewService;
         this.OrderslistService = OrderslistService;
-        this.FEE_RECORDS_EXISTS = false;
         this.selectedUnprocessedFeeEvent = new EventEmitter();
         this.getUnprocessedFeeCount = new EventEmitter();
         this.viewStatus = 'main';
@@ -3703,59 +3702,46 @@ class UnprocessedPaymentsComponent {
         this.isBulkScanEnable = this.paymentLibComponent.ISBSENABLE;
         this.isTurnOff = this.paymentLibComponent.ISTURNOFF;
         this.isStFixEnable = this.paymentLibComponent.ISSFENABLE;
+        this.OrderslistService.getFeeExists().subscribe((data) => this.FEE_RECORDS_EXISTS = data);
         this.getUnassignedPaymentlist();
     }
     getUnassignedPaymentlist() {
         if (this.selectedOption === 'dcn') {
-            this.getBSPaymentsByDCNandFee();
+            this.bulkScaningPaymentService.getBSPaymentsByDCN(this.dcnNumber).subscribe(unassignedPayments => {
+                //  unassignedPayments['data'].map(data => data.expandable=false);
+                if (unassignedPayments['data'] && unassignedPayments['data'].payments) {
+                    this.setValuesForUnassignedRecord(unassignedPayments['data']);
+                }
+                else if (unassignedPayments['payments']) {
+                    this.setValuesForUnassignedRecord(unassignedPayments);
+                }
+                else {
+                    this.upPaymentErrorMessage = 'error';
+                    this.getUnprocessedFeeCount.emit('0');
+                }
+            }, (error) => {
+                this.upPaymentErrorMessage = error;
+                this.getUnprocessedFeeCount.emit('0');
+            });
         }
         else {
-            this.getBSPaymentsByCCDandFee();
-        }
-    }
-    getBSPaymentsByDCNandFee() {
-        this.bulkScaningPaymentService.getBSPaymentsByDCN(this.dcnNumber).pipe(switchMap((unassignedPayments) => {
-            if (unassignedPayments['data'] && unassignedPayments['data'].payments) {
-                this.setValuesForUnassignedRecord(unassignedPayments['data']);
-            }
-            else if (unassignedPayments['payments']) {
-                this.setValuesForUnassignedRecord(unassignedPayments);
-            }
-            else {
-                this.upPaymentErrorMessage = 'error';
-                this.getUnprocessedFeeCount.emit('0');
-            }
-            return this.OrderslistService.getFeeExists();
-        })).subscribe((data) => {
-            if (data !== null) {
-                this.FEE_RECORDS_EXISTS = data;
-            }
-        }, (error) => {
-            this.upPaymentErrorMessage = error;
-            this.getUnprocessedFeeCount.emit('0');
-        });
-    }
-    getBSPaymentsByCCDandFee() {
-        this.bulkScaningPaymentService.getBSPaymentsByCCD(this.ccdCaseNumber).pipe(switchMap((unassignedPayments) => {
-            if (unassignedPayments['data'] && unassignedPayments['data'].payments) {
-                this.setValuesForUnassignedRecord(unassignedPayments['data']);
-            }
-            else if (unassignedPayments['payments']) {
-                this.setValuesForUnassignedRecord(unassignedPayments);
-            }
-            else {
-                this.upPaymentErrorMessage = 'error';
+            this.bulkScaningPaymentService.getBSPaymentsByCCD(this.ccdCaseNumber).subscribe(unassignedPayments => {
+                //  unassignedPayments['data'].map(data => data.expandable=false);
+                if (unassignedPayments['data'] && unassignedPayments['data'].payments) {
+                    this.setValuesForUnassignedRecord(unassignedPayments['data']);
+                }
+                else if (unassignedPayments['payments']) {
+                    this.setValuesForUnassignedRecord(unassignedPayments);
+                }
+                else {
+                    this.upPaymentErrorMessage = 'error';
+                    this.getUnprocessedFeeCount.emit('0');
+                }
+            }, (error) => {
+                this.upPaymentErrorMessage = error;
                 this.getUnprocessedFeeCount.emit('0');
-            }
-            return this.OrderslistService.getFeeExists();
-        })).subscribe((data) => {
-            if (data !== null) {
-                this.FEE_RECORDS_EXISTS = data;
-            }
-        }, (error) => {
-            this.upPaymentErrorMessage = error;
-            this.getUnprocessedFeeCount.emit('0');
-        });
+            });
+        }
     }
     setValuesForUnassignedRecord(unassignedPayments) {
         this.unassignedRecordList = unassignedPayments.payments;
@@ -3766,6 +3752,7 @@ class UnprocessedPaymentsComponent {
         if (unassignedPayments['ccd_reference'] === undefined) {
             this.isExceptionCase = true;
         }
+        // this.isRecordExist =  this.unassignedRecordList.length === 0;
         this.getUnprocessedFeeCount.emit(this.unassignedRecordList.length);
         this.unprocessedPaymentSelectEvent(this.unassignedRecordList);
     }
@@ -3840,6 +3827,7 @@ class UnprocessedPaymentsComponent {
         this.isAllocateToExistingFeebtnEnabled = false;
         this.isAllocatedToNewFeebtnEnabled = false;
         this.isMarkAsUnidentifiedbtnEnabled = false;
+        //this.validateButtons();
         this.selectedUnprocessedFeeEvent.emit('');
     }
     showDetailRow(event, obj, i) {
@@ -6740,29 +6728,31 @@ class PbaPaymentComponent {
             this.isContinueButtondisabled = true;
             if (this.pbaAccountList.indexOf(this.selectedPbaAccount) !== -1) {
                 const requestBody = new IserviceRequestPbaPayment(this.selectedPbaAccount, this.pbaPayOrderRef.orderTotalFees, this.pbaAccountRef, this.orgName);
-                this.paymentViewService.postPBAaccountPayment(this.pbaPayOrderRef.orderRefId, requestBody)
-                    .subscribe(r => {
-                    try {
-                        this.pbaAccountrPaymentResult = JSON.parse(r);
-                    }
-                    catch (e) {
-                        this.pbaAccountrPaymentResult = r;
-                    }
-                    this.isPBAAccountPaymentSuccess = true;
-                }, e => {
-                    if (e.status == '402') {
-                        this.isInSufficiantFund = true;
-                    }
-                    else if (e.status == '410') {
-                        this.isPBAAccountNotExist = true;
-                    }
-                    else if (e.status == '412') {
-                        this.isPBAAccountHold = true;
-                    }
-                    else {
-                        this.isPBAServerError = true;
-                    }
-                });
+                setTimeout(() => {
+                    this.paymentViewService.postPBAaccountPayment(this.pbaPayOrderRef.orderRefId, requestBody)
+                        .subscribe(r => {
+                        try {
+                            this.pbaAccountrPaymentResult = JSON.parse(r);
+                        }
+                        catch (e) {
+                            this.pbaAccountrPaymentResult = r;
+                        }
+                        this.isPBAAccountPaymentSuccess = true;
+                    }, e => {
+                        if (e.status == '402') {
+                            this.isInSufficiantFund = true;
+                        }
+                        else if (e.status == '410') {
+                            this.isPBAAccountNotExist = true;
+                        }
+                        else if (e.status == '412') {
+                            this.isPBAAccountHold = true;
+                        }
+                        else {
+                            this.isPBAServerError = true;
+                        }
+                    });
+                }, 5000);
             }
             else {
                 this.isPBAServerError = true;