Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

inter/aus/menu/lang.tsv

@@ -108,7 +108,8 @@ TextID	Note	English	Thai
 000081		Hot	ร้อน
 000082		Iced	เย็น
 000083		Blend	ปั่น
-
+		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
+000084		Normal	ปกติ
 
 
 

inter/aus/xml/menu_new_layout_gen_v2.py

@@ -296,8 +296,12 @@
         out_xml( '\t<Image>\r\n')
         out_xml( '\t<X> 81 </X>\r\n')
         out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
+        if pd_code_2 == "51-05-02-0016":
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
+          out_xml( '\t<Filename> Var( DirImage2 + "normal.png" ) </Filename>\r\n')
+          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
+        else:
+          out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
+          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
         out_xml( '\t</Image>\r\n')
         out_xml( '\t<Text>\r\n')

inter/aus/xml/page_catalog_group_other.lxml

@@ -12068,7 +12068,7 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<Filename> Var( DirImage2 + "normal.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $51-05-02-0016.Button </State>
 	</Image>

inter/mys/menu/lang.tsv

@@ -107,8 +107,8 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 000081		Hot	ร้อน			Hot
 000082		Iced	เย็น			Iced
 000083		Blend	ปั่น			Blend
-
+		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F				Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
-
+000084		Normal	ปกติ			Normal
 
 
 

inter/mys/xml/event/promotion_2.xml

@@ -11448,15 +11448,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-05-02-0062 - 
+	; - 12-05-02-0062 12-05-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062) </State> 
+	<State> Flag( 12-05-02-0062.Button,12-05-03-0062.Button,Disable=Invisible,$Sum12050200621205030062) </State> 
 	<Button>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -11467,10 +11467,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0062.Price
-		Var PriceD3 = $-.Price
+		Var PriceD3 = $12-05-03-0062.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "12-05-02-0062"
-		Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0062"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -11502,20 +11502,20 @@
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "PEPSI  Black Smoothie"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป็ปซี่แม็กน้ำแข็ง"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "PEPSI Black Smoothie"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Pepsi, Ais, Zero Sugar"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0062.Button
-		Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0062.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -11536,7 +11536,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "12-05-03-0062"
 			EndIf
 		EndIf
 		
@@ -11629,7 +11629,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -11639,8 +11639,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11665,10 +11665,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1205020062 = "Disable" Then
+			If $Sum12050200621205030062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-05-03-0062.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -11702,7 +11702,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>

inter/mys/xml/event/promotion_3.xml

@@ -11448,15 +11448,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-05-02-0062 - 
+	; - 12-05-02-0062 12-05-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062) </State> 
+	<State> Flag( 12-05-02-0062.Button,12-05-03-0062.Button,Disable=Invisible,$Sum12050200621205030062) </State> 
 	<Button>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -11467,10 +11467,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0062.Price
-		Var PriceD3 = $-.Price
+		Var PriceD3 = $12-05-03-0062.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "12-05-02-0062"
-		Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0062"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -11502,20 +11502,20 @@
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "PEPSI  Black Smoothie"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป็ปซี่แม็กน้ำแข็ง"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "PEPSI Black Smoothie"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Pepsi, Ais, Zero Sugar"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0062.Button
-		Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0062.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -11536,7 +11536,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "12-05-03-0062"
 			EndIf
 		EndIf
 		
@@ -11629,7 +11629,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -11639,8 +11639,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11665,10 +11665,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1205020062 = "Disable" Then
+			If $Sum12050200621205030062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-05-03-0062.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -11702,7 +11702,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>

inter/mys/xml/event/promotion_pepsi_099.lxml

@@ -11448,15 +11448,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-05-02-0062 - 
+	; - 12-05-02-0062 12-05-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062) </State> 
+	<State> Flag( 12-05-02-0062.Button,12-05-03-0062.Button,Disable=Invisible,$Sum12050200621205030062) </State> 
 	<Button>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -11467,10 +11467,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0062.Price
-		Var PriceD3 = $-.Price
+		Var PriceD3 = $12-05-03-0062.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "12-05-02-0062"
-		Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0062"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -11502,20 +11502,20 @@
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "PEPSI  Black Smoothie"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป็ปซี่แม็กน้ำแข็ง"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "PEPSI Black Smoothie"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Pepsi, Ais, Zero Sugar"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0062.Button
-		Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0062.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -11536,7 +11536,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "12-05-03-0062"
 			EndIf
 		EndIf
 		
@@ -11629,7 +11629,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -11639,8 +11639,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11665,10 +11665,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1205020062 = "Disable" Then
+			If $Sum12050200621205030062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-05-03-0062.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -11702,7 +11702,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>

inter/mys/xml/menu_new_layout_gen_v2.py

@@ -296,8 +296,12 @@
         out_xml( '\t<Image>\r\n')
         out_xml( '\t<X> 81 </X>\r\n')
         out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
+        if pd_code_2 == "12-05-02-0016":
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
+          out_xml( '\t<Filename> Var( DirImage2 + "normal.png" ) </Filename>\r\n')
+          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
+        else:
+          out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
+          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
         out_xml( '\t</Image>\r\n')
         out_xml( '\t<Text>\r\n')

inter/mys/xml/page_catalog_group_other.lxml

@@ -12606,7 +12606,7 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<Filename> Var( DirImage2 + "normal.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $12-05-02-0016.Button </State>
 	</Image>

inter/mys/xml/page_catalog_group_recommend.lxml

@@ -10737,15 +10737,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-05-02-0062 - 
+	; - 12-05-02-0062 12-05-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062) </State> 
+	<State> Flag( 12-05-02-0062.Button,12-05-03-0062.Button,Disable=Invisible,$Sum12050200621205030062) </State> 
 	<Button>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -10756,10 +10756,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0062.Price
-		Var PriceD3 = $-.Price
+		Var PriceD3 = $12-05-03-0062.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "12-05-02-0062"
-		Var PD_CODE3 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0062"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -10791,20 +10791,20 @@
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "PEPSI  Black Smoothie"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป็ปซี่แม็กน้ำแข็ง"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "PEPSI Black Smoothie"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Pepsi, Ais, Zero Sugar"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0062.Button
-		Var PD_STAGE_3 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0062.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -10825,7 +10825,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "12-05-03-0062"
 			EndIf
 		EndIf
 		
@@ -10918,7 +10918,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -10928,8 +10928,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
+	<State> $12-05-03-0062.Button </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $12-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10954,10 +10954,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1205020062 = "Disable" Then
+			If $Sum12050200621205030062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-05-03-0062.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -10991,7 +10991,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020062 </State> 
+	<State> $Sum12050200621205030062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>

menu/new-layout.tsv

@@ -34,7 +34,7 @@ TAGESP
 
 
 		ชามะลิ	JASMINE TEA	ชามะลิ น้ำ 	Jasmine Tea ,Water	12-02-01-0045	12-02-02-0045	12-02-03-0046	bn_jasmine_tea.png	-	-	-	posi1
-		ชามะลิลาเต้	JASMINE MILK TEA	ชามะลิ และนม	Jasmine & Milk	12-02-01-0046	12-02-02-0046	12-02-03-0047	bn_jasmine_milk_tea.png	-	-	-	posi1
+		ชานมมะลิ	JASMINE MILK TEA	ชามะลิ และนม	Jasmine & Milk	12-02-01-0046	12-02-02-0046	12-02-03-0047	bn_jasmine_milk_tea.png	-	-	-	posi1
 		นมคาราเมล 	CARAMEL MILK	นม น้ำเชื่อมคาราเมล  	Milk, Caramel Syrup	12-03-01-0001	12-03-02-0001	12-03-03-0001	bn_iced_caramel.png	-	-	-	posi1	฿35.00	฿40.00	฿45.00	TRUE	TRUE
 		นมชมพู 	PINK MILK	น้ำแดงกลิ่นสละ นม \nน้ำตาล 	Salak Syrup, Milk,\nSugar	-	12-03-02-0006	12-03-03-0006	bn_pink_milk.png	-	-	-	posi1	-	฿35.00	฿40.00	NN	TRUE
 		นมสตอเบอร์รี่ปั่น	STRAWMILK \nSMOOTHIE	นม น้ำเชื่อมสตอเบอร์รี่ \nและน้ำแข็ง	Milk, Strawberry Syrup 	-	-	12-03-03-0011	bn_iced_strawberrymilk_smoothie.png	-	-	-	posi1	-	-	฿45.00	NN	NN
@@ -186,7 +186,7 @@ Name=Tea,file=page_catalog_group_tea.skt
 		ชาเขียวญี่ปุ่น 	MATCHA	ชาเชียว และน้ำ	Matcha & Water 	12-02-01-0011	12-02-02-0011	12-02-03-0011	bn_hot_matcha_tea.png	-	-	-	posi1	฿20.00	฿25.00	฿30.00	TRUE	TRUE
 		ชาเขียวญี่ปุ่นมะนาว\n 	MATCHA \nLIMENADE	ชาเชียว น้ำ มะนาว  	Matcha, Limenade, Water	12-02-01-0012	12-02-02-0012	12-02-03-0012	bn_hot_lime_Matcha.png	-	-	-	posi1	฿25.00	฿30.00	฿35.00	TRUE	TRUE
 		ชามะลิ	JASMINE TEA	ชามะลิ น้ำ 	Jasmine Tea ,Water	12-02-01-0045	12-02-02-0045	12-02-03-0046	bn_jasmine_tea.png	-	-	-	posi1
-		ชามะลิลาเต้	JASMINE MILK TEA	ชามะลิ และนม	Jasmine Tea & Milk	12-02-01-0046	12-02-02-0046	12-02-03-0047	bn_jasmine_milk_tea.png	-	-	-	posi1
+		ชานมมะลิ	JASMINE MILK TEA	ชามะลิ และนม	Jasmine Tea & Milk	12-02-01-0046	12-02-02-0046	12-02-03-0047	bn_jasmine_milk_tea.png	-	-	-	posi1
 		มัทฉะลาเต้มินต์	 MATCHA LATTE MINT	ชาเขียวมัทฉะ น้ำเชื่อมมินต์ และนมอุ่น	Matcha, Mint Syrup &Milk	12-02-01-0050	12-02-02-0050	12-02-03-0050	bn_Mint_Matcha_Latte.png	-	-	-	posi1	#N/A	#N/A	#REF!	#N/A	#N/A
 		ชาพีช	PEACH TEA	ชาไทย และน้ำเชื่อมพีช	Thai Tea, Peach Syrup & Water	12-02-01-0051	12-02-02-0051	12-02-03-0051	-	-	-	-	posi1
 		ชามะลิพีช	PEACH JASMINE TEA	ชามะลิ และน้ำเชื่อมพีช	Jasmine Tea, Peach Syrup &Milk	-	12-02-02-0052	-	-	-	-	-	posi1
@@ -223,7 +223,7 @@ Name=Tea,file=page_catalog_group_tea.skt
 
 Name=Other,file=page_catalog_group_other.skt
 		เป๊ปซี่น้ำแข็ง	PEPSI	เป๊ปซี่  	Pepsi & Ice	-	12-05-02-0007	12-05-03-0007	bn_iced_pepsi.png	-	-	-	posi1	-	฿15.00	฿20.00	NN	TRUE
-			PEPSI MAX				12-05-02-0062	12-05-03-0062					posi1
+IGNORE			PEPSI MAX				12-05-02-0062	12-05-03-0062					posi1
 		เต่าทรงพลังโซดา	TAO POWER \nDRINK SODA	เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน)	Medicine drink, Soda & Ice	-	12-05-02-0035	12-05-03-0035	bn_iced_energy_drink_soda.png	-	-	-	posi1	-	฿15.00	#N/A	NN	#N/A
 		เมล่อนโซดา	MELON SODA	น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง	Melon Syrup, Soda, Ice	-	12-05-02-0044	-	bn_iced_melon_soda.png	-	-	-	posi1	-	฿30.00	-	NN	NN
 		ยูซุโซดา	YUZU SODA	น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง	Yuzu Syrup, Soda, Ice	-	12-05-02-0045	-	bn_iced_yuzu_soda.png	-	-	-	posi1	-	฿25.00	-	NN	NN

xml/event/my_mint_my_moment/page_mymint_random.xml

@@ -115,6 +115,9 @@
             Var var2 = "X"
             Var var3 = "X"
 
+            ; Debug code
+            ;Var UserCouponReward = "glass"
+
             If UserCouponReward = "glass" Then
                 Var CodeType = "117"
             EndIf

xml/event/promotion_15THB.xml

@@ -7924,7 +7924,7 @@ AMERICANO" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "JASMINE MILK TEA"
-		Var NameDrinkTH = "ชามะลิลาเต้"
+		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
@@ -7995,7 +7995,7 @@ AMERICANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิลาเต้" </Value>
+	<Value> "ชานมมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/promotion_mymint.xml

@@ -527,17 +527,12 @@
             
 			; Handle penetrator
 
-			If EnableJsonProfileMode = "true" Then
+			If Only18 = "true" Then
-				If Only18 = "true" Then
+				
-					; OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+                Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
-					Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
-				Else
-					; OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-					Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-				EndIf
 			Else
-				; OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+				
-				Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+                Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
 			EndIf
 
             ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
@@ -7929,7 +7924,7 @@ AMERICANO" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "JASMINE MILK TEA"
-		Var NameDrinkTH = "ชามะลิลาเต้"
+		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
@@ -8000,7 +7995,7 @@ AMERICANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิลาเต้" </Value>
+	<Value> "ชานมมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10016,7 +10011,7 @@ LIMENADE SODA" </Value>
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/event/promotion_pepween.xml

@@ -7924,7 +7924,7 @@ AMERICANO" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "JASMINE MILK TEA"
-		Var NameDrinkTH = "ชามะลิลาเต้"
+		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
@@ -7995,7 +7995,7 @@ AMERICANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิลาเต้" </Value>
+	<Value> "ชานมมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/promotion_template1.inc

@@ -71,7 +71,7 @@
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/page_brewing3.xml

@@ -217,6 +217,11 @@
 		Var AddData = 0
 	EndIf 
 
+	If MyMintEnable = 1 Then
+		If FromMyMintPro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
 
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0

xml/page_brewing3Conti.xml

@@ -128,6 +128,12 @@
 		Var AddData = 0
 	EndIf 
 
+	If MyMintEnable = 1 Then
+		If FromMyMintPro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
 	If LedLidBlink = "true" Then
 		Var LedLidBlink = "no"
 		LED LedDoorLid Blink 255 255 255 255

xml/page_catalog_group_other.xml

@@ -792,503 +792,6 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 11
-	; 12-05-02-0062 12-05-03-0062  
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0062.Button,12-05-03-0062.Button,.Button,$Sum12050200621205030062) </State> 
-	<Button>
-	<State> $Sum12050200621205030062 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = ""
-		Var NameDrinkTH = "PEPSI MAX"
-		Var DrinkDescriptionTH = ""
-		Var DrinkDescription = ""
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-05-02-0062.Price
-		Var PriceD2 = $12-05-03-0062.Price
-		Var PriceD3 = $.Price
-		Var PD_CODE1 = "12-05-02-0062"
-		Var PD_CODE2 = "12-05-03-0062"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-05-02-0062.Button
-		Var PD_STAGE_2 = $12-05-03-0062.Button
-		Var PD_STAGE_3 = "Disable2"
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-03-0062"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-05-02-0062"
-			Else
-			Topping "Load" ""
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $12-05-02-0062.NameE
-		Var menu_desc_eng_hot = $12-05-02-0062.descriptionE
-		Var menu_name_thai_hot = $12-05-02-0062.Name
-		Var menu_desc_thai_hot = $12-05-02-0062.description
-		
-		Var menu_name_eng_cold = $12-05-03-0062.NameE
-		Var menu_desc_eng_cold = $12-05-03-0062.descriptionE
-		Var menu_name_thai_cold = $12-05-03-0062.Name
-		Var menu_desc_thai_cold = $12-05-03-0062.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "PEPSI MAX" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "" </Value>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $12-05-02-0062.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-02-0062.Button </State>
-	<Value> StringFmt(  $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-05-03-0062.Button </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-03-0062.Button </State>
-	<Value> StringFmt( $12-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum12050200621205030062 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum12050200621205030062 = "Disable" Then
-				STRCONTAIN "ERR" $12-05-02-0062.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-03-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum12050200621205030062 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	;   posi1 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( .Button,.Button,posi1.Button,$Sumposi1) </State> 
-	<Button>
-	<State> $Sumposi1 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = ""
-		Var NameDrinkTH = "PEPSI MAX"
-		Var DrinkDescriptionTH = ""
-		Var DrinkDescription = ""
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
-		Var PriceD2 = $.Price
-		Var PriceD3 = $posi1.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "posi1"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = "Disable2"
-		Var PD_STAGE_3 = $posi1.Button
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" ""
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
-			Else
-			Topping "Load" "posi1"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $##-##-##-####.NameE
-		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-		Var menu_name_thai_cold = $##-##-##-####.Name
-		Var menu_desc_thai_cold = $##-##-##-####.description
-		
-		Var menu_name_eng_blender = $posi1.NameE
-		Var menu_desc_eng_blender = $posi1.descriptionE
-		Var menu_name_thai_blender = $posi1.Name
-		Var menu_desc_thai_blender = $posi1.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "PEPSI MAX" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "" </Value>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $posi1.Button </State>
-	</Image>
-	<Text>
-	<X> 183 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $posi1.Button </State>
-	<Value> StringFmt( $posi1.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			Var ice_tab_process_show = "Invisible"
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sumposi1 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $posi1.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sumposi1 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
 	; ==================> Len = 17
 	; - 12-05-02-0035 12-05-03-0035 
 <Block>

xml/page_catalog_group_recommend.xml

@@ -6942,7 +6942,7 @@ AMERICANO" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "JASMINE MILK TEA"
-		Var NameDrinkTH = "ชามะลิลาเต้"
+		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
@@ -7013,7 +7013,7 @@ AMERICANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิลาเต้" </Value>
+	<Value> "ชานมมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_tea.xml

@@ -5358,7 +5358,7 @@ LIMENADE" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "JASMINE MILK TEA"
-		Var NameDrinkTH = "ชามะลิลาเต้"
+		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine Tea & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
@@ -5429,7 +5429,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิลาเต้" </Value>
+	<Value> "ชานมมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_topping_select6.lxml

@@ -211,6 +211,7 @@
 	Var hot_button_state = PD_STAGE_1
 	Var cold_button_state = PD_STAGE_2
 	Var blend_button_state = PD_STAGE_3
+	Var normal_button_state = "Invisible"
 
 	; Protect have product-code but menu disable or invalid.
 	If hot_button_state = "Invisible" Then
@@ -624,6 +625,10 @@
 
 		DEBUGVAR SubMenuGroupIDSlot6_1
 
+		If PD_CODE2 = "12-05-02-0016" Then
+			Var cold_button_state = "Invisible"
+			Var normal_button_state = "PressForever"
+		EndIf
 
 		; i f Hot menu disable away
 		If hot_button_state = "PressForever" Then
@@ -1557,6 +1562,61 @@
 </Language>
 </Button>
 
+<Button>
+<X> 594 </X>
+<Y> 72 </Y>
+<State> normal_button_state </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping_inter/bt_cold_no.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping_inter/bt_cold_disable_no.png" </FilenameDisable>
+<FilenameDisable2> "ROOT/taobin_project/image/topping_inter/bt_cold_disable2_no.png" </FilenameDisable2>
+<FilenameForce> "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" </FilenameForce>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var SelectDrinkType = 1
+	
+	SAVELOG "Press cold"
+
+	Var normal_button_state = "PressForever"
+
+	If hot_button_state = "Disable" Then
+
+	Else
+		If hot_button_state = "Disable2" Then
+
+		Else
+			Var hot_button_state = "Enable"
+		EndIf
+	EndIf
+
+	If blend_button_state = "Disable" Then
+
+	Else
+		If blend_button_state = "Disable2" Then
+
+		Else
+			Var blend_button_state = "Enable"
+		EndIf
+	EndIf
+	
+	Var BugFlag = 0
+	Var topping_price_refresh = 0
+	Topping "Load" PD_CODE2
+
+	Var IndexDrinktType = 1
+
+</EventClick>
+<Language>
+	<X> 35 </X>
+	<Y> 8 </Y>
+	<Width> 150 </Width>
+	<Height> 42 </Height>
+	<ID> 000084 </ID>
+</Language>
+</Button>
+
 
 
 <Button>
@@ -3717,6 +3777,12 @@
 		EndIf
 		If DefaultDrinkType = 2 Then
 			Var cold_button_state = "PressForever"
+
+			If PD_CODE2 = "12-05-02-0016" Then
+				Var cold_button_state = "Invisible"
+				Var normal_button_state = "PressForever"
+			EndIf
+			
 			Var IndexDrinktType = 1
 		EndIf
 		If DefaultDrinkType = 3 Then

xml/page_topping_select7.xml

@@ -309,6 +309,13 @@
 	Var img_cold_dis2 = "/bt_cold_disable2_no.png"
 
 
+	If PD_CODE2 = "12-05-02-0016" Then
+		Var img_cold = "/bt_normal_no.png"
+		Var img_cold_sel = "/bt_normal_selected_no.png"
+		Var img_cold_dis = "/bt_cold_disable_no.png"
+		Var img_cold_dis2 = "/bt_cold_disable2_no.png"
+	EndIf
+
 	Var img_smth = "/bt_smoothie_no.png"
 	Var img_smth_sel = "/bt_smoothie_selected_no.png"
 	Var img_smth_dis = "/bt_smoothie_disable_no.png"
@@ -4093,6 +4100,13 @@
 		Var img_cold_sel = "/bt_cold_selected_no.png"
 		Var img_cold_dis = "/bt_cold_disable_no.png"
 		Var img_cold_dis2 = "/bt_cold_disable2_no.png"
+
+		If PD_CODE2 = "12-05-02-0016" Then
+			Var img_cold = "/bt_normal_no.png"
+			Var img_cold_sel = "/bt_normal_selected_no.png"
+			Var img_cold_dis = "/bt_cold_disable_no.png"
+			Var img_cold_dis2 = "/bt_cold_disable2_no.png"
+		EndIf
 	Else
 		Var img_cold = "/bt_cold.png"
 		Var img_cold_sel = "/bt_cold_selected.png"
@@ -4127,6 +4141,13 @@
 	Var img_cold_dis = "/bt_cold_disable_no.png"
 	Var img_cold_dis2 = "/bt_cold_disable2_no.png"
 
+	If PD_CODE2 = "12-05-02-0016" Then
+		Var img_cold = "/bt_normal_no.png"
+		Var img_cold_sel = "/bt_normal_selected_no.png"
+		Var img_cold_dis = "/bt_cold_disable_no.png"
+		Var img_cold_dis2 = "/bt_cold_disable2_no.png"
+	EndIf
+
 	Var img_smth = "/bt_smoothie_no.png"
 	Var img_smth_sel = "/bt_smoothie_selected_no.png"
 	Var img_smth_dis = "/bt_smoothie_disable_no.png"