diff --git a/[esx_addons]/esx_banking/locales/da.lua b/[esx_addons]/esx_banking/locales/da.lua index cd2e8689..78aed4ad 100644 --- a/[esx_addons]/esx_banking/locales/da.lua +++ b/[esx_addons]/esx_banking/locales/da.lua @@ -9,6 +9,9 @@ Locales['da'] = { ['access_bank'] = 'Tilgå banken', ['banking_blip'] = 'Bank', ['cant_do_it'] = "Du kan ikke gøre det!", + ['error_deposit_money'] = "Der opstod en fejl med indbetalingen, prøv igen senere!", + ['error_withdraw_money'] = "Der opstod en fejl med udbetalingen, prøv igen senere!", + ['error_transfer_money'] = "Der opstod en fejl med overførslen, prøv igen senere!", ['not_enough_money'] = "Ikke nok penge! Du mangler %s DKK!", ['pincode_not_found'] = "Ugyldig PIN-kode", ['pincode_found'] = "Gyldig PIN-kode...", diff --git a/[esx_addons]/esx_banking/locales/de.lua b/[esx_addons]/esx_banking/locales/de.lua index 773e7cfd..1d9fe513 100644 --- a/[esx_addons]/esx_banking/locales/de.lua +++ b/[esx_addons]/esx_banking/locales/de.lua @@ -1,16 +1,19 @@ Locales['de'] = { - ['invalid_amount'] = 'Das ist eine Ungültige anzahl von Geld', - ['deposit_money'] = 'Du zahlst ein %s€', - ['withdraw_money'] = 'Du zahlst aus %s€', - ['pincode_money'] = 'Dein neuer Pin lautet %s', - ['transfer_money'] = 'Du überweist %s€ an ID: %s', - ['receive_transfer'] = 'Du erhälst eine überweisung Betrag: %s€ Von: %s', - ['press_e_banking'] = 'Drücke [E] um auf die Bank zuzugreifen', - ['access_bank'] = 'Auf die Bank zugreifen', - ['banking_blip'] = 'Bank', - ['cant_do_it'] = "Kannst du nicht tun!", - ['not_enough_money'] = "Nicht genug Geld! Du benötigst %s Geld!", - ['pincode_not_found'] = "Ungültiger PIN Code", - ['pincode_found'] = "Gültiger PIN Code!", - ['bank_name'] = "Fleeca Bank" + ['invalid_amount'] = 'Ungültiger Betrag', + ['deposit_money'] = 'Du hast $%s eingezahlt', + ['withdraw_money'] = 'Du hast $%s abgehoben', + ['pincode_money'] = 'Du hast einen neuen PIN-Code %s', + ['transfer_money'] = 'Erfolgreiche Überweisung von $%s an ID: %s', + ['receive_transfer'] = 'Du hast eine Überweisung von $%s von ID: %s erhalten', + ['press_e_banking'] = 'Drücke [E] um auf die Bank zuzugreifen', + ['access_bank'] = 'Zugriff auf Bank', + ['banking_blip'] = 'Bank', + ['cant_do_it'] = "Du kannst dir das nicht leisten!", + ['error_deposit_money'] = "Es gab einen Fehler bei der Einzahlung, versuche es später noch einmal!", + ['error_withdraw_money'] = "Es gab einen Fehler bei der Auszahlung, versuche es später noch einmal!", + ['error_transfer_money'] = "Es gab einen Fehler bei der Überweisung, versuche es später noch einmal!", + ['not_enough_money'] = "Du hast nicht genug Geld! Du brauchst %s Geld!", + ['pincode_not_found'] = "Ungültiger PIN-Code", + ['pincode_found'] = "Gültiger PIN-Code.. Willkommen", + ['bank_name'] = "Fleeca" } diff --git a/[esx_addons]/esx_banking/locales/en.lua b/[esx_addons]/esx_banking/locales/en.lua index 9f5453c8..1e0f4594 100644 --- a/[esx_addons]/esx_banking/locales/en.lua +++ b/[esx_addons]/esx_banking/locales/en.lua @@ -9,8 +9,11 @@ Locales['en'] = { ['access_bank'] = 'Access the bank', ['banking_blip'] = 'Bank', ['cant_do_it'] = "Can't do it!", + ['error_deposit_money'] = "There was an error with the deposit, try again later!", + ['error_withdraw_money'] = "There was an error with the withdrawal, try again later!", + ['error_transfer_money'] = "There was an error with the transfer, try again later!", ['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" -} \ No newline at end of file +} diff --git a/[esx_addons]/esx_banking/locales/es.lua b/[esx_addons]/esx_banking/locales/es.lua index 2bf30eee..e6e501f1 100644 --- a/[esx_addons]/esx_banking/locales/es.lua +++ b/[esx_addons]/esx_banking/locales/es.lua @@ -9,6 +9,9 @@ Locales['es'] = { ['access_bank'] = 'Acceder al banco', ['banking_blip'] = 'Banco', ['cant_do_it'] = "No puedes permitirte esto!", + ['error_deposit_money'] = "Hubo un error en el deposito intentalo mas tarde!", + ['error_withdraw_money'] = "Hubo un error en la retirada intentalo mas tarde!", + ['error_transfer_money'] = "Hubo un error en la transferencia intentalo mas tarde!", ['not_enough_money'] = "¡No tienes suficiente dinero! Necesitas %s de dinero!", ['pincode_not_found'] = "Código PIN invalido", ['pincode_found'] = "Código PIN válido.. Bienvenido", diff --git a/[esx_addons]/esx_banking/locales/et.lua b/[esx_addons]/esx_banking/locales/et.lua index 84f85234..2de30dad 100644 --- a/[esx_addons]/esx_banking/locales/et.lua +++ b/[esx_addons]/esx_banking/locales/et.lua @@ -9,6 +9,9 @@ Locales['et'] = { ['access_bank'] = 'Ava pank', ['banking_blip'] = 'Pank', ['cant_do_it'] = "Ei saa seda teha!", + ['error_deposit_money'] = "Sissemaksel tekkis viga, proovi hiljem uuesti!", + ['error_withdraw_money'] = "Väljavõtmisel tekkis viga, proovi hiljem uuesti!", + ['error_transfer_money'] = "Ülekandel tekkis viga, proovi hiljem uuesti!", ['not_enough_money'] = "Pole piisavalt raha! Sul on vaja %s !", ['pincode_not_found'] = "Vale PIN", ['pincode_found'] = "Õige PIN...", diff --git a/[esx_addons]/esx_banking/locales/fi.lua b/[esx_addons]/esx_banking/locales/fi.lua index bd4385b3..1654ebf9 100644 --- a/[esx_addons]/esx_banking/locales/fi.lua +++ b/[esx_addons]/esx_banking/locales/fi.lua @@ -9,6 +9,9 @@ Locales['fi'] = { ['access_bank'] = 'Avaa pankki', ['banking_blip'] = 'Pankki', ['cant_do_it'] = "Ei voida tehdä sitä!", + ['error_deposit_money'] = "Talletuksessa tapahtui virhe, yritä myöhemmin uudelleen!", + ['error_withdraw_money'] = "Nostossa tapahtui virhe, yritä myöhemmin uudelleen!", + ['error_transfer_money'] = "Siirrossa tapahtui virhe, yritä myöhemmin uudelleen!", ['not_enough_money'] = "Ei tarpeeksi rahaa! Tarvitset %s rahaa!", ['pincode_not_found'] = "Virheellinen PIN-koodi", ['pincode_found'] = "Kelvollinen PIN-koodi...", diff --git a/[esx_addons]/esx_banking/locales/fr.lua b/[esx_addons]/esx_banking/locales/fr.lua index 4e52384d..887006e2 100644 --- a/[esx_addons]/esx_banking/locales/fr.lua +++ b/[esx_addons]/esx_banking/locales/fr.lua @@ -9,8 +9,11 @@ Locales['fr'] = { ['access_bank'] = 'Accéder à la banque', ['banking_blip'] = 'Banque', ['cant_do_it'] = "Tu ne peux pas faire ça!", + ['error_deposit_money'] = "Une erreur s'est produite lors du dépôt, réessayez plus tard !", + ['error_withdraw_money'] = "Une erreur s'est produite lors du retrait, réessayez plus tard !", + ['error_transfer_money'] = "Une erreur s'est produite lors du transfert, réessayez plus tard !", ['not_enough_money'] = "Tu n'as pas assez d'argent ! Tu as besoin de %s!", ['pincode_not_found'] = "Code PIN invalide", ['pincode_found'] = "Code PIN valide...", ['bank_name'] = "Banque Fleeca" - } \ 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 0d74a8c4..2d06a197 100644 --- a/[esx_addons]/esx_banking/locales/hu.lua +++ b/[esx_addons]/esx_banking/locales/hu.lua @@ -9,8 +9,11 @@ Locales['hu'] = { ['access_bank'] = 'Bank megnyitása', ['banking_blip'] = 'Bank', ['cant_do_it'] = "Ezt nem lehet!", + ['error_deposit_money'] = "Hiba történt a befizetés során, próbáld újra később!", + ['error_withdraw_money'] = "Hiba történt a kivét során, próbáld újra később!", + ['error_transfer_money'] = "Hiba történt az utalás során, próbáld újra később!", ['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" -} \ No newline at end of file +} diff --git a/[esx_addons]/esx_banking/locales/it.lua b/[esx_addons]/esx_banking/locales/it.lua index 0576403f..97bbc54f 100644 --- a/[esx_addons]/esx_banking/locales/it.lua +++ b/[esx_addons]/esx_banking/locales/it.lua @@ -9,6 +9,9 @@ Locales['it'] = { ['access_bank'] = 'accedi alla banca', ['banking_blip'] = 'Banca', ['cant_do_it'] = "non puoi farlo!", + ['error_deposit_money'] = "Si è verificato un errore con il deposito, riprova più tardi!", + ['error_withdraw_money'] = "Si è verificato un errore con il prelievo, riprova più tardi!", + ['error_transfer_money'] = "Si è verificato un errore con il trasferimento, riprova più tardi!", ['not_enough_money'] = "non hai abbastanza soldi! hai bisogno di %s soldi!", ['pincode_not_found'] = "codice PIN errato", ['pincode_found'] = "codice PIN valido...", diff --git a/[esx_addons]/esx_banking/locales/nl.lua b/[esx_addons]/esx_banking/locales/nl.lua index a98d0b1a..d872b793 100644 --- a/[esx_addons]/esx_banking/locales/nl.lua +++ b/[esx_addons]/esx_banking/locales/nl.lua @@ -9,6 +9,9 @@ Locales['nl'] = { ['access_bank'] = 'Geldautomaat', ['banking_blip'] = 'Bank', ['cant_do_it'] = "Kan dit niet doen!", + ['error_deposit_money'] = "Er is een fout opgetreden bij het storten, probeer het later opnieuw!", + ['error_withdraw_money'] = "Er is een fout opgetreden bij het opnemen, probeer het later opnieuw!", + ['error_transfer_money'] = "Er is een fout opgetreden bij de overschrijving, probeer het later opnieuw!", ['not_enough_money'] = "Niet genoeg geld! Je hebt nog %s nodig!", ['pincode_not_found'] = "Onjuiste PIN", ['pincode_found'] = "Een moment geduld...", diff --git a/[esx_addons]/esx_banking/locales/sl.lua b/[esx_addons]/esx_banking/locales/sl.lua index 54b36e14..d35890c8 100644 --- a/[esx_addons]/esx_banking/locales/sl.lua +++ b/[esx_addons]/esx_banking/locales/sl.lua @@ -9,8 +9,11 @@ Locales['sl'] = { ['access_bank'] = 'Dostop do banke', ['banking_blip'] = 'Banka', ['cant_do_it'] = "NI možno to narediti!", + ['error_deposit_money'] = "Prišlo je do napake pri pologu, poskusite kasneje!", + ['error_withdraw_money'] = "Prišlo je do napake pri dvigu, poskusite kasneje!", + ['error_transfer_money'] = "Prišlo je do napake pri nakazilu, poskusite kasneje!", ['not_enough_money'] = "Premalo denarja! Vi potrebujete %s denarja!", ['pincode_not_found'] = "Neveljavna PIN Koda", ['pincode_found'] = "Pravilna PIN Koda...", ['bank_name'] = "Delavska Hranilnica" -} \ No newline at end of file +} diff --git a/[esx_addons]/esx_banking/locales/sr.lua b/[esx_addons]/esx_banking/locales/sr.lua index edbc8270..032bf566 100644 --- a/[esx_addons]/esx_banking/locales/sr.lua +++ b/[esx_addons]/esx_banking/locales/sr.lua @@ -9,6 +9,9 @@ Locales['sr'] = { ['access_bank'] = 'Pristupi banci', ['banking_blip'] = 'Banka', ['cant_do_it'] = "Ne mozete to uraditi!", + ['error_deposit_money'] = "Došlo je do greške prilikom uplate, pokušajte kasnije!", + ['error_withdraw_money'] = "Došlo je do greške prilikom isplate, pokušajte kasnije!", + ['error_transfer_money'] = "Došlo je do greške prilikom transfera, pokušajte kasnije!", ['not_enough_money'] = "Nemate dovoljno novca! Potrebno vam je %s !", ['pincode_not_found'] = "Pogresan PIN kod", ['pincode_found'] = "Validni PIN kod...", diff --git a/[esx_addons]/esx_banking/locales/sv.lua b/[esx_addons]/esx_banking/locales/sv.lua index e56f3890..aad275b9 100644 --- a/[esx_addons]/esx_banking/locales/sv.lua +++ b/[esx_addons]/esx_banking/locales/sv.lua @@ -9,6 +9,9 @@ Locales['sv'] = { ['access_bank'] = 'Öppna banken', ['banking_blip'] = 'Bank', ['cant_do_it'] = "Går inte att göra!", + ['error_deposit_money'] = "Det uppstod ett fel med insättningen, försök igen senare!", + ['error_withdraw_money'] = "Det uppstod ett fel med uttaget, försök igen senare!", + ['error_transfer_money'] = "Det uppstod ett fel med överföringen, försök igen senare!", ['not_enough_money'] = "Inte tillräckligt med pengar! Du behöver %skr!", ['pincode_not_found'] = "Ogiltig PIN-kod", ['pincode_found'] = "Giltig PIN-kod...", diff --git a/[esx_addons]/esx_banking/locales/tr.lua b/[esx_addons]/esx_banking/locales/tr.lua index 1a8aded1..5b996d7f 100644 --- a/[esx_addons]/esx_banking/locales/tr.lua +++ b/[esx_addons]/esx_banking/locales/tr.lua @@ -9,9 +9,11 @@ Locales['tr'] = { ['access_bank'] = 'Bankaya Erişim', ['banking_blip'] = 'Banka', ['cant_do_it'] = "Yapamazsınız!", + ['error_deposit_money'] = "Para yatırma işleminde bir hata oluştu, daha sonra tekrar deneyin!", + ['error_withdraw_money'] = "Para çekme işleminde bir hata oluştu, daha sonra tekrar deneyin!", + ['error_transfer_money'] = "Transfer işleminde bir hata oluştu, daha sonra tekrar deneyin!", ['not_enough_money'] = "Yetersiz bakiye! %s para gerekiyor!", ['pincode_not_found'] = "Geçersiz PIN kodu", ['pincode_found'] = "Geçerli PIN kodu...", ['bank_name'] = "Fleeca Bank" } - \ No newline at end of file diff --git a/[esx_addons]/esx_banking/locales/zh-cn.lua b/[esx_addons]/esx_banking/locales/zh-cn.lua index cc007d36..9202fc4d 100644 --- a/[esx_addons]/esx_banking/locales/zh-cn.lua +++ b/[esx_addons]/esx_banking/locales/zh-cn.lua @@ -9,6 +9,9 @@ Locales['zh-cn'] = { ['access_bank'] = '访问银行', ['banking_blip'] = '花园银行', ['cant_do_it'] = "错误的操作!", + ['error_deposit_money'] = "存款时发生错误，请稍后再试！", + ['error_withdraw_money'] = "取款时发生错误，请稍后再试！", + ['error_transfer_money'] = "转账时发生错误，请稍后再试！", ['not_enough_money'] = "暂无足够现金! 您还需要至少 %s 的现金!", ['pincode_not_found'] = "无效的PIN密码输入", ['pincode_found'] = "验证PIN密码中...", diff --git a/[esx_addons]/esx_banking/server/main.lua b/[esx_addons]/esx_banking/server/main.lua index a5759e5a..1fa7730e 100644 --- a/[esx_addons]/esx_banking/server/main.lua +++ b/[esx_addons]/esx_banking/server/main.lua @@ -139,7 +139,7 @@ function logTransaction(targetSource,label, key,amount) print("ERROR: Do you need use these: WITHDRAW,DEPOSIT,TRANSFER_RECEIVE") return end - + if type(key) ~= "string" or key == '' then print("ERROR: Do you need use these: WITHDRAW,DEPOSIT,TRANSFER_RECEIVE and can only be string type!") return @@ -158,9 +158,9 @@ function logTransaction(targetSource,label, key,amount) if xPlayer ~= nil then local bankCurrentMoney = xPlayer.getAccount('bank').money - BANK.LogTransaction(targetSource, label, string.upper(key), amount, bankCurrentMoney) + BANK.LogTransaction(targetSource, label, string.upper(key), amount, bankCurrentMoney) else - print("ERROR: xPlayer is nil!") + print("ERROR: xPlayer is nil!") end end exports("logTransaction", logTransaction) @@ -191,25 +191,48 @@ BANK = { end end, Withdraw = function(amount, xPlayer) - xPlayer.addAccountMoney('money', amount) - xPlayer.removeAccountMoney('bank', amount) + if xPlayer.removeAccountMoney('bank', amount) then + if not xPlayer.addAccountMoney('money', amount) then + xPlayer.addAccountMoney('bank', amount) + TriggerClientEvent("esx:showNotification", xPlayer.source, TranslateCap("error_withdraw_money"), "error") + return false + end + return true + end + return false end, + Deposit = function(amount, xPlayer) - xPlayer.removeAccountMoney('money', amount) - xPlayer.addAccountMoney('bank', amount) + if xPlayer.removeAccountMoney('money', amount) then + if not xPlayer.addAccountMoney('bank', amount) then + xPlayer.addAccountMoney('money', amount) + TriggerClientEvent("esx:showNotification", xPlayer.source, TranslateCap("error_deposit_money"), "error") + return false + end + return true + end + return false end, + Transfer = function(xTarget, xPlayer, amount, key) if xTarget == nil or xPlayer.src == xTarget.src then TriggerClientEvent("esx:showNotification", source, TranslateCap("cant_do_it"), "error") return false end - xPlayer.removeAccountMoney('bank', amount) - xTarget.addAccountMoney('bank', amount) + if not xPlayer.removeAccountMoney('bank', amount) then + return false + end + + if not xTarget.addAccountMoney('bank', amount) then + xPlayer.addAccountMoney('bank', amount) + TriggerClientEvent("esx:showNotification", xPlayer.src, TranslateCap("error_transfer_money"), "error") + return false + end + local bankMoney = xTarget.getAccount('bank').money BANK.LogTransaction(xTarget.src, "TRANSFER_RECEIVE", amount, bankMoney) - TriggerClientEvent("esx:showNotification", xTarget.src, TranslateCap('receive_transfer', amount, xPlayer.src), - "success") + TriggerClientEvent("esx:showNotification", xTarget.src, TranslateCap('receive_transfer', amount, xPlayer.src), "success") return true end, @@ -227,8 +250,8 @@ BANK = { local xPlayer = ESX.Player(playerId) local identifier = xPlayer.getIdentifier() - + MySQL.insert('INSERT INTO banking (identifier, label, type, amount, time, balance) VALUES (?, ?, ?, ?, ?, ?)', {identifier,label,logType,amount, os.time() * 1000, bankMoney}) - end + end }