@hmcts/ccpay-web-component 5.0.1-beta28 → 5.0.1-beta29

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

@@ -14,7 +14,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { Injectable, Component, Input, Output, EventEmitter, ViewChild, ChangeDetectorRef, Pipe, NgModule, defineInjectable, inject } from '@angular/core';
 import { FormBuilder, Validators, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 
 /**
  * @fileoverview added by tsickle
@@ -1389,6 +1389,7 @@ var PaymentViewComponent = /** @class */ (function () {
                 this.paymentGroup = paymentgrp;
                 this.viewStatus = 'issuerefund';
                 this.isRefundRemission = true;
+                this.paymentLibComponent.isFromServiceRequestPage = false;
             }
         }
     };
@@ -3813,6 +3814,7 @@ var CaseTransactionsComponent = /** @class */ (function () {
             if (this.chkIssueRefundBtnEnable(payment)) {
                 this.viewStatus = 'issuerefund';
                 this.payment = payment;
+                this.paymentLibComponent.isFromServiceRequestPage = true;
                 this.isRefundRemission = true;
             }
         }
@@ -6787,9 +6789,9 @@ var AddRemissionComponent = /** @class */ (function () {
         else if (this.selectedRefundReason.includes('Other') && this.remissionForm.controls['reason'].value !== '') {
             this.refundHasError = false;
             this.refundReason += '-' + this.remissionForm.controls['reason'].value;
-            this.displayRefundReason = this.remissionForm.controls['reason'].value;
+            this.displayRefundReason = this.selectedRefundReason + '-' + this.remissionForm.controls['reason'].value;
             if (this.isFromRefundListPage) {
-                this.refundListReason.emit({ reason: this.selectedRefundReason, code: this.refundReason });
+                this.refundListReason.emit({ reason: this.displayRefundReason, code: this.refundReason });
             }
             else {
                 this.viewCompStatus = '';
@@ -7013,15 +7015,6 @@ var AddRemissionComponent = /** @class */ (function () {
             this.paymentLibComponent.ISNEWPCIPALOFF = this.isNewPcipalOff;
             this.paymentLibComponent.ISOLDPCIPALOFF = this.isOldPcipalOff;
             this.paymentLibComponent.isFromServiceRequestPage = true;
-            // this.paymentViewService.getBSfeature().subscribe(
-            //   features => {
-            //     let result = JSON.parse(features).filter(feature => feature.uid === BS_ENABLE_FLAG);
-            //     this.paymentLibComponent.ISBSENABLE = result[0] ? result[0].enable : false;
-            //   },
-            //   err => {
-            //     this.paymentLibComponent.ISBSENABLE = false;
-            //   }
-            // );
             this.paymentLibComponent.ISBSENABLE = true;
             /** @type {?} */
             var partUrl = this.bsPaymentDcnNumber ? "&dcn=" + this.bsPaymentDcnNumber : '';
@@ -7117,49 +7110,63 @@ var AddRemissionComponent = /** @class */ (function () {
      */
     function (event) {
         event.preventDefault();
-        this.OrderslistService.setnavigationPage('casetransactions');
-        this.OrderslistService.setisFromServiceRequestPage(false);
-        this.paymentLibComponent.viewName = 'case-transactions';
-        this.paymentLibComponent.ISBSENABLE = true;
-        // // if (this.paymentLibComponent.REFUNDLIST) {
-        // //   this.paymentLibComponent.viewName = 'refund-list';
-        // //   return;
-        // // }
-        // // if (this.paymentLibComponent.TAKEPAYMENT === undefined && this.paymentLibComponent.SERVICEREQUEST === undefined) {
-        // //   this.paymentLibComponent.SERVICEREQUEST = 'false';
-        // // }
-        // // this.OrderslistService.setisFromServiceRequestPage(false);
-        // // this.OrderslistService.setpaymentPageView({method: '',payment_group_reference: '', reference:''});
-        // // this.OrderslistService.setnavigationPage('casetransactions');
-        // // this.errorMessage = '';
-        // // this.paymentLibComponent.viewName = 'case-transactions';
-        // // //this.paymentLibComponent.TAKEPAYMENT = true;
-        // // this.paymentLibComponent.ISTURNOFF = this.isTurnOff;
-        // // this.paymentLibComponent.ISNEWPCIPALOFF = this.isNewPcipalOff;
-        // // this.paymentLibComponent.ISOLDPCIPALOFF = this.isOldPcipalOff;
-        // // this.paymentLibComponent.isFromServiceRequestPage = true;  
-        // // this.paymentLibComponent.ISBSENABLE = true;
-        // // let partUrl = this.bsPaymentDcnNumber ? `&dcn=${this.bsPaymentDcnNumber}` : '';
-        // //  partUrl += this.paymentLibComponent.ISBSENABLE ? '&isBulkScanning=Enable' : '&isBulkScanning=Disable';
-        // //  partUrl += this.paymentLibComponent.ISTURNOFF ? '&isTurnOff=Enable' : '&isTurnOff=Disable';
-        // //  partUrl += this.isStrategicFixEnable ? '&isStFixEnable=Enable' : '&isStFixEnable=Disable';
-        // //  partUrl += `&caseType=${this.caseType}`;
-        // //  partUrl += this.paymentLibComponent.ISNEWPCIPALOFF ? '&isNewPcipalOff=Enable' : '&isNewPcipalOff=Disable';
-        // //  partUrl += this.paymentLibComponent.ISOLDPCIPALOFF ? '&isOldPcipalOff=Enable' : '&isOldPcipalOff=Disable';
-        // //  if(this.isFromPaymentDetailPage) {
-        // //    partUrl += this.paymentLibComponent.isFromPaymentDetailPage
-        // //  }
-        // //  if(!this.paymentLibComponent.SERVICEREQUEST) {
-        // //   const url = `/payment-history/${this.ccdCaseNumber}?view=case-transactions&takePayment=${this.paymentLibComponent.TAKEPAYMENT}&selectedOption=${this.option}${partUrl}`;
-        // //   this.router.routeReuseStrategy.shouldReuseRoute = () => false;
-        // //   this.router.onSameUrlNavigation = 'reload';
-        // //   this.router.navigateByUrl(url);
-        // //  } else {
-        // //   const url =`/payment-history/${this.ccdCaseNumber}?selectedOption=${this.option}${partUrl}`;
-        // //   this.router.routeReuseStrategy.shouldReuseRoute = () => false;
-        // //   this.router.onSameUrlNavigation = 'reload';
-        // //   this.router.navigateByUrl(url);
-        // //  }
+        if (!this.paymentLibComponent.isFromServiceRequestPage) {
+            this.OrderslistService.setnavigationPage('casetransactions');
+            this.OrderslistService.setisFromServiceRequestPage(false);
+            this.paymentLibComponent.viewName = 'case-transactions';
+            this.paymentLibComponent.ISBSENABLE = true;
+        }
+        else {
+            if (this.paymentLibComponent.REFUNDLIST) {
+                this.paymentLibComponent.viewName = 'refund-list';
+                return;
+            }
+            if (this.paymentLibComponent.TAKEPAYMENT === undefined && this.paymentLibComponent.SERVICEREQUEST === undefined) {
+                this.paymentLibComponent.SERVICEREQUEST = 'false';
+            }
+            this.OrderslistService.setisFromServiceRequestPage(false);
+            this.OrderslistService.setpaymentPageView({ method: '', payment_group_reference: '', reference: '' });
+            this.OrderslistService.setnavigationPage('casetransactions');
+            this.errorMessage = '';
+            this.paymentLibComponent.viewName = 'case-transactions';
+            //this.paymentLibComponent.TAKEPAYMENT = true;
+            this.paymentLibComponent.ISTURNOFF = this.isTurnOff;
+            this.paymentLibComponent.ISNEWPCIPALOFF = this.isNewPcipalOff;
+            this.paymentLibComponent.ISOLDPCIPALOFF = this.isOldPcipalOff;
+            this.paymentLibComponent.isFromServiceRequestPage = true;
+            this.paymentLibComponent.ISBSENABLE = true;
+            /** @type {?} */
+            var partUrl = this.bsPaymentDcnNumber ? "&dcn=" + this.bsPaymentDcnNumber : '';
+            partUrl += this.paymentLibComponent.ISBSENABLE ? '&isBulkScanning=Enable' : '&isBulkScanning=Disable';
+            partUrl += this.paymentLibComponent.ISTURNOFF ? '&isTurnOff=Enable' : '&isTurnOff=Disable';
+            partUrl += this.isStrategicFixEnable ? '&isStFixEnable=Enable' : '&isStFixEnable=Disable';
+            partUrl += "&caseType=" + this.caseType;
+            partUrl += this.paymentLibComponent.ISNEWPCIPALOFF ? '&isNewPcipalOff=Enable' : '&isNewPcipalOff=Disable';
+            partUrl += this.paymentLibComponent.ISOLDPCIPALOFF ? '&isOldPcipalOff=Enable' : '&isOldPcipalOff=Disable';
+            if (this.isFromPaymentDetailPage) {
+                partUrl += this.paymentLibComponent.isFromPaymentDetailPage;
+            }
+            if (!this.paymentLibComponent.SERVICEREQUEST) {
+                /** @type {?} */
+                var url = "/payment-history/" + this.ccdCaseNumber + "?view=case-transactions&takePayment=" + this.paymentLibComponent.TAKEPAYMENT + "&selectedOption=" + this.option + partUrl;
+                this.router.routeReuseStrategy.shouldReuseRoute = (/**
+                 * @return {?}
+                 */
+                function () { return false; });
+                this.router.onSameUrlNavigation = 'reload';
+                this.router.navigateByUrl(url);
+            }
+            else {
+                /** @type {?} */
+                var url = "/payment-history/" + this.ccdCaseNumber + "?selectedOption=" + this.option + partUrl;
+                this.router.routeReuseStrategy.shouldReuseRoute = (/**
+                 * @return {?}
+                 */
+                function () { return false; });
+                this.router.onSameUrlNavigation = 'reload';
+                this.router.navigateByUrl(url);
+            }
+        }
     };
     /**
      * @param {?} currency
@@ -7914,11 +7921,12 @@ var ReportsComponent = /** @class */ (function () {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 var TableComponent = /** @class */ (function () {
-    function TableComponent(paymentLibComponent, cdRef, OrderslistService$$1, router) {
+    function TableComponent(paymentLibComponent, cdRef, OrderslistService$$1, router, activeRoute) {
         this.paymentLibComponent = paymentLibComponent;
         this.cdRef = cdRef;
         this.OrderslistService = OrderslistService$$1;
         this.router = router;
+        this.activeRoute = activeRoute;
         // displayedColumns = ['ccdCaseNumber', 'refundReference', 'reason', 'createBy', 'updateDate', 'Action'];
         this.displayedColumns = ['ccd_case_number', 'refund_reference', 'user_full_name', 'date_created', 'date_updated', 'Action'];
     }
@@ -8051,17 +8059,7 @@ var TableComponent = /** @class */ (function () {
      * @return {?}
      */
     function (ccdCaseNumber, refundData) {
-        /** @type {?} */
-        var url = "/cases/case-details/:" + ccdCaseNumber;
-        console.log(url);
-        console.log(this.router.getCurrentNavigation());
-        this.router.routeReuseStrategy.shouldReuseRoute = (/**
-         * @return {?}
-         */
-        function () { return false; });
-        this.router.onSameUrlNavigation = 'reload';
-        this.router.navigateByUrl(url);
-        console.log(this.router.getCurrentNavigation());
+        this.router.navigate(["/cases/case-details/:" + ccdCaseNumber], { relativeTo: this.activeRoute });
     };
     TableComponent.decorators = [
         { type: Component, args: [{
@@ -8075,7 +8073,8 @@ var TableComponent = /** @class */ (function () {
         { type: PaymentLibComponent },
         { type: ChangeDetectorRef },
         { type: OrderslistService },
-        { type: Router }
+        { type: Router },
+        { type: ActivatedRoute }
     ]; };
     TableComponent.propDecorators = {
         DATASOURCE: [{ type: Input, args: ['DATASOURCE',] }],