@everymatrix/cashier-method-details 1.27.2 → 1.27.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/cashier-method-details",
-  "version": "1.27.2",
+  "version": "1.27.5",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0c03a79deed2ad6c051e5842c9c172ccdfee2b46"
+  "gitHead": "8155a0b8b58289a1253d06ffabea74af8bbd932e"
 }

package/src/CashierMethodDetails.svelte

@@ -12,6 +12,7 @@
   import '@everymatrix/cashier-notifications'
 
   import type {PaymentMethod} from "./CashierMethodDetails.types";
+  import {number} from "svelte-i18n";
   export class PaymentMethodDetails {
     name: string;
     label: string;
@@ -113,10 +114,16 @@
   export let currency: string;
   export let amount: number;
   export let assetsurl: string;
+  export let type: string = TxnType.Deposit;
   export let selectedpaymentmethodname: string;
   export let clientstyling:string = '';
   export let clientstylingurl:string = ''
 
+  export enum TxnType {
+    Deposit='Deposit',
+    Withdraw='Withdraw'
+  }
+
   const VISIBLE_FIELD_TYPES: string[] =
           'Text,Number,Money,Boolean,Lookup,Date,Time,DateTime,Password,Label,Link,QRCode'.split(',');
   export enum RedirectionModeStringEnum {
@@ -156,6 +163,8 @@
   let amountError = '';
   let showError = {};
   let fieldValidation = {};
+  let openLookupTop = false;
+  let maxLookupHeight: number;
 
   $: endpoint && session && selectedpaymentmethodname && currency && getPaymentDetails();
   $: clientstyling && customStylingContainer && setClientStyling();
@@ -284,10 +293,18 @@
 
   const showLookup = (event, name) => {
     if (name === openedLookup) {
+      showError[openedLookup] = true;
+      validateField(fields.find(field => field.name === openedLookup));
       openedLookup = null
       return;
     }
+    event.stopPropagation();
     clickedElem = event.composedPath()[0]
+    const clickY =  clickedElem.getBoundingClientRect().y;
+    const minLookupHeight = 200;
+    const lookupMargin = 55;
+    openLookupTop = (window.innerHeight - clickY) < minLookupHeight;
+    maxLookupHeight = openLookupTop ? clickY - minLookupHeight : window.innerHeight - clickY - lookupMargin;
     openedLookup = name
   }
 
@@ -590,7 +607,11 @@
                     {: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}>
+                        <div class="OptionList"
+                             class:Opened={openedLookup === field.name}
+                             class:Top={openLookupTop}
+                             style="max-height: {`${maxLookupHeight}px`};"
+                        >
                           {#each field.values as value}
                             <div on:click="{() => {prepareFields[field.name] = value.Name; fields = fields}}">
                               <span>{value.Value}</span>
@@ -627,7 +648,7 @@
               <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')}
+              {$_(`${type.toLowerCase()}.makeTxnButton`)}
               <span class="ButtonAmount">{formatter.format(amount)} {currency}</span>
             </button>
           {:else}
@@ -682,14 +703,17 @@
   {/if}
   {#if showConfirmModal}
     <cashier-confirm-modal>
-      <span slot="text">{$_('confirmDepositText')} {formatter.format(amount)} {currency} ?</span>
-      <div slot="confirm">{$_('confirmDepositButton')}</div>
+      <span slot="text">{$_(`${type.toLowerCase()}.confirmText`)} {formatter.format(amount)} {currency} ?</span>
+      <div slot="confirm">{$_(`${type.toLowerCase()}.confirmButton`)}</div>
     </cashier-confirm-modal>
   {/if}
 </div>
 
 
 <style lang="scss">
+
+  $input-height: 40px;
+
   @keyframes loading-spinner {
     from {
       transform: rotate(0deg)
@@ -698,6 +722,18 @@
       transform: rotate(360deg)
     }
   }
+  ::-webkit-scrollbar {
+    width: 4px;
+  }
+  ::-webkit-scrollbar-track {
+    background: transparent;
+  }
+  ::-webkit-scrollbar-thumb {
+    background: var(--emw--color-gray-100, #E8E9EB);
+  }
+  ::-webkit-scrollbar-thumb:hover {
+    background: var(--emw--color-gray-300, #666);
+  }
 
   input::-webkit-outer-spin-button,
   input::-webkit-inner-spin-button {
@@ -865,7 +901,7 @@
   input, .Selected {
     border: 1px solid var(--emw--color-gray-100, #E8E9EB);
     border-radius: var(--emw--border-radius-medium, 4px);
-    height: 40px;
+    height: $input-height;
     line-height: var(--emw--size-small, 14px);
     color: var(--emw--color-black, #111);
     padding: 0 15px;
@@ -1011,7 +1047,6 @@
   .OptionList {
     display: none;
     position: absolute;
-    top: 100%;
     left: 0;
     right: 0;
     z-index: 99;
@@ -1019,10 +1054,17 @@
     border: 1px solid var(--emw--color-gray-100, #E8E9EB);
     border-radius: var(--emw--border-radius-medium, 4px);
     margin-top: 5px;
+    overflow: auto;
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1);
+    &.Top {
+      transform: translate(0, calc(-1 * (100% + $input-height + 10px)));
+    }
     div {
       padding: 8px 16px;
       cursor: pointer;
       user-select: none;
+      line-height: calc(var(--emw--size-small, 14px) + 3px);
+      font-size: var(--emw--size-small, 14px);
       &:hover {
          background-color: var(--emw--color-background-secondary, #F9F9F9)
       }

package/src/translations.js

@@ -2,9 +2,6 @@ export const TRANSLATIONS = {
   "en": {
     "loading": "Loading...",
     "amountLabel": "Amount",
-    "makeDepositButton": "DEPOSIT",
-    "confirmDepositText": "Are you sure you want to deposit",
-    "confirmDepositButton": "Ok",
     "redirectTitle": "You are redirected to the payment\'s provider page",
     "redirectMessage": "Please complete your transaction on the payment\'s provider page.",
     "backToPayment": "Close",
@@ -21,6 +18,16 @@ export const TRANSLATIONS = {
     "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"
+    "invalidFieldError": "{field} is invalid",
+    "deposit": {
+      "makeTxnButton": "DEPOSIT",
+      "confirmText": "Are you sure you want to deposit?",
+      "confirmButton": "Ok",
+    },
+    "withdraw": {
+      "makeTxnButton": "WITHDRAW",
+      "confirmText": "Are you sure you want to withdraw?",
+      "confirmButton": "Ok",
+    }
   }
 };