From caf94ba42fc713ac5bdf15b8020e2c6f10e84aea Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Sun, 29 Jun 2025 05:12:26 +0200 Subject: [PATCH] fix --- resources/[tools]/okokBanking/server.lua | 37 ++++++++-------- resources/[tools]/okokBanking/web/scripts.js | 44 ++++++++++---------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/resources/[tools]/okokBanking/server.lua b/resources/[tools]/okokBanking/server.lua index 23cd7336c..3a83830b2 100644 --- a/resources/[tools]/okokBanking/server.lua +++ b/resources/[tools]/okokBanking/server.lua @@ -315,34 +315,33 @@ AddEventHandler("okokBanking:SetIBAN", function(iban) local src = source local xPlayer = QBCore.Functions.GetPlayer(src) - if not xPlayer then - print("[okokBanking] Error: Player not found") - return - end + if not xPlayer then return end -- Validate player + -- Check if IBAN is valid if not iban or type(iban) ~= "string" then - print("[okokBanking] Error: Invalid IBAN provided") + print("[okokBanking] ERROR: Invalid IBAN provided") return end - -- Method 1: Store in charinfo (recommended for QBCore, if IBAN is part of charinfo) - if xPlayer.PlayerData.charinfo then - xPlayer.PlayerData.charinfo.iban = iban - xPlayer.Functions.SetPlayerData('charinfo', xPlayer.PlayerData.charinfo) - - -- Optional: Sync with database (standard QBCore method) - exports['qb-database']:update('UPDATE players SET charinfo = ? WHERE citizenid = ?', { - json.encode(xPlayer.PlayerData.charinfo), - xPlayer.PlayerData.citizenid - }) - else - -- Method 2: Fallback to metadata if charinfo isn't available - xPlayer.Functions.SetMetaData("iban", iban) + -- Update IBAN in charinfo (QBCore standard) + if not xPlayer.PlayerData.charinfo then + print("[okokBanking] ERROR: Player charinfo missing") + return end - print(("[okokBanking] Updated IBAN for %s (%s)"):format(xPlayer.PlayerData.name, iban)) + xPlayer.PlayerData.charinfo.iban = iban + xPlayer.Functions.SetPlayerData('charinfo', xPlayer.PlayerData.charinfo) + + -- Proper QBCore database update method + MySQL.Async.execute('UPDATE players SET charinfo = ? WHERE citizenid = ?', { + json.encode(xPlayer.PlayerData.charinfo), + xPlayer.PlayerData.citizenid + }) + + print("[okokBanking] Updated IBAN for", xPlayer.PlayerData.name, "New IBAN:", iban) end) + QBCore.Functions.CreateCallback("okokBanking:HasCreditCard", function(source, cb) local xPlayer = QBCore.Functions.GetPlayer(source) if xPlayer ~= nil then diff --git a/resources/[tools]/okokBanking/web/scripts.js b/resources/[tools]/okokBanking/web/scripts.js index 13961da94..cd9f16189 100644 --- a/resources/[tools]/okokBanking/web/scripts.js +++ b/resources/[tools]/okokBanking/web/scripts.js @@ -56,7 +56,7 @@ window.addEventListener('message', function(event) { ${avatar}
- Wallet: EUR + Wallet: USD
@@ -124,7 +124,7 @@ window.addEventListener('message', function(event) { From ${name}
Received
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Sent } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { var name = db.receiver_name; @@ -136,7 +136,7 @@ window.addEventListener('message', function(event) { To ${name}
Sent
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; // Deposited } else if (db.type == 'deposit') { var name = db.receiver_name; @@ -148,7 +148,7 @@ window.addEventListener('message', function(event) { Into ${name}
Deposited
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Withdrawn } else if (db.type == 'withdraw') { var name = db.sender_name; @@ -160,7 +160,7 @@ window.addEventListener('message', function(event) { From ${name}
Withdrawn
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; } row += ` @@ -267,7 +267,7 @@ window.addEventListener('message', function(event) { From ${name}
Received
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Sent } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { var name = db.receiver_name; @@ -279,7 +279,7 @@ window.addEventListener('message', function(event) { To ${name}
Sent
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; // Deposited } else if (db.type == 'deposit') { var name = db.receiver_name; @@ -291,7 +291,7 @@ window.addEventListener('message', function(event) { Into ${name}
Deposited
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Withdrawn } else if (db.type == 'withdraw') { var name = db.sender_name; @@ -303,7 +303,7 @@ window.addEventListener('message', function(event) { From ${name}
Withdrawn
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; } row += ` @@ -332,7 +332,7 @@ window.addEventListener('message', function(event) {
INCOME
-

${event.data.graph_values[7].toLocaleString()}€

+

${event.data.graph_values[7].toLocaleString()}$

@@ -340,7 +340,7 @@ window.addEventListener('message', function(event) {
OUTCOME
-

${event.data.graph_values[8].toLocaleString()}€

+

${event.data.graph_values[8].toLocaleString()}$

@@ -348,7 +348,7 @@ window.addEventListener('message', function(event) {
EARNINGS
-

${event.data.graph_values[9].toLocaleString()}€

+

${event.data.graph_values[9].toLocaleString()}$

@@ -705,7 +705,7 @@ function overview_page_function(event) {
-

Balance: EUR

+

Balance: USD

IBAN:

@@ -756,7 +756,7 @@ function overview_page_function(event) { From ${name}
Received
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Sent } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { var name = db.receiver_name; @@ -768,7 +768,7 @@ function overview_page_function(event) { To ${name}
Sent
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; // Deposited } else if (db.type == 'deposit') { var name = db.receiver_name; @@ -780,7 +780,7 @@ function overview_page_function(event) { Into ${name}
Deposited
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Withdrawn } else if (db.type == 'withdraw') { var name = db.sender_name; @@ -792,7 +792,7 @@ function overview_page_function(event) { From ${name}
Withdrawn
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; } row += ` @@ -969,7 +969,7 @@ function society_page_function(event) {
-

Balance: EUR

+

Balance: USD

IBAN:

@@ -1019,7 +1019,7 @@ function society_page_function(event) { From ${name}
Received
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Sent } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { var name = db.receiver_name; @@ -1031,7 +1031,7 @@ function society_page_function(event) { To ${name}
Sent
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; // Deposited } else if (db.type == 'deposit') { var name = db.receiver_name; @@ -1043,7 +1043,7 @@ function society_page_function(event) { Into ${name}
Deposited
`; - amount = `+ ${db.value.toLocaleString()} EUR`; + amount = `+ ${db.value.toLocaleString()} USD`; // Withdrawn } else if (db.type == 'withdraw') { var name = db.sender_name; @@ -1055,7 +1055,7 @@ function society_page_function(event) { From ${name}
Withdrawn
`; - amount = `- ${db.value.toLocaleString()} EUR`; + amount = `- ${db.value.toLocaleString()} USD`; } row += `