Max/Main
1
0
Fork 0
forked from Simnation/Main
Code Pull requests Activity

fix

Browse source
This commit is contained in:
Nordi98 2025-06-29 05:12:26 +02:00
parent 071df6cc88
commit caf94ba42f
2 changed files with 40 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

37
resources/[tools]/okokBanking/server.lua
View file

@ -315,34 +315,33 @@ AddEventHandler("okokBanking:SetIBAN", function(iban)
local src = source local src = source
local xPlayer = QBCore.Functions.GetPlayer(src) local xPlayer = QBCore.Functions.GetPlayer(src)
if not xPlayer then if not xPlayer then return end -- Validate player
print("[okokBanking] Error: Player not found")
return
end
-- Check if IBAN is valid
if not iban or type(iban) ~= "string" then if not iban or type(iban) ~= "string" then
print("[okokBanking] Error: Invalid IBAN provided") print("[okokBanking] ERROR: Invalid IBAN provided")
return return
end end
-- Method 1: Store in charinfo (recommended for QBCore, if IBAN is part of charinfo) -- Update IBAN in charinfo (QBCore standard)
if xPlayer.PlayerData.charinfo then if not xPlayer.PlayerData.charinfo then
xPlayer.PlayerData.charinfo.iban = iban print("[okokBanking] ERROR: Player charinfo missing")
xPlayer.Functions.SetPlayerData('charinfo', xPlayer.PlayerData.charinfo) return
-- 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)
end 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) end)
QBCore.Functions.CreateCallback("okokBanking:HasCreditCard", function(source, cb) QBCore.Functions.CreateCallback("okokBanking:HasCreditCard", function(source, cb)
local xPlayer = QBCore.Functions.GetPlayer(source) local xPlayer = QBCore.Functions.GetPlayer(source)
if xPlayer ~= nil then if xPlayer ~= nil then

44
resources/[tools]/okokBanking/web/scripts.js
View file

@ -56,7 +56,7 @@ window.addEventListener('message', function(event) {
<span id="playerName"></span> <span id="avatar">${avatar}</span> <span id="playerName"></span> <span id="avatar">${avatar}</span>
</span> </span>
<div class="wallet-div"> <div class="wallet-div">
<span>Wallet: <span id="wallet_money"></span> EUR</span> <span>Wallet: <span id="wallet_money"></span> USD</span>
</div> </div>
</div> </div>
</div> </div>
@ -124,7 +124,7 @@ window.addEventListener('message', function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Received</div> <div class="mtm3125">Received</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} USD</td>`;
// Sent // Sent
} else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) {
var name = db.receiver_name; var name = db.receiver_name;
@ -136,7 +136,7 @@ window.addEventListener('message', function(event) {
To <span class="transactions-name">${name}</span> To <span class="transactions-name">${name}</span>
<div class="mtm3125">Sent</div> <div class="mtm3125">Sent</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} USD</td>`;
// Deposited // Deposited
} else if (db.type == 'deposit') { } else if (db.type == 'deposit') {
var name = db.receiver_name; var name = db.receiver_name;
@ -148,7 +148,7 @@ window.addEventListener('message', function(event) {
Into <span class="transactions-name">${name}</span> Into <span class="transactions-name">${name}</span>
<div class="mtm3125">Deposited</div> <div class="mtm3125">Deposited</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} USD</td>`;
// Withdrawn // Withdrawn
} else if (db.type == 'withdraw') { } else if (db.type == 'withdraw') {
var name = db.sender_name; var name = db.sender_name;
@ -160,7 +160,7 @@ window.addEventListener('message', function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Withdrawn</div> <div class="mtm3125">Withdrawn</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} USD</td>`;
} }
row += ` row += `
@ -267,7 +267,7 @@ window.addEventListener('message', function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Received</div> <div class="mtm3125">Received</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} USD</td>`;
// Sent // Sent
} else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) {
var name = db.receiver_name; var name = db.receiver_name;
@ -279,7 +279,7 @@ window.addEventListener('message', function(event) {
To <span class="transactions-name">${name}</span> To <span class="transactions-name">${name}</span>
<div class="mtm3125">Sent</div> <div class="mtm3125">Sent</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} USD</td>`;
// Deposited // Deposited
} else if (db.type == 'deposit') { } else if (db.type == 'deposit') {
var name = db.receiver_name; var name = db.receiver_name;
@ -291,7 +291,7 @@ window.addEventListener('message', function(event) {
Into <span class="transactions-name">${name}</span> Into <span class="transactions-name">${name}</span>
<div class="mtm3125">Deposited</div> <div class="mtm3125">Deposited</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 transactions-received text-center">+ ${db.value.toLocaleString()} USD</td>`;
// Withdrawn // Withdrawn
} else if (db.type == 'withdraw') { } else if (db.type == 'withdraw') {
var name = db.sender_name; var name = db.sender_name;
@ -303,7 +303,7 @@ window.addEventListener('message', function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Withdrawn</div> <div class="mtm3125">Withdrawn</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} EUR</td>`; amount = `<td class="align-middle fw500 text-center">- ${db.value.toLocaleString()} USD</td>`;
} }
row += ` row += `
@ -332,7 +332,7 @@ window.addEventListener('message', function(event) {
<div class="card stats-title"> <div class="card stats-title">
<div class="card-body text-center"> <div class="card-body text-center">
<h6 class="card-title">INCOME</h6> <h6 class="card-title">INCOME</h6>
<p class="card-text fw125" id="totalIncome">${event.data.graph_values[7].toLocaleString()}€</p> <p class="card-text fw125" id="totalIncome">${event.data.graph_values[7].toLocaleString()}$</p>
</div> </div>
</div> </div>
</div> </div>
@ -340,7 +340,7 @@ window.addEventListener('message', function(event) {
<div class="card stats-title"> <div class="card stats-title">
<div class="card-body text-center"> <div class="card-body text-center">
<h6 class="card-title">OUTCOME</h6> <h6 class="card-title">OUTCOME</h6>
<p class="card-text fw125" id="unpaidInvoices">${event.data.graph_values[8].toLocaleString()}€</p> <p class="card-text fw125" id="unpaidInvoices">${event.data.graph_values[8].toLocaleString()}$</p>
</div> </div>
</div> </div>
</div> </div>
@ -348,7 +348,7 @@ window.addEventListener('message', function(event) {
<div class="card stats-title"> <div class="card stats-title">
<div class="card-body text-center"> <div class="card-body text-center">
<h6 class="card-title">EARNINGS</h6> <h6 class="card-title">EARNINGS</h6>
<p class="card-text fw125" id="awaitedIncome">${event.data.graph_values[9].toLocaleString()}€</p> <p class="card-text fw125" id="awaitedIncome">${event.data.graph_values[9].toLocaleString()}$</p>
</div> </div>
</div> </div>
</div> </div>
@ -705,7 +705,7 @@ function overview_page_function(event) {
</div> </div>
</div> </div>
<hr> <hr>
<p class="card-text text-center ccard-fs" style="margin-bottom: 1.1rem;"><span class="fff">Balance:</span> <span id="playerBankMoney"></span> EUR</p> <p class="card-text text-center ccard-fs" style="margin-bottom: 1.1rem;"><span class="fff">Balance:</span> <span id="playerBankMoney"></span> USD</p>
<p class="card-text text-center ccard-fs"><span class="fff">IBAN:</span> <span id="playerIBAN"></span></p> <p class="card-text text-center ccard-fs"><span class="fff">IBAN:</span> <span id="playerIBAN"></span></p>
</div> </div>
</div> </div>
@ -756,7 +756,7 @@ function overview_page_function(event) {
From <span class="lastT-name">${name}</span> From <span class="lastT-name">${name}</span>
<div class="mtm3125">Received</div> <div class="mtm3125">Received</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} USD</span></td>`;
// Sent // Sent
} else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) {
var name = db.receiver_name; var name = db.receiver_name;
@ -768,7 +768,7 @@ function overview_page_function(event) {
To <span class="lastT-name">${name}</span> To <span class="lastT-name">${name}</span>
<div class="mtm3125">Sent</div> <div class="mtm3125">Sent</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} USD</span></td>`;
// Deposited // Deposited
} else if (db.type == 'deposit') { } else if (db.type == 'deposit') {
var name = db.receiver_name; var name = db.receiver_name;
@ -780,7 +780,7 @@ function overview_page_function(event) {
Into <span class="lastT-name">${name}</span> Into <span class="lastT-name">${name}</span>
<div class="mtm3125">Deposited</div> <div class="mtm3125">Deposited</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} USD</span></td>`;
// Withdrawn // Withdrawn
} else if (db.type == 'withdraw') { } else if (db.type == 'withdraw') {
var name = db.sender_name; var name = db.sender_name;
@ -792,7 +792,7 @@ function overview_page_function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Withdrawn</div> <div class="mtm3125">Withdrawn</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} USD</span></td>`;
} }
row += ` row += `
@ -969,7 +969,7 @@ function society_page_function(event) {
</div> </div>
</div> </div>
<hr> <hr>
<p class="card-text text-center ccard-fs" style="margin-bottom: 1.1rem;""><span class="fff">Balance:</span> <span id="playerBankMoney"></span> EUR</p> <p class="card-text text-center ccard-fs" style="margin-bottom: 1.1rem;""><span class="fff">Balance:</span> <span id="playerBankMoney"></span> USD</p>
<p class="card-text text-center ccard-fs"><span class="fff">IBAN:</span> <span id="playerIBAN"></span></p> <p class="card-text text-center ccard-fs"><span class="fff">IBAN:</span> <span id="playerIBAN"></span></p>
</div> </div>
</div> </div>
@ -1019,7 +1019,7 @@ function society_page_function(event) {
From <span class="lastT-name">${name}</span> From <span class="lastT-name">${name}</span>
<div class="mtm3125">Received</div> <div class="mtm3125">Received</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} USD</span></td>`;
// Sent // Sent
} else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) { } else if (db.type == 'transfer' && db.sender_identifier == event.data.identifier) {
var name = db.receiver_name; var name = db.receiver_name;
@ -1031,7 +1031,7 @@ function society_page_function(event) {
To <span class="lastT-name">${name}</span> To <span class="lastT-name">${name}</span>
<div class="mtm3125">Sent</div> <div class="mtm3125">Sent</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} USD</span></td>`;
// Deposited // Deposited
} else if (db.type == 'deposit') { } else if (db.type == 'deposit') {
var name = db.receiver_name; var name = db.receiver_name;
@ -1043,7 +1043,7 @@ function society_page_function(event) {
Into <span class="lastT-name">${name}</span> Into <span class="lastT-name">${name}</span>
<div class="mtm3125">Deposited</div> <div class="mtm3125">Deposited</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500 lastT-received"><span class="floatr">+ ${db.value.toLocaleString()} USD</span></td>`;
// Withdrawn // Withdrawn
} else if (db.type == 'withdraw') { } else if (db.type == 'withdraw') {
var name = db.sender_name; var name = db.sender_name;
@ -1055,7 +1055,7 @@ function society_page_function(event) {
From <span class="transactions-name">${name}</span> From <span class="transactions-name">${name}</span>
<div class="mtm3125">Withdrawn</div> <div class="mtm3125">Withdrawn</div>
</td>`; </td>`;
amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} EUR</span></td>`; amount = `<td class="align-middle fw500"><span class="floatr">- ${db.value.toLocaleString()} USD</span></td>`;
} }
row += ` row += `