Fix issue #112, #113

README.md

@@ -406,6 +406,7 @@ end)
 local garaIndex = nil
 local function SetupGaragesMenu()
     local isingarage, canStoreVehicle = exports["MojiaGarages"]:IsInGarage()
+	local isInJobGarage, lastJobVehicle = exports["MojiaGarages"]:isInJobStation(PlayerData.job.name)
 	local GaragesMenu = {
         id = 'garages',
         title = 'Garages',
@@ -419,7 +420,7 @@ local function SetupGaragesMenu()
 			icon = 'warehouse',
 			type = 'client',
 			event = 'MojiaGarages:client:openGarage',
-			shouldClose = false,
+			shouldClose = true,
 		}
 		local veh = nil
 		local ped = PlayerPedId()
@@ -443,7 +444,46 @@ local function SetupGaragesMenu()
 						icon = 'parking',
 						type = 'client',
 						event = 'MojiaGarages:client:storeVehicle',
-						shouldClose = false,
+						shouldClose = true,
+					}
+				end
+			end
+		end
+	end
+	if isInJobGarage then
+		if lastJobVehicle == nil then
+			GaragesMenu.items[#GaragesMenu.items+1] = {
+				id = 'openjobgarage',
+				title = 'Open Job Garage',
+				icon = 'warehouse',
+				type = 'client',
+				event = 'MojiaGarages:client:openJobVehList',
+				shouldClose = true,
+			}
+		else
+			local veh = nil
+			local ped = PlayerPedId()
+			local pos = GetEntityCoords(ped)
+			local vehout, distance = QBCore.Functions.GetClosestVehicle(pos)
+			local vehin = IsPedInAnyVehicle(ped, true)
+			if vehin then
+				veh = GetVehiclePedIsIn(ped)
+			else
+				if NetworkGetEntityIsLocal(vehout) and distance <= 5 then
+					veh = vehout
+				end
+			end
+			if veh ~= nil and veh == lastJobVehicle then
+				local plate = QBCore.Functions.GetPlate(veh)
+				if exports["qb-vehiclekeys"]:HasVehicleKey(plate) then --disable if use MojiaVehicleKeys
+			--if exports['MojiaVehicleKeys']:CheckHasKey(plate) then --enable if use MojiaVehicleKeys
+					GaragesMenu.items[#GaragesMenu.items+1] = {
+						id = 'hidejobvehicle',
+						title = 'Hide Job Vehicle',
+						icon = 'parking',
+						type = 'client',
+						event = 'MojiaGarages:client:HideJobVeh',
+						shouldClose = true,
 					}
 				end
 			end

client.lua

@@ -1631,7 +1631,10 @@ function SpawnVehicles(vehdata)
 			QBCore.Functions.SpawnVehicle(vehdata.model, function(veh)
 				SetVehicleModifications(veh, vehdata.mods)
 				SetEntityRotation(veh, vehdata.rotation)
-				exports['LegacyFuel']:SetFuel(veh, vehdata.mods.fuelLevel)			
+				exports['LegacyFuel']:SetFuel(veh, vehdata.mods.fuelLevel)
+				if not UsingMojiaVehiclekeys then
+					TriggerServerEvent('MojiaGarages:server:updateVehicleKey')
+				end
 			end, vehdata.position, true)
 		end		
 	end)
@@ -1705,4 +1708,4 @@ end)
 -- export
 
 exports('IsInGarage', IsInGarage)
-exports('isInJobStation', isInJobStation)
+exports('isInJobStation', isInJobStation)

server.lua

@@ -698,4 +698,6 @@ RegisterNetEvent('MojiaGarages:server:refreshVehicles', function()
 	RefreshVehicles()
 end)
 
-
+RegisterNetEvent('MojiaGarages:server:updateVehicleKey', function()
+	TriggerClientEvent('MojiaGarages:client:updateVehicleKey', -1, plate) -- Update vehicle key for qb-vehiclekey
+end)