@everymatrix/cashier-method-details 1.28.4 → 1.28.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/cashier-method-details",
-  "version": "1.28.4",
+  "version": "1.28.6",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1bfc13085b6829695a52b1569af671db1c024e41"
+  "gitHead": "1962d52e7f4ec718d6318e592deea4b535abde4a"
 }

package/src/CashierMethodDetails.svelte

@@ -227,6 +227,7 @@
         flatpickr(el, {dateFormat: dateformat}).destroy();
       })
     }
+    showReceiptPage = false;
     flatpickrEl = [];
     fields = [];
     prepareFields = {};
@@ -278,7 +279,7 @@
       if(!el) {
         return;
       }
-      flatpickr(flatpickrEl, dateOptions[el.dataset.type])
+        flatpickr(flatpickrEl, {...dateOptions[el.dataset.type], maxDate: el.dataset.maxvalue, minDate: el.dataset.minvalue})
     });
   }
   const setActiveLanguage = ():void => {
@@ -451,6 +452,7 @@
       if (data.ResponseCode !== 'Success') {
         errorResponseCode = data.ResponseCode
         isProcessingTxn = false;
+        toggleDisableActionOnPage();
         showModal()
         return;
       }
@@ -637,9 +639,27 @@
     }
     return ''
   }
+  
+  const patternValidator = (pattern, value) => {
+    if (!pattern) return true;
+    let regex;
+    let regexStr;
+    if (typeof pattern === 'string') {
+      regexStr = '';
+      if (pattern.charAt(0) !== '^') regexStr += '^';
+      regexStr += pattern;
+      if (pattern.charAt(pattern.length - 1) !== '$') regexStr += '$';
+      regex = new RegExp(regexStr);
+    }
+    else {
+      regexStr = pattern.toString();
+      regex = pattern;
+    }
+    return regex.test(value);
+  }
 
   const patternMatchesError = (field, value):string => {
-    if (field.format && value && !value.toString().match(field.format)) {
+    if (field.format && value && !patternValidator(field.format, value)) {
       return $_('invalidFieldError',{ values: { field: field.label }})
     }
     return ''
@@ -684,7 +704,7 @@
                 <img src={selectedPaymentMethod.Logos[0] && selectedPaymentMethod.Logos[0].LogoUrl} alt={selectedPaymentMethod.Label} />
               </div>
               <div class="SelectedLogoDescription">
-                {selectedPaymentMethod.Label}
+                {selectedPaymentMethod.Label || selectedPaymentMethod.Name}
               </div>
               {#if mobileView}
                 <div on:click={() => backToMethodList()} class="ChangePaymeth">{$_('change')}</div>
@@ -744,6 +764,8 @@
                     {:else if field.type === FieldTypes.Time || field.type === FieldTypes.Date || field.type === FieldTypes.DateTime}
                       <input type="text" bind:value={ prepareFields[field.name] } pattern={field.format}
                              data-type={field.type}
+                             data-maxvalue={field.maxValue}
+                             data-minvalue={field.minValue}
                              placeholder={field.placeholder}
                              on:input={() => { validateField(field) }}
                              on:change={() => { showError[field.name] = true; validateField(field) }}
@@ -933,10 +955,10 @@
   }
   .ReceiptPage {
     background-color: var(--emw--color-gray-transparency-100, rgb(255, 255, 255));
-    border-radius: 6px;
-    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1);
-    padding: 0 15px 15px;
-    margin-bottom: 10px;
+    border-radius: var(--mmw--border-radius-medium-plus, 6px);
+    box-shadow: 0 2px 6px 0 var(--mmw--color-black-transparency-10, rgba(0, 0, 0, .1));
+    padding: 0 var(--emw--spacing-small, 12px);
+    margin-bottom: var(--emw--spacing-small-minus, 10px);
   }
   .MethodsDetails {
     position: relative;