@everymatrix/player-rglimits 1.36.0 → 1.36.1

package/index.html

@@ -33,23 +33,13 @@
     <player-rglimits
       session="4fbdd39b70d8b93163dc95f20a111b6cea3e0ad15ce90fb8"
       sessiontype="admin"
-      userid="6252873"
+      userid="6447183"
       transactionspageurl="https://backoffice-stage.everymatrix.com/2670"
       endpoint="https://betathome-de-stage-api.stage.norway.everymatrix.com"
       editlimitaction="true"
       deletelimitaction="true"
       cancelimitscheduleaction="true"
     ></player-rglimits>
-    <!--<player-rglimits
-      session="1cb29c658e7c0fd4547aac18727fa445bf61f8497522449e"
-      sessiontype="admin"
-      userid="6292957"
-      transactionspageurl="https://backoffice-stage.everymatrix.com/2670"
-      endpoint="https://betathome-de-stage-api.stage.norway.everymatrix.com"
-      editlimitaction="true"
-      deletelimitaction="true"
-      cancelimitscheduleaction="true"
-    ></player-rglimits>-->
   </div>
 
 </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/player-rglimits",
-  "version": "1.36.0",
+  "version": "1.36.1",
   "main": "index.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "09be81de9c66446d0062303022d5f036d874d153"
+  "gitHead": "5ffc382ef56d1d1736e48fec65bba06fbdadc8cf"
 }

package/src/PlayerRglimits.svelte

@@ -56,12 +56,15 @@
     from: '',
     to: '',
   };
-  let limitPeriodList:Array<string> = [];
-  let limitTypeList:Array<string> = [];
-  let selectedLimitPeriod:string = '';
-  let selectedLimitType:string = '';
+
+  let limitWalletTypeList: Array<string> = [];
+  let limitPeriodList: Array<string> = [];
+  let limitTypeList: Array<string> = [];
+  let selectedWalletType: string = '';
+  let selectedLimitPeriod: string = '';
+  let selectedLimitType: string = '';
   let selectedProduct: string = '';
-  let limitDefinitionList:Array<MonetaryLimitType> = [];
+  let limitDefinitionList: Array<MonetaryLimitType> = [];
   let productList: Array<string> = [];
 
   let gaugeValue:number = 0;
@@ -74,6 +77,11 @@
     Monthly: 2
   };
 
+  const walletTypeMap = {
+    All: 'All',
+    RealCash: 'Real Money'
+  };
+
   type TranslationKeys = keyof typeof TRANSLATIONS;
   Object.keys(TRANSLATIONS).forEach((item: TranslationKeys): void => {
     addNewMessages(item, TRANSLATIONS[item]);
@@ -133,6 +141,10 @@
       filteredLimits = filteredLimits.filter(item => item.period === selectedLimitPeriod);
     }
 
+    if (selectedWalletType) {
+      filteredLimits = filteredLimits.filter(item => item.walletTypes.includes(selectedWalletType));
+    }
+
     if (selectedLimitType) {
       filteredLimits = filteredLimits.filter(item => item.type === selectedLimitType);
     }
@@ -159,19 +171,23 @@
         noLimitToDisplay = true;
         return;
       }
+      limitPeriodList = [...new Set(limitDefinitionList.map((limit) => limit.period))].sort((a, b) => timeMap[a] - timeMap[b]);
 
-      limitPeriodList = [...new Set(limitDefinitionList.map((limit) => limit.period))].sort((a, b) => {
-        return timeMap[a] - timeMap[b];
-      });
+      if (!selectedLimitPeriod || !limitPeriodList.includes(selectedLimitPeriod)) {
+        selectedLimitPeriod = limitPeriodList[0];
+      }
+      limitWalletTypeList = getWalletTypeList(selectedLimitPeriod);    
 
-      const period = selectedLimitPeriod || limitDefinitionList[0].period;
-      productList = getProductListByPeriod(period);
+      if (!selectedWalletType || !limitWalletTypeList.includes(selectedWalletType)) {
+        selectedWalletType = limitWalletTypeList[0];
+      }
+      productList = getProductList(selectedLimitPeriod, selectedWalletType);
+      
       if (!productList.includes(selectedProduct)) {
         selectedProduct = productList[0];
       }
+      getLimitBalanceById(findBestMatchingLimit());
 
-      const limit = findBestMatchingLimit();
-      getLimitBalanceById(limit);
     } catch ( err ) {
       isLoading = false;
       handleError($_('fetchLimitBalanceError'));
@@ -206,6 +222,7 @@
       const allowedLimitTypes = ['Deposit', 'Loss', 'Wagering'];
       const limitTypes: string[] = res.limits.map((item: MonetaryLimitType) => item.type);
       limitTypeList = Array.from(new Set(limitTypes)).filter((type) => allowedLimitTypes.includes(type));
+
       if (!selectedLimitType) {
         selectedLimitType = limitTypeList[0];
       }
@@ -219,16 +236,16 @@
   };
 
   /**
-   * Updates product list based on selected period.
+   * Updates product list based on selected period and walletType.
    * 
    * @param period - The selected period.
+   * @param walletType - The selected walletType.
    */
-  const getProductListByPeriod = (period: string):Array<string> => {
-    const limits = limitDefinitionList.filter( (limit) => {
-      return limit.period === period;
-    });
-
+   const getProductList = (period: string, walletType: string): Array<string> => {
+    
+    const limits = limitDefinitionList.filter((limit) => limit.period === period && limit.walletTypes[0] === walletType);
     const newProductList = [];
+
     limits.forEach((currentLimit) => {
       currentLimit.products.forEach( (product) => {
         if(newProductList.indexOf(product) === -1) {
@@ -240,6 +257,28 @@
     return newProductList.sort();
   }
 
+
+  /**
+   * Updates wallet types list based on selected period.
+   * 
+   * @param period - The selected period.
+   */
+   const getWalletTypeList = (period: string): Array<string> => {
+
+    const limits = limitDefinitionList.filter((limit) => limit.period === period);
+    const newWalletTypeList = [];
+
+    limits.forEach((currentLimit) => {
+      currentLimit.walletTypes.forEach((walletType) => {
+        if (newWalletTypeList.indexOf(walletType) === -1) {
+          newWalletTypeList.push(walletType)
+        }
+      });
+    });
+
+    return newWalletTypeList.sort();
+  }
+
   /**
    * Retrieves the limit balance for a specific limit.
    * 
@@ -284,6 +323,7 @@
   const setCurrentLimit = (limitBalance: LimitDefinition, limit: MonetaryLimitType): void => {
     selectedLimitPeriod = limitBalance.limitPeriod;
     selectedProduct = limitBalance.limitProducts[0];
+    selectedWalletType = limitBalance.limitWalletTypes[0];
 
     const limitSchedule = formatScheduleData(limit.id, limit.schedules);
     displayedLimit = {
@@ -396,7 +436,40 @@
     const element = event.currentTarget as HTMLInputElement
 
     selectedLimitPeriod = element.value;
-    productList = getProductListByPeriod(selectedLimitPeriod);
+
+    limitWalletTypeList = getWalletTypeList(selectedLimitPeriod);    
+    if (!selectedWalletType || !limitWalletTypeList.includes(selectedWalletType)) {
+      selectedWalletType = limitWalletTypeList[0];
+    }
+    productList = getProductList(selectedLimitPeriod, selectedWalletType);
+
+    showDropdown = false;
+    
+    if (!productList.includes(selectedProduct)) {
+      selectedProduct = productList[0];
+    }
+    
+    const selectedLimit = limitDefinitionList.find((limit) => {
+      return limit.period === selectedLimitPeriod && limit.walletTypes[0] === selectedWalletType && limit.products.includes(selectedProduct);
+    });
+
+    if (!selectedLimit) {
+      return;
+    }
+
+    getLimitBalanceById(selectedLimit);
+  }
+
+  /**
+   * Handles the change in the selected wallet type.
+   * 
+   * @param event - The event object containing the target value.
+   */
+   const handleWalletTypeChange = (event: Event):void => {
+    const element = event.currentTarget as HTMLInputElement
+
+    selectedWalletType = element.value;
+    productList = getProductList(selectedLimitPeriod, selectedWalletType);
     showDropdown = false;
     
     if (!productList.includes(selectedProduct)) {
@@ -404,7 +477,7 @@
     }
     
     const selectedLimit = limitDefinitionList.find((limit) => {
-      return limit.period === selectedLimitPeriod && limit.products.includes(selectedProduct);
+      return limit.period === selectedLimitPeriod && limit.walletTypes[0] === selectedWalletType && limit.products.includes(selectedProduct);
     });
 
     if (!selectedLimit) {
@@ -717,6 +790,18 @@
       </div>
       <div class="ContentRight">
         <div class="WidgetControls">
+          {#if limitWalletTypeList.length > 0}
+            <div class="ControlContainer">
+              <label for="LimitPeriod">{$_('limitWalletTypeLabel')}: </label>
+              <select bind:value={selectedWalletType} id="WalletType" on:change={handleWalletTypeChange}>
+                {#each limitWalletTypeList as value}
+                  <option {value}>
+                    {walletTypeMap[value]}
+                  </option>
+                {/each}
+              </select>
+            </div>
+          {/if}
           {#if limitPeriodList.length > 0}
             <div class="ControlContainer">
               <label for="LimitPeriod">{$_('changeLimitLabel')}: </label>
@@ -822,7 +907,7 @@
 
   .ErrorMessage {
     margin: 0 15px;
-    font-size: 12px;
+    font-size: var(--emw--font-size-x-small, 12px);
     color: var(--emw--color-error, var(--emw--color-red, #ed0909));
   }
 
@@ -832,7 +917,7 @@
     max-width: 700px;
     min-height: 150px;
     border: 1px solid $primary-color;
-    border-radius: 20px;
+    border-radius: var(--emw--border-radius-large, 20px);
     overflow: hidden;
     box-shadow: 14px 26px 19.7px 0px $primary-text-color;
     gap:25px;
@@ -856,7 +941,7 @@
     margin-bottom: 15px;
     display: inline;
     span {
-      font-weight: 700;
+      font-weight: var(--emw--font-weight-bold, 700);
     }
   }
 
@@ -886,7 +971,7 @@
 
   .AddLimitControl {
     border: 0.1rem solid $primary-color;
-    border-radius: 0.3rem;
+    border-radius: var(--emw--border-radius-small, 0.3rem);
     min-height: 1rem;
     color: var(--emw--color-white, #FFFFFF);
     background: $primary-color;
@@ -903,27 +988,32 @@
     display: flex;
     width: 100%;
     justify-content: end;
-    gap: 20px;
+    gap: 10px;
   }
 
   .ControlContainer {
     label {
       display: block;
       width: 100%;
-      font-size: 12px;
-      font-weight: bold;
+      font-size: var(--emw--font-size-x-small, 12px);
+      font-weight: var(--emw--font-weight-bold, 700);
       margin-bottom: 5px;
     }
     button {
       padding: 5px;
       border: 1px solid $primary-contrast-color;
-      border-radius: 5px;
+      border-radius: var(--emw--border-radius-small, 5px);
       width: 25px;
-      cursor: pointer;
+        cursor: pointer;
       display: flex;
       flex-direction: column;
       margin-bottom: 4px;
     }
+
+    select {
+      max-width: 100px;
+    }
+
     .ActionsSvg  {
       height: 1em;
       width: 1em;
@@ -931,26 +1021,26 @@
       justify-content: center;
       cursor: pointer;
     }
-  }
+    }
 
   .ControlContainer button {
-    padding: 5px;
-    border: 1px solid $primary-contrast-color;
-    border-radius: 5px;
-    width: 25px;
-    cursor: pointer;
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 4px;
-  }
+      padding: 5px;
+      border: 1px solid $primary-contrast-color;
+      border-radius: var(--emw--border-radius-small, 5px);
+      width: 25px;
+      cursor: pointer;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: 4px;
+    }
 
   .ControlContainer .ActionsSvg {
-    height: 1em;
-    width: 1em;
-    display: flex;
-    justify-content: center;
-    cursor: pointer;
-  }
+      height: 1em;
+      width: 1em;
+      display: flex;
+      justify-content: center;
+      cursor: pointer;
+    }
 
   .AddLimitControl .ActionsSvg {
     height: 2em;
@@ -961,14 +1051,14 @@
     padding: 5px;
     margin-right: 5px;
     border: 1px solid $primary-contrast-color;
-    border-radius: 4px;
+    border-radius: var(--emw--border-radius-small, 4px);
     background: var(--emw--color-white, #FFFFFF);
   }
 
   .Gauge {
     width: 100%;
     font-family: 'Roboto', sans-serif;
-    color: black;
+    color: var(--emw--color-black, #000000);
     margin: 1rem 0;
     flex: 1;
     align-content: center;
@@ -1010,7 +1100,7 @@
     left: 50%;
     transform: translateX(-50%);
     top: 50%;
-    font-size: large;
+    font-size: var(--emw--font-size-large, 18px);
     white-space: nowrap;
     width: 130px;
     max-width: 200px;
@@ -1059,8 +1149,8 @@
 
   .DisplayContainer {
     border: 1px solid $primary-color;
-    background-color: #f5f5f5;
-    border-radius: 13px;
+    background-color: var(--emw--color-gray-100, #f5f5f5);
+    border-radius: var(--emw--border-radius-medium, 12px);
     box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25);
     padding: 9px;
     display: flex;
@@ -1072,14 +1162,14 @@
   }
 
   .SelectedProduct {
-    font-weight: 700;
+    font-weight: var(--emw--font-weight-bold, 700);
     text-align: center;
     width: 70px;
     color: $primary-text-color;
   }
 
   .TotalAmount {
-    font-size: 36px;
+    font-size: var(--emw--font-size-2x-large, 36px);
     align-items: baseline;
     gap: 5px;
     overflow-x: auto;
@@ -1093,7 +1183,7 @@
     flex: 1;
     text-align: center;
     .Currency {
-      font-size:24px
+      font-size: var(--emw--font-size-x-large, 24px);
     }
   }
 
@@ -1107,13 +1197,14 @@
   .ProductsDropdown{
     display: none;
     position: absolute;
-    background-color: #F5F5F5;
+    background-color: var(--emw--color-gray-100, #f5f5f5);
     width: 100%;
     box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
     z-index: 1;
     border: 1px solid $primary-color;
     &.Show {
       display: block;
+      border-radius: var(--emw--border-radius-medium, 12px);
     }
 
     button {
@@ -1124,10 +1215,11 @@
       padding: 10px;
       width: 100%;
       text-align: left;
-      font-weight: 700;
+      font-weight: var(--emw--font-weight-bold, 700);
       &:hover{
+        border-radius: var(--emw--border-radius-medium, 10px);
         background-color: $primary-color;
-        color: #fff;
+        color: var(--emw--color-white, #FFFFFF);
       }
     }
   }

package/src/translations.js

@@ -28,7 +28,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Edit Limit",
     "deleteLimitTitle": "Delete limit",
     "cancelScheduleTitle": "Cancel schedule",
-    "addLimitText": "Add monetary limit"
+    "addLimitText": "Add monetary limit",
+    "limitWalletTypeLabel": "Wallet type"
   },
   "zh-hk": {
     "noLimitToDisplay": "使用者尚未設定限額...",
@@ -59,7 +60,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "編輯限制",
     "deleteLimitTitle": "刪除限制",
     "cancelScheduleTitle": "取消行程",
-    "addLimitText": "新增貨幣限額"
+    "addLimitText": "新增貨幣限額",
+    "limitWalletTypeLabel": "钱包类型"
   },
   "de": {
     "noLimitToDisplay": "Der Benutzer hat kein Limit festgelegt...",
@@ -90,7 +92,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Limit bearbeiten",
     "deleteLimitTitle": "Limit löschen",
     "cancelScheduleTitle": "Zeitplan abbrechen",
-    "addLimitText": "Geldlimit hinzufügen"
+    "addLimitText": "Geldlimit hinzufügen",
+    "limitWalletTypeLabel": "Geldbörsentyp"
   },
   "it": {
     "noLimitToDisplay": "L'utente non ha impostato un limite...",
@@ -121,7 +124,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Modifica limite",
     "deleteLimitTitle": "Elimina limite",
     "cancelScheduleTitle": "Annulla pianificazione",
-    "addLimitText": "Aggiungi limite monetario"
+    "addLimitText": "Aggiungi limite monetario",
+    "limitWalletTypeLabel": "Tipo di portafoglio"
   },
   "fr": {
     "noLimitToDisplay": "L'utilisateur n'a pas fixé de limite...",
@@ -152,7 +156,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Modifier la limite",
     "deleteLimitTitle": "Supprimer la limite",
     "cancelScheduleTitle": "Annuler le planning",
-    "addLimitText": "Ajouter une limite monétaire"
+    "addLimitText": "Ajouter une limite monétaire",
+    "limitWalletTypeLabel": "Type de portefeuille"
   },
   "es": {
     "noLimitToDisplay": "El usuario no ha establecido un límite...",
@@ -183,7 +188,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Editar límite",
     "deleteLimitTitle": "Eliminar límite",
     "cancelScheduleTitle": "Cancelar programación",
-    "addLimitText": "Agregar límite monetario"
+    "addLimitText": "Agregar límite monetario",
+    "limitWalletTypeLabel": "Tipo de billetera"
   },
   "el": {
     "noLimitToDisplay": "Ο χρήστης δεν έχει ορίσει όριο...",
@@ -214,7 +220,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Επεξεργασία ορίου",
     "deleteLimitTitle": "Διαγραφή ορίου",
     "cancelScheduleTitle": "Ακύρωση προγράμματος",
-    "addLimitText": "Προσθήκη νομισματικού ορίου"
+    "addLimitText": "Προσθήκη νομισματικού ορίου",
+    "limitWalletTypeLabel": "Τύπος πορτοφολιού"
   },
   "tr": {
     "noLimitToDisplay": "Kullanıcı bir sınırlama belirlemedi...",
@@ -245,7 +252,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Sınırı Düzenle",
     "deleteLimitTitle": "Sınırı sil",
     "cancelScheduleTitle": "Programı iptal et",
-    "addLimitText": "Para limiti ekle"
+    "addLimitText": "Para limiti ekle",
+    "limitWalletTypeLabel": "Cüzdan türü"
   },
   "ru": {
     "noLimitToDisplay": "Пользователь не установил лимит...",
@@ -276,7 +284,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Изменить лимит",
     "deleteLimitTitle": "Удалить лимит",
     "cancelScheduleTitle": "Отменить расписание",
-    "addLimitText": "Добавить денежный лимит"
+    "addLimitText": "Добавить денежный лимит",
+    "limitWalletTypeLabel": "Тип кошелька"
   },
   "ro": {
     "noLimitToDisplay": "Utilizatorul nu a setat nicio limită...",
@@ -307,7 +316,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Editați limita",
     "deleteLimitTitle": "Ștergeți limita",
     "cancelScheduleTitle": "Anulați programul",
-    "addLimitText": "Adăugați o limită monetară"
+    "addLimitText": "Adăugați o limită monetară",
+    "limitWalletTypeLabel": "Tip portofel"
   },
   "hr": {
     "noLimitToDisplay": "Korisnik nije postavio limit...",
@@ -338,7 +348,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Uredi ograničenje",
     "deleteLimitTitle": "Ograničenje brisanja",
     "cancelScheduleTitle": "Otkaži raspored",
-    "addLimitText": "Dodaj novčani limit"
+    "addLimitText": "Dodaj novčani limit",
+    "limitWalletTypeLabel": "Vrsta novčanika"
   },
   "hu": {
     "noLimitToDisplay": "A felhasználó nem állított be korlátot...",
@@ -369,7 +380,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Korlát szerkesztése",
     "deleteLimitTitle": "Korlát törlése",
     "cancelScheduleTitle": "Ütemezés törlése",
-    "addLimitText": "Pénzösszeg hozzáadása"
+    "addLimitText": "Pénzösszeg hozzáadása",
+    "limitWalletTypeLabel": "Pénztárca típusa"
   },
   "pl": {
     "noLimitToDisplay": "Użytkownik nie ustawił limitu...",
@@ -400,7 +412,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Limit edycji",
     "deleteLimitTitle": "Usuń limit",
     "cancelScheduleTitle": "Anuluj harmonogram",
-    "addLimitText": "Dodaj limit pieniężny"
+    "addLimitText": "Dodaj limit pieniężny",
+    "limitWalletTypeLabel": "Typ portfela"
   },
   "pt": {
     "noLimitToDisplay": "O usuário não definiu um limite...",
@@ -431,7 +444,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Editar Limite",
     "deleteLimitTitle": "Excluir limite",
     "cancelScheduleTitle": "Cancelar agendamento",
-    "addLimitText": "Adicionar limite monetário"
+    "addLimitText": "Adicionar limite monetário",
+    "limitWalletTypeLabel": "Tipo de carteira"
   },
   "sl": {
     "noLimitToDisplay": "Uporabnik ni določil omejitve...",
@@ -462,7 +476,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Uredi omejitev",
     "deleteLimitTitle": "Omejitev brisanja",
     "cancelScheduleTitle": "Prekliči razpored",
-    "addLimitText": "Dodaj denarno omejitev"
+    "addLimitText": "Dodaj denarno omejitev",
+    "limitWalletTypeLabel": "Vrsta denarnice"
   },
   "sr": {
     "noLimitToDisplay": "Korisnik nije postavio limit...",
@@ -493,7 +508,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Ограничење уређивања",
     "deleteLimitTitle": "Избриши ограничење",
     "cancelScheduleTitle": "Откажи распоред",
-    "addLimitText": "Додај новчано ограничење"
+    "addLimitText": "Додај новчано ограничење",
+    "limitWalletTypeLabel": "Тип новчаника"
   },
   "es-mx": {
     "noLimitToDisplay": "El usuario no ha establecido un límite...",
@@ -524,7 +540,8 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Editar límite",
     "deleteLimitTitle": "Eliminar límite",
     "cancelScheduleTitle": "Cancelar programación",
-    "addLimitText": "Agregar límite monetario"
+    "addLimitText": "Agregar límite monetario",
+    "limitWalletTypeLabel": "Tipo de billetera"
   },
   "pt-br": {
     "noLimitToDisplay": "O usuário não definiu um limite...",
@@ -555,6 +572,7 @@ export const TRANSLATIONS = {
     "editLimitTitle": "Editar límite",
     "deleteLimitTitle": "Eliminar límite",
     "cancelScheduleTitle": "Cancelar programación",
-    "addLimitText": "Agregar límite monetario"
+    "addLimitText": "Agregar límite monetario",
+    "limitWalletTypeLabel": "Tipo de carteira"
   }
 };