context implementation (policejob) (#758)

[esx_addons]/esx_policejob/client/main.lua

@@ -50,30 +50,38 @@ function OpenCloakroomMenu()
 	local grade = ESX.PlayerData.job.grade_name
 
 	local elements = {
-		{label = TranslateCap('citizen_wear'), value = 'citizen_wear'},
-		{label = TranslateCap('bullet_wear'), uniform = 'bullet_wear'},
-		{label = TranslateCap('gilet_wear'), uniform = 'gilet_wear'},
-		{label = TranslateCap('police_wear'), uniform = grade}
+		{unselectable = true, icon = "fas fa-shirt", title = TranslateCap("cloakroom")},
+		{icon = "fas fa-shirt", title = TranslateCap('citizen_wear'), value = 'citizen_wear'},
+		{icon = "fas fa-shirt", title = TranslateCap('bullet_wear'), uniform = 'bullet_wear'},
+		{icon = "fas fa-shirt", title = TranslateCap('gilet_wear'), uniform = 'gilet_wear'},
+		{icon = "fas fa-shirt", title = TranslateCap('police_wear'), uniform = grade}
 	}
 
 	if Config.EnableCustomPeds then
 		for k,v in ipairs(Config.CustomPeds.shared) do
-			table.insert(elements, {label = v.label, value = 'freemode_ped', maleModel = v.maleModel, femaleModel = v.femaleModel})
+			elements[#elements+1] = {
+				icon = "fas fa-shirt",
+				title = v.label, 
+				value = 'freemode_ped', 
+				maleModel = v.maleModel, 
+				femaleModel = v.femaleModel
+			}
 		end
 
 		for k,v in ipairs(Config.CustomPeds[grade]) do
-			table.insert(elements, {label = v.label, value = 'freemode_ped', maleModel = v.maleModel, femaleModel = v.femaleModel})
+			elements[#elements+1] = {
+				icon = "fas fa-shirt",
+				title = v.label, 
+				value = 'freemode_ped', 
+				maleModel = v.maleModel, 
+				femaleModel = v.femaleModel
+			}
 		end
 	end
 
-	ESX.UI.Menu.CloseAll()
-
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'cloakroom', {
-		title    = TranslateCap('cloakroom'),
-		align    = 'top-left',
-		elements = elements
-	}, function(data, menu)
+	ESX.OpenContext("right", elements, function(menu,element)
 		cleanPlayer(playerPed)
+		local data = {current = element}
 
 		if data.current.value == 'citizen_wear' then
 			if Config.EnableCustomPeds then
@@ -194,9 +202,7 @@ function OpenCloakroomMenu()
 				end)
 			end)
 		end
-	end, function(data, menu)
-		menu.close()
-
+	end, function(menu)
 		CurrentAction     = 'menu_cloakroom'
 		CurrentActionMsg  = TranslateCap('open_cloackroom')
 		CurrentActionData = {}
@@ -207,28 +213,24 @@ function OpenArmoryMenu(station)
 	local elements
 	if Config.OxInventory then
 		exports.ox_inventory:openInventory('stash', {id = 'society_police', owner = station})
-		return ESX.UI.Menu.CloseAll()
+		return ESX.CloseContext()
 	else
 		elements = {
-			{label = TranslateCap('buy_weapons'), value = 'buy_weapons'}
+			{unselectable = true, icon = "fas fa-gun", title = TranslateCap('armory')},
+			{icon = "fas fa-gun", title = TranslateCap('buy_weapons'), value = 'buy_weapons'}
+			
 		}
 
 		if Config.EnableArmoryManagement then
-			table.insert(elements, {label = TranslateCap('get_weapon'),     value = 'get_weapon'})
-			table.insert(elements, {label = TranslateCap('put_weapon'),     value = 'put_weapon'})
-			table.insert(elements, {label = TranslateCap('remove_object'),  value = 'get_stock'})
-			table.insert(elements, {label = TranslateCap('deposit_object'), value = 'put_stock'})
+			table.insert(elements, {icon = "fas fa-gun", title = TranslateCap('get_weapon'),     value = 'get_weapon'})
+			table.insert(elements, {icon = "fas fa-gun", title = TranslateCap('put_weapon'),     value = 'put_weapon'})
+			table.insert(elements, {icon = "fas fa-box", title = TranslateCap('remove_object'),  value = 'get_stock'})
+			table.insert(elements, {icon = "fas fa-box", title = TranslateCap('deposit_object'), value = 'put_stock'})
 		end
 	end
 
-	ESX.UI.Menu.CloseAll()
-
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'armory', {
-		title    = TranslateCap('armory'),
-		align    = 'top-left',
-		elements = elements
-	}, function(data, menu)
-
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {current = element}
 		if data.current.value == 'get_weapon' then
 			OpenGetWeaponMenu()
 		elseif data.current.value == 'put_weapon' then
@@ -240,10 +242,7 @@ function OpenArmoryMenu(station)
 		elseif data.current.value == 'get_stock' then
 			OpenGetStocksMenu()
 		end
-
-	end, function(data, menu)
-		menu.close()
-
+	end, function(menu)
 		CurrentAction     = 'menu_armory'
 		CurrentActionMsg  = TranslateCap('open_armory')
 		CurrentActionData = {station = station}
@@ -251,39 +250,41 @@ function OpenArmoryMenu(station)
 end
 
 function OpenPoliceActionsMenu()
-	ESX.UI.Menu.CloseAll()
+	local elements = {
+		{unselectable = true, icon = "fas fa-police", title = "Police"},
+		{icon = "fas fa-user", title = TranslateCap('citizen_interaction'), value = 'citizen_interaction'},
+		{icon = "fas fa-car", title = TranslateCap('vehicle_interaction'), value = 'vehicle_interaction'},
+		{icon = "fas fa-object", title = TranslateCap('object_spawner'), value = 'object_spawner'}
+	}
+
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {current = element}
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'police_actions', {
-		title    = 'Police',
-		align    = 'top-left',
-		elements = {
-			{label = TranslateCap('citizen_interaction'), value = 'citizen_interaction'},
-			{label = TranslateCap('vehicle_interaction'), value = 'vehicle_interaction'},
-			{label = TranslateCap('object_spawner'), value = 'object_spawner'}
-	}}, function(data, menu)
 		if data.current.value == 'citizen_interaction' then
-			local elements = {
-				{label = TranslateCap('id_card'), value = 'identity_card'},
-				{label = TranslateCap('search'), value = 'search'},
-				{label = TranslateCap('handcuff'), value = 'handcuff'},
-				{label = TranslateCap('drag'), value = 'drag'},
-				{label = TranslateCap('put_in_vehicle'), value = 'put_in_vehicle'},
-				{label = TranslateCap('out_the_vehicle'), value = 'out_the_vehicle'},
-				{label = TranslateCap('fine'), value = 'fine'},
-				{label = TranslateCap('unpaid_bills'), value = 'unpaid_bills'}
+			local elements2 = {
+				{unselectable = true, icon = "fas fa-user", title = element.title},
+				{icon = "fas fa-idkyet", title = TranslateCap('id_card'), value = 'identity_card'},
+				{icon = "fas fa-idkyet", title = TranslateCap('search'), value = 'search'},
+				{icon = "fas fa-idkyet", title = TranslateCap('handcuff'), value = 'handcuff'},
+				{icon = "fas fa-idkyet", title = TranslateCap('drag'), value = 'drag'},
+				{icon = "fas fa-idkyet", title = TranslateCap('put_in_vehicle'), value = 'put_in_vehicle'},
+				{icon = "fas fa-idkyet", title = TranslateCap('out_the_vehicle'), value = 'out_the_vehicle'},
+				{icon = "fas fa-idkyet", title = TranslateCap('fine'), value = 'fine'},
+				{icon = "fas fa-idkyet", title = TranslateCap('unpaid_bills'), value = 'unpaid_bills'}
 			}
 
 			if Config.EnableLicenses then
-				table.insert(elements, {label = TranslateCap('license_check'), value = 'license'})
+				elements2[#elements2+1] = {
+					icon = "fas fa-scroll",
+					title = TranslateCap('license_check'),
+					value = 'license'
+				}
 			end
 
-			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'citizen_interaction', {
-				title    = TranslateCap('citizen_interaction'),
-				align    = 'top-left',
-				elements = elements
-			}, function(data2, menu2)
+			ESX.OpenContext("right", elements2, function(menu2,element2)
 				local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer()
 				if closestPlayer ~= -1 and closestDistance <= 3.0 then
+					local data2 = {current = element2}
 					local action = data2.current.value
 
 					if action == 'identity_card' then
@@ -308,33 +309,36 @@ function OpenPoliceActionsMenu()
 				else
 					ESX.ShowNotification(TranslateCap('no_players_nearby'))
 				end
-			end, function(data2, menu2)
-				menu2.close()
+			end, function(menu)
+				OpenPoliceActionsMenu()
 			end)
 		elseif data.current.value == 'vehicle_interaction' then
-			local elements  = {}
+			local elements3  = {
+				{unselectable = true, icon = "fas fa-car", title = element.title}
+			}
 			local playerPed = PlayerPedId()
 			local vehicle = ESX.Game.GetVehicleInDirection()
 
 			if DoesEntityExist(vehicle) then
-				table.insert(elements, {label = TranslateCap('vehicle_info'), value = 'vehicle_infos'})
-				table.insert(elements, {label = TranslateCap('pick_lock'), value = 'hijack_vehicle'})
-				table.insert(elements, {label = TranslateCap('impound'), value = 'impound'})
+				elements3[#elements3+1] = {icon = "fas fa-car", title = TranslateCap('vehicle_info'), value = 'vehicle_infos'}
+				elements3[#elements3+1] = {icon = "fas fa-car", title = TranslateCap('pick_lock'), value = 'hijack_vehicle'}
+				elements3[#elements3+1] = {icon = "fas fa-car", title = TranslateCap('impound'), value = 'impound'}
 			end
 
-			table.insert(elements, {label = TranslateCap('search_database'), value = 'search_database'})
-
-			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_interaction', {
-				title    = TranslateCap('vehicle_interaction'),
-				align    = 'top-left',
-				elements = elements
-			}, function(data2, menu2)
+			elements3[#elements3+1] = {
+				icon = "fas fa-scroll",
+				title = TranslateCap('search_database'), 
+				value = 'search_database'
+			}
+			
+			ESX.OpenContext("right", elements3, function(menu3,element3)
+				local data2 = {current = element3}
 				local coords  = GetEntityCoords(playerPed)
 				vehicle = ESX.Game.GetVehicleInDirection()
 				action  = data2.current.value
 
 				if action == 'search_database' then
-					LookupVehicle()
+					LookupVehicle(element3)
 				elseif DoesEntityExist(vehicle) then
 					if action == 'vehicle_infos' then
 						local vehicleData = ESX.Game.GetVehicleProperties(vehicle)
@@ -350,7 +354,6 @@ function OpenPoliceActionsMenu()
 							ESX.ShowNotification(TranslateCap('vehicle_unlocked'))
 						end
 					elseif action == 'impound' then
-						-- is the script busy?
 						if currentTask.busy then
 							return
 						end
@@ -362,10 +365,9 @@ function OpenPoliceActionsMenu()
 						currentTask.task = ESX.SetTimeout(10000, function()
 							ClearPedTasks(playerPed)
 							ImpoundVehicle(vehicle)
-							Wait(100) -- sleep the entire script to let stuff sink back to reality
+							Wait(100)
 						end)
 
-						-- keep track of that vehicle!
 						CreateThread(function()
 							while currentTask.busy do
 								Wait(1000)
@@ -384,21 +386,21 @@ function OpenPoliceActionsMenu()
 				else
 					ESX.ShowNotification(TranslateCap('no_vehicles_nearby'))
 				end
-
-			end, function(data2, menu2)
-				menu2.close()
+			end, function(menu)
+				OpenPoliceActionsMenu()
 			end)
-		elseif data.current.value == 'object_spawner' then
-			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'citizen_interaction', {
-				title    = TranslateCap('traffic_interaction'),
-				align    = 'top-left',
-				elements = {
-					{label = TranslateCap('cone'), model = 'prop_roadcone02a'},
-					{label = TranslateCap('barrier'), model = 'prop_barrier_work05'},
-					{label = TranslateCap('spikestrips'), model = 'p_ld_stinger_s'},
-					{label = TranslateCap('box'), model = 'prop_boxpile_07d'},
-					{label = TranslateCap('cash'), model = 'hei_prop_cash_crate_half_full'}
-			}}, function(data2, menu2)
+		elseif data.current.value == "object_spawner" then
+			local elements4 = {
+				{unselectable = true, icon = "fas fa-object", title = element.title},
+				{icon = "fas fa-cone", title = TranslateCap('cone'), model = 'prop_roadcone02a'},
+				{icon = "fas fa-cone", title = TranslateCap('barrier'), model = 'prop_barrier_work05'},
+				{icon = "fas fa-cone", title = TranslateCap('spikestrips'), model = 'p_ld_stinger_s'},
+				{icon = "fas fa-cone", title = TranslateCap('box'), model = 'prop_boxpile_07d'},
+				{icon = "fas fa-cone", title = TranslateCap('cash'), model = 'hei_prop_cash_crate_half_full'}
+			}
+
+			ESX.OpenContext("right", elements4, function(menu4,element4)
+				local data2 = {current = element4}
 				local playerPed = PlayerPedId()
 				local coords, forward = GetEntityCoords(playerPed), GetEntityForwardVector(playerPed)
 				local objectCoords = (coords + forward * 1.0)
@@ -407,46 +409,40 @@ function OpenPoliceActionsMenu()
 					SetEntityHeading(obj, GetEntityHeading(playerPed))
 					PlaceObjectOnGroundProperly(obj)
 				end)
-			end, function(data2, menu2)
-				menu2.close()
+			end, function(menu)
+				OpenPoliceActionsMenu()
 			end)
 		end
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function OpenIdentityCardMenu(player)
 	ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data)
 		local elements = {
-			{label = TranslateCap('name', data.name)},
-			{label = TranslateCap('job', ('%s - %s'):format(data.job, data.grade))}
+			{icon = "fas fa-user", title = TranslateCap('name', data.name)},
+			{icon = "fas fa-user", title = TranslateCap('job', ('%s - %s'):format(data.job, data.grade))}
 		}
 
 		if Config.EnableESXIdentity then
-			table.insert(elements, {label = TranslateCap('sex', TranslateCap(data.sex))})
-			table.insert(elements, {label = TranslateCap('dob', data.dob)})
-			table.insert(elements, {label = TranslateCap('height', data.height)})
+			elements[#elements+1] = {icon = "fas fa-user", title = TranslateCap('sex', TranslateCap(data.sex))}
+			elements[#elements+1] = {icon = "fas fa-user", title = TranslateCap('sex', TranslateCap(data.sex))}
+			elements[#elements+1] = {icon = "fas fa-user", title = TranslateCap('height', data.height)}
 		end
 
 		if Config.EnableESXOptionalneeds and data.drunk then
-			table.insert(elements, {label = TranslateCap('bac', data.drunk)})
+			elements[#elements+1] = {title = TranslateCap('bac', data.drunk)}
 		end
 
 		if data.licenses then
-			table.insert(elements, {label = TranslateCap('license_label')})
+			elements[#elements+1] = {title = TranslateCap('license_label')}
 
 			for i=1, #data.licenses, 1 do
-				table.insert(elements, {label = data.licenses[i].label})
+				elements[#elements+1] = {title = data.licenses[i].label}
 			end
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'citizen_interaction', {
-			title    = TranslateCap('citizen_interaction'),
-			align    = 'top-left',
-			elements = elements
-		}, nil, function(data, menu)
-			menu.close()
+		ESX.OpenContext("right", elements, nil, function(menu)
+			OpenPoliceActionsMenu()	
 		end)
 	end, GetPlayerServerId(player))
 end
@@ -454,21 +450,23 @@ end
 function OpenBodySearchMenu(player)
 	if Config.OxInventory then
 		exports.ox_inventory:openInventory('player', GetPlayerServerId(player))
-		return ESX.UI.Menu.CloseAll()
+		return ESX.CloseContext()
 	end
 
 	ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data)
-		local elements = {}
+		local elements = {
+			{unselectable = true, icon = "fas fa-user", title = TranslateCap('search')}
+		}
 
 		for i=1, #data.accounts, 1 do
 			if data.accounts[i].name == 'black_money' and data.accounts[i].money > 0 then
-				table.insert(elements, {
-					label    = TranslateCap('confiscate_dirty', ESX.Math.Round(data.accounts[i].money)),
+				elements[#elements+1] = {
+					icon = "fas fa-money",
+					title    = TranslateCap('confiscate_dirty', ESX.Math.Round(data.accounts[i].money)),
 					value    = 'black_money',
 					itemType = 'item_account',
 					amount   = data.accounts[i].money
-				})
-
+				}
 				break
 			end
 		end
@@ -476,78 +474,72 @@ function OpenBodySearchMenu(player)
 		table.insert(elements, {label = TranslateCap('guns_label')})
 
 		for i=1, #data.weapons, 1 do
-			table.insert(elements, {
-				label    = TranslateCap('confiscate_weapon', ESX.GetWeaponLabel(data.weapons[i].name), data.weapons[i].ammo),
+			elements[#elements+1] = {
+				icon = "fas fa-gun",
+				title    = TranslateCap('confiscate_weapon', ESX.GetWeaponLabel(data.weapons[i].name), data.weapons[i].ammo),
 				value    = data.weapons[i].name,
 				itemType = 'item_weapon',
 				amount   = data.weapons[i].ammo
-			})
+			}
 		end
 
-		table.insert(elements, {label = TranslateCap('inventory_label')})
+		elements[#elements+1] = {title = TranslateCap('inventory_label')}
 
 		for i=1, #data.inventory, 1 do
 			if data.inventory[i].count > 0 then
-				table.insert(elements, {
-					label    = TranslateCap('confiscate_inv', data.inventory[i].count, data.inventory[i].label),
+				elements[#elements+1] = {
+					icon = "fas fa-box",
+					title    = TranslateCap('confiscate_inv', data.inventory[i].count, data.inventory[i].label),
 					value    = data.inventory[i].name,
 					itemType = 'item_standard',
 					amount   = data.inventory[i].count
-				})
+				}
 			end
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'body_search', {
-			title    = TranslateCap('search'),
-			align    = 'top-left',
-			elements = elements
-		}, function(data, menu)
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			if data.current.value then
 				TriggerServerEvent('esx_policejob:confiscatePlayerItem', GetPlayerServerId(player), data.current.itemType, data.current.value, data.current.amount)
 				OpenBodySearchMenu(player)
 			end
-		end, function(data, menu)
-			menu.close()
 		end)
 	end, GetPlayerServerId(player))
 end
 
 function OpenFineMenu(player)
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'fine', {
-		title    = TranslateCap('fine'),
-		align    = 'top-left',
-		elements = {
-			{label = TranslateCap('traffic_offense'), value = 0},
-			{label = TranslateCap('minor_offense'),   value = 1},
-			{label = TranslateCap('average_offense'), value = 2},
-			{label = TranslateCap('major_offense'),   value = 3}
-	}}, function(data, menu)
+	local elements = {
+		{unselectable = true, icon = "fas fa-scroll", title = TranslateCap('fine')},
+		{icon = "fas fa-scroll", title = TranslateCap('traffic_offense'), value = 0},
+		{icon = "fas fa-scroll", title = TranslateCap('minor_offense'),   value = 1},
+		{icon = "fas fa-scroll", title = TranslateCap('average_offense'), value = 2},
+		{icon = "fas fa-scroll", title = TranslateCap('major_offense'),   value = 3}
+	}
+
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {current = element}
 		OpenFineCategoryMenu(player, data.current.value)
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function OpenFineCategoryMenu(player, category)
 	ESX.TriggerServerCallback('esx_policejob:getFineList', function(fines)
-		local elements = {}
+		local elements = {
+			{unselectable = true, icon = "fas fa-scroll", title = TranslateCap('fine')}
+		}
 
 		for k,fine in ipairs(fines) do
-			table.insert(elements, {
-				label     = ('%s <span style="color:green;">%s</span>'):format(fine.label, TranslateCap('armory_item', ESX.Math.GroupDigits(fine.amount))),
+			elements[#elements+1] = {
+				icon = "fas fa-scroll",
+				title     = ('%s <span style="color:green;">%s</span>'):format(fine.label, TranslateCap('armory_item', ESX.Math.GroupDigits(fine.amount))),
 				value     = fine.id,
 				amount    = fine.amount,
 				fineLabel = fine.label
-			})
+			}
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'fine_category', {
-			title    = TranslateCap('fine'),
-			align    = 'top-left',
-			elements = elements
-		}, function(data, menu)
-			menu.close()
-
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			if Config.EnablePlayerManagement then
 				TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(player), 'society_police', TranslateCap('fine_total', data.current.fineLabel), data.current.amount)
 			else
@@ -557,65 +549,63 @@ function OpenFineCategoryMenu(player, category)
 			ESX.SetTimeout(300, function()
 				OpenFineCategoryMenu(player, category)
 			end)
-		end, function(data, menu)
-			menu.close()
 		end)
 	end, category)
 end
 
-function LookupVehicle()
-	ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'lookup_vehicle', {
-		title = TranslateCap('search_database_title'),
-	}, function(data, menu)
+function LookupVehicle(elementF)
+	local elements = {
+		{unselectable = true, icon = "fas fa-car", title = elementF.title},
+		{title = "Enter Plate", input = true, inputType = "text", inputPlaceholder = "ABC 123"},
+		{icon = "fas fa-check-double", title = "Lookup Plate", value = "lookup"}
+	}
+
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {value = menu.eles[2].inputValue}
 		local length = string.len(data.value)
 		if not data.value or length < 2 or length > 8 then
 			ESX.ShowNotification(TranslateCap('search_database_error_invalid'))
 		else
 			ESX.TriggerServerCallback('esx_policejob:getVehicleInfos', function(retrivedInfo)
-				local elements = {{label = TranslateCap('plate', retrivedInfo.plate)}}
-				menu.close()
+				local elements = {
+					{unselectable = true, icon = "fas fa-car", title = element.title},
+					{unselectable = true, icon = "fas fa-car", title = TranslateCap('plate', retrivedInfo.plate)}			
+				}
 
 				if not retrivedInfo.owner then
-					table.insert(elements, {label = TranslateCap('owner_unknown')})
+					elements[#elements+1] = {unselectable = true, icon = "fas fa-user", title = TranslateCap('owner_unknown')}
 				else
-					table.insert(elements, {label = TranslateCap('owner', retrivedInfo.owner)})
+					elements[#elements+1] = {unselectable = true, icon = "fas fa-user", title = TranslateCap('owner', retrivedInfo.owner)}
 				end
 
-				ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_infos', {
-					title    = TranslateCap('vehicle_info'),
-					align    = 'top-left',
-					elements = elements
-				}, nil, function(data2, menu2)
-					menu2.close()
+				ESX.OpenContext("right", elements, nil, function(menu)
+					OpenPoliceActionsMenu()
 				end)
 			end, data.value)
-
 		end
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function ShowPlayerLicense(player)
-	local elements = {}
+	local elements = {
+		{unselectable = true, icon = "fas fa-scroll", title = TranslateCap('license_revoke')}
+	}
 
 	ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(playerData)
 		if playerData.licenses then
 			for i=1, #playerData.licenses, 1 do
 				if playerData.licenses[i].label and playerData.licenses[i].type then
-					table.insert(elements, {
-						label = playerData.licenses[i].label,
+					elements[#elements+1] = {
+						icon = "fas fa-scroll",
+						title = playerData.licenses[i].label,
 						type = playerData.licenses[i].type
-					})
+					}
 				end
 			end
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'manage_license', {
-			title    = TranslateCap('license_revoke'),
-			align    = 'top-left',
-			elements = elements,
-		}, function(data, menu)
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			ESX.ShowNotification(TranslateCap('licence_you_revoked', data.current.label, playerData.name))
 			TriggerServerEvent('esx_policejob:message', GetPlayerServerId(player), TranslateCap('license_revoked', data.current.label))
 
@@ -624,85 +614,77 @@ function ShowPlayerLicense(player)
 			ESX.SetTimeout(300, function()
 				ShowPlayerLicense(player)
 			end)
-		end, function(data, menu)
-			menu.close()
 		end)
-
 	end, GetPlayerServerId(player))
 end
 
 function OpenUnpaidBillsMenu(player)
-	local elements = {}
+	local elements = {
+		{unselectable = true, icon = "fas fa-scroll", title = TranslateCap('unpaid_bills')}
+	}
 
 	ESX.TriggerServerCallback('esx_billing:getTargetBills', function(bills)
 		for k,bill in ipairs(bills) do
-			table.insert(elements, {
-				label = ('%s - <span style="color:red;">%s</span>'):format(bill.label, TranslateCap('armory_item', ESX.Math.GroupDigits(bill.amount))),
+			elements[#elements+1] = {
+				unselectable = true,
+				icon = "fas fa-scroll",
+				title = ('%s - <span style="color:red;">%s</span>'):format(bill.label, TranslateCap('armory_item', ESX.Math.GroupDigits(bill.amount))),
 				billId = bill.id
-			})
+			}
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', {
-			title    = TranslateCap('unpaid_bills'),
-			align    = 'top-left',
-			elements = elements
-		}, nil, function(data, menu)
-			menu.close()
-		end)
+		ESX.OpenContext("right", elements, nil, nil)
 	end, GetPlayerServerId(player))
 end
 
 function OpenVehicleInfosMenu(vehicleData)
 	ESX.TriggerServerCallback('esx_policejob:getVehicleInfos', function(retrivedInfo)
-		local elements = {{label = TranslateCap('plate', retrivedInfo.plate)}}
+		local elements = {
+			{unselectable = true, icon = "fas fa-car", title = TranslateCap('vehicle_info')},
+			{icon = "fas fa-car", title = TranslateCap('plate', retrivedInfo.plate)}
+			
+		}
 
 		if not retrivedInfo.owner then
-			table.insert(elements, {label = TranslateCap('owner_unknown')})
+			elements[#elements+1] = {unselectable = true, icon = "fas fa-user", title = TranslateCap('owner_unknown')}
 		else
-			table.insert(elements, {label = TranslateCap('owner', retrivedInfo.owner)})
+			elements[#elements+1] = {unselectable = true, icon = "fas fa-user", title = TranslateCap('owner', retrivedInfo.owner)}
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_infos', {
-			title    = TranslateCap('vehicle_info'),
-			align    = 'top-left',
-			elements = elements
-		}, nil, function(data, menu)
-			menu.close()
-		end)
+		ESX.OpenContext("right", elements, nil, nil)
 	end, vehicleData.plate)
 end
 
 function OpenGetWeaponMenu()
 	ESX.TriggerServerCallback('esx_policejob:getArmoryWeapons', function(weapons)
-		local elements = {}
+		local elements = {
+			{unselectable = true, icon = "fas fa-gun", title = TranslateCap('get_weapon_menu')}
+		}
 
 		for i=1, #weapons, 1 do
 			if weapons[i].count > 0 then
-				table.insert(elements, {
-					label = 'x' .. weapons[i].count .. ' ' .. ESX.GetWeaponLabel(weapons[i].name),
+				elements[#elements+1] = {
+					icon = "fas fa-gun",
+					title = 'x' .. weapons[i].count .. ' ' .. ESX.GetWeaponLabel(weapons[i].name),
 					value = weapons[i].name
-				})
+				}
 			end
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'armory_get_weapon', {
-			title    = TranslateCap('get_weapon_menu'),
-			align    = 'top-left',
-			elements = elements
-		}, function(data, menu)
-			menu.close()
-
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			ESX.TriggerServerCallback('esx_policejob:removeArmoryWeapon', function()
+				ESX.CloseContext()
 				OpenGetWeaponMenu()
 			end, data.current.value)
-		end, function(data, menu)
-			menu.close()
 		end)
 	end)
 end
 
 function OpenPutWeaponMenu()
-	local elements   = {}
+	local elements   = {
+		{unselectable = true, icon = "fas fa-gun", title = TranslateCap('put_weapon_menu')}
+	}
 	local playerPed  = PlayerPedId()
 	local weaponList = ESX.GetWeaponList()
 
@@ -710,30 +692,27 @@ function OpenPutWeaponMenu()
 		local weaponHash = joaat(weaponList[i].name)
 
 		if HasPedGotWeapon(playerPed, weaponHash, false) and weaponList[i].name ~= 'WEAPON_UNARMED' then
-			table.insert(elements, {
-				label = weaponList[i].label,
+			elements[#elements+1] = {
+				icon = "fas fa-gun",
+				title = weaponList[i].label,
 				value = weaponList[i].name
-			})
+			}
 		end
 	end
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'armory_put_weapon', {
-		title    = TranslateCap('put_weapon_menu'),
-		align    = 'top-left',
-		elements = elements
-	}, function(data, menu)
-		menu.close()
-
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {current = element}
 		ESX.TriggerServerCallback('esx_policejob:addArmoryWeapon', function()
+			ESX.CloseContext()
 			OpenPutWeaponMenu()
 		end, data.current.value, true)
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function OpenBuyWeaponsMenu()
-	local elements = {}
+	local elements = {
+		{unselectable = true, icon = "fas fa-gun", title = TranslateCap('armory_weapontitle')}
+	}
 	local playerPed = PlayerPedId()
 
 	for k,v in ipairs(Config.AuthorizedWeapons[ESX.PlayerData.job.grade_name]) do
@@ -757,15 +736,16 @@ function OpenBuyWeaponsMenu()
 						end
 					end
 
-					table.insert(components, {
-						label = label,
+					components[#components+1] = {
+						icon = "fas fa-gun",
+						title = label,
 						componentLabel = component.label,
 						hash = component.hash,
 						name = component.name,
 						price = v.components[i],
 						hasComponent = hasComponent,
 						componentNum = i
-					})
+					}
 				end
 			end
 		end
@@ -782,21 +762,19 @@ function OpenBuyWeaponsMenu()
 			end
 		end
 
-		table.insert(elements, {
-			label = label,
+		elements[#elements+1] = {
+			icon = "fas fa-gun",
+			title = label,
 			weaponLabel = weapon.label,
 			name = weapon.name,
 			components = components,
 			price = v.price,
 			hasWeapon = hasWeapon
-		})
+		}
 	end
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'armory_buy_weapons', {
-		title    = TranslateCap('armory_weapontitle'),
-		align    = 'top-left',
-		elements = elements
-	}, function(data, menu)
+	ESX.OpenContext("right", elements, function(menu,element)
+		local data = {current = element}
 		if data.current.hasWeapon then
 			if #data.current.components > 0 then
 				OpenWeaponComponentShop(data.current.components, data.current.name, menu)
@@ -815,17 +793,13 @@ function OpenBuyWeaponsMenu()
 				end
 			end, data.current.name, 1)
 		end
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function OpenWeaponComponentShop(components, weaponName, parentShop)
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'armory_buy_weapons_components', {
-		title    = TranslateCap('armory_componenttitle'),
-		align    = 'top-left',
-		elements = components
-	}, function(data, menu)
+
+	ESX.OpenContext("right", components, function(menu,element)
+		local data = {current = element}
 		if data.current.hasComponent then
 			ESX.ShowNotification(TranslateCap('armory_hascomponent'))
 		else
@@ -843,96 +817,94 @@ function OpenWeaponComponentShop(components, weaponName, parentShop)
 				end
 			end, weaponName, 2, data.current.componentNum)
 		end
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
 function OpenGetStocksMenu()
 	ESX.TriggerServerCallback('esx_policejob:getStockItems', function(items)
-		local elements = {}
+		local elements = {
+			{unselectable = true, icon = "fas fa-box", title = TranslateCap('police_stock')}
+		}
 
 		for i=1, #items, 1 do
-			table.insert(elements, {
-				label = 'x' .. items[i].count .. ' ' .. items[i].label,
+			elements[#elements+1] = {
+				icon = "fas fa-box",
+				title = 'x' .. items[i].count .. ' ' .. items[i].label,
 				value = items[i].name
-			})
+			}
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'stocks_menu', {
-			title    = TranslateCap('police_stock'),
-			align    = 'top-left',
-			elements = elements
-		}, function(data, menu)
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			local itemName = data.current.value
 
-			ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'stocks_menu_get_item_count', {
-				title = TranslateCap('quantity')
-			}, function(data2, menu2)
+			local elements2 = {
+				{unselectable = true, icon = "fas fa-box", title = element.title},
+				{title = TranslateCap('quantity'), input = true, inputType = "number", inputMin = 1, inputMax = 150, inputPlaceholder = "Amount to withdraw.."},
+				{icon = "fas fa-check-double", title = "Confirm", value = "confirm"}
+			}
+
+			ESX.OpenContext("right", elements2, function(menu2,element2)
+				local data2 = {value = menu2.eles[2].inputValue}
 				local count = tonumber(data2.value)
 
 				if not count then
 					ESX.ShowNotification(TranslateCap('quantity_invalid'))
 				else
-					menu2.close()
-					menu.close()
+					ESX.CloseContext()
 					TriggerServerEvent('esx_policejob:getStockItem', itemName, count)
 
 					Wait(300)
 					OpenGetStocksMenu()
 				end
-			end, function(data2, menu2)
-				menu2.close()
 			end)
-		end, function(data, menu)
-			menu.close()
 		end)
 	end)
 end
 
 function OpenPutStocksMenu()
 	ESX.TriggerServerCallback('esx_policejob:getPlayerInventory', function(inventory)
-		local elements = {}
+		local elements = {
+			{unselectable = true, icon = "fas fa-box", title = TranslateCap('inventory')}
+		}
 
 		for i=1, #inventory.items, 1 do
 			local item = inventory.items[i]
 
 			if item.count > 0 then
-				table.insert(elements, {
-					label = item.label .. ' x' .. item.count,
+				elements[#elements+1] = {
+					icon = "fas fa-box",
+					title = item.label .. ' x' .. item.count,
 					type = 'item_standard',
 					value = item.name
-				})
+				}
 			end
 		end
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'stocks_menu', {
-			title    = TranslateCap('inventory'),
-			align    = 'top-left',
-			elements = elements
-		}, function(data, menu)
+		ESX.OpenContext("right", elements, function(menu,element)
+			local data = {current = element}
 			local itemName = data.current.value
 
-			ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'stocks_menu_put_item_count', {
-				title = TranslateCap('quantity')
-			}, function(data2, menu2)
+			local elements2 = {
+				{unselectable = true, icon = "fas fa-box", title = element.title},
+				{title = TranslateCap('quantity'), input = true, inputType = "number", inputMin = 1, inputMax = 150, inputPlaceholder = "Amount to withdraw.."},
+				{icon = "fas fa-check-double", title = "Confirm", value = "confirm"}
+			}
+
+			ESX.OpenContext("right", elements2, function(menu2,element2)
+				local data2 = {value = menu2.eles[2].inputValue}
 				local count = tonumber(data2.value)
 
 				if not count then
 					ESX.ShowNotification(TranslateCap('quantity_invalid'))
 				else
-					menu2.close()
-					menu.close()
+					ESX.CloseContext()
 					TriggerServerEvent('esx_policejob:putStockItems', itemName, count)
 
 					Wait(300)
 					OpenPutStocksMenu()
 				end
-			end, function(data2, menu2)
-				menu2.close()
 			end)
-		end, function(data, menu)
-			menu.close()
 		end)
 	end)
 end
@@ -993,7 +965,7 @@ end)
 
 AddEventHandler('esx_policejob:hasExitedMarker', function(station, part, partNum)
 	if not isInShopMenu then
-		ESX.UI.Menu.CloseAll()
+		ESX.CloseContext()
 	end
 
 	CurrentAction = nil
@@ -1437,7 +1409,7 @@ ESX.RegisterInput("police:interact", "(ESX PoliceJob) Interact", "keyboard", "E"
 	elseif CurrentAction == 'delete_vehicle' then
 		ESX.Game.DeleteVehicle(CurrentActionData.vehicle)
 	elseif CurrentAction == 'menu_boss_actions' then
-		ESX.UI.Menu.CloseAll()
+		ESX.CloseContext()
 		TriggerEvent('esx_society:openBossMenu', 'police', function(data, menu)
 			menu.close()
 

[esx_addons]/esx_policejob/client/vehicle.lua

@@ -3,16 +3,15 @@ local spawnedVehicles = {}
 
 function OpenVehicleSpawnerMenu(type, station, part, partNum)
 	local playerCoords = GetEntityCoords(PlayerPedId())
+	local elements = {
+		{unselectable = true, icon = "fas fa-car", title = TranslateCap('garage_title')},
+		{icon = "fas fa-car", title = TranslateCap('garage_storeditem'), action = 'garage'},
+		{icon = "fas fa-car", title = TranslateCap('garage_storeitem'), action = 'store_garage'},
+		{icon = "fas fa-car", title = TranslateCap('garage_buyitem'), action = 'buy_vehicle'}
+	}
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle', {
-		title    = TranslateCap('garage_title'),
-		align    = 'top-left',
-		elements = {
-			{label = TranslateCap('garage_storeditem'), action = 'garage'},
-			{label = TranslateCap('garage_storeitem'), action = 'store_garage'},
-			{label = TranslateCap('garage_buyitem'), action = 'buy_vehicle'}
-	}}, function(data, menu)
-		if data.current.action == 'buy_vehicle' then
+	ESX.OpenContext("right", elements, function(menu,element)
+		if element.action == "buy_vehicle" then
 			local shopElements = {}
 			local shopCoords = Config.PoliceStations[station][part][partNum].InsideShop
 			local authorizedVehicles = Config.AuthorizedVehicles[type][ESX.PlayerData.job.grade_name]
@@ -23,14 +22,15 @@ function OpenVehicleSpawnerMenu(type, station, part, partNum)
 						if IsModelInCdimage(vehicle.model) then
 							local vehicleLabel = GetLabelText(GetDisplayNameFromVehicleModel(vehicle.model))
 
-							table.insert(shopElements, {
-								label = ('%s - <span style="color:green;">%s</span>'):format(vehicleLabel, TranslateCap('shop_item', ESX.Math.GroupDigits(vehicle.price))),
+							shopElements[#shopElements+1] = {
+								icon = 'fas fa-car',
+								title = ('%s - <span style="color:green;">%s</span>'):format(vehicleLabel, TranslateCap('shop_item', ESX.Math.GroupDigits(vehicle.price))),
 								name  = vehicleLabel,
 								model = vehicle.model,
 								price = vehicle.price,
 								props = vehicle.props,
 								type  = type
-							})
+							}
 						end
 					end
 
@@ -45,8 +45,10 @@ function OpenVehicleSpawnerMenu(type, station, part, partNum)
 			else
 				ESX.ShowNotification(TranslateCap('garage_notauthorized'))
 			end
-		elseif data.current.action == 'garage' then
-			local garage = {}
+		elseif element.action == "garage" then
+			local garage = {
+				{unselectable = true, icon = "fas fa-car", title = "Garage"}
+			}
 
 			ESX.TriggerServerCallback('esx_vehicleshop:retrieveJobVehicles', function(jobVehicles)
 				if #jobVehicles > 0 then
@@ -65,42 +67,37 @@ function OpenVehicleSpawnerMenu(type, station, part, partNum)
 								label = label .. ('<span style="color:darkred;">%s</span>'):format(TranslateCap('garage_notstored'))
 							end
 
-							table.insert(garage, {
-								label = label,
+							garage[#garage+1] = {
+								icon = 'fas fa-car',
+								title = label,
 								stored = v.stored,
 								model = props.model,
 								plate = props.plate
-							})
+							}
 
 							allVehicleProps[props.plate] = props
 						end
 					end
 
 					if #garage > 0 then
-						ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_garage', {
-							title    = TranslateCap('garage_title'),
-							align    = 'top-left',
-							elements = garage
-						}, function(data2, menu2)
-							if data2.current.stored == 1 then
+						ESX.OpenContext("right", garage, function(menuG,elementG)
+							if elementG.stored == 1 then
 								local foundSpawn, spawnPoint = GetAvailableVehicleSpawnPoint(station, part, partNum)
 
 								if foundSpawn then
-									menu2.close()
+									ESX.CloseContext()
 
-									ESX.Game.SpawnVehicle(data2.current.model, spawnPoint.coords, spawnPoint.heading, function(vehicle)
-										local vehicleProps = allVehicleProps[data2.current.plate]
+									ESX.Game.SpawnVehicle(elementG.model, spawnPoint.coords, spawnPoint.heading, function(vehicle)
+										local vehicleProps = allVehicleProps[elementG.plate]
 										ESX.Game.SetVehicleProperties(vehicle, vehicleProps)
 
-										TriggerServerEvent('esx_vehicleshop:setJobVehicleState', data2.current.plate, false)
+										TriggerServerEvent('esx_vehicleshop:setJobVehicleState', elementG.plate, false)
 										ESX.ShowNotification(TranslateCap('garage_released'))
 									end)
 								end
 							else
 								ESX.ShowNotification(TranslateCap('garage_notavailable'))
 							end
-						end, function(data2, menu2)
-							menu2.close()
 						end)
 					else
 						ESX.ShowNotification(TranslateCap('garage_empty'))
@@ -109,11 +106,9 @@ function OpenVehicleSpawnerMenu(type, station, part, partNum)
 					ESX.ShowNotification(TranslateCap('garage_empty'))
 				end
 			end, type)
-		elseif data.current.action == 'store_garage' then
+		elseif element.action == "store_garage" then
 			StoreNearbyVehicle(playerCoords)
 		end
-	end, function(data, menu)
-		menu.close()
 	end)
 end
 
@@ -207,85 +202,74 @@ end
 function OpenShopMenu(elements, restoreCoords, shopCoords)
 	local playerPed = PlayerPedId()
 	isInShopMenu = true
+	ESX.OpenContext("right", elements, function(menu,element)
+		local elements2 = {
+			{unselectable = true, icon = "fas fa-car", title = element.title},
+			{icon = "fas fa-eye", title = "View", value = "view"}
+		}
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_shop', {
-		title    = TranslateCap('vehicleshop_title'),
-		align    = 'top-left',
-		elements = elements
-	}, function(data, menu)
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_shop_confirm', {
-			title    = TranslateCap('vehicleshop_confirm', data.current.name, data.current.price),
-			align    = 'top-left',
-			elements = {
-				{label = TranslateCap('confirm_no'), value = 'no'},
-				{label = TranslateCap('confirm_yes'), value = 'yes'}
-		}}, function(data2, menu2)
-			if data2.current.value == 'yes' then
-				local newPlate = exports['esx_vehicleshop']:GeneratePlate()
-				local vehicle  = GetVehiclePedIsIn(playerPed, false)
-				local props    = ESX.Game.GetVehicleProperties(vehicle)
-				props.plate    = newPlate
+		ESX.OpenContext("right", elements2, function(menu2,element2)
+			if element2.value == "view" then
+				DeleteSpawnedVehicles()
+				WaitForVehicleToLoad(element.model)
 
-				ESX.TriggerServerCallback('esx_policejob:buyJobVehicle', function (bought)
-					if bought then
-						ESX.ShowNotification(TranslateCap('vehicleshop_bought', data.current.name, ESX.Math.GroupDigits(data.current.price)))
+				ESX.Game.SpawnLocalVehicle(element.model, shopCoords, 0.0, function(vehicle)
+					table.insert(spawnedVehicles, vehicle)
+					TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
+					FreezeEntityPosition(vehicle, true)
+					SetModelAsNoLongerNeeded(element.model)
 
+					if element.props then
+						ESX.Game.SetVehicleProperties(vehicle, element.props)
+					end
+				end)
+
+				local elements3 = {
+					{unselectable = true, icon = "fas fa-car", title = element.title},
+					{icon = "fas fa-check-double", title = "Buy", value = "buy"},
+					{icon = "fas fa-eye", title = "Stop Viewing", value = "stop"}
+				}
+
+				ESX.OpenContext("right", elements3, function(menu3,element3)
+					if element3.value == 'stop' then
 						isInShopMenu = false
-						ESX.UI.Menu.CloseAll()
+						ESX.CloseContext()
+
 						DeleteSpawnedVehicles()
 						FreezeEntityPosition(playerPed, false)
 						SetEntityVisible(playerPed, true)
 
 						ESX.Game.Teleport(playerPed, restoreCoords)
-					else
-						ESX.ShowNotification(TranslateCap('vehicleshop_money'))
-						menu2.close()
+					elseif element3.value == "buy" then
+						local newPlate = exports['esx_vehicleshop']:GeneratePlate()
+						local vehicle  = GetVehiclePedIsIn(playerPed, false)
+						local props    = ESX.Game.GetVehicleProperties(vehicle)
+						props.plate    = newPlate
+
+						ESX.TriggerServerCallback('esx_policejob:buyJobVehicle', function (bought)
+							if bought then
+								ESX.ShowNotification(TranslateCap('vehicleshop_bought', element.name, ESX.Math.GroupDigits(element.price)))
+
+								isInShopMenu = false
+								ESX.CloseContext()
+								DeleteSpawnedVehicles()
+								FreezeEntityPosition(playerPed, false)
+								SetEntityVisible(playerPed, true)
+
+								ESX.Game.Teleport(playerPed, restoreCoords)
+							else
+								ESX.ShowNotification(TranslateCap('vehicleshop_money'))
+								ESX.CloseContext()
+							end
+						end, props, element.type)
 					end
-				end, props, data.current.type)
-			else
-				menu2.close()
-			end
-		end, function(data2, menu2)
-			menu2.close()
-		end)
-	end, function(data, menu)
-		isInShopMenu = false
-		ESX.UI.Menu.CloseAll()
-
-		DeleteSpawnedVehicles()
-		FreezeEntityPosition(playerPed, false)
-		SetEntityVisible(playerPed, true)
-
-		ESX.Game.Teleport(playerPed, restoreCoords)
-	end, function(data, menu)
-		DeleteSpawnedVehicles()
-		WaitForVehicleToLoad(data.current.model)
-
-		ESX.Game.SpawnLocalVehicle(data.current.model, shopCoords, 0.0, function(vehicle)
-			table.insert(spawnedVehicles, vehicle)
-			TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
-			FreezeEntityPosition(vehicle, true)
-			SetModelAsNoLongerNeeded(data.current.model)
-
-			if data.current.props then
-				ESX.Game.SetVehicleProperties(vehicle, data.current.props)
+				end)
 			end
 		end)
 	end)
-
-	WaitForVehicleToLoad(elements[1].model)
-	ESX.Game.SpawnLocalVehicle(elements[1].model, shopCoords, 0.0, function(vehicle)
-		table.insert(spawnedVehicles, vehicle)
-		TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
-		FreezeEntityPosition(vehicle, true)
-		SetModelAsNoLongerNeeded(elements[1].model)
-
-		if elements[1].props then
-			ESX.Game.SetVehicleProperties(vehicle, elements[1].props)
-		end
-	end)
 end
 
+
 CreateThread(function()
 	while true do
 		Wait(0)