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

package/bundles/hmcts-ccpay-web-component.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('rxjs/observable/throw'), require('uuid'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('@angular/platform-browser'), require('@angular/common'), require('file-saver'), require('xlsx'), require('@angular/material/table'), require('@angular/material/paginator'), require('@angular/material/sort'), require('@angular/material/form-field'), require('@angular/material/input'), require('@angular/forms'), require('@angular/router'), require('@angular/core')) :
-    typeof define === 'function' && define.amd ? define('@hmcts/ccpay-web-component', ['exports', 'rxjs/observable/throw', 'uuid', 'rxjs', '@angular/common/http', 'rxjs/operators', '@angular/platform-browser', '@angular/common', 'file-saver', 'xlsx', '@angular/material/table', '@angular/material/paginator', '@angular/material/sort', '@angular/material/form-field', '@angular/material/input', '@angular/forms', '@angular/router', '@angular/core'], factory) :
-    (factory((global.hmcts = global.hmcts || {}, global.hmcts['ccpay-web-component'] = {}),global.rxjs['observable/throw'],global.uuid,global.rxjs,global.ng.common.http,global.rxjs.operators,global.ng.platformBrowser,global.ng.common,global.FileSaver,global.XLSX,global.ng.material.table,global.ng.material.paginator,global.ng.material.sort,global.ng.material['form-field'],global.ng.material.input,global.ng.forms,global.ng.router,global.ng.core));
-}(this, (function (exports,_throw,uuid,rxjs,i1,operators,i5,common,FileSaver,XLSX,table,paginator,sort,formField,input,forms,router,i0) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('rxjs/observable/throw'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('@angular/platform-browser'), require('@angular/common'), require('file-saver'), require('xlsx'), require('@angular/material/table'), require('@angular/material/paginator'), require('@angular/material/sort'), require('@angular/material/form-field'), require('@angular/material/input'), require('@angular/forms'), require('@angular/router'), require('@angular/core')) :
+    typeof define === 'function' && define.amd ? define('@hmcts/ccpay-web-component', ['exports', 'rxjs/observable/throw', 'rxjs', '@angular/common/http', 'rxjs/operators', '@angular/platform-browser', '@angular/common', 'file-saver', 'xlsx', '@angular/material/table', '@angular/material/paginator', '@angular/material/sort', '@angular/material/form-field', '@angular/material/input', '@angular/forms', '@angular/router', '@angular/core'], factory) :
+    (factory((global.hmcts = global.hmcts || {}, global.hmcts['ccpay-web-component'] = {}),global.rxjs['observable/throw'],global.rxjs,global.ng.common.http,global.rxjs.operators,global.ng.platformBrowser,global.ng.common,global.FileSaver,global.XLSX,global.ng.material.table,global.ng.material.paginator,global.ng.material.sort,global.ng.material['form-field'],global.ng.material.input,global.ng.forms,global.ng.router,global.ng.core));
+}(this, (function (exports,_throw,rxjs,i1,operators,i5,common,FileSaver,XLSX,table,paginator,sort,formField,input,forms,router,i0) { 'use strict';
 
     /**
      * @fileoverview added by tsickle
@@ -1120,7 +1120,9 @@
             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(operators.catchError(this.errorHandlerService.handleError));
             };
         /**
@@ -1134,7 +1136,9 @@
          * @return {?}
          */
             function (serviceRef, body) {
-                body['idempotency_key'] = uuid.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);
@@ -3457,17 +3461,13 @@
                             }
                         }));
                     }
-                    _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']
@@ -3552,18 +3552,17 @@
                             }));
                         }
                     }
+                    _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'];
@@ -9467,7 +9466,12 @@
                      * @param {?} r
                      * @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