@hmcts/ccpay-web-component 4.0.0-beta550 → 4.0.0-beta551

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

@@ -6194,6 +6194,8 @@
             function () {
                 var _this = this;
                 this.default = 'Select a different reason';
+                this.pattern1 = '^([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})$';
+                this.pattern2 = '^([A-Za-z]{2}[0-9]{2})-([0-9]{6})$';
                 if (this.viewCompStatus !== '' && this.viewCompStatus !== undefined) {
                     this.viewStatus = '';
                 }
@@ -6212,9 +6214,14 @@
                 this.remissionForm = this.formBuilder.group({
                     remissionCode: new forms.FormControl('', forms.Validators.compose([
                         forms.Validators.required,
-                        // Validators.pattern('/(^[a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})$/|/(^[A-Za-z]{2}[0-9]{2})-([0-9]{6})$/')
-                        forms.Validators.pattern('^([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})$')
+                        forms.Validators.pattern("(" + this.pattern1 + ")|(" + this.pattern2 + ")")
                     ])),
+                    // remissionCode: new FormControl('', Validators.compose([  [A-Za-z]{2}[0-9]{2} [0-9]{6}
+                    //   Validators.required,
+                    //  // Validators.pattern('/(^[a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})$/|/^([A-Za-z]{2}[0-9]{2})-([0-9]{6})$/')
+                    //  // Validators.pattern('^([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})$'),
+                    //   Validators.pattern('/^(([A-Za-z]{2}[0-9]{2})-([0-9]{6}))|(([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3})-([a-zA-Z0-9]{3}))$/')
+                    // ])),
                     amount: new forms.FormControl('', forms.Validators.compose([
                         forms.Validators.required,
                         forms.Validators.pattern('^[0-9]+(\.[0-9]{1,2})?$')
@@ -6223,9 +6230,6 @@
                     refundDDReason: new forms.FormControl('', forms.Validators.compose([forms.Validators.required])),
                     reason: new forms.FormControl()
                 });
-                // const remissionctrls=this.remissionForm.controls; ,
-                //   Validators.pattern('^([A-Za-z]{2}[0-9]{2})-([0-9]{6})$')
-                // remissionctrls['refundDDReason'].setValue('Select a different reason', {onlySelf: true});
                 if (this.viewCompStatus === '') {
                     this.viewStatus = 'main';
                 }
@@ -6258,12 +6262,6 @@
                 if (this.viewCompStatus === 'processretroremissonpage' && this.isFromRefundListPage) {
                     this.viewStatus = 'processretroremissonpage';
                 }
-                // this.refundService.getUserDetails().subscribe(
-                //   userdetail => { 
-                //     console.log(userdetail);
-                //     console.log(userdetail['data']);
-                //   } );
-                // this.paymentLibComponent.CCD_CASE_NUMBER
             };
         /**
          * @return {?}
@@ -6279,7 +6277,7 @@
                 var isRemissionLessThanFee = this.fee.calculated_amount > remissionctrls.amount.value;
                 this.remissionForm.controls['refundReason'].setErrors(null);
                 this.remissionForm.controls['refundDDReason'].setErrors(null);
-                this.remissionForm.controls['amount'].setErrors(null);
+                //this.remissionForm.controls['amount'].setErrors(null);
                 if (this.remissionForm.dirty && this.remissionForm.valid && isRemissionLessThanFee) {
                     this.viewStatus = 'confirmation';
                 }