@hmcts/ccpay-web-component 6.0.0-beta14 → 6.0.0-beta17

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

@@ -1,5 +1,4 @@
 import { _throw } from 'rxjs/observable/throw';
-import { v4 } from 'uuid';
 import { BehaviorSubject } from 'rxjs';
 import { HttpClient, HttpHeaders, HttpClientModule } from '@angular/common/http';
 import { catchError } from 'rxjs/operators';
@@ -1100,7 +1099,9 @@ var PaymentViewService = /** @class */ (function () {
     function (serviceRef, body) {
         /** @type {?} */
         var url = this.paymentLibService.API_ROOT + "/service-request/" + serviceRef + "/card-payments";
-        body['return-url'] = this.paymentLibService.CARDPAYMENTRETURNURL + "/payment";
+        /** @type {?} */
+        var rurl = this.paymentLibService.CARDPAYMENTRETURNURL.replace('.prod', '');
+        body['return-url'] = rurl + "/payment";
         return this.https.post(url, body).pipe(catchError(this.errorHandlerService.handleError));
     };
     /**
@@ -1114,7 +1115,9 @@ var PaymentViewService = /** @class */ (function () {
      * @return {?}
      */
     function (serviceRef, body) {
-        body['idempotency_key'] = v4();
+        /** @type {?} */
+        var randomKey = 'idam-key-' + Math.random().toString().split('.').join('-');
+        body['idempotency_key'] = randomKey;
         /** @type {?} */
         var url = this.paymentLibService.API_ROOT + "/service-request/" + serviceRef + "/pba-payments";
         return this.https.post(url, body);
@@ -3480,17 +3483,13 @@ var CaseTransactionsComponent = /** @class */ (function () {
                     }
                 }));
             }
-            _this.orderPendingPayments = (_this.orderFeesTotal - _this.orderRemissionTotal) - _this.orderTotalPayments;
-            if (_this.orderPendingPayments <= 0.00) {
-                _this.orderStatus = 'Paid';
+            // this.orderPendingPayments = (this.orderFeesTotal - this.orderRemissionTotal) - this.orderTotalPayments;
+            if (paymentGroup.service_request_status === 'Paid') {
+                _this.orderStatus = paymentGroup.service_request_status;
                 _this.orderAddBtnEnable = false;
             }
-            else if (_this.orderFeesTotal > 0 && (_this.orderTotalPayments > 0 || _this.orderRemissionTotal > 0) && (_this.orderTotalPayments < _this.orderPendingPayments)) {
-                _this.orderStatus = 'Partially paid';
-                _this.orderAddBtnEnable = true;
-            }
-            else {
-                _this.orderStatus = 'Not paid';
+            else if (paymentGroup.service_request_status === 'Partially paid' || paymentGroup.service_request_status === 'Not paid') {
+                _this.orderStatus = paymentGroup.service_request_status;
                 _this.orderAddBtnEnable = true;
             }
             //this.orderLevelFees.push({orderRefId:paymentGroup['payment_group_reference'],orderTotalFees: this.orderFeesTotal,orderStatus: this.orderStatus,orderParty:'Santosh', orderCCDEvent:'Case Creation',orderCreated: new Date(), orderAddBtnEnable: this.orderAddBtnEnable}); this.cpoDetails['createdTimestamp']
@@ -3580,18 +3579,17 @@ var CaseTransactionsComponent = /** @class */ (function () {
                     }));
                 }
             }
+            _this.orderStatus = orderDetail.service_request_status;
         }));
-        this.orderPendingPayments = (this.orderFeesTotal - this.orderRemissionTotal) - this.orderTotalPayments;
+        //this.orderPendingPayments = (this.orderFeesTotal - this.orderRemissionTotal) - this.orderTotalPayments;
         // this.orderRef = orderReferenceObj.orderRefId;
-        if (this.orderPendingPayments <= 0.00) {
-            this.orderStatus = 'Paid';
-        }
-        else if (this.orderFeesTotal > 0 && (this.orderTotalPayments > 0 || this.orderRemissionTotal > 0) && (this.orderTotalPayments < this.orderPendingPayments)) {
-            this.orderStatus = 'Partially paid';
-        }
-        else {
-            this.orderStatus = 'Not paid';
-        }
+        // if (this.orderPendingPayments <= 0.00) {
+        //   this.orderStatus = 'Paid';
+        // } else if (this.orderFeesTotal > 0 && (this.orderTotalPayments > 0 || this.orderRemissionTotal > 0) && (this.orderTotalPayments < this.orderPendingPayments)) {
+        //   this.orderStatus = 'Partially paid'
+        // } else {
+        //   this.orderStatus = 'Not paid'
+        // }
         if (this.cpoDetails !== null) {
             this.orderParty = this.cpoDetails['responsibleParty'];
             this.orderCreated = this.cpoDetails['createdTimestamp'];
@@ -9620,7 +9618,12 @@ var PbaPaymentComponent = /** @class */ (function () {
                  * @return {?}
                  */
                 function (r) {
-                    _this.pbaAccountrPaymentResult = JSON.parse(r).data;
+                    try {
+                        _this.pbaAccountrPaymentResult = JSON.parse(r);
+                    }
+                    catch (e) {
+                        _this.pbaAccountrPaymentResult = r;
+                    }
                     _this.isPBAAccountPaymentSuccess = true;
                 }), (/**
                  * @param {?} e