@everymatrix/cashier-page 1.37.12 → 1.38.0

package/index.html

@@ -36,17 +36,18 @@
               local="en-US"
               channel="Desktop"
               type="Deposit"
-              session="935b0211-7b3d-4454-8b0a-f8e66099c18f"
+              session="a4db5664-cefc-4a37-b2b1-e05e5ec31a73"
               translationurl="https://static.everymatrix.com/mmstage/translations/1995/mm-localization-en.json"
               assetsurl="https://static.everymatrix.com/mmstage/cashier/operator-assets/1995"
-              endpoint="https://odeonbet-api.stage.norway.mazeday.com"
-              merchantid="1995"
+              endpoint="https://zirvebet-api.stage.norway.everymatrix.com"
+              merchantid="2719"
               successurl="https://odeonbet-stage.mazeday.com/tr/receipt"
               failurl="https://odeonbet-stage.mazeday.com/tr/receipt"
               cancelurl="https://odeonbet-stage.mazeday.com/tr/receipt"
-              customerid="6246443"
+              customerid="6440095"
               currency="TRY"
               numberofmethodsshown="1"
+              amount="10"
       >
       </cashier-page>
   </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/cashier-page",
-  "version": "1.37.12",
+  "version": "1.38.0",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "284346262a669a2f5a5891d7ba9327b0c94aa44c"
+  "gitHead": "7070080d10ab3c85ed4a5d2eeb2442cc9ff8fb2d"
 }

package/src/CashierPage.svelte

@@ -14,6 +14,7 @@
   import '@everymatrix/cashier-modal';
   import '@everymatrix/cashier-confirm-modal';
   import '@everymatrix/cashier-iframe-redirect';
+  import '@everymatrix/cashier-session-expiration-modal';
 
   enum RedirectionModeStringEnum {
     Default = 'Default',
@@ -46,8 +47,9 @@
   export let channel: string = TxnChannel.Desktop;
   export let showheader: string = 'true';
   export let numberofmethodsshown: string;
-  export let clientstyling:string = '';
-  export let clientstylingurl:string = ''
+  export let clientstyling: string = '';
+  export let clientstylingurl: string = '';
+  export let showsessionexpirationmodal: string = 'true';
 
   let xPlayerSessionId: string;
   let xPaymentSessionToken: string;
@@ -60,7 +62,7 @@
   let isMethodOpen:boolean  = false;
   let displayNone:boolean = false;
   let customStylingContainer:HTMLElement;
-  let widgetWidth: number
+  let widgetWidth: number;
   let mobileView: string;
   let prepareRequest;
   let showConfirmModal:boolean = false;
@@ -126,7 +128,7 @@
             .then(res => res.json())
             .then(data => {
               if (data.error) {
-                errorMessage = data.error
+                errorMessage = data.error;
               }
               if (data.ResponseCode === ResponseCode.PlayerSessionIsNotValid) {
                 errorResponseCode = data.ResponseCode;
@@ -144,6 +146,7 @@
               }
               xPaymentSessionToken = data.XPaymentSessionToken;
               isLoading = false;
+              window.postMessage({ type: 'StartSessionCountdown', xPaymentSessionToken }, window.location.href);
             })
             .catch(error => console.log(error))
   }
@@ -220,9 +223,16 @@
   }
 
   const hideModal = () => {
-    window.postMessage({ type: 'HideCashierModal' }, window.location.href)
+    window.postMessage({ type: 'HideCashierModal' }, window.location.href);
   }
 
+  const renewSession = () => {
+    errorResponseCode = null;
+    setErrorResponseCode();
+    getPlayerSession();
+  }
+
+
   const closeModal = () => {
     showConfirmModal = false;
   }
@@ -251,6 +261,10 @@
     if (e.data.type === 'ShowCashierModal') {
       modalErrorMessage = e.data.modalErrorMessage;
     }
+    if (e.data.type === 'SessionExpired') {
+      errorResponseCode = ResponseCode.JwtTokenError;
+      setErrorResponseCode();
+    }
   }
 
   $: endpoint && session && customerid && lang && channel && type && successurl && failurl && cancelurl && getPlayerSession();
@@ -303,7 +317,22 @@
       >
       <div slot="button" class="ModalButton" on:click={hideModal}>{$_('closeModal')}</div>
       </cashier-error>
-    </cashier-modal>
+      </cashier-modal>
+      {#if showsessionexpirationmodal === 'true'}
+         <cashier-session-expiration-modal
+                {assetsurl}
+                {translationurl}
+                {clientstylingurl}
+                {clientstyling}
+                {lang}
+                {local}
+                {endpoint}
+                {currency}
+                {customerid}
+                 selectedpaymentmethodname="{selectedPaymentMethod.Name}"
+         >
+         </cashier-session-expiration-modal> 
+      {/if}   
     {#if showConfirmModal}
     <cashier-confirm-modal
               {clientstylingurl}
@@ -360,12 +389,18 @@
           {translationurl}
           {clientstylingurl}
           {clientstyling}
-          hidebuttons="true"
+          imgurl = {errorResponseCode === ResponseCode.JwtTokenError ? 'session-expired-icon.png' : ''}
+          hidebuttons= {errorResponseCode !== ResponseCode.JwtTokenError}
           errorcode={errorResponseCode}
     >
       {#if !errorResponseCode}
         <span slot="text">{errorMessage}</span>
       {/if}
+      {#if errorResponseCode === ResponseCode.JwtTokenError}
+        <span slot="title">{$_('sessionExpiredTitle')}</span>
+        <span slot="text">{$_('sessionExpiredText')}</span>
+        <div slot="button" class="CashierErrorButton" on:click={renewSession}>{$_('continueSession')}</div>
+      {/if}
     </cashier-error>
   {/if}
 </div>

package/src/translations.js

@@ -2,6 +2,9 @@ export const TRANSLATIONS = {
   "en": {
     "loading": "Loading...",
     "closeModal": "CLOSE",
+    "continueSession": "CONTINUE",
+    "sessionExpiredTitle": "Session Expired!",
+    "sessionExpiredText": "Your session has ended. We apologize for any inconvenience. Please click the button to continue.",
     "deposit": {
       "makeTxnButton": "DEPOSIT",
       "confirmText": "You're going to deposit to your account",
@@ -17,14 +20,33 @@ export const TRANSLATIONS = {
   },
   "hr": {
     "loading": "Učitavanje",
+    "closeModal": "CLOSE",
+    "continueSession": "CONTINUE",
+    "sessionExpiredTitle": "Session Expired!",
+    "sessionExpiredText": "Your session has ended. We apologize for any inconvenience. Please click the button to continue.",
     "header": {
       "deposit": "Uplata",
       "withdraw": "Povlačenje"
+    },
+    "deposit": {
+      "makeTxnButton": "DEPOSIT",
+      "confirmText": "You're going to deposit to your account",
+      "confirmTextWithAmount": "You're going to deposit {amount} {currency} to your account",
+      "confirmButton": "Ok"
+    },
+    "withdraw": {
+      "makeTxnButton": "WITHDRAW",
+      "confirmText": "You're going to withdraw from your account",
+      "confirmTextWithAmount": "You're going to withdraw {amount} {currency} from your account",
+      "confirmButton": "Ok"
     }
   },
   "tr": {
     "loading": "Yükleniyor...",
     "closeModal": "KAPAT",
+    "continueSession": "Devam et",
+    "sessionExpiredTitle": "Session Expired!",
+    "sessionExpiredText": "Your session has ended. We apologize for any inconvenience. Please click the button to continue.",
     "header": {
       "deposit": "Yatır",
       "withdraw": "Çek"