Merge pull request #462 from Gellipapa/main

fix(esx_banking) some issue fix and responsive table fix

[esx_addons]/esx_banking/client/main.lua

@@ -126,14 +126,10 @@ function OpenUi(atm)
             openATM = atm,
             datas = {
                 your_money_panel = {
-                    title = _U('your_money_title'),
-                    desc = _U('your_money_desc'),
                     accountsData = {{
-                        title = _U('your_money_cash'),
                         name = "cash",
                         amount = data.money
                     }, {
-                        title = _U('your_money_bank'),
                         name = "bank",
                         amount = data.bankMoney
                     }}

[esx_addons]/esx_banking/html/config.json

@@ -71,6 +71,10 @@
             }
         ],
         "LAUNGAGE": {
+            "your_money_title":"Balance",
+            "your_money_desc":"Here you can see your current balance and cash.",
+            "your_money_cash_label":"Your cash",
+            "your_money_bank_label":"Your bank balance",
             "withdraw":"WITHDRAW",
             "deposit":"DEPOSIT",
             "transfer":"TRANSFER",
@@ -165,6 +169,10 @@
             
         ],
         "LAUNGAGE": {
+            "your_money_title":"Egyenleged",
+            "your_money_desc":"Itt láthatod a jelenlegi egyenleged és készpénzed.",
+            "your_money_cash_label":"Készpénz",
+            "your_money_bank_label":"Banki egyenleged",
             "withdraw":"KIVÉTEL",
             "deposit":"BETÉTEL",
             "transfer":"UTALÁS",
@@ -187,5 +195,102 @@
                 "tableFullLanguage":"Hungarian" 
             }
         }
+    },
+    "IT":{
+        "DYNAMIC_FORM_DATA":[
+            {
+                "componentName":"moreGraph",
+                "elementID":"#wrapper",
+                "title":"",
+                "closeButtonText":"Close",
+                "bankTitle":"Fleeca Bank",
+                "mainExitButtonText": "Disconnettersi"
+            },
+            {
+                "elementID":"#cpincode",
+                "name":"cpincode",
+                "buttonText":"conferma",
+                "inputPlaceholder": "4 cifre...",
+                "title":"IMPOSTAZIONE CODICE PIN",
+                "description": "Qui puoi impostare o modificare il codice PIN.",
+                "type":"password"
+            },
+            {
+                "elementID":"#withdraw",
+                "name":"withdraw",
+                "buttonText":"conferma",
+                "inputPlaceholder": "Quantità",
+                "title":"RITIRARE",
+                "description": "Qui puoi prelevare i tuoi soldi dalla banca.",
+                "type":"number"
+            },
+            {
+                "elementID":"#deposit",
+                "name":"deposit",
+                "buttonText":"conferma",
+                "inputPlaceholder": "Quantità",
+                "title":"DEPOSITARE",
+                "description": "Qui puoi depositare i tuoi soldi in banca.",
+                "type":"number"
+            },
+            {
+                "elementID":"#transfer",
+                "name":"transfer",
+                "buttonText":"trasferisci",
+                "inputPlaceholder": "Quantità",
+                "inputPlaceholder2": "Giocatore ID",
+                "title":"TRASFERIMENTO",
+                "description": "Qui puoi trasferire i tuoi soldi a qualcun altro."
+            },
+            {
+                "componentName":"trans",
+                "elementID":"#third-column",
+                "title":"CRONOLOGIA DELLE TRANSAZIONI",
+                "description": "Qui puoi vedere la cronologia delle tue operazioni.",
+                "moreHistoryText": "Mostra più cronologia",
+                "moreGraphText": "Mostra tutto il grafico"
+            },
+            {
+                "componentName":"pincodePanel",
+                "elementID":"#wrapper",
+                "title":"Enter PIN",
+                "deleteButtonText": "<i class='fa-solid fa-ban'></i>",
+                "loginButtonText": "<i class='fa-solid fa-right-to-bracket'></i>",
+                "closeButtonText": "Close"
+            },
+            {
+                "componentName":"atmComponent",
+                "elementID":"#wrapper",
+                "title":"Fleeca Bank",
+                "closeButtonText":"Disconnettersi"
+            }
+        ],
+        "LAUNGAGE": {
+            "your_money_title":"saldo",
+            "your_money_desc":"qui puoi vedere il saldo attuale e contanti.",
+            "your_money_cash":"i tuoi soldi",
+            "your_money_bank":"il tuo saldo bancario",
+            "withdraw":"RITIRARE",
+            "deposit":"DEPOSITARE",
+            "transfer":"TRASFERIMENTO",
+            "transferReceive":"TRASFERIMENTO RICEVUTO",
+            "moneyFormat":"$__replaceData__",
+            "graphTitle":"Il tuo bilancio",
+            "moreGraphTitle": "grafico",
+            "moreHistoryTitle":"Mostra la cronologia",
+            "inputErrorTitle":"I dati non sono corretti",
+            "inputErrorMessage":"Non può essere vuoto o un valore inferiore a 1!",
+            "showPincodeErrorTitle":"PIN errato",
+            "showPincodeErrorMessage":"Il pin deve contenere almeno 4 caratteri!",
+            "tableLang":{
+                "typeLabel": "Tipo di transazione",
+                "balanceLabel":"bilancio",
+                "amountLabel":"quantità",
+                "timeLabel":"tempo",
+                "searchInputPlaceholder":"Cerca ...",
+                "_comment": "tabella Opzioni complete della lingua: inglese, ungherese, italiana puoi trovare qui tutte le lingue: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/",
+                "tableFullLanguage":"Italiano" 
+            }
+        }
     }
 }

[esx_addons]/esx_banking/html/css/app.css

@@ -758,3 +758,10 @@ table.dataTable tbody tr:hover {
 	padding: 3vmin;
 	border-radius: 1.38vmin;
 }
+
+/*MEDIA QUERY*/
+@media only screen and (max-width: 1280px) {
+	.dataTables_scrollBody{
+		max-height: 310px !important;
+	}
+}

[esx_addons]/esx_banking/html/scripts/app.js

@@ -57,6 +57,8 @@ class Components{
 			</svg>`);
 			$(appendedDiv).fadeIn(200)
 			LOADED = true
+
+
 			setTimeout(() => {
 				$(`${appendedDiv}`).fadeOut(200)
 				$("#wrapper").fadeIn().css("display","flex");
@@ -371,14 +373,13 @@ class Render {
 	renderMyMoneySection(){
 		const moneyData =  this.fullRenderData
 		$("#your-money-panel").empty();
-		let template = `<h3>${moneyData.title}</h3>
+		let template = `<h3>${this.language.your_money_title}</h3>
-		<p>${moneyData.desc}</p>
+		<p>${this.language.your_money_desc}</p>
 		<div id="money-containers">`;
 			moneyData.accountsData.forEach((data)=>{
-
 			template += `
 				<div class="money-container">
-					<h4>${data.title}</h4>
+					<h4>${this.language[`your_money_${data.name}_label`]}</h4>
 					<span id="money-${data.name}">${this.language.moneyFormat.replace("__replaceData__",data.amount)}</span>
 				</div>
 			`;
@@ -480,8 +481,7 @@ class Pincode {
 	}
 }
 
-
+var timeZone = ""
-const timeZone = localStorage.getItem("TIME_ZONE")
 class Utils {
 	static dateFormat(date){
 		if(typeof(date) == "number"){
@@ -489,8 +489,7 @@ class Utils {
 		}else{
 			var newDate = date
 		}
-		
+		return newDate.toLocaleString([Utils.getTimeZone()], {
-		return newDate.toLocaleString([timeZone], {
 			weekday:"long",
 			hour:"2-digit",
 			minute:"2-digit",
@@ -529,6 +528,14 @@ class Utils {
 		}
 		return genNum;
 	}
+
+	static setTimeZone(newTimeZone){
+		timeZone = newTimeZone
+	}
+
+	static getTimeZone(){
+		return timeZone
+	}
 }
 
 class Graph{
@@ -643,7 +650,7 @@ $(document).ready(function(){
 		if(data[data.lang] != null){
 			lang = data.lang
 		}
-		localStorage.setItem("TIME_ZONE",lang == "EN" ? "en-GB" : "hu-HU")
+		Utils.setTimeZone(lang == "HU" ? "hu-HU" : "en-GB")
 		formData = new GlobalStore(data[lang]["DYNAMIC_FORM_DATA"])
 		language = new GlobalStore(data[lang]["LAUNGAGE"])
 	}).fail(function(error){

[esx_addons]/esx_banking/locales/en.lua

@@ -12,9 +12,5 @@ Locales['en'] = {
   ['not_enough_money'] = "Not enough money! You need %s money!",
   ['pincode_not_found'] = "Invalid PIN code",
   ['pincode_found'] = "Valid PIN code...",
-  ['bank_name'] = "Fleeca Bank",
+  ['bank_name'] = "Fleeca Bank"
-  ['your_money_title'] = "Balance",
-  ['your_money_desc'] = "Here you can see your current balance and cash.",
-  ['your_money_cash'] = "Your cash",
-  ['your_money_bank'] = "Your bank balance"
 }

[esx_addons]/esx_banking/locales/hu.lua

@@ -12,9 +12,5 @@ Locales['hu'] = {
     ['not_enough_money'] = "Nincs elég pénzed, még szükséged lesz ennyire: %s",
     ['pincode_not_found'] = "Érvénytelen PIN kód",
     ['pincode_found'] = "Érvényes PIN kód...",
-    ['bank_name'] = "Fleeca Bank",
+    ['bank_name'] = "Fleeca Bank"
-    ['your_money_title'] = "Egyenleg",
-    ['your_money_desc'] = "Itt láthatod a jelenlegi egyenleged és készpénzed.",
-    ['your_money_cash'] = "Készpénz",
-    ['your_money_bank'] = "Banki egyenleged"
 }

[esx_addons]/esx_banking/locales/it.lua

@@ -0,0 +1,16 @@
+Locales['it'] = {
+    ['invalid_amount'] = 'questa è una somma di denaro non valida',
+    ['deposit_money']  = 'hai depositato $%s',
+    ['withdraw_money'] = 'hai prelevato $%s',
+    ['pincode_money'] = 'hai un nuovo codice pin %s',
+    ['transfer_money'] = 'hai trasferito con successo il denaro a $%s ID: %s',
+    ['receive_transfer'] = 'hai ricevuto un trasferimento di denaro da $%s ID: %s',
+    ['press_e_banking']    = 'premi [E] per accedere alla banca',
+    ['access_bank']    = 'accedi alla banca',
+    ['banking_blip']       = 'Banca',
+    ['cant_do_it']       = "non puoi farlo!",
+    ['not_enough_money'] = "non hai abbastanza soldi! hai bisogno di %s soldi!",
+    ['pincode_not_found'] = "codice PIN errato",
+    ['pincode_found'] = "codice PIN valido...",
+    ['bank_name'] = "Fleeca Bank",
+}

readme.md

@@ -1,3 +1,12 @@
+<h1>ESX BANKING</h1>
+
+## BANK UI
+![esx_banking_pic1](https://user-images.githubusercontent.com/22717950/189738189-375101ac-c86b-4ce8-8df3-19d740c3809c.png)
+## ATM UI
+![esx_banking_pic2](https://user-images.githubusercontent.com/22717950/189738199-a325092b-5f1d-4c7f-8950-d660d053ed0f.png)
+![esx_banking_pic3](https://user-images.githubusercontent.com/22717950/189738210-7af2c7d5-7fa1-4f70-8460-743ee9258f88.png)
+
+
 <h1 align='center'>ESX Legacy</a></h1>
 <p align="center"><img src="https://docs.esx-framework.org/severcount.svg"/></p>
 <p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://docs.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
@@ -7,7 +16,7 @@
 
 <hr>
 
-### Supporters 
+### Supporters
 
 Interested in helping us? [Take a look at our patreon](https://www.patreon.com/esx "Take a look at our patreon")