diff --git a/[esx]/es_extended/client/functions.lua b/[esx]/es_extended/client/functions.lua index 467f88a1..b71fafff 100644 --- a/[esx]/es_extended/client/functions.lua +++ b/[esx]/es_extended/client/functions.lua @@ -492,13 +492,26 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked) local isAutomobile = IsThisModelACar(model) if isAutomobile ~= false then isAutomobile = true end ESX.TriggerServerCallback('esx:Onesync:SpawnVehicle',function(NetID) - print("Spawned Vehicle: " .. NetID) if NetID then + local Tries = 0 + SetNetworkIdCanMigrate(NetID, true) local vehicle = NetworkGetEntityFromNetworkId(NetID) - while not DoesEntityExist(vehicle) and not NetworkHasControlOfEntity(vehicle) do - vehicle = NetworkGetEntityFromNetworkId(NetID) - NetworkRequestControlOfEntity(vehicle) + while not DoesEntityExist(vehicle) do Wait(0) + vehicle = NetworkGetEntityFromNetworkId(NetID) + Tries += 1 + if Tries > 250 then + break + end + end + Tries = 0 + NetworkRequestControlOfEntity(vehicle) + while not NetworkHasControlOfEntity(vehicle) do + Wait(0) + Tries += 1 + if Tries > 250 then + break + end end SetEntityAsMissionEntity(vehicle, true, true) SetVehicleHasBeenOwnedByPlayer(vehicle, true) diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua index 836fb7c8..135cf5e0 100644 --- a/[esx]/es_extended/server/main.lua +++ b/[esx]/es_extended/server/main.lua @@ -298,8 +298,18 @@ function loadESXPlayer(identifier, playerId, isNew) TriggerEvent('esx:playerLoaded', playerId, xPlayer, isNew) xPlayer.triggerEvent('esx:playerLoaded', - {accounts = xPlayer.getAccounts(), coords = xPlayer.getCoords(), identifier = xPlayer.getIdentifier(), inventory = xPlayer.getInventory(), - job = xPlayer.getJob(), loadout = xPlayer.getLoadout(), maxWeight = xPlayer.getMaxWeight(), money = xPlayer.getMoney(), dead = false}, isNew, + { + accounts = xPlayer.getAccounts(), + coords = xPlayer.getCoords(), + identifier = xPlayer.getIdentifier(), + inventory = xPlayer.getInventory(), + job = xPlayer.getJob(), + loadout = xPlayer.getLoadout(), + maxWeight = xPlayer.getMaxWeight(), + money = xPlayer.getMoney(), + sex = xPlayer.get("sex") or "m", + dead = false + }, isNew, userData.skin) if not Config.OxInventory then diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index 0804e506..fccdc5f2 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -272,8 +272,9 @@ if ESX.GetConfig().Multichar then local spawn = playerData.coords or Config.Spawn if isNew or not skin or #skin == 1 then local finished = false - local sex = skin.sex or 0 - local model = sex == 0 and mp_m_freemode_01 or mp_f_freemode_01 + skin = Config.Default[playerData.sex] + skin.sex = playerData.sex == "m" and 0 or 1 + local model = skin.sex == 0 and mp_m_freemode_01 or mp_f_freemode_01 RequestModel(model) while not HasModelLoaded(model) do RequestModel(model) @@ -281,13 +282,8 @@ if ESX.GetConfig().Multichar then end SetPlayerModel(PlayerId(), model) SetModelAsNoLongerNeeded(model) - while not ESX.PlayerData.sex do - Wait(0) - end - skin = Config.Default[ESX.PlayerData.sex] - skin.sex = ESX.PlayerData.sex == "m" and 0 or 1 TriggerEvent('skinchanger:loadSkin', skin, function() - playerPed = PlayerPedId() + local playerPed = PlayerPedId() SetPedAoBlobRendering(playerPed, true) ResetEntityAlpha(playerPed) TriggerEvent('esx_skin:openSaveableMenu', function() diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index bc10890a..3dd4a489 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -20,7 +20,7 @@ end local function CreateBlips() local tmpActiveBlips = {} for i = 1, #Config.Banks do - if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Activate then + if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Enabled then local blip = AddBlipForCoord(Config.Banks[i].Position.xy) SetBlipSprite(blip, Config.Banks[i].Blip.Sprite) SetBlipScale(blip, Config.Banks[i].Blip.Scale) @@ -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..0deac798 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", @@ -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": "", + "loginButtonText": "", + "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" + } + } } } 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/images/checkmark.svg b/[esx_addons]/esx_banking/html/images/checkmark.svg deleted file mode 100644 index 583c32e8..00000000 --- a/[esx_addons]/esx_banking/html/images/checkmark.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/[esx_addons]/esx_banking/html/scripts/app.js b/[esx_addons]/esx_banking/html/scripts/app.js index ff2d5c01..2cf8afe5 100644 --- a/[esx_addons]/esx_banking/html/scripts/app.js +++ b/[esx_addons]/esx_banking/html/scripts/app.js @@ -1,3 +1,4 @@ +var LOADED = true class Components{ static allComponents = [] static generateAllComponents(generatedData,generateType = "bank"){ @@ -55,11 +56,14 @@ class Components{ `); $(appendedDiv).fadeIn(200) + LOADED = true + setTimeout(() => { $(`${appendedDiv}`).fadeOut(200) $("#wrapper").fadeIn().css("display","flex"); if(appendedDiv == ".loader") $("#container").fadeIn().css("display","flex") + LOADED = false }, 2500); }else if(state == "hide"){ $(`${appendedDiv}`).fadeOut(200) @@ -264,25 +268,7 @@ class Render { language = "" constructor(elementID){ this.elementID = elementID - // this.fullRenderData = renderData } - - // getCurrentTemplate(){ - // let functionName = "" - // switch(this.elementID){ - // case "bankcard": - // functionName = this.renderBankCard() - // break; - // case "your_money": - // functionName = this.renderMyMoneySection() - // break; - // case "transaction": - // functionName = this.renderTransactions() - // break; - // } - // return functionName; - // } - renderBankCard(){ const bankData = this.fullRenderData $("#bankcard").empty(); @@ -387,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)}
`; @@ -496,8 +481,7 @@ class Pincode { } } - -const timeZone = localStorage.getItem("TIME_ZONE") +var timeZone = "" class Utils { static dateFormat(date){ if(typeof(date) == "number"){ @@ -505,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", @@ -545,6 +528,14 @@ class Utils { } return genNum; } + + static setTimeZone(newTimeZone){ + timeZone = newTimeZone + } + + static getTimeZone(){ + return timeZone + } } class Graph{ @@ -659,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){ @@ -898,7 +889,6 @@ $(document).ready(function(){ second: false } - let currentNotify = false $(document).on('keyup','input[type="number"] , input[type="password"]',function(){ let buttonGroup = $(this).closest('.input-groups-container').find('button'); @@ -927,12 +917,6 @@ $(document).ready(function(){ if($(this).val() != '') { if($(this).attr("name") == "pincode" && $(this).val().length < 4){ - if(!currentNotify){ - currentNotify = true - setTimeout(function(){ - currentNotify = false - },3000) - } return } @@ -962,12 +946,6 @@ $(document).ready(function(){ let inputValue = $(this).prev('input').val(); if(inputValue == undefined){return} if((inputValue.length == 0 && inputValue <= 0 )){ - if(!currentNotify){ - currentNotify = true - setTimeout(function(){ - currentNotify = false - },3000) - } return } @@ -997,8 +975,10 @@ $(document).ready(function(){ $(document).keyup(function(e) { if(e.which == 27) { - Components.loader(".loader","hide") - $.post('https://esx_banking/close', JSON.stringify({})); + if (!LOADED) { + Components.loader(".loader","hide") + $.post('https://esx_banking/close', JSON.stringify({})); + } } }); }) diff --git a/[esx_addons]/esx_banking/html/ui.html b/[esx_addons]/esx_banking/html/ui.html index aa5b68f9..922ff813 100644 --- a/[esx_addons]/esx_banking/html/ui.html +++ b/[esx_addons]/esx_banking/html/ui.html @@ -3,7 +3,6 @@ - @@ -15,7 +14,6 @@ - - \ No newline at end of file + 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 diff --git a/[esx_addons]/esx_banking/locales/it.lua b/[esx_addons]/esx_banking/locales/it.lua new file mode 100644 index 00000000..ed5de004 --- /dev/null +++ b/[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", +} \ No newline at end of file diff --git a/[esx_addons]/esx_property/locales/en.lua b/[esx_addons]/esx_property/locales/en.lua index 1810139c..7a1636ba 100644 --- a/[esx_addons]/esx_property/locales/en.lua +++ b/[esx_addons]/esx_property/locales/en.lua @@ -108,7 +108,7 @@ Locales['en'] = { ["wardrobe_desc"] = "Change Position of Property Wardrobe.", ["Furniture_title"] = "Furniture", ["Furniture_desc"] = "Change Position of Property Wardrobe.", - ["enter_title"] = "Inventory", + ["enter_title"] = "Enter", ["knock_title"] = "Knock On Door", ["buy_title"] = "Buy", ["buy_desc"] = "Buy This Property For $%s", diff --git a/readme.md b/readme.md index 7b3dcc98..9a6bd291 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@
-### Supporters +### Supporters Interested in helping us? [Take a look at our patreon](https://www.patreon.com/esx "Take a look at our patreon")