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

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

@@ -3461,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']
@@ -3556,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'];
@@ -9471,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