From 9645f3afffd8a7bdbce12a6e151112220c61255f Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 1 Nov 2022 10:54:07 +0700
Subject: [PATCH] fix bug topping 5

---
 video/sync_1.file            |  4 +++
 xml/page_topping_select5.xml | 58 +++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 17 deletions(-)
 create mode 100644 video/sync_1.file

diff --git a/video/sync_1.file b/video/sync_1.file
new file mode 100644
index 00000000..3d057187
--- /dev/null
+++ b/video/sync_1.file
@@ -0,0 +1,4 @@
+total 12400
+-rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4
+-rw-rw---- 1 root sdcard_rw       0 2021-11-01 15:13 sync_1.file
+-rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml
index e6294507..17affb84 100644
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@@ -423,9 +423,7 @@
 		EndIf
 	EndIf
 
-	If new_layout = "true" Then 
-		Function 2
-	EndIf
+	Function 2
 	
 	
 	RefreshAll
@@ -550,7 +548,19 @@
 		EndIf
 
 		DEBUGVAR SubMenuGroupIDSlot6_1
-		
+
+
+		; i f Hot menu disable away
+		If hot_button_state = "PressForever" Then
+			If showOreoAddEnable = "Enable" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+			If showOreoAddEnable = "Press" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+		EndIf
+
+		; first time.
 		If blend_button_state = "PressForever" Then
 
 		Else
@@ -665,7 +675,6 @@
 		EndIf
 		
 			
-			
 		If UserSeletedSugar = 0 Then 
 			If SugarModeUpdateWhenChangeDrinkType = 1 Then
 				Var SugarModeUpdateWhenChangeDrinkType = 0
@@ -819,6 +828,8 @@
 				Var SugarState4 = "Enable"
 				Var SugarState5 = "Enable"
 
+				DEBUGVAR "set default Powder Sugar"
+
 				If toppingID1index1 = toppingID1Default Then
 					Var SugarState1 = "PressForever"
 					Var sugar_default_flag = 1
@@ -847,6 +858,9 @@
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
+
+				DEBUGVAR toppingID1Default
+				DEBUGVAR SugarState1
 			EndIf
 			
 
@@ -986,6 +1000,8 @@
 				EndIf
 			EndIf
 
+			DEBUGVAR SelectDrinkType
+
 			If SelectDrinkType = 0 Then
 				Var SugarState1 = "Enable"
 				Var SugarState2 = "Enable"
@@ -1150,9 +1166,10 @@
 		DEBUGVAR showShotEnable
 		DEBUGVAR showOreoAddEnable
 		DEBUGVAR ShotCoffeePremium
-		SAVELOG toppingID2price1
-		SAVELOG toppingID2price2
-		SAVELOG toppingID2price3
+		DEBUGVAR toppingID2price1
+		DEBUGVAR toppingID2price2
+		DEBUGVAR toppingID2price3
+		Function 2
 	EndIf
 
 
@@ -1281,6 +1298,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	Var SelectDrinkType = 1
 	
 	SAVELOG "Press hot"
 
@@ -1314,9 +1332,9 @@
 
 	Var high_light_drink_type = "Invisible"
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 
 
 </EventClick>
@@ -1337,6 +1355,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	Var SelectDrinkType = 1
 	
 	SAVELOG "Press cold"
 
@@ -1366,9 +1385,9 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 </EventClick>
 </Button>
 
@@ -1389,6 +1408,7 @@
 <EventClick> 
 	
 	SAVELOG "Press blend"
+	Var SelectDrinkType = 1
 
 	Var blend_button_state = "PressForever"
 
@@ -1416,9 +1436,9 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 </EventClick>
 </Button>
 
@@ -3569,7 +3589,8 @@
 	DEBUGVAR PriceDrinkNoTop
 	DEBUGVAR PriceDiff
 	DEBUGVAR showShotEnable
-	
+	Var TOPPING_PRICE = 0
+
 	If ShotCoffeePremium = "Press" Then
 		If blendedState = "Press" Then
 			Var PriceDrinkTmp = PriceDrinkNoTop
@@ -3586,7 +3607,7 @@
 		
 		Var showText7 = "Enable"
 
-		SAVELOG "Select add normal shot"
+		SAVELOG "Select premi normal shot"
 
 	Else
 
@@ -3628,13 +3649,15 @@
 
 
 	DEBUGVAR showOreoAddEnable
+	DEBUGVAR TOPPING_PRICE
 
 	If showOreoAddEnable = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
 		Var topping6 = toppingID6index2
 		Var DisableUsingCode = "true"
 	Else
-		Var PriceDrinkTmp = PriceDrinkNoTop
+
+		;Var PriceDrinkTmp = PriceDrinkNoTop
 
 		Var topping6 = toppingID6index1
 
@@ -3664,6 +3687,7 @@
 
 
 	Var Timeout = 0
+	
 	RefreshAll
 
 </Function2>