From a3a7eaa584ac60dd1b9f55a5ea00bb0a5e243f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= <jeremie.ngadi@gmail.com>
Date: Tue, 15 Aug 2017 09:53:14 +0200
Subject: [PATCH] UseItem fixes + add paycheck

---
 .../es_extended/client/functions.lua          |  5 ++--
 .../es_extended/server/functions.lua          | 23 +++++++++++++++++++
 .../[essential]/es_extended/server/main.lua   | 14 +++++++++--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/resources/[essential]/es_extended/client/functions.lua b/resources/[essential]/es_extended/client/functions.lua
index f3c04818..60d2aff5 100644
--- a/resources/[essential]/es_extended/client/functions.lua
+++ b/resources/[essential]/es_extended/client/functions.lua
@@ -1003,12 +1003,11 @@ ESX.ShowInventory = function()
 
 							TriggerServerEvent('esx:useItem', data.current.value)
 
-							menu2.close()
-							menu.close()
-
 						elseif data.current.action == 'return' then
+							
 							ESX.UI.Menu.CloseAll()
 							ESX.ShowInventory()
+						
 						end
 						
 					end,
diff --git a/resources/[essential]/es_extended/server/functions.lua b/resources/[essential]/es_extended/server/functions.lua
index c5541654..97b9f252 100644
--- a/resources/[essential]/es_extended/server/functions.lua
+++ b/resources/[essential]/es_extended/server/functions.lua
@@ -158,6 +158,29 @@ ESX.StartDBSync = function()
 
 end
 
+ESX.StartPayCheck = function()
+	
+	function payCheck()
+
+		local xPlayers = ESX.GetPlayers()
+
+		for k,v in pairs(xPlayers) do
+
+			if v.job.grade_salary > 0 then
+				v.addMoney(v.job.grade_salary)
+				TriggerClientEvent('esx:showNotification', v.source, 'Vous avez reçu votre salaire : ~g~$' .. v.job.grade_salary)
+			end
+
+		end
+
+		SetTimeout(Config.PaycheckInterval, payCheck)
+
+	end
+
+	SetTimeout(Config.PaycheckInterval, payCheck)
+
+end
+
 ESX.GetPlayers = function()
 	return ESX.Players
 end
diff --git a/resources/[essential]/es_extended/server/main.lua b/resources/[essential]/es_extended/server/main.lua
index c06d44b8..4338ed81 100644
--- a/resources/[essential]/es_extended/server/main.lua
+++ b/resources/[essential]/es_extended/server/main.lua
@@ -510,8 +510,17 @@ AddEventHandler('esx:removeInventoryItem', function(type, itemName, itemCount)
 end)
 
 RegisterServerEvent('esx:useItem')
-AddEventHandler('esx:useItem', function(item)
-	ESX.UseItem(source, item)
+AddEventHandler('esx:useItem', function(itemName)
+
+	local xPlayer = ESX.GetPlayerFromId(source)
+	local count   = xPlayer.getInventoryItem(itemName).count
+
+	if count > 0 then
+		ESX.UseItem(source, itemName)
+	else
+		TriggerClientEvent('esx:showNotification', xPlayer.source, 'Action impossible')
+	end
+
 end)
 
 ESX.RegisterServerCallback('esx:getPlayerData', function(source, cb)
@@ -547,3 +556,4 @@ end)
 TriggerEvent("es:addGroup", "jobmaster", "user", function(group) end)
 
 ESX.StartDBSync()
+ESX.StartPayCheck()
\ No newline at end of file