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

Merge pull request #455 from dolutattoo/main

Browse Source 
fix(esx_property): fixed locales and SQL queries
This commit is contained in:
Mycroft
2022-10-10 22:19:57 +01:00
committed by GitHub
parent 6b4d082024 af26e35d33
commit 0f89512118
3 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_property/client/furniture.lua
+1 -1
View File
@@ -267,7 +267,7 @@ if Config.Furniture.Enabled then
{title = TranslateCap("back"), value = "go-back", icon = "fas fa-arrow-left"}}
for k, v in pairs(Config.FurnitureCatagories[Catagory]) do
table.insert(Items, {title = v.title, value = v.name, index = k, description = "Price: " .. v.price, icon = "fas fa-shopping-cart"})
table.insert(Items, {title = v.title, value = v.name, index = k, description = _U("price", v.price), icon = "fas fa-shopping-cart"})
end
ESX.OpenContext("right", Items, function(data, element)
[esx_addons]/esx_property/locales/en.lua
+1 -1
View File
@@ -19,7 +19,7 @@ Locales['en'] = {
["place"] = "Place Furniture",
["delete_furni"] = "Delete",
["confirm_buy"] = "Do You Want To Buy %s ?",
["price"] = "Price: $&s",
["price"] = "Price: $%s",
["yes"] = "Yes",
["no"] = "No",
["action"] = "You %s ~b~%s~s~ !",
[esx_addons]/esx_property/server/main.lua
+53 -47
View File
@@ -95,54 +95,60 @@ function IsPlayerAdmin(player, action)
end
CreateThread(function()
Wait(3000)
PropertiesRefresh()
MySQL.query("ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `last_property` LONGTEXT NULL", function(result)
if result then
print("[^2INFO^7] Adding ^5last_property^7 column to users table")
end
end)
MySQL.insert("INSERT IGNORE INTO `datastore` (name, label, shared) VALUES ('property', 'Property' , 1)", function(result)
if result then
print("[^2INFO^7] Adding ^5Property^7 into ^5datastore^7 table")
end
end)
MySQL.insert("INSERT IGNORE INTO `datastore_data` (name, owner, data) VALUES ('property', NULL, '{}')", function(result)
if result then
print("[^2INFO^7] Adding ^5Property^7 into ^5datastore_data^7 table")
end
end)
if PM.Enabled then
MySQL.insert("INSERT IGNORE INTO `addon_account` (name, label, shared) VALUES (?, ? , 1)", {PM.society, PM.joblabel}, function(result)
if result then
print("[^2INFO^7] Adding ^5" .. PM.society .. " - " .. PM.joblabel .. "^7 into ^5addon_account^7 table")
end
end)
local Existance = ESX.DoesJobExist(PM.job, 0)
if not Existance then
MySQL.query("INSERT INTO `jobs` VALUES (?, ?, 1)", {PM.job, PM.joblabel}, function(result)
if result then
print("[^2INFO^7] Inserting ^5" .. PM.job .. " - " .. PM.joblabel .. "^7 into ^5jobs^7 table")
end
end)
end
for i = 1, #PM.jobRanks do
local Existance = ESX.DoesJobExist(PM.job, PM.jobRanks[i].grade)
if not Existance then
MySQL.query("INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES (?, ?,?, ?, ?,'{}','{}')",
{PM.job, PM.jobRanks[i].grade, PM.jobRanks[i].name, PM.jobRanks[i].label, PM.jobRanks[i].salary}, function(result)
if result then
print("[^2INFO^7] Inserting ^5" .. PM.job .. " - " .. PM.jobRanks[i].grade .. " - " .. PM.jobRanks[i].label ..
"^7 into ^5job_grades^7 table")
Wait(3000)
PropertiesRefresh()
MySQL.query("ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `last_property` LONGTEXT NULL", function(result)
if result?.affectedRows > 0 then
print("[^2INFO^7] Added ^5last_property^7 column to users table")
end
end)
-- Check if datastore table exists before to insert values.
if MySQL.scalar.await("SELECT EXISTS (SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_TYPE LIKE 'BASE TABLE' AND TABLE_NAME = 'datastore')") > 0 then
MySQL.insert("INSERT IGNORE INTO `datastore` (name, label, shared) VALUES ('property', 'Property' , 1)", function(affectedRows)
if affectedRows > 0 then
print("[^2INFO^7] Added ^5Property^7 into ^5datastore^7 table")
end
end)
MySQL.insert("INSERT IGNORE INTO `datastore_data` (name, owner, data) VALUES ('property', NULL, '{}')", function(affectedRows)
if affectedRows > 0 then
print("[^2INFO^7] Added ^5Property^7 into ^5datastore_data^7 table")
end
end)
end
if PM.Enabled then
if MySQL.scalar.await("SELECT EXISTS (SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_TYPE LIKE 'BASE TABLE' AND TABLE_NAME = 'datastore')") > 0 then
MySQL.insert("INSERT IGNORE INTO `addon_account` (name, label, shared) VALUES (?, ? , 1)", {PM.society, PM.joblabel}, function(affectedRows)
if affectedRows > 0 then
print("[^2INFO^7] Added ^5" .. PM.society .. " - " .. PM.joblabel .. "^7 into ^5addon_account^7 table")
end
end)
end
end)
end
end
Wait(10)
ESX.RefreshJobs()
TriggerEvent('esx_society:registerSociety', 'realestateagent', 'realestateagent', 'society_realestateagent', 'society_realestateagent',
'society_realestateagent', {type = 'private'})
end
if not ESX.DoesJobExist(PM.job, 0) then
MySQL.insert("INSERT INTO `jobs` SET name = ?, label = ?, whitelisted = 1", {PM.job, PM.joblabel}, function(affectedRows)
if affectedRows > 0 then
print("[^2INFO^7] Inserted ^5" .. PM.job .. " - " .. PM.joblabel .. "^7 into ^5jobs^7 table")
end
end)
end
local QUERIES = {}
for i = 1, #PM.jobRanks do
if not ESX.DoesJobExist(PM.job, PM.jobRanks[i].grade) then
QUERIES[i] = {
query = "INSERT INTO `job_grades` SET job_name = ?, grade = ?, name = ?, label = ?, salary = ?, skin_male = '{}', skin_female = '{}'",
parameters = { PM.job, PM.jobRanks[i].grade, PM.jobRanks[i].name, PM.jobRanks[i].label, PM.jobRanks[i].salary }
}
end
end
MySQL.transaction(QUERIES)
Wait(10)
ESX.RefreshJobs()
TriggerEvent('esx_society:registerSociety', 'realestateagent', 'realestateagent', 'society_realestateagent', 'society_realestateagent', 'society_realestateagent', {type = 'private'})
end
end)
AddEventHandler("esx:playerLoaded", function(playerId, xPlayer)