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

Added sold vehicles list

Browse Source
This commit is contained in:
ElPumpo
2018-11-25 15:54:19 +01:00
parent 592083b2ae
commit 6c570cee98
9 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+34 -4
View File
@@ -487,6 +487,7 @@ function OpenResellerMenu()
SetVehicleNumberPlateText(LastVehicles[#LastVehicles], newPlate)
TriggerServerEvent('esx_vehicleshop:sellVehicle', model)
TriggerServerEvent('esx_vehicleshop:addToList', GetPlayerServerId(closestPlayer), model, newPlate)
if Config.EnableOwnedVehicles then
TriggerServerEvent('esx_vehicleshop:setVehicleOwnedPlayerId', GetPlayerServerId(closestPlayer), vehicleProps)
@@ -513,6 +514,7 @@ function OpenResellerMenu()
SetVehicleNumberPlateText(LastVehicles[#LastVehicles], newPlate)
TriggerServerEvent('esx_vehicleshop:sellVehicle', model)
TriggerServerEvent('esx_vehicleshop:addToList', GetPlayerServerId(closestPlayer), model, newPlate)
if Config.EnableSocietyOwnedVehicles then
TriggerServerEvent('esx_vehicleshop:setVehicleOwnedSociety', xPlayer.job.name, vehicleProps)
@@ -639,12 +641,40 @@ function OpenBossActionsMenu()
title = _U('dealer_boss'),
align = 'top-left',
elements = {
{label = _U('boss_actions'), value = 'boss_actions'}
{label = _U('boss_actions'), value = 'boss_actions'},
{label = _U('boss_sold'), value = 'sold_vehicles'}
}
}, function (data, menu)
if data.current.value == 'boss_actions' then
TriggerEvent('esx_society:openBossMenu', 'cardealer', function(data, menu)
menu.close()
TriggerEvent('esx_society:openBossMenu', 'cardealer', function(data2, menu2)
menu2.close()
end)
elseif data.current.value == 'sold_vehicles' then
ESX.TriggerServerCallback('esx_vehicleshop:getSoldVehicles', function(customers)
local elements = {
head = { _U('customer_client'), _U('customer_model'), _U('customer_plate'), _U('customer_soldby'), _U('customer_date') },
rows = {}
}
for i=1, #customers, 1 do
table.insert(elements.rows, {
data = customers[i],
cols = {
customers[i].client,
customers[i].model,
customers[i].plate,
customers[i].soldby,
customers[i].date
}
})
end
ESX.UI.Menu.Open('list', GetCurrentResourceName(), 'sold_vehicles', elements, function(data2, menu2)
end, function(data2, menu2)
menu2.close()
end)
end)
end
@@ -687,7 +717,7 @@ function OpenGetStocksMenu()
TriggerServerEvent('esx_vehicleshop:getStockItem', itemName, count)
menu2.close()
menu.close()
OpenGetStocksMenu()
OpenGetStocksMenu()
end
end, function (data2, menu2)
menu2.close()
esx_vehicleshop.sql
+10
View File
@@ -26,6 +26,16 @@ CREATE TABLE `cardealer_vehicles` (
PRIMARY KEY (`id`)
);
CREATE TABLE `vehicle_sold` (
`client` VARCHAR(50) NOT NULL,
`model` VARCHAR(50) NOT NULL,
`plate` VARCHAR(50) NOT NULL,
`soldby` VARCHAR(50) NOT NULL,
`date` VARCHAR(50) NOT NULL,
PRIMARY KEY (`plate`)
)
CREATE TABLE `owned_vehicles` (
`owner` varchar(30) NOT NULL,
`plate` varchar(12) NOT NULL,
locales/br.lua
+8
View File
@@ -48,4 +48,12 @@ Locales['br'] = {
['have_withdrawn'] = 'you have withdrawn ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'you have deposited ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'boss actions',
-- sold vehicles
['boss_sold'] = 'list of sold vehicles',
['customer_client'] = 'customer name',
['customer_model'] = 'car model',
['customer_plate'] = 'car plate',
['customer_soldby'] = 'sold by',
['customer_date'] = 'date',
}
locales/en.lua
+8
View File
@@ -53,4 +53,12 @@ Locales['en'] = {
['have_withdrawn'] = 'you have withdrawn ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'you have deposited ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'boss actions',
-- sold vehicles
['boss_sold'] = 'list of sold vehicles',
['customer_client'] = 'customer name',
['customer_model'] = 'car model',
['customer_plate'] = 'car plate',
['customer_soldby'] = 'sold by',
['customer_date'] = 'date',
}
locales/fi.lua
+8
View File
@@ -53,4 +53,12 @@ Locales['fi'] = {
['have_withdrawn'] = 'sinä otit ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'sinä talletit ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'Pomo toiminnot',
-- sold vehicles
['boss_sold'] = 'list of sold vehicles',
['customer_client'] = 'customer name',
['customer_model'] = 'car model',
['customer_plate'] = 'car plate',
['customer_soldby'] = 'sold by',
['customer_date'] = 'date',
}
locales/fr.lua
+8
View File
@@ -52,4 +52,12 @@ Locales['fr'] = {
['have_withdrawn'] = 'you have withdrawn ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'you have deposited ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'boss actions',
-- sold vehicles
['boss_sold'] = 'list of sold vehicles',
['customer_client'] = 'customer name',
['customer_model'] = 'car model',
['customer_plate'] = 'car plate',
['customer_soldby'] = 'sold by',
['customer_date'] = 'date',
}
locales/pl.lua
+8
View File
@@ -51,4 +51,12 @@ Locales['pl'] = {
['have_withdrawn'] = 'wyciągasz ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'deponujesz ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'akcje szefa',
-- sold vehicles
['boss_sold'] = 'list of sold vehicles',
['customer_client'] = 'customer name',
['customer_model'] = 'car model',
['customer_plate'] = 'car plate',
['customer_soldby'] = 'sold by',
['customer_date'] = 'date',
}
locales/sv.lua
+8
View File
@@ -53,4 +53,12 @@ Locales['sv'] = {
['have_withdrawn'] = 'du har tagit ut ~y~x%s~s~ ~b~%s~s~',
['have_deposited'] = 'du har lagt in ~y~x%s~s~ ~b~%s~s~',
['boss_actions'] = 'chef handlingar',
-- sold vehicles
['boss_sold'] = 'lista av sålda fordon',
['customer_client'] = 'kund',
['customer_model'] = 'bil modell',
['customer_plate'] = 'registreringsnummer',
['customer_soldby'] = 'såld av',
['customer_date'] = 'datum',
}
server/main.lua
+26 -6
View File
@@ -92,6 +92,32 @@ AddEventHandler('esx_vehicleshop:sellVehicle', function (vehicle)
end)
end)
RegisterServerEvent('esx_vehicleshop:addToList')
AddEventHandler('esx_vehicleshop:addToList', function(target, model, plate)
local xPlayer, xTarget = ESX.GetPlayerFromId(source), ESX.GetPlayerFromId(target)
local dateNow = os.date('%Y-%m-%d %H:%M')
if xPlayer.job.name ~= 'cardealer' then
print(('esx_vehicleshop: %s attempted to add a sold vehicle to list!'):format(xPlayer.identifier))
return
end
MySQL.Async.execute('INSERT INTO vehicle_sold (client, model, plate, soldby, date) VALUES (@client, @model, @plate, @soldby, @date)', {
['@client'] = xTarget.getName(),
['@model'] = model,
['@plate'] = plate,
['@soldby'] = xPlayer.getName(),
['@date'] = dateNow
})
end)
ESX.RegisterServerCallback('esx_vehicleshop:getSoldVehicles', function (source, cb)
MySQL.Async.fetchAll('SELECT * FROM vehicle_sold', {}, function(result)
cb(result)
end)
end)
RegisterServerEvent('esx_vehicleshop:rentVehicle')
AddEventHandler('esx_vehicleshop:rentVehicle', function (vehicle, plate, playerName, basePrice, rentPrice, target)
local xPlayer = ESX.GetPlayerFromId(target)
@@ -119,12 +145,6 @@ AddEventHandler('esx_vehicleshop:rentVehicle', function (vehicle, plate, playerN
end)
end)
-- unused?
RegisterServerEvent('esx_vehicleshop:setVehicleForAllPlayers')
AddEventHandler('esx_vehicleshop:setVehicleForAllPlayers', function (props, x, y, z, radius)
TriggerClientEvent('esx_vehicleshop:setVehicle', -1, props, x, y, z, radius)
end)
RegisterServerEvent('esx_vehicleshop:getStockItem')
AddEventHandler('esx_vehicleshop:getStockItem', function (itemName, count)
local _source = source