THAI: Added Happy Trios, Free Jemila topping, Free Sugar zero cal

xml/page_topping_select7.xml

@@ -911,7 +911,7 @@
 
 	CRLFToSpace showname
 	CRLFToSpace showdesc
-	
+
 
 	If SugarSoundFlag = 1 Then
 		If SelectDrinkType = 1 Then
@@ -948,7 +948,7 @@
 	Function 2
 
 
-	
+
 </EventClick>
 </Button>
 
@@ -1035,6 +1035,9 @@
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
 
+	DEBUGVAR toppingID3index1
+	DEBUGVAR toppingID3index2
+
 	DEBUGVAR toppingID6index1
 	DEBUGVAR toppingID6index2
 	DEBUGVAR toppingID6index3
@@ -1396,6 +1399,8 @@
 			If showOreoAddEnable = "Press" Then
 				Var showOreoAddEnable = "Disable"
 			EndIf
+
+			Var CollagenState = "Disable"
 		EndIf
 
 		; i f cold menu disable away
@@ -2005,7 +2010,18 @@
 
 				Var SugarZeroCalPrice = 10
 				Var priceFormat = "(+฿%.0f)"
-				Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
+
+                Var SugarZeroCalState = "Invisible"
+				Var SugarZeroCalFreeState = "Invisible"
+
+				If SugarZeroCalFreeFlag = 1 Then
+					Var SugarZeroCalFreeState = "Enable"
+				    Var SugarZeroCalPrice = 0
+				Else
+				    Var SugarZeroCalState = "Enable"
+				    Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
+				EndIf
+
 
 				Var SugarNormalCheck = "PressForever"
 			Else
@@ -2339,13 +2355,30 @@
 			EndIf
 
 		;-END
-			If TOPPING3 = "Collagen" Then
+		    DEBUGVAR TOPPING3
+			If TOPPING3 = "Collagen(mix)" Then
 				Var CollagenState = "Enable"
+				Var ExtraTopping = "Enable"
 			Else
 				Var CollagenState = "Invisible"
 				Var ShowCollagenOnly = "Invisible"
 			EndIf
 
+			If JemilaToppingFlag = 1 Then
+    			If CollagenState = "Enable" Then
+    			    If JemilaToppingFreeFlag = 1 Then
+    					Var CollagenToppingBg = "/bg_top_jemila_free.png"
+    					Var CollagenToppingPrice = 0
+    				Else
+    				    Var CollagenToppingBg = "/bg_top_jemila.png"
+    					Var CollagenToppingPrice = 5
+    				EndIf
+    			EndIf
+			Else
+			    Var CollagenState = "Invisible"
+			EndIf
+
+
 		EndIf
 		;topping_price_refresh = 0
 
@@ -3811,12 +3844,18 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
 
 ; sugar1
 <Button>
@@ -4425,12 +4464,19 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
+
 
 ; sugar1
 <Button>
@@ -4741,12 +4787,19 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
+
 
 ; sugar1
 <Button>
@@ -5535,6 +5588,82 @@
 
 </Row1>
 
+<Row1>
+<Width> 986 </Width>
+<Height> "auto" </Height>
+<State> CollagenState </State>
+;
+<Image>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Filename> Var( DirImage + CollagenToppingBg ) </Filename>
+</Image>
+;
+<Button>
+<X> 40 </X>
+<Y> 5 </Y>
+<State> CollagenState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_add_jemila.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_jemila.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_jemila.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	SAVELOG "Press add jemila"
+
+	If CollagenState = "Press" Then
+		Var CollagenState = "Enable"
+	Else
+		Var CollagenState = "Press"
+	EndIf
+
+	Function 2
+
+	Refresh
+
+</EventClick>
+<Animation>
+	<Style> "shake-text" </Style>
+	<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+</Button>
+
+;
+<Button>
+<X> 896 </X>
+<Y> 14 </Y>
+<State> CollagenState </State>
+<Mode> "No" </Mode>
+<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	SAVELOG "Press add jemila"
+
+	If CollagenState = "Press" Then
+		Var CollagenState = "Enable"
+	Else
+		Var CollagenState = "Press"
+	EndIf
+
+	Function 2
+
+
+
+	Refresh
+
+</EventClick>
+<Animation>
+	<Style> "shake-text" </Style>
+	<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+</Button>
+</Row1>
+
 
 ;
 ;
@@ -7607,6 +7736,15 @@
 
 	EndIf
 
+    If CollagenState = "Press" Then
+        Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice
+        Var topping3 = toppingID3index2
+        Var DisableUsingCode = "true"
+    Else
+        Var topping3 = toppingID3index1
+        Var DisableUsingCode = "false"
+    EndIf
+
 
 	If SugarZeroCalEnable = "true" Then
 		If SugarZeroCalOption = "Enable" Then