THAI: fix topping show that invisible

inc/button_topping_select_confirm_order.inc

@@ -340,27 +340,47 @@ If CART_COUNT  = 0 Then
             If blend_button_state = "PressForever" Then
                 Var toppingSelectState = "Enable"
                 If toppingSelectState = "Enable" Then
-                    Var CustomOreoState = "Enable"
+                    
-                    Var CustomOvaltineState = "Enable"
+                   
-                    Var CustomCocoaState = "Enable"
+                    
                     
                     Var PopupToppingSelect = "Enable"
 
 
 					If toppingID6index2 = 321 Then
+                        If toppingID6index2Status = "Enable" Then
 						    Var CustomOreoCheckState = "Enable"
+                            Var CustomOreoState = "Enable"
                         Else
                              Var CustomOreoCheckState = "Disable"
+                             Var CustomOreoState = "Enable"
                         EndIf
+					Else
+						Var CustomOreoCheckState = "Invisible"
+					EndIf
+
 					If toppingID6index3 = 322 Then
+                        If toppingID6index3Status = "Enable" Then
 						    Var CustomCocoaCheckState = "Enable"
+                            Var CustomCocoaState = "Enable"
                         Else
                             Var CustomCocoaCheckState = "Disable"
+                            Var CustomCocoaState = "Enable"
                         EndIf
+					Else
+						Var CustomCocoaCheckState = "Invisible"
+					EndIf
+
 					If toppingID6index4 = 323 Then
+                        If toppingID6index4Status = "Enable" Then
 						    Var CustomOvaltineCheckState = "Enable"
+                            Var CustomOvaltineState = "Enable"
                         Else
                             Var CustomOvaltineCheckState = "Disable"
+                            Var CustomOvaltineState = "Enable"
+                        EndIf
+					Else
+						Var CustomOvaltineCheckState = "Invisible"
 					EndIf
                 EndIf
             EndIf

xml/page_topping_select8.xml

@@ -1030,22 +1030,7 @@
 	EndIf
 
 
-	Var oreo_y = 1060
-	Var oreo_button_y = 1070
-	Var oreo_text_y = 1085
 
-	Var ovaltine_y = 1060
-	Var ovaltine_button_y = 1070
-	Var ovaltine_text_y = 1085
-	
-	Var cocoa_y = 1060
-	Var cocoa_button_y = 1070
-	Var cocoa_text_y = 1085
-	
-	Var bottom_y = 1060
-	Var accept_y = 1075
-	
-	Var offset = 0
 
 	If Seeker = "curr" Then
 		If MenuReason = "arm-not-ready" Then
@@ -1086,26 +1071,53 @@
 		Var MenuReasonStage = "Enable"
 	EndIf
 
+
+	Var oreo_y = 1060
+	Var oreo_button_y = 1070
+	Var oreo_text_y = 1085
+
+	Var ovaltine_y = 1060
+	Var ovaltine_button_y = 1070
+	Var ovaltine_text_y = 1085
+
+	Var cocoa_y = 1060
+	Var cocoa_button_y = 1070
+	Var cocoa_text_y = 1085
+
+	Var bottom_y = 1060
+	Var accept_y = 1075
+
+	Var offset_total = 0
+
 	If CustomOreoState = "Enable" Then
-		Var offset = offset + 72
+		Var offset_total = 72
-		Var ovaltine_y = 1060 + offset
-		Var ovaltine_button_y = 1070 + offset
-		Var ovaltine_text_y = 1085 + offset
 	EndIf
 
+	Var ovaltine_offset = offset_total
+
 	If CustomOvaltineState = "Enable" Then
-		Var offset = offset + 72
+		Var offset_total = offset_total + 72
-		Var cocoa_y = 1060 + offset
-		Var cocoa_button_y = 1070 + offset
-		Var cocoa_text_y = 1085 + offset
 	EndIf
 
+	Var cocoa_offset = offset_total
+
 	If CustomCocoaState = "Enable" Then
-		Var offset = offset + 72
+		Var offset_total = offset_total + 72
-		Var bottom_y = 1060 + offset
-		Var accept_y = 1075 + offset
 	EndIf
 
+	Var bottom_offset = offset_total
+
+	Var ovaltine_y = 1060 + ovaltine_offset
+	Var ovaltine_button_y = 1070 + ovaltine_offset
+	Var ovaltine_text_y = 1085 + ovaltine_offset
+
+	Var cocoa_y = 1060 + cocoa_offset
+	Var cocoa_button_y = 1070 + cocoa_offset
+	Var cocoa_text_y = 1085 + cocoa_offset
+
+	Var bottom_y = 1060 + bottom_offset
+	Var accept_y = 1075 + bottom_offset
+
 	Refresh
 	TimerReset
 </EventTimeout> 
@@ -1665,6 +1677,8 @@
 				Var SpecialMix = "Enable"
 				Var CustomSyrup = "Enable"
 				
+				
+
 				Var showOreoAddEnable = "Disable"
 				Var showOvaltineEnable = "Disable"
 				Var showCocoaEnable = "Disable"
@@ -1745,8 +1759,45 @@
 ;				Var showCoffeeTamping = "Invisible"
 			EndIf
 
+			If toppingID6index2Status = "" Then
+				Var showOreoAddEnable = "Invisible"
+			EndIf
 
+			If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
 
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+
+			If toppingID6index5Status = "" Then
+				Var showStrawberryEnable = "Invisible"
+			EndIf
+
+			If toppingID6index6Status = "" Then
+				Var showYuzuEnable = "Invisible"
+			EndIf
+
+			If toppingID6index2Status = "Disable" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+
+			If toppingID6index3Status = "Disable" Then
+				Var showCocoaEnable = "Disable"
+			EndIf
+
+			If toppingID6index4Status = "Disable" Then
+				Var showOvaltineEnable = "Disable"
+			EndIf
+
+			If toppingID6index5Status = "Disable" Then
+				Var showStrawberryEnable = "Disable"
+			EndIf
+
+			If toppingID6index6Status = "Disable" Then
+				Var showYuzuEnable = "Disable"
+			EndIf
 			
 			Var ExtraTopping = "Enable"
 
@@ -8734,28 +8785,42 @@
    If SelectedToppingCount >= 2 Then
         If showCocoaEnable = "Press" Then
 		Else
+			If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			If toppingID6index3Status = "Enable" Then
             	Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
         If showOreoAddEnable = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
            	 	Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showCocoaEnable = "Disable" Then
 			If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
            		 	Var showCocoaEnable = "Enable"
 				Else
 					Var showCocoaEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOreoAddEnable = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
            			Var showOreoAddEnable = "Enable"
 				Else
 					Var showOreoAddEnable = "Disible"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -8794,28 +8859,42 @@
    If SelectedToppingCount >= 2 Then
         If showCocoaEnable = "Press" Then
 		Else
+			If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			If toppingID6index3Status = "Enable" Then
             	Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
         If showOreoAddEnable = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
            	 	Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showCocoaEnable = "Disable" Then
 			If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
            		 	Var showCocoaEnable = "Enable"
 				Else
 					Var showCocoaEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOreoAddEnable = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
            			Var showOreoAddEnable = "Enable"
 				Else
 					Var showOreoAddEnable = "Disible"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -8907,28 +8986,42 @@
     If SelectedToppingCount >= 2 Then
         If showCocoaEnable = "Press" Then
 		Else
+            If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			 If toppingID6index3Status = "Enable" Then
 				Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
         If showOvaltineEnable = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
 		    	Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showCocoaEnable = "Disable" Then
             If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
 					Var showCocoaEnable = "Enable"
 				Else
 					Var showCocoaEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOvaltineEnable = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
             		Var showOvaltineEnable = "Enable"
 				Else
 					Var showOvaltineEnable = "Disable"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -8971,28 +9064,42 @@
     If SelectedToppingCount >= 2 Then
         If showCocoaEnable = "Press" Then
 		Else
+            If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			 If toppingID6index3Status = "Enable" Then
 				Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
         If showOvaltineEnable = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
 		    	Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showCocoaEnable = "Disable" Then
             If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
 					Var showCocoaEnable = "Enable"
 				Else
 					Var showCocoaEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOvaltineEnable = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
             		Var showOvaltineEnable = "Enable"
 				Else
 					Var showOvaltineEnable = "Disable"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -9064,28 +9171,42 @@
     If SelectedToppingCount >= 2 Then
         If showOreoAddEnable = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
             	Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
         If showOvaltineEnable = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
             	Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showOreoAddEnable = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
             		Var showOreoAddEnable = "Enable"
 				Else
 					Var showOreoAddEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOvaltineEnable = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
             		Var showOvaltineEnable = "Enable"
 				Else
 					Var showOvaltineEnable = "Disable"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -9140,28 +9261,42 @@
     If SelectedToppingCount >= 2 Then
         If showOreoAddEnable = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
             	Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
         If showOvaltineEnable = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
             	Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If showOreoAddEnable = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
             		Var showOreoAddEnable = "Enable"
 				Else
 					Var showOreoAddEnable = "Disable"
 				EndIf
 			EndIf
+        EndIf
         If showOvaltineEnable = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
             		Var showOvaltineEnable = "Enable"
 				Else
 					Var showOvaltineEnable = "Disable"
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     If SelectedToppingCount > 0 Then
         Var SelectToppingType = 1
@@ -9372,18 +9507,28 @@
 	If showStrawberryEnable = "Press" Then
 		
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Enable"
+			Else
+				Var showStrawberryEnable = "Disable"
+			EndIf
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Enable"
+			Else
+				Var showYuzuEnable = "Disable"
+			EndIf
 		EndIf
 
 	Else
 
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Press"
 			EndIf
+		EndIf
 
 		If toppingID6index6 = 325 Then
 				Var showYuzuEnable = "Disable"
@@ -9418,18 +9563,28 @@
 	If showStrawberryEnable = "Press" Then
 		
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Enable"
+			Else
+				Var showStrawberryEnable = "Disable"
+			EndIf
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Enable"
+			Else
+				Var showYuzuEnable = "Disable"
+			EndIf
 		EndIf
 
 	Else
 
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Press"
 			EndIf
+		EndIf
 
 		If toppingID6index6 = 325 Then
 				Var showYuzuEnable = "Disable"
@@ -9439,11 +9594,10 @@
 
 	Var SelectSyrupType = 1
 	
+
 	Function 2
 
 	Refresh
-
-
 </EventClick>
 <Animation>
 	<Style> "shake-text" </Style>
@@ -9497,11 +9651,19 @@
 
 	If showYuzuEnable = "Press" Then
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Enable"
+			Else
+				Var showStrawberryEnable = "Disable"
+			EndIf
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Enable"
+			Else
+				Var showYuzuEnable = "Disable"
+			EndIf
 		EndIf
 	Else
 		
@@ -9510,9 +9672,11 @@
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Press"
 			EndIf
 		EndIf
+	EndIf
 
 
 	
@@ -9542,17 +9706,23 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-
 	SAVELOG "Press add Yuzu"
 
-
 	If showYuzuEnable = "Press" Then
 		If toppingID6index5 = 324 Then
+			If toppingID6index5Status = "Enable" Then
 				Var showStrawberryEnable = "Enable"
+			Else
+				Var showStrawberryEnable = "Disable"
+			EndIf
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Enable"
+			Else
+				Var showYuzuEnable = "Disable"
+			EndIf
 		EndIf
 	Else
 		
@@ -9561,17 +9731,19 @@
 		EndIf
 
 		If toppingID6index6 = 325 Then
+			If toppingID6index6Status = "Enable" Then
 				Var showYuzuEnable = "Press"
 			EndIf
 		EndIf
+	EndIf
+
+
 	
 
 	Var SelectSyrupType = 1
 
 	Function 2
 
-
-
 	Refresh
 
 </EventClick>
@@ -10064,14 +10236,11 @@
 	DEBUGVAR TOPPING_PRICE
 
 	; Oreo
-	Var strMulti6_1 = ""
+	Var strMulti6_1 = "TPID:321+multiply:0"
 	; Ovaltine
-	Var strMulti6_2 = ""
+	Var strMulti6_2 = "TPID:323+multiply:0"
 	; Coaco
-	Var strMulti6_3 = ""
+	Var strMulti6_3 = "TPID:322+multiply:0"
-	Var strMulti6_4 = ""
-	Var strMulti6_5 = ""
-	Var strMulti6_6 = ""
 
 
 	If showOreoAddEnable = "Press" Then
@@ -10510,32 +10679,48 @@
     If SelectedToppingCount >= 2 Then
         If CustomOvaltineCheckState = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var CustomOvaltineCheckState = "Invisible"
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
 				Var CustomOvaltineCheckState = "Disable"
 				Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
         If CustomCocoaCheckState = "Press" Then
 		Else
+			If toppingID6index3Status = "" Then
+				Var CustomCocoaCheckState = "Invisible"
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			If toppingID6index3Status = "Enable" Then
 				 Var CustomCocoaCheckState = "Disable"
            		 Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If CustomOvaltineCheckState = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
 					Var CustomOvaltineCheckState = "Enable"
 					Var showOvaltineEnable = "Enable"
 				Else
 					Var CustomOvaltineCheckState = "Disable"
 					Var showOvaltineEnable = "Disable"
 				EndIf
+			EndIf
 
         EndIf
         If CustomCocoaCheckState = "Disable" Then
 			If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
 					Var CustomCocoaCheckState = "Enable"
 					Var showCocoaEnable = "Enable"
 				Else
-				Var CustomCocoaCheckState = "Enable"
+					Var CustomCocoaCheckState = "Disable"
-				Var showCocoaEnable = "Enable"
+					Var showCocoaEnable = "Disable"
+				EndIf
 			EndIf
         EndIf
     EndIf
@@ -10590,17 +10775,30 @@
     If SelectedToppingCount >= 2 Then
         If CustomOreoCheckState = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				 Var CustomOreoCheckState = "Invisible"
+           		 Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
 				Var CustomOreoCheckState = "Disable"
 				Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
         If CustomCocoaCheckState = "Press" Then
 		Else
+			If toppingID6index3Status = "" Then
+				Var CustomCocoaCheckState = "Invisible"
+				Var showCocoaEnable = "Invisible"
+			EndIf
+			If toppingID6index3Status = "Enable" Then
 				Var CustomCocoaCheckState = "Disable"
 				Var showCocoaEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If CustomOreoCheckState = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
 					Var CustomOreoCheckState = "Enable"
 					Var showOreoAddEnable = "Enable"
 				Else
@@ -10608,8 +10806,10 @@
 					Var showOreoAddEnable = "Disable"		
 				EndIf
 			EndIf
+        EndIf
         If CustomCocoaCheckState = "Disable" Then
 			If toppingID6index3 = 322 Then
+				If toppingID6index3Status = "Enable" Then
 					Var CustomCocoaCheckState = "Enable"
 					Var showCocoaEnable = "Enable"
 				Else
@@ -10618,6 +10818,7 @@
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     Function 2
     Refresh
@@ -10670,17 +10871,30 @@
     If SelectedToppingCount >= 2 Then
         If CustomOvaltineCheckState = "Press" Then
 		Else
+			If toppingID6index4Status = "" Then
+				Var CustomOvaltineCheckState = "Invisible"
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+			If toppingID6index4Status = "Enable" Then
 				Var CustomOvaltineCheckState = "Disable"
 				Var showOvaltineEnable = "Disable"
 			EndIf
+        EndIf
         If CustomOreoCheckState = "Press" Then
 		Else
+			If toppingID6index2Status = "" Then
+				Var CustomOreoCheckState = "Invisible"
+           		Var showOreoAddEnable = "Invisible"
+			EndIf
+			If toppingID6index2Status = "Enable" Then
 				Var CustomOreoCheckState = "Disable"
 				Var showOreoAddEnable = "Disable"
 			EndIf
+        EndIf
     Else
         If CustomOvaltineCheckState = "Disable" Then
 			If toppingID6index4 = 323 Then
+				If toppingID6index4Status = "Enable" Then
 					Var CustomOvaltineCheckState = "Enable"
 					Var showOvaltineEnable = "Enable"
 				Else
@@ -10688,8 +10902,10 @@
 					Var showOvaltineEnable = "Disable"
 				EndIf
 			EndIf	
+        EndIf
         If CustomOreoCheckState = "Disable" Then
 			If toppingID6index2 = 321 Then
+				If toppingID6index2Status = "Enable" Then
 					Var CustomOreoCheckState = "Enable"
 					Var showOreoAddEnable = "Enable"
 				Else
@@ -10698,6 +10914,7 @@
 				EndIf
 			EndIf
         EndIf
+    EndIf
 
     
     Function 2