Fixed negative bills

This commit is contained in:
ElPumpo
2018-02-22 16:57:43 +01:00
parent bfed8a8f06
commit d052d98042
6 changed files with 36 additions and 34 deletions
+2
View File
@@ -12,6 +12,7 @@ server_scripts {
'locales/en.lua',
'locales/fr.lua',
'locales/es.lua',
'locales/sv.lua',
'config.lua',
'server/main.lua'
}
@@ -23,6 +24,7 @@ client_scripts {
'locales/en.lua',
'locales/fr.lua',
'locales/es.lua',
'locales/sv.lua',
'config.lua',
'client/main.lua'
}
+6 -9
View File
@@ -63,13 +63,10 @@ end
-- Key controls
Citizen.CreateThread(function()
while true do
Wait(0)
if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then
ShowBillsMenu()
GUI.Time = GetGameTimer()
end
end
Citizen.Wait(25)
if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then
ShowBillsMenu()
GUI.Time = GetGameTimer()
end
end
end)
+1 -1
View File
@@ -1,2 +1,2 @@
Config = {}
Config.Locale = 'en'
Config.Locale = 'sv'
+2 -2
View File
@@ -1,9 +1,9 @@
Locales['en'] = {
['invoices'] = 'invoices',
['received_invoice'] = 'you ~r~received~s~ an invoice',
['received_invoice'] = 'you have just ~r~received~s~ an invoice',
['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$',
['received_payment'] = 'you ~g~received~s~ a payment of ~r~$',
['player_not_logged'] = 'the player is not logged in',
['no_money'] = 'you do not have enough money to pay this bill',
}
+8
View File
@@ -0,0 +1,8 @@
Locales['sv'] = {
['invoices'] = 'räkningar',
['received_invoice'] = 'du har ~r~mottagit~s~ en räkning',
['paid_invoice'] = 'du ~g~betalade~s~ precis en räkning på ~g~$',
['received_payment'] = 'u har ~g~mottagit~s~ en räkning på ~g~$',
['player_not_logged'] = 'spelaren är inte online',
['no_money'] = 'du har inte råd för att betala räkningen',
}
+17 -22
View File
@@ -163,30 +163,25 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id)
end
else
TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account)
MySQL.Async.execute(
'DELETE from billing WHERE id = @id',
{
['@id'] = id
},
function(rowsChanged)
xPlayer.removeMoney(amount)
account.addMoney(amount)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount)
if foundPlayer ~= nil then
TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount)
end
if xPlayer.get('money') >= amount then
MySQL.Async.execute(
'DELETE from billing WHERE id = @id',
{
['@id'] = id
},
function(rowsChanged)
xPlayer.removeMoney(amount)
account.addMoney(amount)
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount)
if foundPlayer ~= nil then
TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount)
end
cb()
end
)
end)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money'))
end
end)
end