From d55d809b642e5f939854e3deeb178526cf2d74d4 Mon Sep 17 00:00:00 2001 From: Phantom Date: Wed, 20 Dec 2023 00:45:28 +0000 Subject: [PATCH] v2.8.7 - Added da.lua locales - Updated Script for qb-banking changes - Fixed Config.Usebzzz issue - Updated config to include Jim and Taylors newer Jobs - Added example of CustomCashRegister to config - Added Banking examples --- README.md | 3 + client/client.lua | 2 +- config.lua | 37 ++++++++++-- fxmanifest.lua | 2 +- locales/da.lua | 134 +++++++++++++++++++++++++++++++++++++++++++ server/atmserver.lua | 68 +++++++++++----------- server/server.lua | 22 +++++-- 7 files changed, 223 insertions(+), 45 deletions(-) create mode 100644 locales/da.lua diff --git a/README.md b/README.md index b03aa05..7d5d7d8 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ ### If you need support I have a discord server available, it helps me keep track of issues and give better support. ## https://discord.gg/xKgQZ6wZvS +### We also have Documentation over on Gitbook, feel free to check it out +## https://jixelpatterns.gitbook.io/jixelpatterns-script-guide/overview/who-we-are + ### If you think I did a good job here, consider donating as it keeps by lights on and my cat fat/floofy: ## https://ko-fi.com/jixelpatterns diff --git a/client/client.lua b/client/client.lua index 3657176..0a5249d 100644 --- a/client/client.lua +++ b/client/client.lua @@ -98,7 +98,7 @@ RegisterNetEvent('jim-payments:client:Charge', function(data, outside) if not dialog.citizen or not dialog.price then return end TriggerServerEvent('jim-payments:server:Charge', dialog.citizen, dialog.price, dialog.billtype, data.img, outside, gang) end - if config.Usebzzz then + if Config.Usebzzz then ExecuteCommand("e c") end end) diff --git a/config.lua b/config.lua index 1e238c8..f1b55ee 100644 --- a/config.lua +++ b/config.lua @@ -7,13 +7,17 @@ print("^2Jim^7-^2Payments ^7v^42^7.^48^7.^45 ^7- ^2Payments Script by ^1Jimathy^ Config = { Lan = "en", Debug = false, - Notify = "qb", + Notify = "qb", -- "qb" | "okok" | "t" | "infinity" | "rr" --------------------------------- -- Default Job Payment Systems -- --------------------------------- - Banking = "qb", -- qb, renewed, and fd currently default supported + Banking = "qb-banking", + -- "qb-management" - This is for the older version of QBCore + -- "qb-banking" - This is for the latest QBCore updates + -- "renewed" + -- "fd" - currently default supported ApGov = false, -- Toggle support for AP-Goverment Tax @@ -64,8 +68,9 @@ Config = { -- PayPerTicket should never be higher than MinAmountforTicket -- Commission is a percentage eg "0.10" becomes 10% Jobs = { - ['beanmachine'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + -- Jim Businesses | https://jimathy666.tebex.io/ ['bakery'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['beanmachine'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, ['burgershot'] = { MinAmountforTicket = 50, PayPerTicket = 50 , Commission = 0.10, }, ['catcafe'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, ['henhouse'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, @@ -73,8 +78,27 @@ Config = { ['popsdiner'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, ['tequilala'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, ['vanilla'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['upnatom'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['hornys'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + + -- JixelTay Businesses | https://jixeltay.tebex.io/ + ['cigarbar'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['cluckinbell'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['smokeshop'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['pearls'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['kois'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['whitewidow'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + ['bestbuds'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, }, + + -- Jim Mechanic | https://jimathy666.tebex.io/ ['mechanic'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, }, - ['lostmc'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, gang = true, }, -- Example of a gang being supported + ['tuners'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, }, + ['ottos'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, }, + ['lscustoms'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, }, + ['bennys'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, }, + + -- Gangs | Example of a gang being supported + ['lostmc'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, gang = true, }, }, ------------------------------ @@ -83,7 +107,10 @@ Config = { -- This adds the ability to add multiple locations for each job -- Basically adding ready made locations, all you need to a vector4 and to confrim if you need a new prop in that location CustomCashRegisters = { - + -- ["jobname"] = { -- Player job role restriction + -- { coords = vector4(0, 0, 0, 0), prop = true, }, -- vector4 to place the till and the way it faces + -- { coords = vector4(0, 0, 0, 0), prop = true, }, -- "prop = true" spawns a prop at the coords + -- }, }, -- The /polcharge command requires specific jobs to be set diff --git a/fxmanifest.lua b/fxmanifest.lua index d3eb49e..7953682 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,6 +1,6 @@ name "Jim-Payments" author "Jimathy" -version "v2.8.6" +version "v2.8.7" description "Payment Script By Jimathy" fx_version "cerulean" game "gta5" diff --git a/locales/da.lua b/locales/da.lua new file mode 100644 index 0000000..d7f747a --- /dev/null +++ b/locales/da.lua @@ -0,0 +1,134 @@ +-- Provided by iplayer1337fivem on Github +Loc["da"] = { + error = { + ["cancel"] = "Afbestilt", + ["no_one"] = "Ingen i nærheden at opkræve", + ["not_onduty"] = "Ikke logget ind!", + ["no_job"] = "Du har ikke det påkrævede job", + ["no_ticket"] = "Du har ingen billetter at handle med", + ["bank_low"] = "Bankbalance for lav", + ["no_cash"] = "Ikke nok kontanter", + ["saving_low"] = "Savings balance for lav", + ["soc_low"] = "Society balance for lav", + ["nomoney_bank"] = "Ikke nok penge på din bankkonto", + ["error_start"] = "Fejl: Konto '", + ["error_end"] = "' ikke fundet", + ["not_enough"] = "Du har ikke nok kontanter til at give", + ["zero"] = "Du kan ikke give DKK0", + ["charge_zero"] = "Du kan ikke opkræve 0 DKK", + ["no_ticket_to"] = "Ingen billetter at handle med", + ["customer_nocash"] = "Kunden har ikke nok kontanter til at betale", + ["you_nocash"] = "Du har ikke nok kontanter til at betale", + ["decline_pay"] = " afslog DKK", + ["declined_payment"] = "Du afslog betalingen", + }, + success = { + ["draw"] = "Hævet DKK", + ["from_bank"] = " fra banken", + ["deposited"] = "Indsat DKK", + ["into_bank"] = " på bankkontoen", + ["draw_save"] = " Trukket fra opsparingskontoen til bankkontoen", + ["depos_save"] = " Indsat fra bankkontoen til opsparingen", + ["fromthe"] = " fra ", + ["into"] = " til ", + ["account"] = " konto", + ["sent"] = "Sendt DKK", + ["recieved"] = "Modtaget DKK", + ["to"] = " til ", + ["from"] = " fra ", + ["you_gave"] = "Du gav ", + ["you_got"] = "Du fik DKK", + ["invoice_start"] = " Betalte deres DKK", + ["invoice_end"] = " faktura", + ["rec_rec"] = "Kvittering modtaget", + ["commission"] = " i provision", + ["trade_ticket_start"] = "Billetter handlet: ", + ["trade_ticket_end"] = " I alt: DKK", + ["inv_succ"] = "Faktura sendt med succes", + ["inv_recieved"] = "Ny faktura modtaget", + ["declined"] = "Du afslog betalingen", + ["accepted_pay"] = " accepterede DKK", + ["payment"] = " betaling", + ["charged"] = " blev opkrævet for DKK", + ["you_charged"] = "Du blev opkrævet for DKK", + ["charge_end"] = " opkrævning", + }, + blip = { + ["blip_atm"] = "Hæveautomat", + ["blip_bank"] = "Bank", + }, + command = { + ["pay_user"] = "Betal en bruger i nærheden", + ["cash_reg"] = "Brug mobil kontantregister", + ["charge"] = "Opkræv en anden person", + }, + target = { + ["atm"] = "Brug hæveautomat", + ["bank"] = "Brug bank", + ["transfer"] = "Overfør penge", + ["saving"] = "Adgang til opsparing", + ["soc_saving"] = "Adgang til society-konto", + ["soc_trans"] = "Society pengetransfer", + ["gang_acct"] = "Gang Society-konto", + ["gang_trans"] = "Gang pengetransfer", + ["charge"] = "Opkræv kunde", + ["cashin_boss"] = "Indbetal jobkvitteringer", + ["cashin_gang"] = "Indbetal gangkvitteringer", + }, + menu = { + ["close"] = "Luk", + ["withdraw"] = "Hæv", + ["deposit"] = "Indsæt", + ["transfer"] = "Overfør", + ["transfer_money"] = "Overfør penge", + ["header_atm"] = "💵 Hæveautomat Bank 💵", + ["header_trans_amount"] = "💵 Beløb at overføre", + ["header_bank"] = "🏦 Bankvæsen 🏦", + ["header_trans"] = "🔀 Overførselsservice 🔀", + ["header_account_no"] = "🏦 Kontonr.", + ["header_saving"] = "💰 Opsparing 💰", + ["acc_atm"] = "Adgang til hæveautomat", + ["acc_bank"] = "Adgang til bank", + ["acc_trans"] = "Adgang til overførsler", + ["acc_saving"] = "Adgang til opsparing", + ["acc_boss"] = "Adgang til society-konto", + ["acc_boss_trans"] = "Adgang til society-overførsler", + ["acc_gang"] = "Adgang til gang-society-konto", + ["acc_gang_trans"] = "Adgang til gangoverførsler", + ["header_soc"] = "

- Society-konto -
", + ["header_balance"] = "

- Balancer -
🏢", + ["header_soc_bank"] = "🏢 Society Bank 🏢", + ["amount_pay"] = "💵 Beløb at betale", + ["give_cash"] = "Giv nogen kontanter", + ["give"] = "Giv", + ["welcome"] = "Velkommen tilbage, ", + ["citizenid"] = "

- Borger-ID -
", + ["header_acc"] = "

- Konto -
", + ["header_info"] = "

- Kontoinformation -
Opsparings-ID: ", + ["header_balance_bank"] = "

- Balancer -
🏦Bank - DKK", + ["header_option"] = "

- Valg -", + ["cash_balance"] = "
💵Kontanter - DKK", + ["bank_balance"] = "
🏦Bank - DKK", + ["saving_balance"] = "

- Balancer -
💰Opsparing - DKK", + ["cus_id"] = "# Kundens ID #", + ["type"] = "Betalingstype", + ["amount_charge"] = "💵 Beløb at opkræve", + ["cash_reg"] = "Kontantregister", + ["person_id"] = "# Personens ID #", + ["charge"] = "Opkræv", + ["send"] = "Send", + ["receipt"] = "Kvitteringer 🧾", + ["payment"] = " Betaling 🧾", + ["trade_confirm"] = "Vil du bytte dine kvitteringer til betaling?", + ["accept_payment"] = "Vil du acceptere betalingen?", + ["accept_charge"] = "Vil du acceptere opkrævningen?", + ["ticket_amount"] = "Antal billetter: ", + ["total_pay"] = "
Total betaling: DKK", + ["yes"] = "Ja", + ["no"] = "Nej", + ["cash"] = "Kontanter", + ["card"] = "Kort", + ["payment_amount"] = " Betaling: DKK", + ["bank_charge"] = "Bankgebyr: DKK", + }, +} \ No newline at end of file diff --git a/server/atmserver.lua b/server/atmserver.lua index 9830b25..ffd418d 100644 --- a/server/atmserver.lua +++ b/server/atmserver.lua @@ -67,23 +67,18 @@ 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.Banking == "renewed" then - exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.job.name), amount) - elseif Config.Banking == "qb" then - exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) - elseif Config.Banking == "fd" then - exports.fd_banking:RemoveMoney(tostring(Player.PlayerData.job.name), amount) + if Config.Banking == "renewed" then exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "fd" then exports.fd_banking: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.Banking == "qb" then - exports['Renewed-Banking']:addAccountMoney(tostring(Player.PlayerData.job.name), amount) - elseif Config.Banking == "qb" then - exports["qb-management"]:AddMoney(tostring(Player.PlayerData.job.name), amount) - elseif Config.Banking == "fd" then - exports.fd_banking:AddMoney(tostring(Player.PlayerData.job.name), amount) - end + if Config.Banking == "renewed" then exports['Renewed-Banking']:addAccountMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:AddMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "fd" then exports.fd_banking: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 @@ -106,13 +101,10 @@ 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.Banking == "renewed" then - exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.job.name), amount) - elseif Config.Banking == "qb" then - exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) end - elseif Config.Banking == "fd" then - exports.fd_banking:RemoveMoney(tostring(Player.PlayerData.job.name), amount) - end + if Config.Banking == "renewed" then exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:RemoveMoney(tostring(Player.PlayerData.job.name), amount) + elseif Config.Banking == "fd" then exports.fd_banking: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) @@ -133,15 +125,17 @@ 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.Banking == "renewed" then exports['Renewed-Banking']:removeAccountMoney( tostring(Player.PlayerData.gang.name), amount) - elseif Config.Banking == "qb" then exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) + if Config.Banking == "renewed" then exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) elseif Config.Banking == "fd" then exports.fd_banking: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.Banking == "rewnewed" then exports['Renewed-Banking']:addAccountMoney(tostring(Player.PlayerData.gang.name), amount) - elseif Config.Banking == "qb" then exports["qb-management"]:AddGangMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:AddGangMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddGangMoney(tostring(Player.PlayerData.gang.name), amount) elseif Config.Banking == "fd" then exports.fd_banking: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) @@ -165,13 +159,10 @@ 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.Banking == "renewed" then - exports['Renewed-Banking']:removeAccountMoney( tostring(Player.PlayerData.gang.name), amount) - elseif Config.Banking == "qb" then - exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) - elseif Config.Banking == "fd" then - exports.fd_banking:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) - end + if Config.Banking == "renewed" then exports['Renewed-Banking']:removeAccountMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-management" then exports["qb-management"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:RemoveGangMoney(tostring(Player.PlayerData.gang.name), amount) + elseif Config.Banking == "fd" then exports.fd_banking: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,8 +204,8 @@ 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 triggerNotify(nil, Loc[Config.Lan].error["error_start"]..baccount..Loc[Config.Lan].error["error_end"], "error", src) - + elseif not result[1] then + triggerNotify(nil, Loc[Config.Lan].error["error_start"]..baccount..Loc[Config.Lan].error["error_end"], "error", src) end end end @@ -230,8 +221,19 @@ QBCore.Functions.CreateCallback('jim-payments:ATM:Find', function(source, cb) local society = 0 local gsociety = 0 + 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 + 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 + end + end + -- If qb-management, grab info directly from database - if not Config.Banking == "renewed" then + elseif not Config.Banking == "renewed" 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 diff --git a/server/server.lua b/server/server.lua index 9aa4ecc..7fa27ef 100644 --- a/server/server.lua +++ b/server/server.lua @@ -31,7 +31,10 @@ RegisterServerEvent('jim-payments:Tickets:Give', function(data, biller, gang) exports['Renewed-Banking']:addAccountMoney(tostring(biller.PlayerData.gang.name), data.amount - takecomm) if Config.Debug then print("^5Debug^7: ^3Renewed-Banking^7(^3Gang^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.gang.name).."^7' ($^6"..exports['Renewed-Banking']:getAccountMoney(biller.PlayerData.gang.name).."^7)") end - elseif Config.Banking == "qb" then + elseif Config.Banking == "qb-management" then + exports["qb-management"]:AddGangMoney(tostring(biller.PlayerData.gang.name), data.amount - takecomm) + if Config.Debug then print("^5Debug^7: ^3QB-Management^7(^3Gang^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.gang.name).."^7' ($^6"..exports["qb-management"]:GetGangAccount(biller.PlayerData.gang.name).."^7)") end + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddGangMoney(tostring(biller.PlayerData.gang.name), data.amount - takecomm) if Config.Debug then print("^5Debug^7: ^3QB-Banking^7(^3Gang^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.gang.name).."^7' ($^6"..exports["qb-banking"]:GetGangAccount(biller.PlayerData.gang.name).."^7)") end elseif Config.Banking == "fd" then @@ -42,9 +45,12 @@ RegisterServerEvent('jim-payments:Tickets:Give', function(data, biller, gang) if Config.Banking == "renewed" then exports['Renewed-Banking']:addAccountMoney(tostring(biller.PlayerData.job.name), data.amount - takecomm) if Config.Debug then print("^5Debug^7: ^3Renewed-Banking^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..tostring(exports['Renewed-Banking']:getAccountMoney(biller.PlayerData.job.name)).."^7)") end - elseif Config.Banking == "qb" then + elseif Config.Banking == "qb-management" then + exports["qb-management"]:AddMoney(tostring(biller.PlayerData.job.name), data.amount - takecomm) + if Config.Debug then print("^5Debug^7: ^3QB-Management^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-management"]:GetAccount(biller.PlayerData.job.name).."^7)") end + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddMoney(tostring(biller.PlayerData.job.name), data.amount - takecomm) - if Config.Debug then print("^5Debug^7: ^3QB-Banking^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-banking"]:GetAccount(biller.PlayerData.job.name).."^7)") end + if Config.Debug then print("^5Debug^7: ^3QB-Banking^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6^7)") end elseif Config.Banking == "fd" then exports.fd_banking:AddMoney(tostring(biller.PlayerData.job.name), data.amount - takecomm) if Config.Debug then print("^5Debug^7: ^3FD-Banking^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports.fd_banking:GetAccount(biller.PlayerData.job.name).."^7)") end @@ -202,7 +208,10 @@ RegisterServerEvent("jim-payments:server:PolCharge", function(citizen, price) if Config.Banking == "renewed" then exports['Renewed-Banking']:addAccountMoney(tostring(biller.PlayerData.job.name), (price - commission)) if Config.Debug then print("^5Debug^7: ^3Renewed-Banking^7(^3Job^7): ^2Adding ^7$^6"..(price - commission).." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports['Renewed-Banking']:getAccountMoney((biller.PlayerData.job.name).."^7)")) end - elseif Config.Banking == "qb" then + elseif Config.Banking == "qb-management" then + exports["qb-management"]:AddMoney(tostring(biller.PlayerData.job.name), (price - commission)) + if Config.Debug then print("^5Debug^7: ^3QB-Management^7(^3Job^7): ^2Adding ^7$^6"..(price - takecomm).." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-management"]:GetAccount(biller.PlayerData.job.name).."^7)") end + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddMoney(tostring(biller.PlayerData.job.name), (price - commission)) if Config.Debug then print("^5Debug^7: ^3QB-Banking^7(^3Job^7): ^2Adding ^7$^6"..(price - takecomm).." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-banking"]:GetAccount(biller.PlayerData.job.name).."^7)") end elseif Config.Banking == "fd" then @@ -232,7 +241,10 @@ RegisterServerEvent("jim-payments:server:PolPopup", function(data) if Config.Banking == "renewed" then exports['Renewed-Banking']:addAccountMoney(tostring(biller.PlayerData.job.name), data.amount - commission) if Config.Debug then print("^5Debug^7: ^3Renewed-Banking^7(^3Job^7): ^2Adding ^7$^6"..(data.amount - commission).." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports['Renewed-Banking']:getAccountMoney((biller.PlayerData.job.name).."^7)")) end - elseif Config.Banking == "qb" then + elseif Config.Banking == "qb-management" then + exports["qb-management"]:AddMoney(tostring(biller.PlayerData.job.name), data.amount - commission) + if Config.Debug then print("^5Debug^7: ^3QB-Management^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-management"]:GetAccount(biller.PlayerData.job.name).."^7)") end + elseif Config.Banking == "qb-banking" then exports["qb-banking"]:AddMoney(tostring(biller.PlayerData.job.name), data.amount - commission) if Config.Debug then print("^5Debug^7: ^3QB-Banking^7(^3Job^7): ^2Adding ^7$^6"..data.amount - takecomm.." ^2to account ^7'^6"..tostring(biller.PlayerData.job.name).."^7' ($^6"..exports["qb-banking"]:GetAccount(biller.PlayerData.job.name).."^7)") end elseif Config.Banking == "fd" then