Add toggles for bossmenu/management + nearbylist

Fix job label on payment popup
2026-08-17 06:16:02 +01:00 · 2022-04-15 18:25:27 +01:00 · 2022-04-12 21:10:48 +01:00 · 2022-04-12 21:09:44 +01:00 · 2022-04-11 18:59:47 +01:00 · 2022-04-11 18:58:55 +01:00
8 changed files with 868 additions and 98 deletions
--- a/README.md
+++ b/README.md
@@ -1,8 +1,16 @@
 # jim-payments
 QBCore based payment system

+If you think I did a good job here, consider donating as it keeps by lights on and my cat fat:
+https://ko-fi.com/jixelpatterns
+--------------
+
+If you use a different phone/invoice system let me know and I will add support for it as best I can!
+
 Enchanced QB-Input payment system from my other scripts now free on its own

+![General](https://i.imgur.com/37d2mE3.jpeg) ![General](https://i.imgur.com/AIdXzxX.jpeg)
+![General](https://i.imgur.com/RYADcI2.jpeg) ![General](https://i.imgur.com/ICbQyeQ.jpeg)
 # Installation

 To make use of this payment system you need trigger the event
@@ -38,4 +46,25 @@ Go to [qb] > qb-phone > client > main.lua

 - Add this line:

-```TriggerServerEvent('jim-payments:Tickets:Give', amount, society)```
+```TriggerServerEvent('jim-payments:Tickets:Give', data)```
+
+--------------
+
+The latest banking systems are very simple to use and add,
+simply look in the atms.lua and change the config options at the top
+
+Choose wether to use atm's, choose wether to use banking locations
+Choose wether to add bank blips (if you want to disable qb-banking)
+Choose wether to add ATM blips (if you like $ signs)
+
+
+--------------
+
+New Commission system added
+
+This brings more config options to find tune the script
+
+Choose wether people get commission from every sale
+Choose if EVERY worker gets Commission that is on duty
+Choose if Commission is limited by MinAmountForTicket
+Choose if the worker charging the customer gets double commission
--- a/atms.lua
+++ b/atms.lua
@@ -0,0 +1,377 @@
+local QBCore = exports['qb-core']:GetCoreObject()
+
+-- This script is a simple replacement for QB-Banking and QB-ATMs
+-- It uses QB-Input and server callbacks to retreive info about accounts and cash
+-- This requires QB-Target and has the location of every ATM, ATM prop and bank window
+
+Config.ATMModels = {"prop_atm_01", "prop_atm_02", "prop_atm_03", "prop_fleeca_atm" }
+
+Config.ATMLocations = {
+  --PACIFIC BANK 10 ATMS
+	vector3(265.9, 213.86, 106.28),	
+	vector3(265.56, 212.98, 106.28),
+	vector3(265.19, 211.91, 106.28),
+	vector3(264.86, 211.03, 106.28),
+	vector3(264.52, 210.06, 106.28),
+	vector3(236.64, 219.72, 106.29),
+	vector3(237.04, 218.72, 106.29),
+	vector3(237.5, 217.87, 106.29),
+	vector3(237.93, 216.94, 106.29),
+	vector3(238.36, 216.03, 106.29),
+	
+	--WALL ATMS
+	vector3(-386.54, 6046.29, 31.5),
+	vector3(-282.82, 6226.24, 31.49),
+	vector3(-132.74, 6366.79, 31.48),
+	vector3(-95.76, 6457.41, 31.46),
+	vector3(-97.52, 6455.65, 31.47),
+	vector3(155.95, 6642.99, 31.6),
+	vector3(173.92, 6638.16, 31.57),
+	vector3(2558.65, 350.92, 108.62),
+	vector3(1077.78, -776.64, 58.35),
+	vector3(1138.14, -468.88, 66.73),
+	vector3(1166.93, -455.96, 66.81),
+	vector3(285.37, 143.07, 104.17),
+	vector3(-165.43, 234.81, 94.92),
+	vector3(-165.4, 232.73, 94.92),
+	vector3(-1410.41, -98.76, 52.43),
+	vector3(-1409.85, -100.51, 52.38),
+	vector3(-1206.0, -324.94, 37.86),
+	vector3(-1205.23, -326.55, 37.86),
+	vector3(-2072.28, -317.27, 13.32),
+	vector3(-2974.7, 380.15, 15.0),
+	vector3(-2959.01, 487.45, 15.46),
+	vector3(-2956.87, 487.36, 15.46),
+	vector3(-3043.98, 594.32, 7.74),
+	vector3(-3241.35, 997.74, 12.55),
+	vector3(-1305.59, -706.64, 25.32),
+	vector3(-537.85, -854.69, 29.28),
+	vector3(-709.98, -818.71, 23.73),
+	vector3(-712.87, -818.71, 23.73),
+	vector3(-526.71, -1223.18, 18.45),
+	vector3(-256.47, -715.94, 33.55),
+	vector3(-259.13, -723.29, 33.54),
+	vector3(-203.82, -861.3, 30.27),
+	vector3(111.38, -774.96, 31.44),
+	vector3(114.56, -776.13, 31.42),
+	vector3(112.46, -819.65, 31.34),
+	vector3(118.93, -883.68, 31.12),
+	vector3(-846.97, -340.29, 38.68),
+	vector3(-846.41, -341.41, 38.68),
+	vector3(-262.21, -2012.17, 30.15),
+	vector3(-273.23, -2024.32, 30.15),
+	vector3(24.46, -945.94, 29.36),
+	vector3(-254.48, -692.74, 33.61),
+	vector3(-1569.95, -546.94, 34.96),
+	vector3(-1570.91, -547.63, 34.96),
+	vector3(289.14, -1282.29, 29.6),
+	vector3(289.18, -1256.84, 29.44),
+	vector3(296.04, -896.22, 29.24),
+	vector3(296.74, -894.26, 29.24),
+	vector3(-301.63, -829.73, 32.43),
+	vector3(-303.23, -829.44, 32.43),
+	vector3(5.27, -919.87, 29.56),
+	vector3(-1200.61, -885.62, 13.26),
+}
+
+Config.BankLocations = {
+    vector3(149.9, -1040.46, 29.37),
+    vector3(314.23, -278.83, 54.17),
+    vector3(-350.8, -49.57, 49.04),
+    vector3(-1213.0, -330.39, 37.79),
+    vector3(-2962.71, 483.0, 15.7),
+    vector3(1175.07, 2706.41, 38.09),
+    vector3(247.44, 223.22, 106.29),
+    vector3(-113.22, 6470.03, 31.63),
+	vector3(242.25, 225.15, 106.29)
+	--vector3(252.41, 221.41, 106.29)
+}
+
+local function cv(amount)
+    local formatted = amount
+    while true do
+        formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2')
+        if (k==0) then
+            break
+        end
+    end
+    return formatted
+end
+local function createBlips()
+	if Config.useATM then
+		if Config.ATMBlips then
+			for k, v in pairs(Config.ATMLocations) do
+				blip = AddBlipForCoord(v)
+				SetBlipSprite(blip, 108)
+				SetBlipDisplay(blip, 4)
+				SetBlipScale(blip, 0.55)
+				SetBlipColour(blip, 3)
+				SetBlipAsShortRange(blip, true)
+				BeginTextCommandSetBlipName("STRING")
+				AddTextComponentString("ATM")
+				EndTextCommandSetBlipName(blip)
+			end
+		end
+	end
+	if Config.useBanks then
+		if Config.BankBlips then
+			for k, v in pairs(Config.BankLocations) do
+				blip = AddBlipForCoord(v)
+				SetBlipSprite(blip, 108)
+				SetBlipDisplay(blip, 4)
+				SetBlipScale(blip, 0.55)
+				SetBlipColour(blip, 2)
+				SetBlipAsShortRange(blip, true)
+				BeginTextCommandSetBlipName("STRING")
+				AddTextComponentString("Bank")
+				EndTextCommandSetBlipName(blip)
+			end
+		end
+	end
+end
+
+AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() == resource then createBlips() end end)
+
+RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() createBlips() end)
+
+local bossroles = {}
+local gangroles = {}
+Citizen.CreateThread(function()
+	if Config.useATM or Config.useBanks then
+		for k, v in pairs(QBCore.Shared.Jobs) do ---Grabs the list of jobs
+			for l, b in pairs(QBCore.Shared.Jobs[tostring(k)].grades) do -- Grabs the list of grades
+				if QBCore.Shared.Jobs[tostring(k)].grades[l].isboss == true then -- Checks the grade if is boss
+					if bossroles[tostring(k)] ~= nil then -- checks if the line exists
+						if bossroles[tostring(k)] > tonumber(l) then bossroles[tostring(k)] = tonumber(l) end -- the 
+					else bossroles[tostring(k)] = tonumber(l)
+					end
+				end
+			end
+		end
+		for k, v in pairs(QBCore.Shared.Gangs) do 
+			for l, b in pairs(QBCore.Shared.Gangs[tostring(k)].grades) do
+				if tostring(k) ~= "none" then
+					if QBCore.Shared.Gangs[tostring(k)].grades[l].isboss == true then
+						if gangroles[tostring(k)] ~= nil then
+							if gangroles[tostring(k)] > tonumber(l) then gangroles[tostring(k)] = tonumber(l) end
+						else gangroles[tostring(k)] = tonumber(l)
+						end
+					end
+				end	
+			end
+			end
+	end
+	if Config.useATM then
+		exports['qb-target']:AddTargetModel(Config.ATMModels, { options = { { event = "jim-payments:Client:ATM:use", icon = "fas fa-money-check-alt", label = "Use ATM", id = "atm" },}, distance = 1.5, })
+		for k,v in pairs(Config.ATMLocations) do
+			exports['qb-target']:AddCircleZone("jimatm"..k, vector3(tonumber(v.x), tonumber(v.y), tonumber(v.z)+0.2), 0.5, { name="jimatm"..k, debugPoly=false, useZ=true, }, 
+			{ options = { { event = "jim-payments:Client:ATM:use", icon = "fas fa-money-check-alt", label = "Use ATM", id = "atm" },
+						  --[[{ event = "jim-payments:Client:ATM:use", icon = "fas fa-arrow-right-arrow-left", label = "Transfer Money", id = "transfer" },]]
+						  }, distance = 1.5 })
+		end
+	end
+	if Config.useBanks then
+		for k,v in pairs(Config.BankLocations) do
+			exports['qb-target']:AddCircleZone("jimbank"..k, vector3(tonumber(v.x), tonumber(v.y), tonumber(v.z)), 2.0, { name="jimbank"..k, debugPoly=false, useZ=true, }, 
+			{ options = { { event = "jim-payments:Client:ATM:use", icon = "fas fa-piggy-bank", label = "Use Bank", id = "bank" },
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-arrow-right-arrow-left", label = "Transfer Money", id = "transfer" },
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-money-check-dollar", label = "Access Savings", id = "savings" },
+						  						  
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-building", label = "Access Society Account", id = "society", job = bossroles },
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-arrow-right-arrow-left", label = "Society Money Transfer", id = "societytransfer", job = bossroles },
+						  
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-building", label = "Gang Society Account", id = "gang", gang = gangroles },
+						  { event = "jim-payments:Client:ATM:use", icon = "fas fa-arrow-right-arrow-left", label = "Gang Money Transfer", id = "gangtransfer", gang = gangroles }, }, distance = 2.5 })
+		end
+	end
+end)
+
+local function PlayATMAnimation(animation)
+    if animation == 'enter' then RequestAnimDict('amb@prop_human_atm@male@enter')
+        while not HasAnimDictLoaded('amb@prop_human_atm@male@enter') do Wait(1) end
+        if HasAnimDictLoaded('amb@prop_human_atm@male@enter') then TaskPlayAnim(PlayerPedId(), 'amb@prop_human_atm@male@enter', "enter", 1.0,-1.0, 1500, 1, 1, true, true, true) end
+	end
+    if animation == 'exit' then RequestAnimDict('amb@prop_human_atm@male@exit')
+		while not HasAnimDictLoaded('amb@prop_human_atm@male@exit') do Wait(1) end
+        if HasAnimDictLoaded('amb@prop_human_atm@male@exit') then TaskPlayAnim(PlayerPedId(), 'amb@prop_human_atm@male@exit', "exit", 1.0,-1.0, 3000, 1, 1, true, true, true) end
+	end
+end
+
+local function GrabAccount(type, job)
+	local p = promise.new()
+	QBCore.Functions.TriggerCallback('jim-payments:ManageWrapper', function(cb) p:resolve(cb) end, type, job)
+	return Citizen.Await(p)
+end
+
+RegisterNetEvent('jim-payments:Client:ATM:use', function(data)
+	--this grabs all the info from names to savings account numbers in the databases
+	while name == nil do 
+	QBCore.Functions.TriggerCallback('jim-payments:ATM:Find', function(cb1, cb2, cb3, cb4, cb5, cb6, cb7) name = cb1 cash = cb2 bank = cb3 account = cb4 cid = cb5 savbal = cb6 aid = cb7 end) 
+		Citizen.Wait(100) 
+	end
+	
+	society = GrabAccount("GetAccount", PlayerJob.name) 
+	Wait(200)
+	gsociety = GrabAccount("GetGangAccount", PlayerGang.name)
+	
+	local atmbartime = 2500
+	local setoptions = {}
+
+	if data.id == "atm" then
+		setoptions = { { value = "withdraw", text = "Withdrawl" }, }
+		setview = "<center><img src=https://static.wikia.nocookie.net/gtawiki/images/b/bd/Fleeca-GTAV-Logo.png width=200px></center><br>Welcome back, "..name.."<br><br>- Citizen ID -<br>"..cid.."<br><br>- Balances -<br>🏦Bank - $"..cv(bank).."<br>💵Cash - $"..cv(cash)..'<br><br>- Options -'
+		setheader = "💵 ATM Banking 💵"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+					  { type = 'number', isRequired = true, name = 'amount', text = '💵 Amount to transfer' }, }
+		for k, v in pairs(Config.ATMModels) do
+			local playerPed = PlayerPedId()
+			local playerCoords = GetEntityCoords(playerPed, true)
+			local hash = GetHashKey(v)
+			local atm = IsObjectNearPoint(hash, playerCoords.x, playerCoords.y, playerCoords.z, 1.5)
+			if atm then
+				local obj = GetClosestObjectOfType(playerCoords.x, playerCoords.y, playerCoords.z, 1.5, v, false, false, false)
+				local atmCoords = GetEntityCoords(obj, false)
+				TaskTurnPedToFaceEntity(playerPed, obj, 1000)
+				Wait(1000)
+				PlayATMAnimation('enter')
+				QBCore.Functions.Progressbar("accessing_atm", "Accessing ATM", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+				end, function()
+					TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+				return
+				end)
+			end
+		end
+
+	elseif data.id == "bank" then
+		setoptions = { { value = "withdraw", text = "Withdrawl" }, { value = "deposit", text = "Deposit" } }
+		setview = "Welcome back, "..name.."<br><br>- Account -<br>"..account.."<br>"..cid.."<br><br>- Balances -<br>🏦Bank - $"..cv(bank).."<br>💵Cash - $"..cv(cash).."<br><br>- Options -"
+		setheader = "🏦 Banking 🏦"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+				      { type = 'number', isRequired = true, name = 'amount', text = '💵 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Bank", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)	
+		
+	elseif data.id == "transfer" then
+		setoptions = { { value = "transfer", text = "Transfer" } }
+		setview = "Welcome back, "..name.."<br><br>- Account -<br>"..account.."<br>"..cid.."<br><br>- Balances -<br>🏦Bank - $"..cv(bank).."<br><br>- Options -"
+		setheader = "🔀 Transfer Services 🔀"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+					  { type = 'text', isRequired = true, name = 'account', text = '🏦 Account no.' },
+					  { type = 'number', isRequired = true, name = 'amount', text = '💸 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Transfers", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+
+	elseif data.id == "savings" then
+		setoptions = { { value = "withdraw", text = "Withdrawl" }, { value = "deposit", text = "Deposit" } }
+		setview = "Welcome back, "..name.."<br><br>- Account Info -<br>Savings ID: "..aid.."<br>"..cid.."<br><br>- Balances -<br>💰Savings - $"..cv(savbal).."<br>🏦Bank - $"..cv(bank).."<br><br>- Options -"
+		setheader = "💰 Savings 💰"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+					  { type = 'number', isRequired = true, name = 'amount', text = '💵 Amount to transfer' }, }					
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Savings", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+		
+	elseif data.id == "society" then
+		setoptions = { { value = "withdraw", text = "Withdrawl" }, { value = "deposit", text = "Deposit" } }
+		setview = "Welcome back, "..name.."<br><br>- Society Account -<br>"..PlayerJob.label.."<br><br>- Balances -<br>🏢"..PlayerJob.label.." - $"..cv(society).."<br>🏦Bank - $"..cv(bank).."<br><br>- Options -"
+		setheader = "🏢 Society Banking 🏢"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+				      { type = 'number', isRequired = true, name = 'amount', text = '💵 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Society Account", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+		
+	elseif data.id == "societytransfer" then
+		setoptions = { { value = "transfer", text = "Transfer" } }
+		setview = "Welcome back, "..name.."<br><br>- Society Account -<br>"..PlayerJob.label.."<br><br>- Balances -<br>🏢"..PlayerJob.label.." - $"..cv(society).."<br><br>- Options -"
+		setheader = "🔀 Transfer Services 🔀"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+					  { type = 'text', isRequired = true, name = 'account', text = '🏦 Account no.' },
+					  { type = 'number', isRequired = true, name = 'amount', text = '💸 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Transfers", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+		
+	elseif data.id == "gang" then
+		setheader = "🏢 Society Banking 🏢"
+		setview = "Welcome back, "..name.."<br><br>- Society Account -<br>"..PlayerGang.label.."<br><br>- Balances -<br>🏢"..PlayerGang.label.." - $"..cv(gsociety).."<br>🏦Bank - $"..cv(bank).."<br><br>- Options -"
+		setoptions = { { value = "withdraw", text = "Withdrawl" }, { value = "deposit", text = "Deposit" } }
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+				      { type = 'number', isRequired = true, name = 'amount', text = '💵 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Society Account", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+		
+	elseif data.id == "gangtransfer" then
+		setoptions = { { value = "transfer", text = "Transfer" } }
+		setview = "Welcome back, "..name.."<br><br>- Society Account -<br>"..PlayerGang.label.."<br><br>- Balances -<br>🏢"..PlayerGang.label.." - $"..cv(gsociety).."<br><br>- Options -"
+		setheader = "🔀 Transfer Services 🔀"
+		setinputs = { { type = 'radio', name = 'billtype', text = setview, options = setoptions },
+					  { type = 'text', isRequired = true, name = 'account', text = '🏦 Account no.' },
+					  { type = 'number', isRequired = true, name = 'amount', text = '💸 Amount to transfer' }, }
+		PlayATMAnimation('enter')
+		QBCore.Functions.Progressbar("accessing_atm", "Accessing Transfers", atmbartime, false, true, { disableMovement = false, disableCarMovement = false, disableMouse = false, disableCombat = false, }, {}, {}, {}, function() -- Done
+		end, function()
+			TriggerEvent("QBCore:Notify", "Cancelled!", "error")
+			return
+		end)
+	end
+		
+	Wait(atmbartime+500)
+	local dialog = exports['qb-input']:ShowInput({ header = setheader, txt = "test", submitText = "Transfer", inputs = setinputs })
+	if dialog then
+		if not dialog.amount then return end
+		PlayATMAnimation('exit') Citizen.Wait(1000)
+		TriggerServerEvent('jim-payments:server:ATM:use', dialog.amount, dialog.billtype, dialog.account, data.id, society, gsociety)
+	end
+	gsociety, society, name = nil
+end)
+
+
+RegisterNetEvent('jim-payments:client:ATM:give', function()
+	local onlineList = {}
+	local nearbyList = {}
+	QBCore.Functions.TriggerCallback('jim-payments:MakePlayerList', function(cb) onlineList = cb if onlineList[1] == nil then Wait(200) end
+		for k, v in pairs(QBCore.Functions.GetPlayersFromCoords(GetEntityCoords(PlayerPedId()), Config.PaymentRadius)) do
+			local dist = #(GetEntityCoords(GetPlayerPed(v)) - GetEntityCoords(PlayerPedId()))
+			for i = 1, #onlineList do
+				if onlineList[i].value == GetPlayerServerId(v) then
+					if v ~= PlayerId() then
+						nearbyList[#nearbyList+1] = { value = onlineList[i].value, text = onlineList[i].text..' ('..math.floor(dist+0.05)..'m)' }
+					end
+				end
+			end
+			dist = nil
+		end
+		if nearbyList[#nearbyList] == nil then TriggerEvent("QBCore:Notify", "No one near by to charge", "error") return end
+		local dialog = exports['qb-input']:ShowInput({ header = "Give someone cash", submitText = "Give",
+		inputs = {
+				{ text = " ", name = "citizen", type = "select", options = nearbyList },                
+				{ type = 'number', isRequired = true, name = 'price', text = '💵  Amount to Pay' }, }
+		})
+		if dialog then
+			if not dialog.citizen or not dialog.price then return end
+			TriggerServerEvent('jim-payments:server:ATM:give', dialog.citizen, dialog.price)
+		end
+	end)
+end)
--- a/atmserver.lua
+++ b/atmserver.lua
@@ -0,0 +1,254 @@
+local QBCore = exports['qb-core']:GetCoreObject()
+
+local function cv(amount)
+    local formatted = amount
+    while true do
+        formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2')
+        if (k==0) then
+            break
+        end
+    end
+    return formatted
+end
+
+
+---- BANK STUFF
+QBCore.Functions.CreateCallback('jim-payments:ManageWrapper', function(source, cb, type, account)
+	local result = nil
+	if type == "GetAccount" then result = exports["qb-management"]:GetAccount(account) end
+	if type == "GetGangAccount" then result = exports["qb-management"]:GetGangAccount(account) end
+	cb(result) 
+end)
+
+RegisterServerEvent('jim-payments:server:ATM:use', function(amount, billtype, baccount, account, society, gsociety)
+	local src = source
+	local Player = QBCore.Functions.GetPlayer(src)
+	local cashB = Player.Functions.GetMoney("cash")
+	local bankB = Player.Functions.GetMoney("bank")
+	local amount = tonumber(amount)
+	--TriggerClientEvent("QBCore:Notify", src, tostring(account), "error")
+
+	--Simple transfers from bank to wallet --
+	if account == "bank" or account == "atm" then
+		if billtype == "withdraw" then
+			if bankB < amount then TriggerClientEvent("QBCore:Notify", src, "Bank Balance too low", "error")
+			elseif bankB >= tonumber(amount) then
+				TriggerClientEvent("QBCore:Notify", src, "Withdrew $"..cv(amount).." from the bank", "success") -- Don't really need this as phone gets notified when money is withdrawn
+				Player.Functions.RemoveMoney('bank', amount) Wait(1500)
+				Player.Functions.AddMoney('cash', amount)
+			end
+		elseif billtype == "deposit" then
+			if cashB < amount then TriggerClientEvent("QBCore:Notify", src, "Not enough cash", "error")
+			elseif cashB >= amount then
+				Player.Functions.RemoveMoney('cash', amount) Wait(1500)
+				Player.Functions.AddMoney('bank', amount)
+				TriggerClientEvent("QBCore:Notify", src, "Deposited $"..cv(amount).." into the Bank", "success")
+			end
+		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
+		
+		if billtype == "withdraw" then
+			if savbal >= amount then
+				savbal = savbal - amount
+				Player.Functions.AddMoney('bank', amount)
+				TriggerClientEvent("QBCore:Notify", src, "$"..cv(amount).." Withdrawn from savings into bank account", "success")
+				MySQL.Async.execute('UPDATE bank_accounts SET amount = ? WHERE citizenid = ? AND record_id = ?', { savbal, Player.PlayerData.citizenid, getSavingsAccount[1].record_id }, function(success)
+					if success then	return true	else return false end
+				end)
+			elseif savbal < amount then
+				TriggerClientEvent("QBCore:Notify", src, "Savings Balance too low", "error")
+			end
+		elseif billtype == "deposit" then
+			if amount < bankB then
+				savbal = savbal + amount
+				Player.Functions.RemoveMoney('bank', amount) 
+				TriggerClientEvent("QBCore:Notify", src, "$"..cv(amount).." Deposited from bank account into savings", "success")
+				MySQL.Async.execute('UPDATE bank_accounts SET amount = ? WHERE citizenid = ? AND record_id = ?', { savbal, Player.PlayerData.citizenid, getSavingsAccount[1].record_id }, function(success)
+					if success then	return true	else return false end
+				end)
+			else TriggerClientEvent("QBCore:Notify", src, "Bank Balance too low", "error")
+			end
+		end
+	--Simple transfers from society account to bank --
+	elseif account == "society" then
+		if billtype == "withdraw" then
+			if tonumber(society) < amount then TriggerClientEvent("QBCore:Notify", src, "Society balance too low", "error")
+			elseif tonumber(society) >= amount then
+				TriggerClientEvent("QBCore:Notify", src, "Withdrew $"..cv(amount).." from the "..Player.PlayerData.job.label.." account", "success")
+				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
+			end
+		elseif billtype == "deposit" then
+			if bankB < amount then TriggerClientEvent("QBCore:Notify", src, "Not enough money in your bank", "error")
+			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
+				Player.Functions.RemoveMoney('bank', amount) Wait(1500)
+				TriggerClientEvent("QBCore:Notify", src, "Deposited $"..cv(amount).." into the "..Player.PlayerData.job.label.." account", "success")
+			end
+		end
+	-- Transfer from boss account to players --
+	elseif account == "societytransfer" then
+		local bannedCharacters = {'%','$',';'}
+		local newAmount = tostring(amount)
+		local newiban = tostring(baccount)
+		for k, v in pairs(bannedCharacters) do
+			newAmount = string.gsub(newAmount, '%' .. v, '')
+			newiban = string.gsub(newiban, '%' .. v, '')
+		end
+		baccount = newiban
+		amount = tonumber(newAmount)
+		
+		local Player = QBCore.Functions.GetPlayer(src)
+		if (society - amount) >= 0 then
+			local query = '%"account":"' .. baccount .. '"%'
+			local result = MySQL.Sync.fetchAll('SELECT * FROM players WHERE charinfo LIKE ?', {query})
+			if result[1] ~= nil 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 Reciever ~= nil then
+					Reciever.Functions.AddMoney('bank', amount)
+					TriggerClientEvent("QBCore:Notify", src, "Sent $"..amount.." to "..Reciever.PlayerData.charinfo.firstname.." "..Reciever.PlayerData.charinfo.lastname, "success")
+					TriggerClientEvent("QBCore:Notify", Reciever.PlayerData.source, "Recieved $"..cv(amount).." from "..tostring(Player.PlayerData.job.label).." account", "success")
+				else
+					local RecieverMoney = json.decode(result[1].money)
+					RecieverMoney.bank = (RecieverMoney.bank + amount)
+					MySQL.Async.execute('UPDATE players SET money = ? WHERE citizenid = ?', {json.encode(RecieverMoney), result[1].citizenid})
+				end
+			elseif result[1] == nil then TriggerClientEvent("QBCore:Notify", src, "Error: Account '"..baccount.."' not found", "error")
+			end
+		end
+	
+	--Simple transfers from gang society account to bank --
+	elseif account == "gang" then
+		if billtype == "withdraw" then
+			if tonumber(gsociety) < amount then TriggerClientEvent("QBCore:Notify", src, "Society balance too low", "error")
+			elseif tonumber(gsociety) >= amount then
+				TriggerClientEvent("QBCore:Notify", src, "Withdrew $"..cv(amount).." from the "..Player.PlayerData.gang.label.." account", "success")
+				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
+			end
+		elseif billtype == "deposit" then
+			if bankB < amount then TriggerClientEvent("QBCore:Notify", src, "Not enough money in your bank", "error")
+			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
+				Player.Functions.RemoveMoney('bank', amount) Wait(1500)
+				TriggerClientEvent("QBCore:Notify", src, "Deposited $"..cv(amount).." into the "..Player.PlayerData.gang.label.." account", "success")
+			end
+		end
+	-- Transfer from gang account to players --
+	elseif account == "gangtransfer" then
+		local bannedCharacters = {'%','$',';'}
+		local newAmount = tostring(amount)
+		local newiban = tostring(baccount)
+		for k, v in pairs(bannedCharacters) do
+			newAmount = string.gsub(newAmount, '%' .. v, '')
+			newiban = string.gsub(newiban, '%' .. v, '')
+		end
+		baccount = newiban
+		amount = tonumber(newAmount)
+		
+		local Player = QBCore.Functions.GetPlayer(src)
+		if (gsociety - amount) >= 0 then
+			local query = '%"account":"' .. baccount .. '"%'
+			local result = MySQL.Sync.fetchAll('SELECT * FROM players WHERE charinfo LIKE ?', {query})
+			if result[1] ~= nil 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 Reciever ~= nil then
+					Reciever.Functions.AddMoney('bank', amount)
+					TriggerClientEvent("QBCore:Notify", src, "Sent $"..amount.." to "..Reciever.PlayerData.charinfo.firstname.." "..Reciever.PlayerData.charinfo.lastname, "success")
+					TriggerClientEvent("QBCore:Notify", Reciever.PlayerData.source, "Recieved $"..cv(amount).." from "..tostring(Player.PlayerData.gang.label).." account", "success")
+				else
+					local RecieverMoney = json.decode(result[1].money)
+					RecieverMoney.bank = (RecieverMoney.bank + amount)
+					MySQL.Async.execute('UPDATE players SET money = ? WHERE citizenid = ?', {json.encode(RecieverMoney), result[1].citizenid})
+				end
+			elseif result[1] == nil then TriggerClientEvent("QBCore:Notify", src, "Error: Account '"..baccount.."' not found", "error")
+
+			end
+		end
+	
+	elseif account == "transfer" then
+	
+		local bannedCharacters = {'%','$',';'}
+		local newAmount = tostring(amount)
+		local newiban = tostring(baccount)
+		for k, v in pairs(bannedCharacters) do
+			newAmount = string.gsub(newAmount, '%' .. v, '')
+			newiban = string.gsub(newiban, '%' .. v, '')
+		end
+		baccount = newiban
+		amount = tonumber(newAmount)
+		
+		local Player = QBCore.Functions.GetPlayer(src)
+		if (Player.PlayerData.money.bank - amount) >= 0 then
+			local query = '%"account":"' .. baccount .. '"%'
+			local result = MySQL.Sync.fetchAll('SELECT * FROM players WHERE charinfo LIKE ?', {query})
+			if result[1] ~= nil then
+				local Reciever = QBCore.Functions.GetPlayerByCitizenId(result[1].citizenid)
+				Player.Functions.RemoveMoney('bank', amount)
+				if Reciever ~= nil then
+					Reciever.Functions.AddMoney('bank', amount)
+					TriggerClientEvent("QBCore:Notify", src, "Sent $"..cv(amount).." to "..Reciever.PlayerData.charinfo.firstname.." "..Reciever.PlayerData.charinfo.lastname, "success")
+					TriggerClientEvent("QBCore:Notify", Reciever.PlayerData.source, "Recieved $"..cv(amount).." from "..Player.PlayerData.charinfo.firstname.." "..Player.PlayerData.charinfo.lastname, "success")
+				else
+					local RecieverMoney = json.decode(result[1].money)
+					RecieverMoney.bank = (RecieverMoney.bank + amount)
+					MySQL.Async.execute('UPDATE players SET money = ? WHERE citizenid = ?', {json.encode(RecieverMoney), result[1].citizenid})
+				end
+			elseif result[1] == nil then TriggerClientEvent("QBCore:Notify", src, "Error: Account '"..baccount.."' not found", "error")
+
+			end
+		end
+	end	
+end)
+
+QBCore.Functions.CreateCallback('jim-payments:ATM:Find', function(source, cb)
+	local Player = QBCore.Functions.GetPlayer(source)
+	local name = Player.PlayerData.charinfo.firstname..' '..Player.PlayerData.charinfo.lastname
+	local cid = Player.PlayerData.citizenid.." ["..source.."]"
+	local cash = Player.Functions.GetMoney("cash")
+	local bank = Player.Functions.GetMoney("bank")
+	local account = Player.PlayerData.charinfo.account
+	
+	local getSavingsAccount = MySQL.Sync.fetchAll('SELECT * FROM bank_accounts WHERE citizenid = ? AND account_type = ?', { Player.PlayerData.citizenid, 'Savings' })
+    if getSavingsAccount[1] ~= nil then
+        aid = getSavingsAccount[1].record_id
+        savbal = getSavingsAccount[1].amount
+	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
+		aid = getSavingsAccount[1].record_id
+		savbal = getSavingsAccount[1].amount
+    end
+	
+	cb(name, cash, bank, account, cid, savbal, aid) 
+end)
+
+QBCore.Commands.Add("cashgive", "Pay a user nearby", {}, false, function(source) TriggerClientEvent("jim-payments:client:ATM:give", source) end)
+
+RegisterServerEvent("jim-payments:server:ATM:give", function(citizen, price)
+    local Player = QBCore.Functions.GetPlayer(source)
+    local Reciever = QBCore.Functions.GetPlayer(tonumber(citizen))
+    local amount = tonumber(price)
+	local balance = Player.Functions.GetMoney("cash")
+	
+	if amount and amount > 0 then
+		if balance >= amount then
+			Player.Functions.RemoveMoney('cash', amount)
+			TriggerClientEvent("QBCore:Notify", source, "You gave "..Reciever.PlayerData.charinfo.firstname.." $"..cv(amount), "success")
+			Reciever.Functions.AddMoney('cash', amount)
+			TriggerClientEvent("QBCore:Notify", tonumber(citizen), "You got $"..cv(amount).." from "..Player.PlayerData.charinfo.firstname, "success")
+		elseif balance < amount then
+			TriggerClientEvent("QBCore:Notify", source, "You don't have enough cash to give", "error")
+		end
+	else TriggerClientEvent('QBCore:Notify', source, "You can't give $0", 'error') end
+end)
--- a/client.lua
+++ b/client.lua
@@ -1,52 +1,75 @@
 local QBCore = exports['qb-core']:GetCoreObject()

 PlayerJob = {}
-
 local onDuty = false

-RegisterNetEvent('QBCore:Client:OnPlayerLoaded')
-AddEventHandler('QBCore:Client:OnPlayerLoaded', function()
-    QBCore.Functions.GetPlayerData(function(PlayerData)
-        PlayerJob = PlayerData.job
-    end)
-end)
-
-RegisterNetEvent('QBCore:Client:OnJobUpdate')
-AddEventHandler('QBCore:Client:OnJobUpdate', function(JobInfo)
-    PlayerJob = JobInfo
-    onDuty = PlayerJob.onduty
-end)
-
-RegisterNetEvent('QBCore:Client:SetDuty')
-AddEventHandler('QBCore:Client:SetDuty', function(duty)
-    onDuty = duty
-end)
+RegisterNetEvent('QBCore:Client:OnPlayerLoaded') AddEventHandler('QBCore:Client:OnPlayerLoaded', function() QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang end) end)
+RegisterNetEvent('QBCore:Client:OnJobUpdate') AddEventHandler('QBCore:Client:OnJobUpdate', function(JobInfo) PlayerJob = JobInfo onDuty = PlayerJob.onduty end)
+RegisterNetEvent('QBCore:Client:SetDuty') AddEventHandler('QBCore:Client:SetDuty', function(duty) onDuty = duty end)
+RegisterNetEvent('QBCore:Client:OnGangUpdate') AddEventHandler('QBCore:Client:OnGangUpdate', function(GangInfo) PlayerGang = GangInfo end)

 --Keeps track of duty on script restarts
-AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() == resource then QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job end) end end)
+AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() == resource then QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang onDuty = PlayerJob.onduty end) end end)

 Citizen.CreateThread(function()
 	local jobroles = {}
-	for k, v in pairs(Config.Jobs) do jobroles[tostring(k)] = 0	end
+	for k, v in pairs(Config.Jobs) do jobroles[tostring(k)] = 0 end
 	exports['qb-target']:AddBoxZone("JimBank", vector3(251.75, 222.17, 106.2), 0.6, 2.0, { name="JimBank", heading = 340.0, debugPoly=false, minZ = 105.75, maxZ = 107.29, }, 
-		{ options = { { type = 'server', event = "jim-payments:Tickets:Sell", icon = "fas fa-receipt", label = "Cash in Receipts", job = jobroles }, },
-		  distance = 2.0
-	})
+		{ options = { { event = "jim-payments:Tickets:Menu", icon = "fas fa-receipt", label = "Cash in Receipts", job = jobroles } }, distance = 2.0 })
 end)

-RegisterNetEvent('jim-payments:client:Charge', function()
+RegisterNetEvent('jim-payments:client:Charge', function(data)
 	if not onDuty then TriggerEvent("QBCore:Notify", "Not Clocked in!", "error") return end  -- Require to be on duty when making a payment
-    QBCore.Functions.TriggerCallback('jim-payments:server:GetCurrentPlayers', function(playerList)
-	if playerList[1] == nil then TriggerEvent("QBCore:Notify", "No one near by to charge", "error") return end
-		local dialog = exports['qb-input']:ShowInput({ header = "Charge Customer", submitText = "Send",
-		inputs = {
-				{ text = "Citizen",	name = "citizen", type = "select", options = playerList	},				
-				{ type = 'number', isRequired = true, name = 'price', text = 'Amount to Charge' },
-				{ type = 'radio', name = 'billtype', text = 'Payment Type', options = {	{ value = "cash", text = "Cash" }, { value = "card", text = "Card" } } }, }
-		})
+	local onlineList = {}
+	local nearbyList = {}
+	QBCore.Functions.TriggerCallback('jim-payments:MakePlayerList', function(cb) onlineList = cb if onlineList[1] == nil then Wait(200) end
+		for k, v in pairs(QBCore.Functions.GetPlayersFromCoords(GetEntityCoords(PlayerPedId()), Config.PaymentRadius)) do
+			local dist = #(GetEntityCoords(GetPlayerPed(v)) - GetEntityCoords(PlayerPedId()))
+			for i = 1, #onlineList do
+				if onlineList[i].value == GetPlayerServerId(v) then
+					if v ~= PlayerId() then
+						nearbyList[#nearbyList+1] = { value = onlineList[i].value, text = onlineList[i].text..' ('..math.floor(dist+0.05)..'m)' }
+					end
+				end
+			end
+			dist = nil
+		end
+		if data.img == nil then img = "" else img = data.img end
+		if nearbyList[#nearbyList] == nil then TriggerEvent("QBCore:Notify", "No one near by to charge", "error") return end
+		local newinputs = {}
+		if Config.List then newinputs[#newinputs+1] = { text = " ", name = "citizen", type = "select", options = nearbyList } end
+		if not Config.List then newinputs[#newinputs+1] = { type = 'text', isRequired = true, name = 'citizen', text = '# Customer ID #' } end
+		newinputs[#newinputs+1] = { type = 'radio', name = 'billtype', text = 'Payment Type', options = { { value = "cash", text = "Cash" }, { value = "bank", text = "Card" } } }
+		newinputs[#newinputs+1] = { type = 'number', isRequired = true, name = 'price', text = '💵  Amount to Charge' }
+		local dialog = exports['qb-input']:ShowInput({ header = img..PlayerJob.label.." Cash Register", submitText = "Send", inputs = newinputs})
 		if dialog then
 			if not dialog.citizen or not dialog.price then return end
-			TriggerServerEvent('jim-payments:server:Charge', dialog.citizen, dialog.price, dialog.billtype)
+			TriggerServerEvent('jim-payments:server:Charge', dialog.citizen, dialog.price, dialog.billtype, data.img)
 		end
 	end)
-end)
+end)
+
+RegisterNetEvent('jim-payments:Tickets:Menu', function()
+	local amount = nil
+	local p = promise.new() QBCore.Functions.TriggerCallback('jim-payments:Ticket:Count', function(cb) p:resolve(cb) end) amount = Citizen.Await(p)
+	for k, v in pairs(Config.Jobs) do if k ~= PlayerJob.name then 
+		else exports['qb-menu']:openMenu({
+			{ isMenuHeader = true, header = "🧾 "..PlayerJob.label.." Receipts 🧾", txt = "Do you want trade your receipts for payment?" },
+			{ isMenuHeader = true, header = "", txt = "Amount of Tickets: "..amount.."<br>Total Payment: $"..(Config.Jobs[PlayerJob.name].PayPerTicket * amount) },
+			{ header = "✅ Yes", txt = "", params = { event = "jim-payments:Tickets:Sell:yes" } },
+			{ header = "❌ No", txt = "", params = { event = "jim-payments:Tickets:Sell:no" } }, })
+		end
+	end
+end)
+
+RegisterNetEvent("jim-payments:client:PayPopup", function(amount, biller, billtype, img, billerjob)
+	if img == nil then img = "" end
+	exports['qb-menu']:openMenu({
+		{ isMenuHeader = true, header = img.."🧾 "..billerjob.." Payment 🧾", txt = "Do you want accept the payment?" },
+		{ isMenuHeader = true, header = "", txt = billtype:gsub("^%l", string.upper).." Payment: $"..amount },
+		{ header = "✅ Yes", txt = "", params = { isServer = true, event = "jim-payments:server:PayPopup", args = { accept = true, amount = amount, biller = biller, billtype = billtype } } },
+		{ header = "❌ No", txt = "", params = { isServer = true, event = "jim-payments:server:PayPopup", args = { accept = false, amount = amount, biller = biller, billtype = billtype } } }, })
+end)
+
+RegisterNetEvent('jim-payments:Tickets:Sell:yes', function() TriggerServerEvent('jim-payments:Tickets:Sell') end)
+RegisterNetEvent('jim-payments:Tickets:Sell:no', function() exports['qb-menu']:closeMenu() end)
--- a/config.lua
+++ b/config.lua
@@ -1,4 +1,4 @@
-print("Jim-Payments v1.0 - Payments Script by Jimathy")
+print("Jim-Payments v2.3 - Payments Script by Jimathy")

 -- If you need support I now have a discord available, it helps me keep track of issues and give better support.

@@ -6,15 +6,40 @@ print("Jim-Payments v1.0 - Payments Script by Jimathy")

 Config = {}

-Config.PaymentRadius = 30 -- This is how far the player list will check
+Config.Manage = true -- "true" if using qb-management
+					 -- "false" if using qb-bossmenu
+					
+Config.TicketSystem = true -- Enable this if you want to use the ticket system false
+
+Config.List = true -- "true" to use nearby player list feature in the cash registers, "false" for manual id entry
+Config.PaymentRadius = 30 -- This is how far the playerlist will check for nearby players (based on the person charging)
+
+Config.useATM = true -- Enable this to use my ATM's
+Config.useBanks = true -- Enable this to use my banking stuff
+Config.BankBlips = true -- Enable this if you disabled qb-banking and need bank locations
+Config.ATMBlips = false -- Enable this if you are a pyscho and need every ATM to be on the map too
+
+Config.PhoneBank = true -- Set this to false to use the popup payment system FOR CARD/BANK PAYMENTS instead of using phone invoices
+						-- This doesn't affect Cash payments as they by default use confirmation now
+						-- This is helpful for phones that don't support invoices well
+
+Config.Commission = false -- Set this to true to enable Commissions and give the person charging a percentage of the total
+Config.CommissionAll = false -- Set this to true to give commission to workers clocked in
+Config.CommissionDouble = false -- Set this to true if you want the person charging to get double Commission
+Config.CommissionLimit = false -- If true, this limits the Commission to only be given if over the "MinAmountForTicket". If false, Commission will be given for any amount
+
+-- MinAmountforTicket should be your cheapest item
+-- PayPerTicket should never be higher than MinAmountforTicket
+-- Commission is a percentage eg "0.10" becomes 10%

 Config.Jobs = {
-	['popsdiner'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['henhouse'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['pizzathis'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['burgershot'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['catcafe'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['tequilala'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['vanilla'] = { MinAmountforTicket = 50, PayPerTicket = 50 },
-	['mechanic'] = { MinAmountforTicket = 1000, PayPerTicket = 500 },
+	['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, },
+	['pizzathis'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, },
+	['popsdiner'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, },
+	['tequilala'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, },
+	['vanilla'] = { MinAmountforTicket = 50, PayPerTicket = 50, Commission = 0.10, },
+	['mechanic'] = { MinAmountforTicket = 1000, PayPerTicket = 500, Commission = 0.10, },
 }
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -1,21 +1,24 @@
 name "Jim-Payments"
 author "Jimathy"
-version "v1.0"
+version "v2.3"
 description "Payment Script By Jimathy"
 fx_version "cerulean"
 game "gta5"

 dependencies {
 	'qb-input',
+	'qb-target',
 }

 client_scripts {
-    'client.lua'
+    'client.lua',
+	'atms.lua'
 }

 server_scripts {
    '@oxmysql/lib/MySQL.lua',
-    'server.lua'
+    'server.lua',
+	'atmserver.lua'
 }

 shared_scripts {
--- a/images/ticket.png
+++ b/images/ticket.png
--- a/server.lua
+++ b/server.lua
@@ -1,76 +1,135 @@
 local QBCore = exports['qb-core']:GetCoreObject()

-RegisterServerEvent('jim-payments:Tickets:Give')
-AddEventHandler('jim-payments:Tickets:Give', function(amount, job)
-    for k, v in pairs(QBCore.Functions.GetPlayers()) do
-        local Player = QBCore.Functions.GetPlayer(v)
-        if Player ~= nil then
-            if Player.PlayerData.job.name == job and Player.PlayerData.job.onduty then
-				if amount >= Config.Jobs[job].MinAmountforTicket then
-					Player.Functions.AddItem('payticket', 1, false, {["quality"] = nil})
-					TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, 'Receipt received', 'success')
-					TriggerClientEvent('inventory:client:ItemBox', Player.PlayerData.source, QBCore.Shared.Items['payticket'], "add", 1) 
-				elseif amount < Config.Jobs[job].MinAmountforTicket then
-					TriggerClientEvent("QBCore:Notify", Player.PlayerData.source, "Amount too low, didn't receive a receipt", "error")
-				end
-			end
+local function cv(amount)
+    local formatted = amount
+    while true do
+        formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2')
+        if (k==0) then
+            break
        end
    end
+    return formatted
+end
+
+--QBCore.Commands.Add("cashregister", "Use mobile cash register", {}, false, function(source) TriggerClientEvent("jim-payments:client:Charge", source, true) end)
+
+RegisterServerEvent('jim-payments:Tickets:Give', function(data, biller)
+	--Find the biller from their citizenid
+	if biller == nil then
+		for k, v in pairs(QBCore.Functions.GetPlayers()) do
+		local Player = QBCore.Functions.GetPlayer(v)
+			if Player.PlayerData.citizenid == data.senderCitizenId then	biller = Player	end
+		end
+	end
+	-- If ticket system enabled, do this
+	if Config.TicketSystem then
+		if data.amount >= Config.Jobs[data.society].MinAmountforTicket then
+			for k, v in pairs(QBCore.Functions.GetPlayers()) do
+				local Player = QBCore.Functions.GetPlayer(v)
+				if Player ~= nil then
+					if Player.PlayerData.job.name == data.society and Player.PlayerData.job.onduty then
+						Player.Functions.AddItem('payticket', 1, false, {["quality"] = nil})
+						TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, 'Receipt received', 'success')
+						TriggerClientEvent('inventory:client:ItemBox', Player.PlayerData.source, QBCore.Shared.Items['payticket'], "add", 1) 
+					end
+				end
+			end
+		end
+	end
+	-- Commission section, does each config option separately
+	local comm = tonumber(Config.Jobs[data.society].Commission)
+	if Config.Commission and comm ~= 0 then
+		if Config.CommissionLimit and data.amount < Config.Jobs[data.society].MinAmountforTicket then return end
+		if Config.CommissionDouble then	
+			biller.Functions.AddMoney("bank", math.floor(tonumber(data.amount) * (comm *2)))
+			TriggerClientEvent("QBCore:Notify", biller.PlayerData.source, "Recieved $"..math.floor(tonumber(data.amount) * (comm *2)).." in Commission", "success")
+		else biller.Functions.AddMoney("bank",  math.floor(tonumber(data.amount) *comm))
+			TriggerClientEvent("QBCore:Notify", biller.PlayerData.source, "Recieved $"..math.floor(tonumber(data.amount) * comm).." in Commission", "success")
+		end
+		if Config.CommissionAll then
+			for k, v in pairs(QBCore.Functions.GetPlayers()) do
+				local Player = QBCore.Functions.GetPlayer(v)
+				if Player ~= nil and Player ~= biller then
+					if Player.PlayerData.job.name == data.society and Player.PlayerData.job.onduty then
+						Player.Functions.AddMoney("bank",  math.floor(tonumber(data.amount) * comm))
+						TriggerClientEvent("QBCore:Notify", Player.PlayerData.source, "Recieved $"..math.floor(tonumber(data.amount) * comm).." in Commission", "success")
+					end
+				end
+			end
+		end
+	end
 end)

-RegisterServerEvent('jim-payments:Tickets:Sell')
-AddEventHandler('jim-payments:Tickets:Sell', function(data)
+RegisterServerEvent('jim-payments:Tickets:Sell', function()
    local Player = QBCore.Functions.GetPlayer(source)
 	if Player.Functions.GetItemByName("payticket") == nil then TriggerClientEvent('QBCore:Notify', source, "No tickets to trade", 'error') return
 	else
 		tickets = Player.Functions.GetItemByName("payticket").amount
 		Player.Functions.RemoveItem('payticket', tickets)
-		Player.Functions.AddMoney('bank', (tickets * Confing.Jobs[Player.PlayerData.job.name].PayPerTicket), 'ticket-payment')
+		pay = (tickets * Config.Jobs[Player.PlayerData.job.name].PayPerTicket)
+		Player.Functions.AddMoney('bank', pay, 'ticket-payment')
 		TriggerClientEvent('inventory:client:ItemBox', source, QBCore.Shared.Items['payticket'], "remove", tickets)
-		TriggerClientEvent('QBCore:Notify', source, "Tickets: "..tickets.." Total: $"..pay, 'success')
+		TriggerClientEvent('QBCore:Notify', source, "Tickets traded: "..tickets.." Total: $"..cv(pay), 'success')
 	end
 end)

-RegisterServerEvent("jim-payments:server:Charge", function(citizen, price, billtype)
-    local biller = QBCore.Functions.GetPlayer(source)
+QBCore.Functions.CreateCallback('jim-payments:Ticket:Count', function(source, cb) 
+	if QBCore.Functions.GetPlayer(source).Functions.GetItemByName('payticket') == nil then amount = 0
+	else amount = QBCore.Functions.GetPlayer(source).Functions.GetItemByName('payticket').amount end 
+	cb(amount) 
+end)
+
+RegisterServerEvent("jim-payments:server:Charge", function(citizen, price, billtype, img)
+	local src = source
+    local biller = QBCore.Functions.GetPlayer(src)
    local billed = QBCore.Functions.GetPlayer(tonumber(citizen))
    local amount = tonumber(price)
-	local billtype = string.lower(tostring(billtype))
-
-	if billed ~= nil then
-		if billtype == "cash" then balance = billed.Functions.GetMoney(billtype)
-			if source == tonumber(citizen) then TriggerClientEvent('QBCore:Notify', source, 'You Cannot Bill Yourself', 'error') return end
-			if balance >= amount then
-				billed.Functions.RemoveMoney('cash', amount) TriggerEvent("qb-bossmenu:server:addAccountMoney", tostring(biller.PlayerData.job.name), amount)
-				TriggerEvent('jim-payments:Tickets:Give', amount, tostring(biller.PlayerData.job.name))
-			elseif balance < amount then
-				TriggerClientEvent("QBCore:Notify", source, "Customer doesn't have enough cash to pay", "error")
-				TriggerClientEvent("QBCore:Notify", tonumber(citizen), "You don't have enough cash to pay", "error")
-			end
-		elseif billtype == "card" then	
-			if biller.PlayerData.citizenid == billed.PlayerData.citizenid then TriggerClientEvent('QBCore:Notify', source, 'You Cannot Bill Yourself', 'error') return end
-			if amount and amount > 0 then
+	local balance = billed.Functions.GetMoney(billtype)
+	if amount and amount > 0 then
+		if balance < amount then
+			TriggerClientEvent("QBCore:Notify", src, "Customer doesn't have enough cash to pay", "error")
+			TriggerClientEvent("QBCore:Notify", tonumber(citizen), "You don't have enough cash to pay", "error")
+			return
+		end
+		if billtype == "cash" then 
+			TriggerClientEvent("jim-payments:client:PayPopup", billed.PlayerData.source, amount, src, billtype, img, biller.PlayerData.job.label)
+		elseif billtype == "bank" then
+			if Config.PhoneBank == false then
+				TriggerClientEvent("jim-payments:client:PayPopup", billed.PlayerData.source, amount, src, billtype, img, biller.PlayerData.job.label)
+			else
 				MySQL.Async.insert(
 					'INSERT INTO phone_invoices (citizenid, amount, society, sender, sendercitizenid) VALUES (?, ?, ?, ?, ?)',
-					{billed.PlayerData.citizenid, amount, biller.PlayerData.job.name,
-					 biller.PlayerData.charinfo.firstname, biller.PlayerData.citizenid})
+					{billed.PlayerData.citizenid, amount, biller.PlayerData.job.name, biller.PlayerData.charinfo.firstname, biller.PlayerData.citizenid})
 				TriggerClientEvent('qb-phone:RefreshPhone', billed.PlayerData.source)
-				TriggerClientEvent('QBCore:Notify', source, 'Invoice Successfully Sent', 'success')
+				TriggerClientEvent('QBCore:Notify', src, 'Invoice Successfully Sent', 'success')
 				TriggerClientEvent('QBCore:Notify', billed.PlayerData.source, 'New Invoice Received')
-			else TriggerClientEvent('QBCore:Notify', source, 'Must Be A Valid Amount Above 0', 'error')	end
+			end
 		end
-	else TriggerClientEvent('QBCore:Notify', source, 'Player Not Online', 'error') end
+	else TriggerClientEvent('QBCore:Notify', source, "You can't charge $0", 'error') return end
 end)

-QBCore.Functions.CreateCallback('jim-payments:server:GetCurrentPlayers', function(source, cb)
-	local onlineList = {}
-	local SPlayer = QBCore.Functions.GetPlayer(source)
-	for k, v in pairs(QBCore.Functions.GetPlayers()) do
-		local Player = QBCore.Functions.GetPlayer(v)
-		if Player ~= nil and v ~= source then
-			local dist = #(vector3(Player.PlayerData.position.x, Player.PlayerData.position.y, Player.PlayerData.position.z) - vector3(SPlayer.PlayerData.position.x, SPlayer.PlayerData.position.y, SPlayer.PlayerData.position.z))
-			if dist < Config.PaymentRadius then onlineList[#onlineList+1] = { value = tonumber(v), text = "["..v.."] - "..Player.PlayerData.charinfo.firstname..' '..Player.PlayerData.charinfo.lastname } end
-		end
+RegisterServerEvent("jim-payments:server:PayPopup", function(data)
+	local src = source
+    local billed = QBCore.Functions.GetPlayer(src)
+    local biller = QBCore.Functions.GetPlayer(tonumber(data.biller))
+	local newdata = { senderCitizenId = biller.PlayerData.citizenid, society = biller.PlayerData.job.name, amount = data.amount }
+	if data.accept == true then
+		billed.Functions.RemoveMoney(tostring(data.billtype), data.amount)
+		if Config.Manage then exports["qb-management"]:AddMoney(tostring(biller.PlayerData.job.name), data.amount)
+		else TriggerEvent("qb-bossmenu:server:addAccountMoney", tostring(biller.PlayerData.job.name), data.amount) end
+		TriggerEvent('jim-payments:Tickets:Give', newdata, biller)
+		TriggerClientEvent("QBCore:Notify", data.biller, billed.PlayerData.charinfo.firstname.." accepted the payment", "success")
+	elseif data.accept == false then
+		TriggerClientEvent("QBCore:Notify", src, "You declined the payment")
+		TriggerClientEvent("QBCore:Notify", data.biller, billed.PlayerData.charinfo.firstname.." declined the payment", "error")
 	end
-	cb(onlineList)
+end)
+
+QBCore.Functions.CreateCallback('jim-payments:MakePlayerList', function(source, cb)
+	local onlineList = {}
+	for k, v in pairs(QBCore.Functions.GetPlayers()) do
+		local P = QBCore.Functions.GetPlayer(v)
+		onlineList[#onlineList+1] = { value = tonumber(v), text = "["..v.."] - "..P.PlayerData.charinfo.firstname..' '..P.PlayerData.charinfo.lastname  }
+	end
+	cb(onlineList) 
 end)
Author	SHA1	Message	Date
jimathy	892acf1283	Add toggles for bossmenu/management + nearbylist	2022-04-15 18:25:27 +01:00
jimathy	13d83a066a	Fix job label on payment popup	2022-04-12 21:10:48 +01:00
jimathy	88765357b3	Fix job label on payment popup	2022-04-12 21:09:44 +01:00
jimathy	f9029f0951	Commission update	2022-04-11 18:59:47 +01:00
jimathy	65f51520fb	Update Readme with new phone event and info	2022-04-11 18:58:55 +01:00
jimathy	7e92b852cf	fix bank popups and popup job tickets	2022-04-06 22:30:26 +01:00
jimathy	a63b40c11f	fix pay popups for shops with no logo	2022-04-06 22:18:38 +01:00
jimathy	644294546e	qb-management export update	2022-04-03 20:52:10 +01:00
jimathy	4dbe600680	qb-management export update	2022-04-03 20:51:34 +01:00
jimathy	9d5086e5d5	qb-management export update	2022-04-03 20:41:07 +01:00
jimathy	b06cb05266	Merge pull request #3 from stacheboi/main Fix for Player Receiving Cash From Self	2022-03-26 17:50:06 +00:00
jimathy	f16a0b0d1f	Removed loops, it was being too strict	2022-03-17 10:57:14 +00:00
jimathy	48003e09a6	Fix for everyone being able to access boss account	2022-03-17 10:43:04 +00:00
stacheboi	95459f63a8	Fix for Player Receiving Cash From Self When you give someone cash it shows they received money from themself. This show show the sending players name instead.	2022-03-16 21:17:10 -04:00
jimathy	0065af7c9d	Notify on accepted payment	2022-03-15 21:32:49 +00:00
jimathy	74990226a9	fix for fix. I need a rest	2022-03-13 13:15:57 +00:00
jimathy	2e5bcc4d86	Fix for bank popup payments	2022-03-13 13:03:09 +00:00
jimathy	185c641f60	fix for tickets with new popup	2022-03-12 12:56:30 +00:00
jimathy	3e036d6996	v2.1 - Add confirmation popups for payments	2022-03-11 00:30:49 +00:00
jimathy	a4a67da493	Move bank enabling varibles to Config.lua	2022-03-10 23:42:35 +00:00
jimathy	2dc29de368	Move bank enabling varibles to Config.lua	2022-03-10 23:41:49 +00:00
jimathy	8379179631	Update config.lua	2022-02-25 12:52:10 +00:00
jimathy	e3e8d71bea	Fix for data being nil	2022-02-25 10:10:08 +00:00
jimathy	07c0195d26	Support for upcoming features	2022-02-23 20:35:50 +00:00
jimathy	0df97ac406	oops, gangmenu isn't bossmenu	2022-02-21 09:05:56 +00:00
jimathy	ad4f5dd203	Improve disabling certain bank features	2022-02-20 16:22:41 +00:00
jimathy	76ff8dcfec	Remov /cashregister command, didn't work correctly	2022-02-20 15:32:42 +00:00
jimathy	61fc56d82d	Add ability to disable receipts	2022-02-20 15:30:15 +00:00
jimathy	b4d185105d	Pulling job names from wrong place This caused errors while trying to access banks or ATMs if you had jobs in the config but not in your shared. This was left in by mistake	2022-02-20 15:09:50 +00:00
jimathy	4e16ff4e04	Added banking images to readme	2022-02-19 12:18:23 +00:00
jimathy	7d059c27d0	Updated Readme	2022-02-19 11:57:01 +00:00
jimathy	9601e4b2ac	Banking update	2022-02-19 11:56:21 +00:00
jimathy	ef5775fd6d	possible fix for not working on restart	2022-02-17 16:36:16 +00:00
jimathy	a5e09e4c49	Adjusted servercallback for new method	2022-02-17 12:44:17 +00:00
jimathy	3e9570607a	Rewrote the playerlist ANOTHER way	2022-02-17 12:43:15 +00:00
jimathy	5de2f99693	an attempted name grab fix let me know if this has any issues	2022-02-14 23:07:18 +00:00
jimathy	24ea006d60	Update layout and removal of reduntant statement Nothing mayjor, just removal of pointless events like "if player offline don't charge" this should be possible to charge them as it retrieves a list of online players nearby	2022-02-11 18:29:47 +00:00
jimathy	8fcea104da	Menu orders moved around slightly Changed formatting to look a bit nicer	2022-02-11 17:49:37 +00:00
jimathy	00367122bf	New receipt image got bored of the old one	2022-02-11 14:59:38 +00:00
jimathy	683f017029	reverted name to usernames	2022-02-10 11:26:00 +00:00
jimathy	ce90bd4f26	Creation of server callbacks for names and tickets This just adds the callbacks for the clientside info	2022-02-09 12:55:49 +00:00
jimathy	afdbb72ce7	Added callbacks to grab characters name This adds callback triggers for grabbing the players Character name instead of their user name Also adds a callback trigger for the amount of tickets in a persons pockets for the trading tickets menu + cosmetic changes	2022-02-09 12:54:06 +00:00
jimathy	cb54fb18fa	testing test commit	2022-02-09 12:45:08 +00:00
jimathy	44833e6c71	Update client.lua debugPoly=fuck off	2022-02-08 20:16:31 +00:00
jimathy	9aee05be46	Update client.lua commented out debugging notification	2022-02-08 19:36:23 +00:00
jimathy	79bfe1c7f9	Rewrite Removal of callback as it has been recreated (and working) in client.lua	2022-02-08 19:21:53 +00:00
jimathy	2bdaf89b28	Update config.lua	2022-02-08 19:20:41 +00:00
jimathy	487459eda8	Update fxmanifest.lua	2022-02-08 19:20:16 +00:00
jimathy	be931570bb	Re-write Had to rewrite the code for grabbing the player list All on client side now and no callbacks	2022-02-08 19:19:05 +00:00
jimathy	e958ae1582	Update README.md Info about removing triggers from older scripts	2022-02-07 22:31:36 +00:00
jimathy	d1ea279f4a	debugpoly left on Forgot to turn this off when testing	2022-02-07 21:58:31 +00:00
jimathy	256394bfe3	distance number rounding rounds the number to remove decimal points, this stops it from making the lines too long	2022-02-07 18:53:28 +00:00
jimathy	227fbd322c	Update config.lua	2022-02-06 17:25:46 +00:00
jimathy	4ed398fd9f	Update fxmanifest.lua	2022-02-06 17:25:29 +00:00
jimathy	2837a808f1	hotfix for leaving the charging player in the list Left this out while testing on private test server	2022-02-06 15:48:41 +00:00
jimathy	b78c6dc3a9	Added menu on payment The menu when cashing in receipts was added while testing stuff, I may expand it on this more	2022-02-06 15:47:07 +00:00
jimathy	412267a5c8	Added extra player checks - changed to dist <= - added distance to the player infos (only updates when you open the register) - added extra check to be sure it doesn't add someone whos too far	2022-02-06 13:42:56 +00:00
jimathy	e0321c51c6	typo hotfix typo.."Confing"	2022-02-05 20:15:02 +00:00
jimathy	0ea3f36d42	Update server.lua fix for error "pay is a nil value"	2022-02-05 20:02:29 +00:00
jimathy	ded2fbb219	duty hotfix fixed onDuty not being picked up on script restarts	2022-02-05 16:18:56 +00:00
jimathy	3722d4b2ba	Update README.md	2022-02-05 16:13:38 +00:00
jimathy	63cf7f972d	target hotfix delayed the loading of the qb-target to help loading of the jobroles table	2022-02-05 16:10:11 +00:00