diff --git a/client/atms.lua b/client/atms.lua index 4ee2ca8..ff13434 100644 --- a/client/atms.lua +++ b/client/atms.lua @@ -108,7 +108,7 @@ RegisterNetEvent('jim-payments:Client:ATM:use', function(data) --this grabs all the info from names to savings account numbers in the databases local p = promise.new() QBCore.Functions.TriggerCallback('jim-payments:ATM:Find', function(cb) p:resolve(cb) end) local info = Citizen.Await(p) - if not Config.Manage then + if not Config.RenewedBanking then local p = promise.new() QBCore.Functions.TriggerCallback('qb-bossmenu:server:GetAccount', function(cb) p:resolve(cb) end, PlayerJob.name) info.society = Citizen.Await(p) local p2 = promise.new() diff --git a/config.lua b/config.lua index 9893e51..ff59234 100644 --- a/config.lua +++ b/config.lua @@ -1,4 +1,4 @@ -print("^2Jim^7-^2Payments ^7v^42^7.^48^7.^44 ^7- ^2Payments Script by ^1Jimathy^7") +print("^2Jim^7-^2Payments ^7v^42^7.^48^7.^45 ^7- ^2Payments Script by ^1Jimathy^7") -- If you need support I now have a discord available, it helps me keep track of issues and give better support. diff --git a/fxmanifest.lua b/fxmanifest.lua index 87d0653..16a8354 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,6 +1,6 @@ name "Jim-Payments" author "Jimathy" -version "v2.8.4" +version "v2.8.5" description "Payment Script By Jimathy" fx_version "cerulean" game "gta5" @@ -9,4 +9,4 @@ lua54 'yes' dependencies { 'qb-input', 'qb-target', } client_scripts { 'client/*.lua', 'locales/*.lua' } server_scripts { '@oxmysql/lib/MySQL.lua', 'server/*.lua' } -shared_scripts { 'config.lua', 'shared/*.lua', 'locales/*.lua' } \ No newline at end of file +shared_scripts { 'config.lua', 'shared/*.lua', 'locales/*.lua' } diff --git a/server/atmserver.lua b/server/atmserver.lua index 728cd7d..4b39b13 100644 --- a/server/atmserver.lua +++ b/server/atmserver.lua @@ -70,14 +70,14 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba elseif tonumber(society) >= amount then triggerNotify(nil, Loc[Config.Lan].success["draw"]..cv(amount)..Loc[Config.Lan].success["fromthe"]..Player.PlayerData.job.label..Loc[Config.Lan].success["account"], "success", src) Player.Functions.AddMoney('bank', amount) - if Config.Manage then exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) - else TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.job.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.job.name), amount) + else exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) end end elseif billtype == "deposit" then if bankB < amount then triggerNotify(nil, Loc[Config.Lan].error["nomoney_bank"], "error", src) elseif bankB >= amount then - if Config.Manage then exports["qb-management"]:AddMoney(tostring(Player.PlayerData.job.name), amount) - else TriggerEvent("qb-bossmenu:server:addAccountMoney", tostring(Player.PlayerData.job.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-bossmenu:server:addAccountMoney", tostring(Player.PlayerData.job.name), amount) + else exports["qb-management"]:AddMoney(tostring(Player.PlayerData.job.name), amount) end Player.Functions.RemoveMoney('bank', amount) Wait(1500) triggerNotify(nil, Loc[Config.Lan].success["deposited"]..cv(amount)..Loc[Config.Lan].success["into"]..Player.PlayerData.job.label..Loc[Config.Lan].success["account"], "success", src) end @@ -100,8 +100,8 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba local result = MySQL.Sync.fetchAll('SELECT * FROM players WHERE charinfo LIKE ?', {query}) if result[1] then local Reciever = QBCore.Functions.GetPlayerByCitizenId(result[1].citizenid) - if Config.Manage then exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) - else TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.job.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.job.name), amount) + else exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) end if Reciever then Reciever.Functions.AddMoney('bank', amount) triggerNotify(nil, Loc[Config.Lan].success["sent"]..amount..Loc[Config.Lan].success["to"]..Reciever.PlayerData.charinfo.firstname.." "..Reciever.PlayerData.charinfo.lastname, "success", src) @@ -122,14 +122,14 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba elseif tonumber(gsociety) >= amount then triggerNotify(nil, Loc[Config.Lan].success["draw"]..cv(amount)..Loc[Config.Lan].success["fromthe"]..Player.PlayerData.gang.label..Loc[Config.Lan].success["account"], "success", src) Player.Functions.AddMoney('bank', amount) - if Config.Manage then exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) - else TriggerEvent("qb-gangmenu:server:removeAccountMoney", tostring(Player.PlayerData.gang.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-gangmenu:server:removeAccountMoney", tostring(Player.PlayerData.gang.name), amount) + else exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) end end elseif billtype == "deposit" then if bankB < amount then triggerNotify(nil, Loc[Config.Lan].error["nomoney_bank"], "error", src) elseif bankB >= amount then - if Config.Manage then exports["qb-management"]:AddGangMoney(tostring(Player.PlayerData.gang.name), amount) - else TriggerEvent("qb-gangmenu:server:addAccountMoney", tostring(Player.PlayerData.gang.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-gangmenu:server:addAccountMoney", tostring(Player.PlayerData.gang.name), amount) + else exports["qb-management"]:AddGangMoney(tostring(Player.PlayerData.gang.name), amount) end Player.Functions.RemoveMoney('bank', amount) Wait(1500) triggerNotify(nil, Loc[Config.Lan].success["deposited"]..cv(amount)..Loc[Config.Lan].success["into"]..Player.PlayerData.gang.label..Loc[Config.Lan].success["account"], "success", src) end @@ -152,8 +152,8 @@ RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, ba local result = MySQL.Sync.fetchAll('SELECT * FROM players WHERE charinfo LIKE ?', {query}) if result[1] then local Reciever = QBCore.Functions.GetPlayerByCitizenId(result[1].citizenid) - if Config.Manage then exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) - else TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.gang.name), amount) end + if Config.RenewedBanking then TriggerEvent("qb-bossmenu:server:removeAccountMoney", tostring(Player.PlayerData.gang.name), amount) + else exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) end if not Reciever then Reciever.Functions.AddMoney('bank', amount) triggerNotify(nil, Loc[Config.Lan].success["sent"]..amount..Loc[Config.Lan].success["to"]..Reciever.PlayerData.charinfo.firstname.." "..Reciever.PlayerData.charinfo.lastname, "success", src) @@ -213,7 +213,7 @@ QBCore.Functions.CreateCallback('jim-payments:ATM:Find', function(source, cb) local gsociety = 0 -- If qb-management, grab info directly from database - if Config.Manage then + if Config.RenewedBanking then local result = MySQL.Sync.fetchAll('SELECT * FROM management_funds') for _, v in pairs(result) do if Player.PlayerData.job.name == v.job_name then society = v.amount end @@ -267,3 +267,4 @@ RegisterServerEvent("jim-payments:server:ATM:give", function(citizen, price) end else triggerNotify(nil, Loc[Config.Lan].error["zero"], 'error', source) end end) +