From 8f03f8d491904a7e8d0aad4494a07f61279650fd Mon Sep 17 00:00:00 2001
From: thanawat saiyota <thanawat.sa@forth.co.th>
Date: Wed, 19 Mar 2025 13:37:32 +0700
Subject: [PATCH] THAI: fix topping selecting that disable

---
 inc/button_topping_select_confirm_order.inc |  18 ++-
 xml/page_topping_select8.xml                | 157 ++++++++++++++++----
 2 files changed, 140 insertions(+), 35 deletions(-)

diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc
index 27aef67d..946ebfb0 100644
--- a/inc/button_topping_select_confirm_order.inc
+++ b/inc/button_topping_select_confirm_order.inc
@@ -380,9 +380,21 @@ If CART_COUNT  = 0 Then
                     Var PopupToppingSelect = "Enable"
 
 
-                    Var CustomOreoCheckState = "Enable"
-                    Var CustomOvaltineCheckState = "Enable"
-                    Var CustomCocoaCheckState = "Enable"
+					If toppingID6index2 = 321 Then
+						Var CustomOreoCheckState = "Enable"
+					Else
+						Var CustomOreoCheckState = "Disable"
+					EndIf
+					If toppingID6index3 = 322 Then
+						Var CustomCocoaCheckState = "Enable"
+					Else
+						Var CustomCocoaCheckState = "Disable"
+					EndIf
+					If toppingID6index4 = 323 Then
+						Var CustomOvaltineCheckState = "Enable"
+					Else
+						Var CustomOvaltineCheckState = "Disable"
+					EndIf
                 EndIf
             EndIf
         EndIf
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 07e27033..0aacdc61 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -1531,6 +1531,7 @@
 
 	DEBUGVAR BrewParam
 	DEBUGVAR UserSeletedSugar
+	DEBUGVAR showOvaltineEnable
 	
 
 	If BugFlag = 1 Then
@@ -1697,6 +1698,7 @@
 ;				Var showCoffeeLevel = "Enable"
 ;				Var showCoffeeTamping = "Enable"
 
+				DEBUGVAR toppingSelectState
 				If toppingSelectState = "Enable" Then
 					Var CustomOreoState = "Enable"
 					Var CustomOvaltineState = "Enable"
@@ -1718,6 +1720,12 @@
 				Var showOvaltineEnable = "Disable"
 				Var showCocoaEnable = "Disable"
 
+				If toppingSelectState = "Enable" Then
+					Var CustomCocoaCheckState = "Disable"
+					Var CustomOreoCheckState = "Disable"
+					Var CustomOvaltineCheckState = "Disable"
+				EndIf
+
 				Var showStrawberryEnable = "Disable"
 				Var showYuzuEnable = "Disable"
 				Var showText8 = "Enable"
@@ -3438,7 +3446,7 @@
 ; straw left
 <Button>
 <X> 725 </X>
-<Y> 485 </Y>
+<Y> 565 </Y>
 <State> StrawState </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
@@ -3464,7 +3472,7 @@
 
 <Button>
 <X> 955 </X>
-<Y> 493 </Y>
+<Y> 575 </Y>
 <State> StrawState </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
@@ -3491,7 +3499,7 @@
 ; LID left
 <Button>
 <X> 725 </X>
-<Y> 565 </Y>
+<Y> 485 </Y>
 <State> LidState </State>
 <Mode> "No" </Mode>
 <Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
@@ -3520,7 +3528,7 @@
 
 <Button>
 <X> 955 </X>
-<Y> 575 </Y>
+<Y> 493 </Y>
 <State> LidState </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
@@ -8727,10 +8735,18 @@
         EndIf
     Else
         If showCocoaEnable = "Disable" Then
-            Var showCocoaEnable = "Enable"
+			If toppingID6index3 = 322 Then
+           		 Var showCocoaEnable = "Enable"
+			Else
+				Var showCocoaEnable = "Disable"
+			EndIf
         EndIf
         If showOreoAddEnable = "Disable" Then
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+           		 Var showOreoAddEnable = "Enable"
+			Else
+				Var showOreoAddEnable = "Disible"
+			EndIf
         EndIf
     EndIf
 
@@ -8779,10 +8795,18 @@
         EndIf
     Else
         If showCocoaEnable = "Disable" Then
-            Var showCocoaEnable = "Enable"
+			If toppingID6index3 = 322 Then
+           		 Var showCocoaEnable = "Enable"
+			Else
+				Var showCocoaEnable = "Disable"
+			EndIf
         EndIf
         If showOreoAddEnable = "Disable" Then
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+           		 Var showOreoAddEnable = "Enable"
+			Else
+				Var showOreoAddEnable = "Disible"
+			EndIf
         EndIf
     EndIf
 
@@ -8884,10 +8908,18 @@
         EndIf
     Else
         If showCocoaEnable = "Disable" Then
-            Var showCocoaEnable = "Enable"
+            If toppingID6index3 = 322 Then
+				Var showCocoaEnable = "Enable"
+			Else
+				Var showCocoaEnable = "Disable"
+			EndIf
         EndIf
         If showOvaltineEnable = "Disable" Then
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+            	Var showOvaltineEnable = "Enable"
+			Else
+				Var showOvaltineEnable = "Disable"
+			EndIf
         EndIf
     EndIf
 
@@ -8939,11 +8971,19 @@
             Var showOvaltineEnable = "Disable"
         EndIf
     Else
-        If showCocoaEnable = "Disable" Then
-            Var showCocoaEnable = "Enable"
+         If showCocoaEnable = "Disable" Then
+            If toppingID6index3 = 322 Then
+				Var showCocoaEnable = "Enable"
+			Else
+				Var showCocoaEnable = "Disable"
+			EndIf
         EndIf
         If showOvaltineEnable = "Disable" Then
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+            	Var showOvaltineEnable = "Enable"
+			Else
+				Var showOvaltineEnable = "Disable"
+			EndIf
         EndIf
     EndIf
 
@@ -9025,10 +9065,18 @@
         EndIf
     Else
         If showOreoAddEnable = "Disable" Then
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+            	Var showOreoAddEnable = "Enable"
+			Else
+				Var showOreoAddEnable = "Disable"
+			EndIf
         EndIf
         If showOvaltineEnable = "Disable" Then
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+            	Var showOvaltineEnable = "Enable"
+			Else
+				Var showOvaltineEnable = "Disable"
+			EndIf
         EndIf
     EndIf
 
@@ -9093,10 +9141,18 @@
         EndIf
     Else
         If showOreoAddEnable = "Disable" Then
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+            	Var showOreoAddEnable = "Enable"
+			Else
+				Var showOreoAddEnable = "Disable"
+			EndIf
         EndIf
         If showOvaltineEnable = "Disable" Then
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+            	Var showOvaltineEnable = "Enable"
+			Else
+				Var showOvaltineEnable = "Disable"
+			EndIf
         EndIf
     EndIf
 
@@ -10429,7 +10485,9 @@
     SAVELOG "Click oreo cb"
     If CustomOreoCheckState = "Press" Then
         Var CustomOreoCheckState = "Enable"
-        Var showOreoAddEnable = "Enable"
+		If toppingID6index2 = 321 Then
+        	Var showOreoAddEnable = "Enable"
+		EndIf
         Var SelectedToppingCount = SelectedToppingCount - 1
     Else
         If SelectedToppingCount < 2 Then
@@ -10452,12 +10510,23 @@
         EndIf
     Else
         If CustomOvaltineCheckState = "Disable" Then
-            Var CustomOvaltineCheckState = "Enable"
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+				Var CustomOvaltineCheckState = "Enable"
+				Var showOvaltineEnable = "Enable"
+			Else
+				Var CustomOvaltineCheckState = "Disable"
+				Var showOvaltineEnable = "Disable"
+			EndIf
+
         EndIf
         If CustomCocoaCheckState = "Disable" Then
-            Var CustomCocoaCheckState = "Enable"
-            Var showCocoaEnable = "Enable"
+			If toppingID6index3 = 322 Then
+				Var CustomCocoaCheckState = "Enable"
+				Var showCocoaEnable = "Enable"
+			Else
+				Var CustomCocoaCheckState = "Enable"
+				Var showCocoaEnable = "Enable"
+			EndIf
         EndIf
     EndIf
 
@@ -10496,7 +10565,9 @@
     SAVELOG "Click ovaltine cb"
     If CustomOvaltineCheckState = "Press" Then
         Var CustomOvaltineCheckState = "Enable"
-        Var showOvaltineEnable = "Enable"
+		If toppingID6index4 = 323 Then
+			Var showOvaltineEnable = "Enable"
+		EndIf
         Var SelectedToppingCount = SelectedToppingCount - 1
     Else
         If SelectedToppingCount < 2 Then
@@ -10519,12 +10590,22 @@
         EndIf
     Else
         If CustomOreoCheckState = "Disable" Then
-            Var CustomOreoCheckState = "Enable"
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+				Var CustomOreoCheckState = "Enable"
+				Var showOreoAddEnable = "Enable"
+			Else
+				Var CustomOreoCheckState = "Disable"
+				Var showOreoAddEnable = "Disable"		
+			EndIf
         EndIf
         If CustomCocoaCheckState = "Disable" Then
-            Var CustomCocoaCheckState = "Enable"
-            Var showCocoaEnable = "Enable"
+			If toppingID6index3 = 322 Then
+				Var CustomCocoaCheckState = "Enable"
+				Var showCocoaEnable = "Enable"
+			Else
+				Var CustomCocoaCheckState = "Disable"
+				Var showCocoaEnable = "Disable"
+			EndIf
         EndIf
     EndIf
 
@@ -10564,7 +10645,9 @@
     SAVELOG "Click cocoa cb"
     If CustomCocoaCheckState = "Press" Then
         Var CustomCocoaCheckState = "Enable"
-        Var showCocoaEnable = "Enable"
+        If toppingID6index3 = 322 Then
+			Var showCocoaEnable = "Enable"
+		EndIf
         Var SelectedToppingCount = SelectedToppingCount - 1
     Else
         If SelectedToppingCount < 2 Then
@@ -10587,12 +10670,22 @@
         EndIf
     Else
         If CustomOvaltineCheckState = "Disable" Then
-            Var CustomOvaltineCheckState = "Enable"
-            Var showOvaltineEnable = "Enable"
+			If toppingID6index4 = 323 Then
+				Var CustomOvaltineCheckState = "Enable"
+				Var showOvaltineEnable = "Enable"
+			Else
+				Var CustomOvaltineCheckState = "Disable"
+				Var showOvaltineEnable = "Disable"
+			EndIf	
         EndIf
         If CustomOreoCheckState = "Disable" Then
-            Var CustomOreoCheckState = "Enable"
-            Var showOreoAddEnable = "Enable"
+			If toppingID6index2 = 321 Then
+				Var CustomOreoCheckState = "Enable"
+				Var showOreoAddEnable = "Enable"
+			Else
+				Var CustomOreoCheckState = "Disable"
+				Var showOreoAddEnable = "Disable"
+			EndIf
         EndIf
     EndIf