starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 17:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial cleanup

Browse Source
This commit is contained in:
ElPumpo
2018-11-09 23:59:38 +01:00
parent e46daa6734
commit 6a4918b58f
4 changed files with 276 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__resource.lua
+18 -18
View File
@@ -5,27 +5,27 @@ description 'ESX Banker job'
version '1.0.1'
server_scripts {
'@async/async.lua',
'@mysql-async/lib/MySQL.lua',
'@es_extended/locale.lua',
'config.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'server/main.lua'
'@async/async.lua',
'@mysql-async/lib/MySQL.lua',
'@es_extended/locale.lua',
'config.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'server/main.lua'
}
client_scripts {
'@es_extended/locale.lua',
'config.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'client/main.lua'
'@es_extended/locale.lua',
'config.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fi.lua',
'locales/fr.lua',
'client/main.lua'
}
dependency 'es_extended'
client/main.lua
+180 -218
View File
File diff suppressed because one or more lines are too long
esx_bankerjob.sql
+1 -1
View File
@@ -12,7 +12,7 @@ INSERT INTO `jobs` (name, label) VALUES
INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
('banker',0,'advisor','Conseiller',10,'{}','{}'),
('banker',1,'banker','Banquier',20,'{}','{}'),
('banker',2,'business_banker','Banquier d\'affaire',30,'{}','{}'),
('banker',2,'business_banker',"Banquier d\'affaire",30,'{}','{}'),
('banker',3,'trader','Trader',40,'{}','{}'),
('banker',4,'boss','Patron',0,'{}','{}')
;
server/main.lua
+77 -86
View File
@@ -7,117 +7,108 @@ TriggerEvent('esx_society:registerSociety', 'banker', 'Banquier', 'society_banke
RegisterServerEvent('esx_bankerjob:customerDeposit')
AddEventHandler('esx_bankerjob:customerDeposit', function (target, amount)
local xPlayer = ESX.GetPlayerFromId(target)
local xPlayer = ESX.GetPlayerFromId(target)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function (account)
if amount > 0 and account.money >= amount then
account.removeMoney(amount)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function (account)
if amount > 0 and account.money >= amount then
account.removeMoney(amount)
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
account.addMoney(amount)
end)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('invalid_amount'))
end
end)
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
account.addMoney(amount)
end)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('invalid_amount'))
end
end)
end)
RegisterServerEvent('esx_bankerjob:customerWithdraw')
AddEventHandler('esx_bankerjob:customerWithdraw', function (target, amount)
local xPlayer = ESX.GetPlayerFromId(target)
local xPlayer = ESX.GetPlayerFromId(target)
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
if amount > 0 and account.money >= amount then
account.removeMoney(amount)
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
if amount > 0 and account.money >= amount then
account.removeMoney(amount)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function (account)
account.addMoney(amount)
end)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('invalid_amount'))
end
end)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function (account)
account.addMoney(amount)
end)
else
TriggerClientEvent('esx:showNotification', xPlayer.source, _U('invalid_amount'))
end
end)
end)
ESX.RegisterServerCallback('esx_bankerjob:getCustomers', function (source, cb)
local xPlayers = ESX.GetPlayers()
local customers = {}
local xPlayers = ESX.GetPlayers()
local customers = {}
for i=1, #xPlayers, 1 do
for i=1, #xPlayers, 1 do
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function(account)
table.insert(customers, {
source = xPlayer.source,
name = xPlayer.name,
bankSavings = account.money
})
end)
end
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
table.insert(customers, {
source = xPlayer.source,
name = GetPlayerName(xPlayer.source),
bankSavings = account.money
})
end)
end
cb(customers)
cb(customers)
end)
function CalculateBankSavings (d, h, m)
local asyncTasks = {}
function CalculateBankSavings(d, h, m)
local asyncTasks = {}
MySQL.Async.fetchAll(
'SELECT * FROM addon_account_data WHERE account_name = @account_name',
{ ['@account_name'] = 'bank_savings' },
function (result)
local bankInterests = 0
MySQL.Async.fetchAll('SELECT * FROM addon_account_data WHERE account_name = @account_name', {
['@account_name'] = 'bank_savings'
}, function(result)
local bankInterests = 0
for i=1, #result, 1 do
local foundPlayer = false
local xPlayer = ESX.GetPlayerFromIdentifier(result[i].owner)
for i=1, #result, 1 do
local xPlayer = ESX.GetPlayerFromIdentifier(result[i].owner)
if xPlayer ~= nil then
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function (account)
local interests = math.floor(account.money / 100 * Config.BankSavingPercentage)
bankInterests = bankInterests + interests
if xPlayer then
TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function(account)
local interests = math.floor(account.money / 100 * Config.BankSavingPercentage)
bankInterests = bankInterests + interests
table.insert(asyncTasks, function(cb)
account.addMoney(interests)
end)
end)
else
local interests = math.floor(result[i].money / 100 * Config.BankSavingPercentage)
local newMoney = result[i].money + interests;
bankInterests = bankInterests + interests
table.insert(asyncTasks, function(cb)
account.addMoney(interests)
end)
end)
else
local interests = math.floor(result[i].money / 100 * Config.BankSavingPercentage)
local newMoney = result[i].money + interests
bankInterests = bankInterests + interests
local scope = function (newMoney, owner)
table.insert(asyncTasks, function (cb)
local scope = function(newMoney, owner)
table.insert(asyncTasks, function(cb)
MySQL.Async.execute('UPDATE addon_account_data SET money = @money WHERE owner = @owner AND account_name = @account_name',
{
['@money'] = newMoney,
['@owner'] = owner,
['@account_name'] = 'bank_savings',
}, function(rowsChanged)
cb()
end)
end)
end
MySQL.Async.execute(
'UPDATE addon_account_data SET money = @money WHERE owner = @owner AND account_name = @account_name',
{
['@money'] = newMoney,
['@owner'] = owner,
['@account_name'] = 'bank_savings',
},
function (rowsChanged)
cb()
end
)
end)
end
scope(newMoney, result[i].owner)
end
end
scope(newMoney, result[i].owner)
end
end
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function(account)
account.addMoney(bankInterests)
end)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_banker', function (account)
account.addMoney(bankInterests)
end)
Async.parallelLimit(asyncTasks, 5, function(results)
print('[BANK] Calculated interests')
end)
Async.parallelLimit(asyncTasks, 5, function (results)
print('[BANK] Calculated interests')
end)
end
)
end)
end
TriggerEvent('cron:runAt', 22, 0, CalculateBankSavings)