fix lint error

server-data/resources/[esx]/esx_society/README.md

@@ -10,7 +10,7 @@ Society management for ESX. Adds employee management (hire, fire, promote / demo
 
 ### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-fvm install --save --folder=esx esx-framework/esx_society
+fvm install --save --folder=esx esx-org/esx_society
 ```
 
 ### Using Git
@@ -20,7 +20,7 @@ git clone https://github.com/ESX-Org/esx_society [esx]/esx_society
 ```
 
 ### Manually
-- Download https://github.com/esx-framework/esx_society/archive/master.zip
+- Download https://github.com/ESX-Org/esx_society/archive/master.zip
 - Put it in the `[esx]` directory
 
 ## Installation
@@ -44,8 +44,8 @@ TriggerServerEvent('esx_society:depositMoney', society, amount)
 TriggerServerEvent('esx_society:washMoney', society, amount)
 
 
-TriggerEvent('esx_society:openBossMenu', society, function (menu)
-	ESX.CloseContext() 
+TriggerEvent('esx_society:openBossMenu', society, function (data, menu)
+	menu.close()
 end, {wash = false}) -- set custom options, e.g disable washing
 ```
 

server-data/resources/[esx]/esx_society/client/main.lua

@@ -1,4 +1,51 @@
-function OpenBossMenu(society, close, options)
+RegisterNetEvent('esx:setJob')
+AddEventHandler('esx:setJob', function(job)
+	ESX.PlayerData.job = job
+	RefreshBussHUD()
+end)
+
+RegisterNetEvent('esx:playerLoaded')
+AddEventHandler('esx:playerLoaded', function(xPlayer)
+	ESX.PlayerData = xPlayer
+	ESX.PlayerLoaded = true
+	RefreshBussHUD()
+end)
+
+function RefreshBussHUD()
+	DisableSocietyMoneyHUDElement()
+
+	if ESX.PlayerData.job.grade_name == 'boss' then
+		EnableSocietyMoneyHUDElement()
+
+		ESX.TriggerServerCallback('esx_society:getSocietyMoney', function(money)
+			UpdateSocietyMoneyHUDElement(money)
+		end, ESX.PlayerData.job.name)
+	end
+end
+
+RegisterNetEvent('esx_addonaccount:setMoney')
+AddEventHandler('esx_addonaccount:setMoney', function(society, money)
+	if ESX.PlayerData.job and ESX.PlayerData.job.grade_name == 'boss' and 'society_' .. ESX.PlayerData.job.name == society then
+		UpdateSocietyMoneyHUDElement(money)
+	end
+end)
+
+function EnableSocietyMoneyHUDElement()
+
+	TriggerEvent('esx_society:toggleSocietyHud', true)
+end
+
+function DisableSocietyMoneyHUDElement()
+
+	TriggerEvent('esx_society:toggleSocietyHud', false)
+end
+
+function UpdateSocietyMoneyHUDElement(money)
+
+	TriggerEvent('esx_society:setSocietyMoney', money)
+end
+
+function OpenBossMenu(society, _, options)
 	options = options or {}
 	local elements = {
 		{unselectable = true, icon = "fas fa-user", title = _U('boss_menu')}
@@ -49,10 +96,10 @@ function OpenBossMenu(society, close, options)
 					TriggerServerEvent('esx_society:checkSocietyBalance', society)
 				elseif element.value == "withdraw_society_money" then
 					local elements = {
-						{unselectable = true, icon = "fas fa-wallet", title = _U('withdraw_amount'), description = _U('withdraw_description')},
-						{icon = "fas fa-wallet", title = _U('amount_title'), input = true, inputType = "number", inputPlaceholder = _U('withdraw_amount_placeholder'), inputMin = 1, inputMax = 250000, name = "withdraw"},
-						{icon = "fas fa-check", title = _U('confirm'), value = "confirm"},
-						{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+						{unselectable = true, icon = "fas fa-wallet", title = _U('withdraw_amount'), description = "Withdraw money from the society account"},
+						{icon = "fas fa-wallet", title = "Amount", input = true, inputType = "number", inputPlaceholder = "Amount to withdraw..", inputMin = 1, inputMax = 250000, name = "withdraw"},
+						{icon = "fas fa-check", title = "Confirm", value = "confirm"},
+						{icon = "fas fa-arrow-left", title = "Return", value = "return"}
 					}
 					ESX.RefreshContext(elements)
 				elseif element.value == "confirm" then
@@ -65,10 +112,10 @@ function OpenBossMenu(society, close, options)
 					end
 				elseif element.value == "deposit_money" then
 					local elements = {
-						{unselectable = true, icon = "fas fa-wallet", title = _U('deposit_amount'), description = _U('deposit_description')},
-						{icon = "fas fa-wallet", title = _U('amount_title'), input = true, inputType = "number", inputPlaceholder = _U('deposit_amount_placeholder'), inputMin = 1, inputMax = 250000, name = "deposit"},
-						{icon = "fas fa-check", title = _U('confirm'), value = "confirm2"},
-						{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+						{unselectable = true, icon = "fas fa-wallet", title = _U('deposit_amount'), description = "Deposit some money into the society account"},
+						{icon = "fas fa-wallet", title = "Amount", input = true, inputType = "number", inputPlaceholder = "Amount to deposit..", inputMin = 1, inputMax = 250000, name = "deposit"},
+						{icon = "fas fa-check", title = "Confirm", value = "confirm2"},
+						{icon = "fas fa-arrow-left", title = "Return", value = "return"}
 					}
 					ESX.RefreshContext(elements)
 				elseif element.value == "confirm2" then
@@ -81,10 +128,10 @@ function OpenBossMenu(society, close, options)
 					end
 				elseif element.value == "wash_money" then
 					local elements = {
-						{unselectable = true, icon = "fas fa-wallet", title = _U('wash_money_amount'), description = _U('wash_money_description')},
-						{icon = "fas fa-wallet", title = _U('amount_title'), input = true, inputType = "number", inputPlaceholder = _U('money_wash_amount_placeholder'), inputMin = 1, inputMax = 250000, name = "wash"},
-						{icon = "fas fa-check", title = _U('confirm'), value = "confirm3"},
-						{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+						{unselectable = true, icon = "fas fa-wallet", title = _U('wash_money_amount'), description = "Deposit some money into the money wash"},
+						{icon = "fas fa-wallet", title = "Amount", input = true, inputType = "number", inputPlaceholder = "Amount to wash..", inputMin = 1, inputMax = 250000, name = "wash"},
+						{icon = "fas fa-check", title = "Confirm", value = "confirm3"},
+						{icon = "fas fa-arrow-left", title = "Return", value = "return"}
 					}
 					ESX.RefreshContext(elements)
 				elseif element.value == "confirm3" then
@@ -104,7 +151,7 @@ function OpenBossMenu(society, close, options)
 				elseif element.value == "return" then
 					OpenBossMenu(society, nil, options)
 				end
-			end, close)
+			end)
 		end
 	end, society)
 end
@@ -115,14 +162,14 @@ function OpenManageEmployeesMenu(society, options)
 		{icon = "fas fa-users", title = _U('employee_list'), value = "employee_list"},
 		{icon = "fas fa-users", title = _U('recruit'), value = "recruit"}
 	}
-	
-	elements[#elements+1] = {icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
-	
-	ESX.OpenContext("right", elements, function(menu,element)
+
+	elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
+
+	ESX.OpenContext("right", elements, function(_, element)
 		if element.value == "employee_list" then
 			OpenEmployeeList(society, options)
 		elseif element.value == "recruit" then
-			OpenRecruitMenu(society, options)	
+			OpenRecruitMenu(society, options)
 		elseif element.value == "return" then
 			OpenBossMenu(society, nil, options)
 		end
@@ -132,7 +179,7 @@ end
 function OpenEmployeeList(society, options)
 	ESX.TriggerServerCallback('esx_society:getEmployees', function(employees)
 		local elements = {
-			{unselectable = true, icon = "fas fa-user", title = _U('employees_title')}
+			{unselectable = true, icon = "fas fa-user", title = "Employees"}
 		}
 
 		for i=1, #employees, 1 do
@@ -141,19 +188,19 @@ function OpenEmployeeList(society, options)
 			elements[#elements+1] = {icon = "fas fa-user", title = employees[i].name .. " | " ..gradeLabel, gradeLabel = gradeLabel, data = employees[i]}
 		end
 
-		elements[#elements+1] = {icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+		elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
 
-		ESX.OpenContext("right", elements, function(menu,element) 
+		ESX.OpenContext("right", elements, function(_,element)
 			if element.value == "return" then
 				OpenManageEmployeesMenu(society, options)
 			else
 				local elements2 = {
 					{unselectable = true, icon = "fas fa-user", title = element.title},
-					{icon = "fas fa-user", title = _U('promote'), value = "promote"},
-					{icon = "fas fa-user", title = _U('fire'), value = "fire"},
-					{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+					{icon = "fas fa-user", title = "Promote", value = "promote"},
+					{icon = "fas fa-user", title = "Fire", value = "fire"},
+					{icon = "fas fa-arrow-left", title = "Return", value = "return"}
 				}
-				ESX.OpenContext("right", elements2, function(menu2,element2)
+				ESX.OpenContext("right", elements2, function(_,element2)
 					local employee = element.data
 					if element2.value == "promote" then
 						ESX.CloseContext()
@@ -185,18 +232,18 @@ function OpenRecruitMenu(society, options)
 			end
 		end
 
-		elements[#elements+1] = {icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+		elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
 
-		ESX.OpenContext("right", elements, function(menu,element)
+		ESX.OpenContext("right", elements, function(_,element)
 			if element.value == "return" then
 				OpenManageEmployeesMenu(society, options)
 			else
 				local elements2 = {
-					{unselectable = true, icon = "fas fa-user", title = _U('confirm')},
+					{unselectable = true, icon = "fas fa-user", title = "Confirm"},
 					{icon = "fas fa-times", title = _U('no'), value = "no"},
 					{icon = "fas fa-check", title = _U('yes'), value = "yes"},
 				}
-				ESX.OpenContext("right", elements2, function(menu2,element2)
+				ESX.OpenContext("right", elements2, function(_,element2)
 					if element2.value == "yes" then
 						ESX.ShowNotification(_U('you_have_hired', element.name))
 
@@ -212,10 +259,6 @@ end
 
 function OpenPromoteMenu(society, employee, options)
 	ESX.TriggerServerCallback('esx_society:getJob', function(job)
-		if not job then
-			return
-		end
-
 		local elements = {
 			{unselectable = true, icon = "fas fa-user", title = _U('promote_employee', employee.name)}
 		}
@@ -228,7 +271,7 @@ function OpenPromoteMenu(society, employee, options)
 
 		elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
 
-		ESX.OpenContext("right", elements, function(menu,element)
+		ESX.OpenContext("right", elements, function(_, element)
 			if element.value == "return" then
 				OpenEmployeeList(society, options)
 			else
@@ -238,18 +281,14 @@ function OpenPromoteMenu(society, employee, options)
 					OpenEmployeeList(society, options)
 				end, employee.identifier, society, element.value, 'promote')
 			end
-		end, function(menu)
+		end, function()
 			OpenEmployeeList(society, options)
 		end)
 	end, society)
 end
 
 function OpenManageSalaryMenu(society, options)
 	ESX.TriggerServerCallback('esx_society:getJob', function(job)
-		if not job then
-			return
-		end
-
 		local elements = {
 			{unselectable = true, icon = "fas fa-wallet", title = _U('salary_management')}
 		}
@@ -263,15 +302,14 @@ function OpenManageSalaryMenu(society, options)
 				value = job.grades[i].grade
 			}
 		end
-			
-		elements[#elements+1] = {icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+
+		elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
 
 		ESX.OpenContext("right", elements, function(menu,element)
 			local elements = {
-				{unselectable = true, icon = "fas fa-wallet", title = element.title, description = _U('change_salary_description'), value = element.value},
-				{icon = "fas fa-wallet", title = _U('amount_title'), input = true, inputType = "number", inputPlaceholder = _U('change_salary_placeholder'), inputMin = 1, inputMax = Config.MaxSalary, name = "gradesalary"},
-				{icon = "fas fa-check", title = _U('confirm'), value = "confirm"}, 
-				{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+				{unselectable = true, icon = "fas fa-wallet", title = element.title, description = "Change a grade salary amount", value = element.value},
+				{icon = "fas fa-wallet", title = "Amount", input = true, inputType = "number", inputPlaceholder = "Amount to change grade salary..", inputMin = 1, inputMax = Config.MaxSalary, name = "gradesalary"},
+				{icon = "fas fa-check", title = "Confirm", value = "confirm"}
 			}
 
 			ESX.RefreshContext(elements)
@@ -299,10 +337,6 @@ end
 
 function OpenManageGradesMenu(society, options)
 	ESX.TriggerServerCallback('esx_society:getJob', function(job)
-		if not job then
-			return
-		end
-
 		local elements = {
 			{unselectable = true, icon = "fas fa-wallet", title = _U('grade_management')}
 		}
@@ -312,15 +346,14 @@ function OpenManageGradesMenu(society, options)
 
 			elements[#elements+1] = {icon = "fas fa-wallet", title = ('%s'):format(gradeLabel), value = job.grades[i].grade}
 		end
-			
-		elements[#elements+1] = {icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+
+		elements[#elements+1] = {icon = "fas fa-arrow-left", title = "Return", value = "return"}
 
 		ESX.OpenContext("right", elements, function(menu,element)
 			local elements = {
-				{unselectable = true, icon = "fas fa-wallet", title = element.title, description = _U('change_label_description'), value = element.value},
-				{icon = "fas fa-wallet", title = _U('change_label_title'), input = true, inputType = "text", inputPlaceholder = _U('change_label_placeholder'), name = "gradelabel"},
-				{icon = "fas fa-check", title = _U('confirm'), value = "confirm"},
-				{icon = "fas fa-arrow-left", title = _U('return'), value = "return"}
+				{unselectable = true, icon = "fas fa-wallet", title = element.title, description = "Change a grade label", value = element.value},
+				{icon = "fas fa-wallet", title = "Label", input = true, inputType = "text", inputPlaceholder = "Label to change job grade label..", name = "gradelabel"},
+				{icon = "fas fa-check", title = "Confirm", value = "confirm"}
 			}
 
 			ESX.RefreshContext(elements)
@@ -345,3 +378,5 @@ end
 AddEventHandler('esx_society:openBossMenu', function(society, close, options)
 	OpenBossMenu(society, close, options)
 end)
+
+if ESX.PlayerLoaded then RefreshBussHUD() end

server-data/resources/[esx]/esx_society/config.lua

@@ -3,10 +3,3 @@ Config = {}
 Config.Locale = 'en'
 Config.EnableESXIdentity = true
 Config.MaxSalary = 3500
-
-Config.BossGrades = { -- Uncomment and/or add additional grades you want to have access to the boss menu.
-    ['boss'] = true,
-    --['staff1'] = false,
-    --['staff2'] = false,
-    --['staff3'] = false,
-}

server-data/resources/[esx]/esx_society/locales/br.lua

@@ -0,0 +1,38 @@
+Locales['br'] = {
+  ['actions']                = 'ações',
+  ['boss_menu']              = 'menu chefe',
+  ['money_generic']          = '$%s',
+  ['deposit_amount']         = 'valor do depósito',
+  ['deposit_society_money']  = 'depositar dinheiro da sociedade',
+  ['do_you_want_to_recruit'] = 'você quer recrutar %s?',
+  ['employee']               = 'empregado',
+  ['employee_list']          = 'lista de empregados',
+  ['employee_management']    = 'gestão de funcionários',
+  ['fire']                   = 'fogo',
+  ['grade']                  = 'grau(escolaridade)',
+  ['have_deposited']         = 'você depositou ~r~$%s',
+  ['have_withdrawn']         = 'você retirou $%s',
+  ['invalid_amount']         = 'montante inválido',
+  ['invalid_amount_max']     = 'esse salário não é permitido',
+  ['no']                     = 'não',
+  ['promote']                = 'promover',
+  ['promote_employee']       = 'promover %s',
+  ['recruit']                = 'recrutar',
+  ['recruiting']             = 'recrutamento',
+  ['salary_amount']          = 'valor do salário',
+  ['salary_management']      = 'gestão salarial',
+  ['wash_money']             = 'lavar dinheiro',
+  ['wash_money_amount']      = 'quantidade a lavar',
+  ['withdraw_amount']        = 'retirar montante',
+  ['withdraw_society_money'] = 'retirar dinheiro da sociedade',
+  ['yes']                    = 'sim',
+  ['you_have']               = 'você tem $%s esperando lavagem de dinheiro (24h).',
+  ['you_have_laundered']     = 'você lavou $%s do seu dinheiro ',
+  ['you_have_hired']         = 'você recrutou %s',
+  ['you_have_been_hired']    = 'você foi contratado por %s',
+  ['you_have_fired']         = 'você demitiu %s',
+  ['you_have_been_fired']    = 'você foi demitido de %s',
+  ['you_have_promoted']      = 'você promoveu %s a %s',
+  ['you_have_been_promoted'] = 'você foi promovido promoted!',
+}
+