@everymatrix/cashier-method-details 1.25.0 → 1.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/cashier-method-details",
-  "version": "1.25.0",
+  "version": "1.27.0",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "668756b576877a7c33679408591fa2b7f93e0f37"
+  "gitHead": "f6ec9c7a552b5acad22390148d440b8050572424"
 }

package/src/CashierMethodDetails.svelte

@@ -105,7 +105,8 @@
   }
   export let endpoint: string;
   export let session: string;
-  export let lang: string;
+  export let lang: string = 'en';
+  export let local: string = 'en-US';
   export let translationurl: string;
   export let customerid: string;
   export let currency: string;
@@ -138,7 +139,7 @@
   let showRetryNotification: boolean;
   let isProcessingTxn: boolean;
   let isTranslationLoaded: boolean;
-  let openedLookup: number | null;
+  let openedLookup: string | null;
   let clickedElem: HTMLElement;
   let qrCodeContainer: HTMLElement[] = [];
   let qrCodeScriptSrc: string = 'https://cdn.rawgit.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js';
@@ -148,6 +149,10 @@
   let userAgent:string = window.navigator.userAgent;
   let mediaQuery = window.matchMedia('(max-width: 750px)');
   let innerWidth: number;
+  let formatter = new Intl.NumberFormat(local, {minimumFractionDigits: 2 });
+  let amountError = '';
+  let showError = {};
+  let fieldValidation = {};
 
   $: endpoint && session && selectedpaymentmethodname && currency && getPaymentDetails();
   $: clientstyling && customStylingContainer && setClientStyling();
@@ -156,7 +161,8 @@
   $: lang && translationurl && setTranslationUrl();
   $: selectedpaymentmethodname && qrCodeContainer.length && generateQr();
   $: innerWidth && onWindowResize();
-  $: mobileView.toString() && hideMethodsList()
+  $: mobileView.toString() && hideMethodsList();
+
   const generateQr = () => {
     qrCodeContainer.forEach(elem => {
       if (elem && elem.innerText) {
@@ -210,8 +216,12 @@
     fetch(url, requestParams).then(res => res.json()).then(data => {
       xPaymentSessionToken = data.XPaymentSessionToken;
       selectedPaymentMethod = data.PaymentMethod;
-      fields = selectedPaymentMethod.Fields && selectedPaymentMethod.Fields.map(field => new PaymentMethodDetails(field));
+      showError = {};
       prepareFields = {};
+      fieldValidation = {};
+      validateAmount();
+      fields = selectedPaymentMethod.Fields && selectedPaymentMethod.Fields.map(field => new PaymentMethodDetails(field));
+      fields.forEach(field => { validateField(field) })
       hideMethodsList();
     })
   }
@@ -258,18 +268,22 @@
   });
 
   const closeAllLookups = (e) => {
+    if (openedLookup) {
+      showError[openedLookup] = true;
+      validateField(fields.find(field => field.name === openedLookup));
+    }
     if(!e.composedPath().includes(clickedElem)){
       openedLookup = null;
     }
   }
 
-  const showLookup = (event, index) => {
-    if (index === openedLookup) {
+  const showLookup = (event, name) => {
+    if (name === openedLookup) {
       openedLookup = null
       return;
     }
     clickedElem = event.composedPath()[0]
-    openedLookup = index
+    openedLookup = name
   }
 
   const prepareTxn = () => {
@@ -373,6 +387,11 @@
     window.postMessage({ type: 'NavigateTo', path: url, target: blankPageTarget || null, externalLink: externalLink || false }, window.location.href);
   }
 
+  const onLookUpChanged = (field, value) => {
+    prepareFields[field.name] = value;
+    validateField(field);
+  }
+
   const showField = (field) => {
     if (!field.correlationFieldName) {
       return true;
@@ -384,17 +403,102 @@
     return isCorrelatedFieldVisible
   }
 
+  const emptyAmountError = ():string => {
+    if (!amount) {
+      return $_('errorEmptyField')
+    }
+    return ''
+  }
+
+  const minAmountError = () => {
+    if (selectedPaymentMethod.DisplayCurrency.MinAmountLimit > amount) {
+      return $_('minAmountError', {
+        values: {
+          amount: formatter.format(selectedPaymentMethod.DisplayCurrency.MinAmountLimit),
+          currency: selectedPaymentMethod.DisplayCurrency.Name
+        }
+      })
+    }
+    return ''
+  }
+
+  const maxAmountError = () => {
+    if (selectedPaymentMethod.DisplayCurrency.MaxAmountLimit < amount) {
+      return $_('maxAmountError', {
+        values: {
+          amount: formatter.format(selectedPaymentMethod.DisplayCurrency.MaxAmountLimit),
+          currency: selectedPaymentMethod.DisplayCurrency.Name
+        }
+      })
+    }
+    return ''
+  }
+
+  const amountMultiplierError = () => {
+    if (selectedPaymentMethod.AmountMultiplier && (selectedPaymentMethod.AmountMultiplier % amount !== 0)) {
+      return $_('amountMultiplierError', {
+        values: {
+          multiplier: selectedPaymentMethod.AmountMultiplier
+        }
+      })
+    }
+    return ''
+  }
+
+  const amountIntError = ():string => {
+    if (selectedPaymentMethod.IsIntegerAmount && !Number.isInteger(amount)) {
+      return $_('amountIntError')
+    }
+    return ''
+  }
+
+  const amountDecimalError = ():string => {
+    if (Number(amount).toFixed(2) != amount) {
+      return $_('amountDecimalError')
+    }
+    return ''
+  }
+
+  const patternMatchesError = (field, value):string => {
+    if (field.format && !value.toString().match(field.format)) {
+      return $_('invalidFieldError',{ values: { field: field.label }})
+    }
+    return ''
+  }
+
+  const emptyFieldError = (field, value):string => {
+    if (field.isRequired && (!value || !value.toString().trim())) {
+      return $_('errorEmptyField')
+    }
+    return ''
+  }
+
+  const validateAmount = () => {
+    amountError = emptyAmountError() || minAmountError() ||
+            maxAmountError() || amountMultiplierError() ||
+            amountIntError() || amountDecimalError();
+  }
+
+  const validateField = (field) => {
+    const value = prepareFields[field.name]
+    fieldValidation[field.name] = emptyFieldError(field, value) || patternMatchesError(field, value);
+  }
+
+  const isSubmitDisabled = (amountError, fieldValidation) => {
+    return !!amountError || Object.values(fieldValidation).some(error => !!error)
+  }
+
 </script>
 <svelte:window bind:innerWidth={innerWidth} />
 <svelte:head>
   <script src={qrCodeScriptSrc}></script>
 </svelte:head>
 <div class="CashierMethodDetails" bind:this={customStylingContainer}>
-  {#if selectedPaymentMethod.Name}
+  {#if selectedPaymentMethod?.Name}
     <div class="MethodsDetails">
       <form on:submit|preventDefault={prepareTxn}>
         <div class="FieldWrapper">
-          <div class="form-logo">
+          <div class="FormLogo">
             <div class="SelectedLogoWrapper">
               <img src={selectedPaymentMethod.Logos[0].LogoUrl} alt={selectedPaymentMethod.Label} />
             </div>
@@ -405,23 +509,34 @@
               <div on:click={() => backToMethodList()} class="ChangePaymeth">{$_('change')}</div>
             {/if}
           </div>
+          {#if selectedPaymentMethod.Description}
+            <div class="SelectedMethodDescription">
+              {selectedPaymentMethod.Description}
+            </div>
+          {/if}
           {#if !selectedPaymentMethod.HideAmountField}
-          <div class="Amount">
+          <div class="Amount" class:Invalid={amountError && showError['amount']}>
             <label>
               <span class="Required">
                 {$_('amountLabel')}
               </span>
               {#if selectedPaymentMethod.IsAmountConfigurable}
-                <input type="number" bind:value={amount} placeholder="{$_('amountPlaceholder')}">
+                <input type="number"
+                       bind:value={amount}
+                       on:input={() => validateAmount()}
+                       on:blur={() => {showError['amount'] = true; validateAmount()}}
+                       placeholder="{$_('amountPlaceholder')}"
+                >
+                <span class="Alert">{amountError}</span>
                 {#if selectedPaymentMethod.DisplayCurrency}
                   <span class="AmountLimits">
-                    {selectedPaymentMethod.DisplayCurrency.MinAmountLimit ? `${$_('generalMin')} ${selectedPaymentMethod.DisplayCurrency.MinAmountLimit} ${currency}` : ''}
-                    {selectedPaymentMethod.DisplayCurrency.MaxAmountLimit ? `/ ${$_('generalMax')} ${selectedPaymentMethod.DisplayCurrency.MaxAmountLimit} ${currency}` : ''}
+                    {selectedPaymentMethod.DisplayCurrency.MinAmountLimit ? `${$_('generalMin')} ${formatter.format(selectedPaymentMethod.DisplayCurrency.MinAmountLimit)} ${currency}` : ''}
+                    {selectedPaymentMethod.DisplayCurrency.MaxAmountLimit ? `/ ${$_('generalMax')} ${formatter.format(selectedPaymentMethod.DisplayCurrency.MaxAmountLimit)} ${currency}` : ''}
                   </span>
                 {/if}
               {:else}
                 <span class="NonConfigurableAmount">
-                  {amount} {currency}
+                  {formatter.format(amount)} {currency}
                 </span>
               {/if}
             </label>
@@ -430,65 +545,77 @@
         </div>
           {#each fields as field, index}
             {#if showField(field)}
-              <div class="FieldWrapper" class:Hidden={field.type === FieldTypes.Hidden}>
-              <label>
-                {#if field.label && field.type !== FieldTypes.Link && field.type !== FieldTypes.Boolean}
-                  <span class:Required={field.isRequired}>{field.label}</span>
-                {/if}
-                {#if field.description && field.description !== field.label && field.type !== FieldTypes.QRCode && field.type !== FieldTypes.Boolean  && field.type !== FieldTypes.Link}
-                  <span class="Description">{field.description}</span>
-                {/if}
-                {#if field.type === FieldTypes.Text}
-                  <input type="text" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
-
-                {:else if field.type === FieldTypes.Number || field.type === FieldTypes.Money}
-                  <input type="number" placeholder="{field.placeholder}" bind:value={prepareFields[field.name]}>
-
-                {:else if field.type === FieldTypes.Password}
-                  <input type="password" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
-
-                {:else if field.type === FieldTypes.Hidden}
-                  <input type="hidden" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
-
-                {:else if field.type === FieldTypes.Lookup}
-                  <div class="CustomSelect">
-                    <div class="Selected" id="{index}" on:click="{(e) => showLookup(e,index)}">{prepareFields[field.name] || ''}</div>
-                    <div class="OptionList" class:Opened={openedLookup === index}>
-                      {#each field.values as value}
-                        <div on:click="{() => {prepareFields[field.name] = value.Name; fields = fields}}">
-                          <span>{value.Value}</span>
-                        </div>
-                      {/each}
+              <div class="FieldWrapper"
+                   class:Hidden={field.type === FieldTypes.Hidden}
+                   class:Invalid={showError[field.name] && fieldValidation[field.name]}>
+                <label>
+                  {#if field.label && field.type !== FieldTypes.Link && field.type !== FieldTypes.Boolean}
+                    <span class:Required={field.isRequired}>{field.label}</span>
+                  {/if}
+                  {#if field.description && field.description !== field.label && field.type !== FieldTypes.QRCode && field.type !== FieldTypes.Boolean  && field.type !== FieldTypes.Link}
+                    <span class="Description">{field.description}</span>
+                  {/if}
+                  {#if field.type === FieldTypes.Text}
+                    <input type="text" bind:value={prepareFields[field.name]}
+                           placeholder="{field.placeholder}"
+                           on:input="{() => { validateField(field) }}"
+                           on:blur="{() => { showError[field.name] = true; validateField(field) }}">
+
+                  {:else if field.type === FieldTypes.Number || field.type === FieldTypes.Money}
+                    <input type="number" placeholder="{field.placeholder}" bind:value={prepareFields[field.name]}
+                           on:input="{() => { validateField(field) }}"
+                           on:blur="{() => { showError[field.name] = true; validateField(field) }}"
+                    >
+                  {:else if field.type === FieldTypes.Password}
+                    <input type="password" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}"
+                           on:input="{() => { validateField(field) }}"
+                           on:blur="{() => { showError[field.name] = true; validateField(field) }}"
+                    >
+                  {:else if field.type === FieldTypes.Hidden}
+                    <input type="hidden" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
+
+                  {:else if field.type === FieldTypes.Lookup}
+                    <div class="CustomSelect">
+                      <div class="Selected" id="{index}" on:click="{(e) => showLookup(e, field.name)}">{prepareFields[field.name] || ''}</div>
+                      <div class="OptionList" class:Opened={openedLookup === field.name}>
+                        {#each field.values as value}
+                          <div on:click="{() => {prepareFields[field.name] = value.Name; fields = fields}}">
+                            <span>{value.Value}</span>
+                          </div>
+                        {/each}
+                      </div>
                     </div>
-                  </div>
-                {:else if field.type === FieldTypes.Boolean}
-                  <div class="Checkbox">
-                    <input type="checkbox" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
-                    <span class="Checkmark"></span>
-                    <span class="Description">{@html field.descriptionWithLink}</span>
-                  </div>
-                {:else if field.type === FieldTypes.QRCode}
-                  <div class="QRCode" on:click={() => {openUrlInNewTab(field.description)}}>
-                    <div bind:this={qrCodeContainer[qrCodeContainer.length]}>{field.defaultValue}</div>
-                  </div>
-                {:else if field.type === FieldTypes.Link}
-                  <span>{@html field.descriptionWithLink}</span>
-                {:else if field.type === FieldTypes.Label}
-                  <span class="Label"></span>
-                {:else}
-                  <input type="text" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
-                {/if}
-              </label>
+                  {:else if field.type === FieldTypes.Boolean}
+                    <div class="Checkbox">
+                      <input type="checkbox" bind:checked={prepareFields[field.name]} placeholder="{field.placeholder}"
+                             on:change="{() => { showError[field.name] = true; validateField(field) }}"
+                      >
+                      <span class="Checkmark"></span>
+                      <span class="Description">{@html field.descriptionWithLink}</span>
+                    </div>
+                  {:else if field.type === FieldTypes.QRCode}
+                    <div class="QRCode" on:click={() => {openUrlInNewTab(field.description)}}>
+                      <div bind:this={qrCodeContainer[qrCodeContainer.length]}>{field.defaultValue}</div>
+                    </div>
+                  {:else if field.type === FieldTypes.Link}
+                    <span>{@html field.descriptionWithLink}</span>
+                  {:else if field.type === FieldTypes.Label}
+                    <span class="Label"></span>
+                  {:else}
+                    <input type="text" bind:value={prepareFields[field.name]} placeholder="{field.placeholder}">
+                  {/if}
+                </label>
+                <span class="Alert">{ fieldValidation[field.name] || '' }</span>
               </div>
             {/if}
           {/each}
         {#if !isProcessingTxn}
-          <button class="PrimaryButton" type="submit">
+          <button class="PrimaryButton" type="submit" disabled="{isSubmitDisabled(amountError, fieldValidation)}">
             <svg class="ButtonLock"  xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
               <path fill-rule="evenodd" clip-rule="evenodd" d="M7.51564 0.574496C6.49714 0.733152 5.5928 1.46162 5.21164 2.43037C5.01714 2.92471 4.98674 3.24368 4.98671 4.78987L4.98668 5.99306L4.55336 6.00671C4.20693 6.01762 4.08258 6.03221 3.93336 6.07946C3.43136 6.23846 3.00318 6.58293 2.73943 7.04C2.70133 7.106 2.63639 7.256 2.59508 7.37334L2.52002 7.58665V13.9067L2.59268 14.12C2.6993 14.4331 2.83849 14.6518 3.09336 14.9067C3.34821 15.1615 3.56693 15.3007 3.88002 15.4073L4.09336 15.48H11.9067L12.12 15.4073C12.4331 15.3007 12.6518 15.1615 12.9067 14.9067C13.1616 14.6518 13.3007 14.4331 13.4074 14.12L13.48 13.9067V7.58665L13.405 7.37334C13.1846 6.74712 12.6999 6.27875 12.0667 6.08C11.9191 6.03371 11.7891 6.0184 11.4467 6.00696L11.0134 5.99253L11.0133 4.78959C11.0133 4.128 11.0008 3.45465 10.9855 3.29334C10.9257 2.66268 10.7188 2.13556 10.3497 1.67368C9.66549 0.817589 8.6023 0.405214 7.51564 0.574496ZM8.46436 1.58665C9.01596 1.7035 9.52999 2.11659 9.79758 2.65809C9.98521 3.03771 9.98202 3.00646 9.99305 4.58L10.003 6H5.99702L6.00699 4.58C6.01802 3.00646 6.01483 3.03771 6.20246 2.65809C6.31793 2.42446 6.43799 2.26065 6.61818 2.09103C6.89043 1.83468 7.21371 1.65496 7.52352 1.58775C7.74977 1.53865 8.23518 1.53809 8.46436 1.58665ZM11.9201 7.0955C12.0975 7.17871 12.2992 7.37412 12.3874 7.54806C12.4231 7.61846 12.465 7.75796 12.4805 7.85803C12.4993 7.97978 12.5061 8.97962 12.501 10.88L12.4934 13.72L12.4082 13.8997C12.26 14.2127 12.0016 14.419 11.6821 14.4796C11.4864 14.5167 4.51364 14.5167 4.31793 14.4796C3.99843 14.419 3.74008 14.2127 3.59183 13.8997L3.50668 13.72L3.49905 10.88C3.49393 8.97728 3.50074 7.97987 3.51964 7.85778C3.57627 7.49218 3.79218 7.21543 4.12918 7.0765L4.28002 7.01431L8.02668 7.0205L11.7734 7.02665L11.9201 7.0955Z" fill="white"/>
             </svg>
             {$_('makeDepositButton')}
-            <span class="ButtonAmount">{amount || $_('amountPlaceholder')} {currency}</span>
+            <span class="ButtonAmount">{formatter.format(amount)} {currency}</span>
           </button>
         {:else}
           <button class="PrimaryButton">
@@ -527,7 +654,7 @@
   {/if}
   {#if showConfirmModal}
     <cashier-confirm-modal>
-      <span slot="text">{$_('confirmDepositText')} {amount} {currency} ?</span>
+      <span slot="text">{$_('confirmDepositText')} {formatter.format(amount)} {currency} ?</span>
       <div slot="confirm">{$_('confirmDepositButton')}</div>
     </cashier-confirm-modal>
   {/if}
@@ -552,7 +679,7 @@
       visibility: hidden;
     }
   }
-  .form-logo {
+  .FormLogo {
     align-items: center;
     display: flex;
     height: 50px;
@@ -586,6 +713,12 @@
       text-decoration-line: underline;
     }
   }
+  .SelectedMethodDescription {
+    color: var(--emw--color-gray-300, #666);
+    font-size: var(--emw--font-size-x-small, 12px);
+    margin: 10px 0 5px;
+    line-height: var(--emw--font-size-x-small, 12px);
+  }
   .RedirectionNotification {
     height: 100%;
     width: inherit;
@@ -664,6 +797,26 @@
       padding: 0;
     }
   }
+  .Alert {
+    display: none;
+  }
+  .Invalid {
+    input, .Selected {
+      border-color: var(--emw--color-error, #FE0101);
+    }
+    .Alert {
+      display: inline-block;
+    }
+    .AmountLimits {
+      display: none;
+    }
+  }
+  .Alert {
+    color: var(--emw--color-error, #FE0101);
+    font-size: var(--emw--font-size-x-small, 12px);
+    margin: 5px 0 0 2px;
+    line-height: var(--emw--font-size-x-small, 12px);
+  }
   .AmountLimits {
     color: var(--emw--color-gray-300, #666);
     font-size: var(--emw--font-size-x-small, 12px);
@@ -702,7 +855,7 @@
   .PrimaryButton {
     color: var(--emw--color-white, #FFF);
     text-align: center;
-    font-size: var(--emw--font-size-small, 14px);
+    font-size: var(--emw--font-size-x-small, 12px);
     font-style: normal;
     font-weight: 400;
     height: 46px;
@@ -713,9 +866,27 @@
     width: 100%;
     margin: 12px 0;
     cursor: pointer;
-    text-transform: uppercase;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 5px;
+    .ButtonAmount {
+      font-weight: 600;
+    }
     .ButtonSpinner {
-      animation: loading-spinner 1s linear infinite
+      animation: loading-spinner 1s linear infinite;
+      background: var(--emw--color-active, #5C950F);
+    }
+    &[disabled] {
+      background: var(--emw--color-disabled, #99999980);
+      cursor: auto;
+      pointer-events: none;
+    }
+    &:hover {
+      background: var(--emw--color-hover, #71B11B);
+    }
+    &:active {
+      background: var(--emw--color-active, #5C950F);
     }
   }
   .QRCode {

package/src/translations.js

@@ -1,8 +1,8 @@
 export const TRANSLATIONS = {
   "en": {
-    "loading": 'Loading...',
+    "loading": "Loading...",
     "amountLabel": "Amount",
-    "makeDepositButton": "Deposit",
+    "makeDepositButton": "DEPOSIT",
     "confirmDepositText": "Are you sure you want to deposit",
     "confirmDepositButton": "Ok",
     "redirectTitle": "You are redirected to the payment\'s provider page",
@@ -10,10 +10,17 @@ export const TRANSLATIONS = {
     "backToPayment": "Close",
     "retryText": "Please note that your popup blocker may prevent the payment window from appearing",
     "retryButton": "RETRY",
-    "processingButton": "Processing...",
-    "generalMin": "Min",
-    "generalMax": "Max",
+    "processingButton": "PROCESSING...",
+    "generalMin": "Min:",
+    "generalMax": "Max:",
     "amountPlaceholder": "0.00",
-    "change": "Change"
-  },
+    "change": "Change",
+    "errorEmptyField": "Please enter data",
+    "minAmountError": "Amount cannot be smaller than {amount} {currency}",
+    "maxAmountError": "Amount cannot be bigger than {amount} {currency}",
+    "amountMultiplierError": "Amount should be multiple of {multiplier}",
+    "amountIntError": "Amount should be integer value",
+    "amountDecimalError": "Amount should have 2 or less digits after decimal point",
+    "invalidFieldError": "{field} is invalid"
+  }
 };