From b610361eb8317e22573dbbd557af2a0ae31624d6 Mon Sep 17 00:00:00 2001
From: Taavi <97351942+Taavi-AU@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:27:19 +0800
Subject: [PATCH] context implementation

---
 [esx_addons]/esx_barbershop/client/main.lua | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/[esx_addons]/esx_barbershop/client/main.lua b/[esx_addons]/esx_barbershop/client/main.lua
index a4b825b4..d261549a 100644
--- a/[esx_addons]/esx_barbershop/client/main.lua
+++ b/[esx_addons]/esx_barbershop/client/main.lua
@@ -6,18 +6,17 @@ function OpenShopMenu()
 	TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu)
 		menu.close()
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', {
-			title = TranslateCap('valid_purchase'),
-			align = 'top-left',
-			elements = {
-				{label = TranslateCap('no'),  value = 'no'},
-				{label = TranslateCap('yes'), value = 'yes'}
-		}}, function(data, menu)
-			menu.close()
+		local elements = {
+			{unselectable = true, icon = "fas fa-check-double", title = TranslateCap("valid_purchase")},
+			{icon = "fas fa-check-circle", title = TranslateCap("yes"), value = "yes"},
+			{icon = "fas fa-window-close", title = TranslateCap("no"), value = "no"},
+		}
 
-			if data.current.value == 'yes' then
+		ESX.OpenContext("right", elements, function(menu,element)
+			if element.value == "yes" then
 				ESX.TriggerServerCallback('esx_barbershop:checkMoney', function(hasEnoughMoney)
 					if hasEnoughMoney then
+						ESX.CloseContext()
 						TriggerEvent('skinchanger:getSkin', function(skin)
 							TriggerServerEvent('esx_skin:save', skin)
 						end)
@@ -25,6 +24,7 @@ function OpenShopMenu()
 						TriggerServerEvent('esx_barbershop:pay')
 						hasPaid = true
 					else
+						ESX.CloseContext()
 						ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
 							TriggerEvent('skinchanger:loadSkin', skin) 
 						end)
@@ -32,16 +32,15 @@ function OpenShopMenu()
 						ESX.ShowNotification(TranslateCap('not_enough_money'))
 					end
 				end)
-			elseif data.current.value == 'no' then
+			elseif element.value == "no" then
 				ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
 					TriggerEvent('skinchanger:loadSkin', skin) 
 				end)
+				ESX.CloseContext()
 			end
-
 			currentAction = 'shop_menu'
 			currentActionMsg = TranslateCap('press_access')
-		end, function(data, menu)
-			menu.close()
+		end, function(menu)
 			currentAction = 'shop_menu'
 			currentActionMsg = TranslateCap('press_access')
 		end)
@@ -82,7 +81,7 @@ AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone)
 end)
 
 AddEventHandler('esx_barbershop:hasExitedMarker', function(zone)
-	ESX.UI.Menu.CloseAll()
+	ESX.CloseContext()
 	currentAction = nil
 
 	if not hasPaid then
@@ -161,4 +160,4 @@ CreateThread(function()
 			Wait(500)
 		end
 	end
-end)
\ No newline at end of file
+end)