starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 18:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from Djamuras/master

Browse Source 
Close menu before starting the test
This commit is contained in:
LazarusOfTheFallen
2021-02-01 17:10:24 -06:00
committed by GitHub
parent a9d82a6c99 99144215fc
commit 8d48036060
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+16 -5
View File
@@ -38,7 +38,7 @@ function StartTheoryTest()
SetNuiFocus(true, true)
end)
TriggerServerEvent('esx_dmvschool:pay', Config.Prices['dmv'])
end
function StopTheoryTest(success)
@@ -75,8 +75,6 @@ function StartDriveTest(type)
SetVehicleFuelLevel(vehicle, 100.0)
DecorSetFloat(vehicle, "_FUEL_LEVEL", GetVehicleFuelLevel(vehicle))
end)
TriggerServerEvent('esx_dmvschool:pay', Config.Prices[type])
end
function StopDriveTest(success)
@@ -146,9 +144,22 @@ function OpenDMVSchoolMenu()
}, function(data, menu)
if data.current.value == 'theory_test' then
menu.close()
StartTheoryTest()
ESX.TriggerServerCallback('esx_dmvschool:canYouPay', function(haveMoney)
if haveMoney then
StartTheoryTest()
else
ESX.ShowNotification(_U('not_enough_money'))
end
end, 'dmv')
elseif data.current.value == 'drive_test' then
StartDriveTest(data.current.type)
menu.close()
ESX.TriggerServerCallback('esx_dmvschool:canYouPay', function(haveMoney)
if haveMoney then
StartDriveTest(data.current.type)
else
ESX.ShowNotification(_U('not_enough_money'))
end
end, data.current.type)
end
end, function(data, menu)
menu.close()
locales/en.lua
+1
View File
@@ -25,4 +25,5 @@ Locales['en'] = {
['driving_too_fast'] = '~r~You\'re driving too fast,~s~ the current speed limit is: ~y~%s~s~ km/h!',
['errors'] = 'mistakes: ~r~%s~s~/%s',
['you_damaged_veh'] = 'you damaged the vehicle',
['not_enough_money'] = 'You don\'t have enough money',
}
server/main.lua
+13 -8
View File
@@ -2,6 +2,19 @@ ESX = nil
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
ESX.RegisterServerCallback('esx_dmvschool:canYouPay', function(source, cb, type)
local xPlayer = ESX.GetPlayerFromId(source)
if xPlayer.getMoney() >= Config.Prices[type] then
xPlayer.removeMoney(Config.Prices[type])
TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Prices[type]))
cb(true)
else
cb(false)
end
end)
AddEventHandler('esx:playerLoaded', function(source)
TriggerEvent('esx_license:getLicenses', source, function(licenses)
TriggerClientEvent('esx_dmvschool:loadLicenses', source, licenses)
@@ -19,11 +32,3 @@ AddEventHandler('esx_dmvschool:addLicense', function(type)
end)
end)
RegisterNetEvent('esx_dmvschool:pay')
AddEventHandler('esx_dmvschool:pay', function(price)
local _source = source
local xPlayer = ESX.GetPlayerFromId(_source)
xPlayer.removeMoney(price)
TriggerClientEvent('esx:showNotification', _source, _U('you_paid', ESX.Math.GroupDigits(price)))
end)