From 36ac7ef2d10735b6337f7bbb44885e40fd9dfb9c Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:15:48 -0400
Subject: [PATCH 01/11] New OnDuty System for jobs.

- Added a setDuty event.
- Added a job.onduty data.
- Default onduty is false at connection and creation of the user, job change.
- Added a esx:toggleDuty event to change the state of the duty.
---
 [esx]/es_extended/locales/br.lua            |  4 ++++
 [esx]/es_extended/locales/cs.lua            |  4 ++++
 [esx]/es_extended/locales/de.lua            |  4 ++++
 [esx]/es_extended/locales/en.lua            |  4 ++++
 [esx]/es_extended/locales/es.lua            |  4 ++++
 [esx]/es_extended/locales/fi.lua            |  4 ++++
 [esx]/es_extended/locales/fr.lua            |  4 ++++
 [esx]/es_extended/locales/pl.lua            |  4 ++++
 [esx]/es_extended/locales/sc.lua            |  4 ++++
 [esx]/es_extended/locales/sv.lua            |  4 ++++
 [esx]/es_extended/locales/tc.lua            |  4 ++++
 [esx]/es_extended/server/classes/player.lua |  6 ++++++
 [esx]/es_extended/server/common.lua         |  1 +
 [esx]/es_extended/server/main.lua           | 14 ++++++++++++++
 [esx]/es_extended/server/paycheck.lua       |  5 +++--
 15 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/[esx]/es_extended/locales/br.lua b/[esx]/es_extended/locales/br.lua
index 491b7cca..a83ad402 100644
--- a/[esx]/es_extended/locales/br.lua
+++ b/[esx]/es_extended/locales/br.lua
@@ -222,4 +222,8 @@ Locales['br'] = {
   ['tint_lspd'] = 'blue skin',
   ['tint_orange'] = 'orange skin',
   ['tint_platinum'] = 'platinum skin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/cs.lua b/[esx]/es_extended/locales/cs.lua
index 487df57a..1a41172e 100644
--- a/[esx]/es_extended/locales/cs.lua
+++ b/[esx]/es_extended/locales/cs.lua
@@ -222,4 +222,8 @@ Locales['cs'] = {
   ['tint_lspd'] = 'modry skin',
   ['tint_orange'] = 'oranzovy skin',
   ['tint_platinum'] = 'platinovy skin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/de.lua b/[esx]/es_extended/locales/de.lua
index 961fb19d..1aa2d8a2 100644
--- a/[esx]/es_extended/locales/de.lua
+++ b/[esx]/es_extended/locales/de.lua
@@ -222,4 +222,8 @@ Locales['de'] = {
   ['tint_lspd'] = 'blau',
   ['tint_orange'] = 'orange',
   ['tint_platinum'] = 'platin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/en.lua b/[esx]/es_extended/locales/en.lua
index 4420bd79..6db91292 100644
--- a/[esx]/es_extended/locales/en.lua
+++ b/[esx]/es_extended/locales/en.lua
@@ -343,4 +343,8 @@ Locales['en'] = {
   ['tint_lspd'] = 'blue skin',
   ['tint_orange'] = 'orange skin',
   ['tint_platinum'] = 'platinum skin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'You\'ve stopped your duty.',
+  ['started_duty'] = 'You\'ve started your duty.',
 }
diff --git a/[esx]/es_extended/locales/es.lua b/[esx]/es_extended/locales/es.lua
index 1d31dc82..5e038594 100644
--- a/[esx]/es_extended/locales/es.lua
+++ b/[esx]/es_extended/locales/es.lua
@@ -343,4 +343,8 @@ Locales['es'] = {
   ['tint_lspd'] = 'Skin Azul',
   ['tint_orange'] = 'Skin Naranja',
   ['tint_platinum'] = 'Skin Plata',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/fi.lua b/[esx]/es_extended/locales/fi.lua
index affa148e..7adf0c41 100644
--- a/[esx]/es_extended/locales/fi.lua
+++ b/[esx]/es_extended/locales/fi.lua
@@ -222,4 +222,8 @@ Locales['fi'] = {
   ['tint_lspd'] = 'blue skin',
   ['tint_orange'] = 'orange skin',
   ['tint_platinum'] = 'platinum skin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/fr.lua b/[esx]/es_extended/locales/fr.lua
index 38565b1e..5cf46d2c 100644
--- a/[esx]/es_extended/locales/fr.lua
+++ b/[esx]/es_extended/locales/fr.lua
@@ -222,4 +222,8 @@ Locales['fr'] = {
   ['tint_lspd'] = 'skin bleu',
   ['tint_orange'] = 'skin orange',
   ['tint_platinum'] = 'skin platine',
+  
+  -- Duty related
+  ['stopped_duty'] = 'Vous êtes maintenant hors-service.',
+  ['started_duty'] = 'Vous êtes maintenant en-service.',
 }
diff --git a/[esx]/es_extended/locales/pl.lua b/[esx]/es_extended/locales/pl.lua
index 38597069..54aa3954 100644
--- a/[esx]/es_extended/locales/pl.lua
+++ b/[esx]/es_extended/locales/pl.lua
@@ -221,4 +221,8 @@ Locales['pl'] = {
   ['tint_lspd'] = 'niebieski skin',
   ['tint_orange'] = 'pomarańczowy skin',
   ['tint_platinum'] = 'platynowy skin',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/sc.lua b/[esx]/es_extended/locales/sc.lua
index 0d81e991..2be7015f 100644
--- a/[esx]/es_extended/locales/sc.lua
+++ b/[esx]/es_extended/locales/sc.lua
@@ -222,4 +222,8 @@ Locales['sc'] = {
   ['tint_lspd'] = '洛圣都警局色调',
   ['tint_orange'] = '橙色调',
   ['tint_platinum'] = '铂金色调',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/sv.lua b/[esx]/es_extended/locales/sv.lua
index 8de56f35..e727ffd1 100644
--- a/[esx]/es_extended/locales/sv.lua
+++ b/[esx]/es_extended/locales/sv.lua
@@ -222,4 +222,8 @@ Locales['sv'] = {
   ['tint_lspd'] = 'blåskinn',
   ['tint_orange'] = 'orangeskinn',
   ['tint_platinum'] = 'platinaskinn',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/tc.lua b/[esx]/es_extended/locales/tc.lua
index 4560c727..f1411018 100644
--- a/[esx]/es_extended/locales/tc.lua
+++ b/[esx]/es_extended/locales/tc.lua
@@ -222,4 +222,8 @@ Locales['tc'] = {
   ['tint_lspd'] = '洛聖都警察局色調',
   ['tint_orange'] = '橘色調',
   ['tint_platinum'] = '柏金色調',
+  
+  -- Duty related
+  ['stopped_duty'] = 'NEED TRANSLATION',
+  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua
index 1243c6d1..c3d973c7 100644
--- a/[esx]/es_extended/server/classes/player.lua
+++ b/[esx]/es_extended/server/classes/player.lua
@@ -356,6 +356,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 		end
 	end
 
+    function self.setDuty(onDuty)
+        self.job.onduty = onDuty
+        self.triggerEvent('esx:setJob', self.job)
+    end
+
 	function self.setJob(job, grade)
 		grade = tostring(grade)
 		local lastJob = json.decode(json.encode(self.job))
@@ -371,6 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			self.job.grade_name   = gradeObject.name
 			self.job.grade_label  = gradeObject.label
 			self.job.grade_salary = gradeObject.salary
+            self.job.onduty = false
 
 			if gradeObject.skin_male then
 				self.job.skin_male = json.decode(gradeObject.skin_male)
diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
index 552e3d4b..73eb53b4 100644
--- a/[esx]/es_extended/server/common.lua
+++ b/[esx]/es_extended/server/common.lua
@@ -93,6 +93,7 @@ MySQL.ready(function()
 					grade = 0,
 					label = 'Unemployed',
 					salary = 200,
+                    onduty = false,
 					skin_male = {},
 					skin_female = {}
 				}
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 37584df5..e4da1b8d 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -156,6 +156,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 	userData.job.grade_name = gradeObject.name
 	userData.job.grade_label = gradeObject.label
 	userData.job.grade_salary = gradeObject.salary
+    userData.job.onduty = false
 
 	userData.job.skin_male = {}
 	userData.job.skin_female = {}
@@ -600,3 +601,16 @@ AddEventHandler('txAdmin:events:scheduledRestart', function(eventData)
 		end)
 	end
 end)
+
+RegisterNetEvent('esx:toggleDuty')
+AddEventHandler('esx:toggleDuty', function()
+    local xPlayer = ESX.GetPlayerFromId(source)
+    if xPlayer.job.onduty then
+        xPlayer.setDuty(false)
+        xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
+    else
+        xPlayer.setDuty(true)
+        xPlayer.triggerEvent('esx:showNotification', _U('started_duty'))
+    end
+    TriggerClientEvent('esx:setJob', source, xPlayer.job)
+end)
\ No newline at end of file
diff --git a/[esx]/es_extended/server/paycheck.lua b/[esx]/es_extended/server/paycheck.lua
index bd6ec910..e084866b 100644
--- a/[esx]/es_extended/server/paycheck.lua
+++ b/[esx]/es_extended/server/paycheck.lua
@@ -5,13 +5,14 @@ function StartPayCheck()
 			local xPlayers = ESX.GetExtendedPlayers()
 			for _, xPlayer in pairs(xPlayers) do
 				local job     = xPlayer.job.grade_name
+                local onduty  = xPlayer.job.onduty
 				local salary  = xPlayer.job.grade_salary
 
 				if salary > 0 then
 					if job == 'unemployed' then -- unemployed
 						xPlayer.addAccountMoney('bank', salary)
 						TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9)
-					elseif Config.EnableSocietyPayouts then -- possibly a society
+					elseif Config.EnableSocietyPayouts and onduty then -- possibly a society
 						TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society)
 							if society ~= nil then -- verified society
 								TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function (account)
@@ -29,7 +30,7 @@ function StartPayCheck()
 								TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
 							end
 						end)
-					else -- generic job
+					elseif onduty then -- generic job
 						xPlayer.addAccountMoney('bank', salary)
 						TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
 					end

From 694a423034735218c412119fca5fc25132fbb1d8 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:34:23 -0400
Subject: [PATCH 02/11] toggleDuty to setDuty

- Default duty have been put to be true.
- toggleDuty event have been changed to setDuty needing a boolean state.
---
 [esx]/es_extended/server/classes/player.lua |  2 +-
 [esx]/es_extended/server/main.lua           | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua
index c3d973c7..fc92bda7 100644
--- a/[esx]/es_extended/server/classes/player.lua
+++ b/[esx]/es_extended/server/classes/player.lua
@@ -376,7 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			self.job.grade_name   = gradeObject.name
 			self.job.grade_label  = gradeObject.label
 			self.job.grade_salary = gradeObject.salary
-            self.job.onduty = false
+            self.job.onduty = true
 
 			if gradeObject.skin_male then
 				self.job.skin_male = json.decode(gradeObject.skin_male)
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index e4da1b8d..9cc11513 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -602,15 +602,17 @@ AddEventHandler('txAdmin:events:scheduledRestart', function(eventData)
 	end
 end)
 
-RegisterNetEvent('esx:toggleDuty')
-AddEventHandler('esx:toggleDuty', function()
+RegisterNetEvent('esx:setDuty')
+AddEventHandler('esx:setDuty', function(state)
     local xPlayer = ESX.GetPlayerFromId(source)
-    if xPlayer.job.onduty then
+    if xPlayer.job.onduty == state then return end
+    
+    if state then
         xPlayer.setDuty(false)
         xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
     else
         xPlayer.setDuty(true)
         xPlayer.triggerEvent('esx:showNotification', _U('started_duty'))
     end
-    TriggerClientEvent('esx:setJob', source, xPlayer.job)
+    TriggerClientEvent('esx:setJob', xPlayer.source, xPlayer.job)
 end)
\ No newline at end of file

From 42d4d6276b7a3610723f2cb0e1300593294e93c5 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:35:21 -0400
Subject: [PATCH 03/11] Fix default onduty state of unemployed.

---
 [esx]/es_extended/server/common.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
index 73eb53b4..cbb92269 100644
--- a/[esx]/es_extended/server/common.lua
+++ b/[esx]/es_extended/server/common.lua
@@ -93,7 +93,7 @@ MySQL.ready(function()
 					grade = 0,
 					label = 'Unemployed',
 					salary = 200,
-                    onduty = false,
+                    onduty = true,
 					skin_male = {},
 					skin_female = {}
 				}

From 028af924844b90985de821bd203ac090ff216fae Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:36:09 -0400
Subject: [PATCH 04/11] Fix: loadESXPlayer onduty.

---
 [esx]/es_extended/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 9cc11513..f1fc1b82 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -156,7 +156,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 	userData.job.grade_name = gradeObject.name
 	userData.job.grade_label = gradeObject.label
 	userData.job.grade_salary = gradeObject.salary
-    userData.job.onduty = false
+    userData.job.onduty = true
 
 	userData.job.skin_male = {}
 	userData.job.skin_female = {}

From 62db2291f82a588fcd98fa5020ccd336270c4870 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:52:53 -0400
Subject: [PATCH 05/11] Config for spawn point (firstspawn/bug)

---
 [esx]/es_extended/config.lua      | 1 +
 [esx]/es_extended/server/main.lua | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua
index 6d9f4203..e83d33e2 100644
--- a/[esx]/es_extended/config.lua
+++ b/[esx]/es_extended/config.lua
@@ -20,3 +20,4 @@ Config.EnablePVP                = true -- Allow Player to player combat
 
 Config.Multichar                = false -- Enable support for esx_multicharacter
 Config.Identity                 = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
+Config.SpawnLocation            = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8} -- The location to spawn at when the player first loads in
\ No newline at end of file
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index f1fc1b82..876cd171 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -246,7 +246,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 		userData.coords = json.decode(result.position)
 	else
 		print('[^3WARNING^7] Column ^5"position"^0 in ^5"users"^0 table is missing required default value. Using backup coords, fix your database.')
-		userData.coords = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8}
+		userData.coords = Config.SpawnLocation
 	end
 
 	-- Skin

From 8ab2aa8fa20dbb9d8ad3346754a97ec909671103 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:53:16 -0400
Subject: [PATCH 06/11] Revert "Config for spawn point (firstspawn/bug)"

This reverts commit 62db2291f82a588fcd98fa5020ccd336270c4870.
---
 [esx]/es_extended/config.lua      | 1 -
 [esx]/es_extended/server/main.lua | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua
index e83d33e2..6d9f4203 100644
--- a/[esx]/es_extended/config.lua
+++ b/[esx]/es_extended/config.lua
@@ -20,4 +20,3 @@ Config.EnablePVP                = true -- Allow Player to player combat
 
 Config.Multichar                = false -- Enable support for esx_multicharacter
 Config.Identity                 = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
-Config.SpawnLocation            = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8} -- The location to spawn at when the player first loads in
\ No newline at end of file
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 876cd171..f1fc1b82 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -246,7 +246,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 		userData.coords = json.decode(result.position)
 	else
 		print('[^3WARNING^7] Column ^5"position"^0 in ^5"users"^0 table is missing required default value. Using backup coords, fix your database.')
-		userData.coords = Config.SpawnLocation
+		userData.coords = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8}
 	end
 
 	-- Skin

From 98c8b401142a04ab4a821fca879c8204c0948250 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Wed, 23 Mar 2022 09:14:22 -0400
Subject: [PATCH 07/11] Code Correction

- Changed onduty for onDuty (CamelCode)
- Event now uses bool instead of state arg.
- Unemployed is now off-duty (doesn't change the paycheck).
---
 [esx]/es_extended/server/classes/player.lua | 6 +++---
 [esx]/es_extended/server/common.lua         | 2 +-
 [esx]/es_extended/server/main.lua           | 8 ++++----
 [esx]/es_extended/server/paycheck.lua       | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua
index fc92bda7..fb2d8fc9 100644
--- a/[esx]/es_extended/server/classes/player.lua
+++ b/[esx]/es_extended/server/classes/player.lua
@@ -356,8 +356,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 		end
 	end
 
-    function self.setDuty(onDuty)
-        self.job.onduty = onDuty
+    function self.setDuty(bool)
+        self.job.onDuty = bool
         self.triggerEvent('esx:setJob', self.job)
     end
 
@@ -376,7 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			self.job.grade_name   = gradeObject.name
 			self.job.grade_label  = gradeObject.label
 			self.job.grade_salary = gradeObject.salary
-            self.job.onduty = true
+            self.job.onDuty = true
 
 			if gradeObject.skin_male then
 				self.job.skin_male = json.decode(gradeObject.skin_male)
diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
index cbb92269..2fa8d8af 100644
--- a/[esx]/es_extended/server/common.lua
+++ b/[esx]/es_extended/server/common.lua
@@ -93,7 +93,7 @@ MySQL.ready(function()
 					grade = 0,
 					label = 'Unemployed',
 					salary = 200,
-                    onduty = true,
+                    onDuty = false,
 					skin_male = {},
 					skin_female = {}
 				}
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index f1fc1b82..d67a331b 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -156,7 +156,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 	userData.job.grade_name = gradeObject.name
 	userData.job.grade_label = gradeObject.label
 	userData.job.grade_salary = gradeObject.salary
-    userData.job.onduty = true
+    userData.job.onDuty = true
 
 	userData.job.skin_male = {}
 	userData.job.skin_female = {}
@@ -603,11 +603,11 @@ AddEventHandler('txAdmin:events:scheduledRestart', function(eventData)
 end)
 
 RegisterNetEvent('esx:setDuty')
-AddEventHandler('esx:setDuty', function(state)
+AddEventHandler('esx:setDuty', function(bool)
     local xPlayer = ESX.GetPlayerFromId(source)
-    if xPlayer.job.onduty == state then return end
+    if xPlayer.job.onDuty == bool then return end
     
-    if state then
+    if bool then
         xPlayer.setDuty(false)
         xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
     else
diff --git a/[esx]/es_extended/server/paycheck.lua b/[esx]/es_extended/server/paycheck.lua
index e084866b..2116cba1 100644
--- a/[esx]/es_extended/server/paycheck.lua
+++ b/[esx]/es_extended/server/paycheck.lua
@@ -5,14 +5,14 @@ function StartPayCheck()
 			local xPlayers = ESX.GetExtendedPlayers()
 			for _, xPlayer in pairs(xPlayers) do
 				local job     = xPlayer.job.grade_name
-                local onduty  = xPlayer.job.onduty
+                local onDuty  = xPlayer.job.onDuty
 				local salary  = xPlayer.job.grade_salary
 
 				if salary > 0 then
 					if job == 'unemployed' then -- unemployed
 						xPlayer.addAccountMoney('bank', salary)
 						TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_help', salary), 'CHAR_BANK_MAZE', 9)
-					elseif Config.EnableSocietyPayouts and onduty then -- possibly a society
+					elseif Config.EnableSocietyPayouts and onDuty then -- possibly a society
 						TriggerEvent('esx_society:getSociety', xPlayer.job.name, function (society)
 							if society ~= nil then -- verified society
 								TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function (account)
@@ -30,7 +30,7 @@ function StartPayCheck()
 								TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
 							end
 						end)
-					elseif onduty then -- generic job
+					elseif onDuty then -- generic job
 						xPlayer.addAccountMoney('bank', salary)
 						TriggerClientEvent('esx:showAdvancedNotification', xPlayer.source, _U('bank'), _U('received_paycheck'), _U('received_salary', salary), 'CHAR_BANK_MAZE', 9)
 					end

From 54f006f0b44ad958f8c92d326ab3c7a8f7cdd082 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Thu, 24 Mar 2022 06:29:44 -0400
Subject: [PATCH 08/11] Added Config for default duty

---
 [esx]/es_extended/config.lua                | 1 +
 [esx]/es_extended/server/classes/player.lua | 2 +-
 [esx]/es_extended/server/main.lua           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua
index 6d9f4203..fb5a0207 100644
--- a/[esx]/es_extended/config.lua
+++ b/[esx]/es_extended/config.lua
@@ -20,3 +20,4 @@ Config.EnablePVP                = true -- Allow Player to player combat
 
 Config.Multichar                = false -- Enable support for esx_multicharacter
 Config.Identity                 = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
+Config.OnDuty                   = true -- Default state of the on duty system
\ No newline at end of file
diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua
index fb2d8fc9..af508708 100644
--- a/[esx]/es_extended/server/classes/player.lua
+++ b/[esx]/es_extended/server/classes/player.lua
@@ -376,7 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			self.job.grade_name   = gradeObject.name
 			self.job.grade_label  = gradeObject.label
 			self.job.grade_salary = gradeObject.salary
-            self.job.onDuty = true
+            self.job.onDuty = Config.OnDuty
 
 			if gradeObject.skin_male then
 				self.job.skin_male = json.decode(gradeObject.skin_male)
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index d67a331b..7eee2ca6 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -156,7 +156,7 @@ function loadESXPlayer(identifier, playerId, isNew)
 	userData.job.grade_name = gradeObject.name
 	userData.job.grade_label = gradeObject.label
 	userData.job.grade_salary = gradeObject.salary
-    userData.job.onDuty = true
+    userData.job.onDuty = Config.OnDuty
 
 	userData.job.skin_male = {}
 	userData.job.skin_female = {}

From 3f4bae10e2102c7d35c3730342d231a7844e8393 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Sat, 26 Mar 2022 14:19:43 -0400
Subject: [PATCH 09/11] Fixed inversed bool for setDuty

---
 [esx]/es_extended/server/main.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 7eee2ca6..53642dcb 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -608,11 +608,11 @@ AddEventHandler('esx:setDuty', function(bool)
     if xPlayer.job.onDuty == bool then return end
     
     if bool then
-        xPlayer.setDuty(false)
-        xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
-    else
         xPlayer.setDuty(true)
         xPlayer.triggerEvent('esx:showNotification', _U('started_duty'))
+    else
+        xPlayer.setDuty(false)
+        xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
     end
     TriggerClientEvent('esx:setJob', xPlayer.source, xPlayer.job)
 end)
\ No newline at end of file

From eece397ea2e89dea72237d1b85c42d69ddb49639 Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Wed, 30 Mar 2022 00:36:36 -0400
Subject: [PATCH 10/11] Added the space to the end of main.lua

---
 [esx]/es_extended/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 53642dcb..326556b4 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -615,4 +615,4 @@ AddEventHandler('esx:setDuty', function(bool)
         xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty'))
     end
     TriggerClientEvent('esx:setJob', xPlayer.source, xPlayer.job)
-end)
\ No newline at end of file
+end)

From 7cedeed29e8f55643a985f5b33c4e972f0fb3d7a Mon Sep 17 00:00:00 2001
From: ZF <48424078+zf-development@users.noreply.github.com>
Date: Sat, 2 Apr 2022 16:06:53 -0400
Subject: [PATCH 11/11] Resolved locales conflicts

Some of the locales had conflicts with translation not finished. Just removed them.
---
 [esx]/es_extended/locales/br.lua | 4 ----
 [esx]/es_extended/locales/cs.lua | 4 ----
 [esx]/es_extended/locales/de.lua | 4 ----
 [esx]/es_extended/locales/es.lua | 4 ----
 [esx]/es_extended/locales/fi.lua | 4 ----
 [esx]/es_extended/locales/pl.lua | 4 ----
 [esx]/es_extended/locales/sc.lua | 4 ----
 [esx]/es_extended/locales/sv.lua | 4 ----
 [esx]/es_extended/locales/tc.lua | 4 ----
 9 files changed, 36 deletions(-)

diff --git a/[esx]/es_extended/locales/br.lua b/[esx]/es_extended/locales/br.lua
index a83ad402..491b7cca 100644
--- a/[esx]/es_extended/locales/br.lua
+++ b/[esx]/es_extended/locales/br.lua
@@ -222,8 +222,4 @@ Locales['br'] = {
   ['tint_lspd'] = 'blue skin',
   ['tint_orange'] = 'orange skin',
   ['tint_platinum'] = 'platinum skin',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/cs.lua b/[esx]/es_extended/locales/cs.lua
index 1a41172e..487df57a 100644
--- a/[esx]/es_extended/locales/cs.lua
+++ b/[esx]/es_extended/locales/cs.lua
@@ -222,8 +222,4 @@ Locales['cs'] = {
   ['tint_lspd'] = 'modry skin',
   ['tint_orange'] = 'oranzovy skin',
   ['tint_platinum'] = 'platinovy skin',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/de.lua b/[esx]/es_extended/locales/de.lua
index 1aa2d8a2..961fb19d 100644
--- a/[esx]/es_extended/locales/de.lua
+++ b/[esx]/es_extended/locales/de.lua
@@ -222,8 +222,4 @@ Locales['de'] = {
   ['tint_lspd'] = 'blau',
   ['tint_orange'] = 'orange',
   ['tint_platinum'] = 'platin',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/es.lua b/[esx]/es_extended/locales/es.lua
index 5e038594..1d31dc82 100644
--- a/[esx]/es_extended/locales/es.lua
+++ b/[esx]/es_extended/locales/es.lua
@@ -343,8 +343,4 @@ Locales['es'] = {
   ['tint_lspd'] = 'Skin Azul',
   ['tint_orange'] = 'Skin Naranja',
   ['tint_platinum'] = 'Skin Plata',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/fi.lua b/[esx]/es_extended/locales/fi.lua
index 7adf0c41..affa148e 100644
--- a/[esx]/es_extended/locales/fi.lua
+++ b/[esx]/es_extended/locales/fi.lua
@@ -222,8 +222,4 @@ Locales['fi'] = {
   ['tint_lspd'] = 'blue skin',
   ['tint_orange'] = 'orange skin',
   ['tint_platinum'] = 'platinum skin',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/pl.lua b/[esx]/es_extended/locales/pl.lua
index 54aa3954..38597069 100644
--- a/[esx]/es_extended/locales/pl.lua
+++ b/[esx]/es_extended/locales/pl.lua
@@ -221,8 +221,4 @@ Locales['pl'] = {
   ['tint_lspd'] = 'niebieski skin',
   ['tint_orange'] = 'pomarańczowy skin',
   ['tint_platinum'] = 'platynowy skin',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/sc.lua b/[esx]/es_extended/locales/sc.lua
index 2be7015f..0d81e991 100644
--- a/[esx]/es_extended/locales/sc.lua
+++ b/[esx]/es_extended/locales/sc.lua
@@ -222,8 +222,4 @@ Locales['sc'] = {
   ['tint_lspd'] = '洛圣都警局色调',
   ['tint_orange'] = '橙色调',
   ['tint_platinum'] = '铂金色调',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/sv.lua b/[esx]/es_extended/locales/sv.lua
index e727ffd1..8de56f35 100644
--- a/[esx]/es_extended/locales/sv.lua
+++ b/[esx]/es_extended/locales/sv.lua
@@ -222,8 +222,4 @@ Locales['sv'] = {
   ['tint_lspd'] = 'blåskinn',
   ['tint_orange'] = 'orangeskinn',
   ['tint_platinum'] = 'platinaskinn',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }
diff --git a/[esx]/es_extended/locales/tc.lua b/[esx]/es_extended/locales/tc.lua
index f1411018..4560c727 100644
--- a/[esx]/es_extended/locales/tc.lua
+++ b/[esx]/es_extended/locales/tc.lua
@@ -222,8 +222,4 @@ Locales['tc'] = {
   ['tint_lspd'] = '洛聖都警察局色調',
   ['tint_orange'] = '橘色調',
   ['tint_platinum'] = '柏金色調',
-  
-  -- Duty related
-  ['stopped_duty'] = 'NEED TRANSLATION',
-  ['started_duty'] = 'NEED TRANSLATION',
 }