diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua
index 9d84e734..3dd4a489 100644
--- a/[esx_addons]/esx_banking/client/main.lua
+++ b/[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
}}
diff --git a/[esx_addons]/esx_banking/html/config.json b/[esx_addons]/esx_banking/html/config.json
index 5eacc1c5..5ded13f2 100644
--- a/[esx_addons]/esx_banking/html/config.json
+++ b/[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",
diff --git a/[esx_addons]/esx_banking/html/css/app.css b/[esx_addons]/esx_banking/html/css/app.css
index 3c53fbfd..0c70a9c0 100644
--- a/[esx_addons]/esx_banking/html/css/app.css
+++ b/[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;
+ }
+}
diff --git a/[esx_addons]/esx_banking/html/scripts/app.js b/[esx_addons]/esx_banking/html/scripts/app.js
index a2bc9585..179b481a 100644
--- a/[esx_addons]/esx_banking/html/scripts/app.js
+++ b/[esx_addons]/esx_banking/html/scripts/app.js
@@ -57,6 +57,8 @@ class Components{
`);
$(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 = `
${moneyData.title}
- ${moneyData.desc}
+ let template = `${this.language.your_money_title}
+ ${this.language.your_money_desc}
`;
moneyData.accountsData.forEach((data)=>{
-
template += `
-
${data.title}
+ ${this.language[`your_money_${data.name}_label`]}
${this.language.moneyFormat.replace("__replaceData__",data.amount)}
`;
@@ -480,8 +481,7 @@ class Pincode {
}
}
-
-const timeZone = localStorage.getItem("TIME_ZONE")
+var timeZone = ""
class Utils {
static dateFormat(date){
if(typeof(date) == "number"){
@@ -489,8 +489,7 @@ class Utils {
}else{
var newDate = date
}
-
- return newDate.toLocaleString([timeZone], {
+ return newDate.toLocaleString([Utils.getTimeZone()], {
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 == "EN" ? "en-GB" : "hu-HU")
formData = new GlobalStore(data[lang]["DYNAMIC_FORM_DATA"])
language = new GlobalStore(data[lang]["LAUNGAGE"])
}).fail(function(error){
diff --git a/[esx_addons]/esx_banking/locales/en.lua b/[esx_addons]/esx_banking/locales/en.lua
index 5fd8777b..9f5453c8 100644
--- a/[esx_addons]/esx_banking/locales/en.lua
+++ b/[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",
- ['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"
+ ['bank_name'] = "Fleeca Bank"
}
\ No newline at end of file
diff --git a/[esx_addons]/esx_banking/locales/hu.lua b/[esx_addons]/esx_banking/locales/hu.lua
index a5877b32..0d74a8c4 100644
--- a/[esx_addons]/esx_banking/locales/hu.lua
+++ b/[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",
- ['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"
+ ['bank_name'] = "Fleeca Bank"
}
\ No newline at end of file