From 53a65bd4a3a63a3e705d9c9c6b71db441289f05f Mon Sep 17 00:00:00 2001 From: Chris McWilliams Date: Sun, 7 Jan 2024 02:37:55 -0500 Subject: [PATCH 1/4] Update atmserver.lua --- server/atmserver.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/atmserver.lua b/server/atmserver.lua index ffd418d..ee4b1e0 100644 --- a/server/atmserver.lua +++ b/server/atmserver.lua @@ -35,15 +35,15 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba end -- Transfers from bank to savings account -- elseif account == "savings" then - local getSavingsAccount = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_type = ?', { Player.PlayerData.citizenid, 'Savings' }) - if getSavingsAccount[1] ~= nil then savbal = tonumber(getSavingsAccount[1].amount) aid = getSavingsAccount[1].record_id end + local getSavingsAccount = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_name = ?', { Player.PlayerData.citizenid, 'Savings' }) + if getSavingsAccount[1] ~= nil then savbal = tonumber(getSavingsAccount[1].account_balance) aid = getSavingsAccount[1].citizenid end if billtype == "withdraw" then if savbal >= amount then savbal -= amount Player.Functions.AddMoney('bank', amount) triggerNotify(nil, "$"..cv(amount)..Loc[Config.Lan].success["draw_save"], "success", src) - MySQL.Async.execute('UPDATE bank_accounts SET amount = ? WHERE citizenid = ? AND record_id = ?', { savbal, Player.PlayerData.citizenid, getSavingsAccount[1].record_id }, function(success) + MySQL.Async.execute('UPDATE bank_accounts SET account_balance = ? WHERE citizenid = ?', { savbal, Player.PlayerData.citizenid}, function(success) if success then return true else return false end end) elseif savbal < amount then @@ -54,7 +54,7 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba savbal += amount Player.Functions.RemoveMoney('bank', amount) triggerNotify(nil, "$"..cv(amount)..Loc[Config.Lan].success["depos_save"], "success", src) - MySQL.Async.execute('UPDATE bank_accounts SET amount = ? WHERE citizenid = ? AND record_id = ?', { savbal, Player.PlayerData.citizenid, getSavingsAccount[1].record_id }, function(success) + MySQL.Async.execute('UPDATE bank_accounts SET account_balance = ? WHERE citizenid = ?', { savbal, Player.PlayerData.citizenid}, function(success) if success then return true else return false end end) else triggerNotify(nil, Loc[Config.Lan].error["bank_low"], "error", src) @@ -204,7 +204,7 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba RecieverMoney.bank += amount MySQL.Async.execute('UPDATE players SET money = ? WHERE citizenid = ?', {json.encode(RecieverMoney), result[1].citizenid}) end - elseif not result[1] then + elseif not result[1] then triggerNotify(nil, Loc[Config.Lan].error["error_start"]..baccount..Loc[Config.Lan].error["error_end"], "error", src) end end @@ -224,11 +224,11 @@ QBCore.Functions.CreateCallback('jim-payments:ATM:Find', function(source, cb) if Config.Banking == "qb-banking" then local result = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts') for _, v in pairs(result) do - if Player.PlayerData.job.name == v.job_name then society = v.amount end + if Player.PlayerData.job.name == v.account_name then society = v.account_balance end end if Player.PlayerData.gang.name ~= "none" then for _, v in pairs(result) do - if Player.PlayerData.gang.name == v.job_name then gsociety = v.amount end + if Player.PlayerData.gang.name == v.account_name then gsociety = v.account_balance end end end @@ -247,15 +247,15 @@ QBCore.Functions.CreateCallback('jim-payments:ATM:Find', function(source, cb) end -- Grab Savings account info - local result = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_type = ?', { Player.PlayerData.citizenid, 'Savings' }) + local result = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_name = ?', { Player.PlayerData.citizenid, 'Savings' }) if result[1] then - accountID = result[1].record_id - savingBalance = result[1].amount + accountID = result[1].citizenid + savingBalance = result[1].account_balance else - MySQL.Async.insert('INSERT INTO bank_accounts (citizenid, amount, account_type) VALUES (?, ?, ?)', { Player.PlayerData.citizenid, 0, 'Savings' }, function() completed = true end) repeat Wait(0) until completed == true - local result = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_type = ?', { Player.PlayerData.citizenid, 'Savings' }) - aid = result[1].record_id - savingBalance = result[1].amount + MySQL.Async.insert('INSERT INTO bank_accounts (citizenid, account_name, account_balance) VALUES (?, ?, ?)', { Player.PlayerData.citizenid, 'Savings', 0}, function() completed = true end) repeat Wait(0) until completed == true + local result = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_name = ?', { Player.PlayerData.citizenid, 'Savings' }) + accountID = result[1].citizenid + savingBalance = result[1].account_balance end cb({name = name, cash = cash, From f973050dfdd3f81259255af374a2907b137092a6 Mon Sep 17 00:00:00 2001 From: Chris McWilliams Date: Sun, 7 Jan 2024 02:38:59 -0500 Subject: [PATCH 2/4] Update server.lua --- server/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.lua b/server/server.lua index 7fa27ef..225961b 100644 --- a/server/server.lua +++ b/server/server.lua @@ -273,4 +273,4 @@ CreateThread(function() TriggerClientEvent("jim-payments:client:Charge", source, {}, true) end) end -end) \ No newline at end of file +end) From ae738606d20137bb74fe18256f2648db3cfbd02a Mon Sep 17 00:00:00 2001 From: Chris McWilliams Date: Sun, 7 Jan 2024 02:39:42 -0500 Subject: [PATCH 3/4] Update atms.lua From 278c72193e3d25e92cd0f4886123fa1d22582312 Mon Sep 17 00:00:00 2001 From: Chris McWilliams Date: Sun, 7 Jan 2024 02:40:56 -0500 Subject: [PATCH 4/4] Update client.lua