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

inter/hkg/menu/lang.tsv

@@ -113,6 +113,18 @@ TextID	Note	English	Mandarin Simplified	Mandarin Traditional
 000083	建议：混合冷饮、混合冷飲	Blend	碎冰	碎冰
 		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
 000084		Normal	常温	常溫
+	page_catalog_menu
+		Font=Kanit,Type=Regular,Size=12,Color=0x513C2F	Font=Kanit,Type=Regular,Size=12,Color=0x513C2F	Font=Kanit,Type=Regular,Size=12,Color=0x513C2F
+		Font=Kanit,Type=Medium,Size=12,Color=0x513C2F	Font=Kanit,Type=Medium,Size=12,Color=0x513C2F	Font=Kanit,Type=Medium,Size=12,Color=0x513C2F
+		Font=Kanit,Type=Regular,Size=12,Color=0x9D9D9D	Font=Kanit,Type=Regular,Size=12,Color=0x9D9D9D	Font=Kanit,Type=Regular,Size=12,Color=0x9D9D9D
+		Font=Kanit,Type=Regular,Size=12,Color=0xCFCFCF	Font=Kanit,Type=Regular,Size=12,Color=0xCFCFCF	Font=Kanit,Type=Regular,Size=12,Color=0xCFCFCF
+000085		Hot	热饮	熱飲
+000086		Cold	冰饮	冰飲
+000087		Blend	碎冰	碎冰
+		Font=Kanit,Type=Regular,Size=12,Color=0x513C2F	Font=Kanit,Type=Regular,Size=12,Color=0x513C2F	Font=Kanit,Type=Regular,Size=12,Color=0x513C2F
+000088		Normal	常温	常溫
+
+
 
 
 

inter/hkg/xml/multi/GetStringTextId.ev

@@ -0,0 +1,4 @@
+;get text string from TextID
+Var TEXT_ID_STRING_000085 !assigned GetLanguageID(000085, LanguageShowByIndex)
+Var TEXT_ID_STRING_000086 !assigned GetLanguageID(000086, LanguageShowByIndex)
+Var TEXT_ID_STRING_000087 !assigned GetLanguageID(000087, LanguageShowByIndex)

inter/hkg/xml/multi/control_and_lang_swith.ev

@@ -35,7 +35,8 @@ Else
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
 EndIf
 
-Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
+TabMenuLock 15
+OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
 
 TabMenuVisibleInst 99
 

inter/hkg/xml/multi/menu_catalog_new.lxml

@@ -114,8 +114,6 @@
 
     SAVELOG "EventLanguageOnChange menu -list"
 
-    
-
     Var LanguageButtonEnable = "Invisible"
     Var BtnLangToggleIndex = "Enable"
     
@@ -127,7 +125,7 @@
 
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
-    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_open_instance.lxml"
     RefreshAll
 
 </EventLanguageOnChange>

inter/hkg/xml/multi/menu_new_layout_gen_v2.py

@@ -289,9 +289,45 @@
         out_xml( '\t<Image>\r\n')
         out_xml( '\t<X> 16 </X>\r\n')
         out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
+        out_xml( '\t<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>\r\n')
         out_xml( '\t</Image>\r\n')
 
+        out_xml( '\t<Text>\r\n')
+        out_xml( '\t<X> TextHotMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> "Disable" </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000085 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
+
+        out_xml( '\t<Text>\r\n')
+        out_xml( '\t<X> TextColdMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> "Disable" </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000086 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
+
+        out_xml( '\t<Text>\r\n')
+        out_xml( '\t<X> TextBlendMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> "Disable" </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000087 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
+
         ice_tab_hot_show = True
         shw = "$" + str_hot_product_code + ".Button"
         if str_hot_product_code == "-" :
@@ -306,9 +342,21 @@
         out_xml( '\t<X> 16 </X>\r\n')
         out_xml( '\t<Y> 264 </Y>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n')
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n')
+        out_xml( '\t<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>\r\n')
+        out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>\r\n')
         out_xml( '\t</Image>\r\n')
+
+        out_xml( '\t<Text>\r\n')
+        out_xml( '\t<X> TextHotMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> ' + shw + ' </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000085 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
         
         out_xml( '\t<Text>\r\n')
         out_xml( '\t<X> TextPriceMenuHotX </X>\r\n')
@@ -351,9 +399,22 @@
           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<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>\r\n')
+          out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
+
+        out_xml( '\t<Text>\r\n')
+        out_xml( '\t<X> TextColdMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> ' + shw + ' </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000086 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
+
         out_xml( '\t</Image>\r\n')
         out_xml( '\t<Text>\r\n')
         out_xml( '\t<X> 113 </X>\r\n')
@@ -388,11 +449,23 @@
         out_xml( '\t<Image>\r\n')
         out_xml( '\t<X> 146 </X>\r\n')
         out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
+        out_xml( '\t<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>\r\n')
+        out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_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')
+        out_xml( '\t<X> TextBlendMenuX </X>\r\n')
+        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
+        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
+        out_xml( '\t<Width>220</Width>\r\n')
+        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')   
+        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
+        out_xml( '\t<State> ' + shw + ' </State>\r\n')
+        out_xml( '\t<Value> TEXT_ID_STRING_000087 </Value>\r\n')
+        out_xml( '\t</Text>\r\n')
+
         out_xml( '\t<Text>\r\n')
         out_xml( '\t<X> TextPriceMenuBlendX </X>\r\n')
         out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')

inter/hkg/xml/multi/page_catalog.lxml

@@ -34,8 +34,6 @@
 
 	;inter-multi
 	DEBUGVAR LanguageShow
-	DEBUGVAR LanguageShow
-	DEBUGVAR LanguageShow
 
 	If LanguageShow = "ENG" Then 
 		SetLanguage "ENG"
@@ -47,8 +45,6 @@
 		SetLanguage "MTC"
 	EndIf
 
-	DEBUGVAR LanguageShow
-	DEBUGVAR LanguageShow
 	DEBUGVAR LanguageShow
 
 	If CountryName = "HongKong" Then

inter/hkg/xml/multi/page_catalog_group_appfast.lxml

@@ -324,16 +324,60 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>
 	</Image>
+	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
+	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	</Image>
 	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuHotX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -347,9 +391,20 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> $54-04-02-1018.Button </State>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-04-02-1018.Button </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -365,11 +420,22 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuBlendX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -623,16 +689,60 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>
 	</Image>
+	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
+	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	</Image>
 	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuHotX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -646,9 +756,20 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> $54-04-02-1019.Button </State>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-04-02-1019.Button </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -664,11 +785,22 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuBlendX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -922,16 +1054,60 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>
 	</Image>
+	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
+	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	</Image>
 	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuHotX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -945,9 +1121,20 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> $54-04-02-1020.Button </State>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-04-02-1020.Button </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -963,11 +1150,22 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuBlendX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -1221,16 +1419,60 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>
 	</Image>
+	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
+	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	</Image>
 	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuHotX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -1244,9 +1486,20 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> $54-04-02-1021.Button </State>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-04-02-1021.Button </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -1262,11 +1515,22 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuBlendX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -1520,16 +1784,60 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/option_deactive.png" </Filename>
 	</Image>
+	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
+	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Disable" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	</Image>
 	<Text>
+	<X> TextHotMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000085 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuHotX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
@@ -1543,9 +1851,20 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> $54-04-02-1022.Button </State>
+	<Text>
+	<X> TextColdMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-04-02-1022.Button </State>
+	<Value> TEXT_ID_STRING_000086 </Value>
+	</Text>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -1561,11 +1880,22 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/drink_option_inter/block.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option_inter/block_db.png" </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
+	<X> TextBlendMenuX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> TEXT_ID_STRING_000087 </Value>
+	</Text>
+	<Text>
 	<X> TextPriceMenuBlendX </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>

inter/hkg/xml/multi/tab_menu.lxml

@@ -68,6 +68,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu1Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -92,6 +93,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu2Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -107,6 +109,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu3Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -125,6 +128,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -141,6 +145,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu7Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -155,6 +160,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu11Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -171,6 +177,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -187,6 +194,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -201,6 +209,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -229,6 +238,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu62Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -243,6 +253,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

inter/hkg/xml/multi/tab_menu_open_instance.lxml

@@ -0,0 +1 @@
+OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"

inter/tha/.special/RoadShow.ev

@@ -19,24 +19,25 @@ If SystemDateYearInt = 2025 Then
 	If BoxID = 200559 Then
 		Var RoadShowBoxID = 1
 	EndIf
-	If BoxID = 201876 Then
-		Var RoadShowBoxID = 1
-	EndIf
-
 
 
 	; EFR01
 	If BoxID = 172325 Then
-		
+
 	EndIf
-	
+
 	If SystemDateMonthInt = 5 Then
 
 		If RoadShowBoxID = 1 Then
-			If SystemDateDayInt = 14 Then
+			If SystemDateDayInt = 16 Then
 				Var RoadShow = "true"
 				Var RoadShowMarketCode = "EFR02"
-				
+
+			EndIf
+            If SystemDateDayInt = 17 Then
+				Var RoadShow = "true"
+				Var RoadShowMarketCode = "EFR02"
+
 			EndIf
 
 		EndIf
@@ -45,7 +46,7 @@ If SystemDateYearInt = 2025 Then
 			If SystemDateDayInt = 4 Then
 				Var RoadShow = "true"
 				Var RoadShowMarketCode = "EFR01"
-				
+
 			EndIf
 
 		EndIf

inter/tha/hardware/powder_schedule_v2.ev

@@ -10,27 +10,28 @@ DEBUGVAR PowderPayPushLowScheduleTurnOn10
 
 If SystemTimeHourInt = 3 Then
     If SystemTimeMinuteInt = 30 Then
-        ; idle 
+        ; idle
         ; and time match
-        
+        ; setvar PowderStatus tricker
         If PowderStatus = "" Then
             Var PowderStatus = "tricker"
             Var PowderTestStep = 1
-            
+
         EndIf
     EndIf
     If PowderStatus = "tricker" Then
         If SystemTimeMinuteInt = 60 Then
-            ; idle 
+            ; idle
             ; and time match
-            
-            Var PowderStatus = "" 
+
+            Var PowderStatus = ""
             Var PowderTestStep = 0
             SAVELOG "PowderScheduleGrind reset reset reset"
         EndIf
     EndIf
 EndIf
 
+; setvarint PowderTestStep 1
 If PowderTestStep = 1 Then
     If CurrentXMLFileName0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
         Var PowderTestStep = 0
@@ -50,10 +51,10 @@ Else
     DEBUGVAR PowderScheduleGrind
     DEBUGVAR PowderDriverToLowPositionResult
 
-    If PowderScheduleGrind = "start" Then 
-    
+    If PowderScheduleGrind = "start" Then
+
         Var PowderScheduleGrind = "powder-run"
-        
+
     EndIf
 
     Var StringCMD = "powder-set-time-for-low-push-stage=1,"
@@ -99,9 +100,9 @@ Else
         __CMD "CLI" "arm_id=1,arm_position=posi_ice_e" "-" "-"
         __CMD "CLI_QUEUE" StringCMD "-" "-"
         DEBUGVAR PowderScheduleGrind
-        
+
     EndIf
-    
+
     If PowderScheduleGrind = "wait-low-test" Then
         DEBUGVAR PowderDriverToLowPositionResult
         If PowderDriverToLowPositionResult = "" Then
@@ -110,7 +111,7 @@ Else
             If PowderDriverToLowPositionResult = "pass" Then
                 SAVELOG " Powder driver low test channel pass pass pass pass pass pass pass pass pass "
                 Var PowderScheduleGrind = ""
-                
+
             Else
                 SAVELOG " Powder driver low test channel error "
                 Var PowderScheduleGrind = ""
@@ -119,6 +120,6 @@ Else
         EndIf
 
     EndIf
-    
+
 
 EndIf

inter/tha/menu/lang.tsv

@@ -1269,42 +1269,42 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบถาดชัตเตอร์
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
 1300010		Draw back	หมุนกลับ
-1300011		Grind beans	บดถั่ว
-1300012		Grind sizes	ขนาดบด
+1300011		Grind beans	บดเมล็ดถั่ว
+1300012		Grind sizes	ขนาดการบด
 1300013		Standard	มาตรฐาน
 1300014		Result	ผลลัพธ์
 1300015		Bean weight:g	น้ำหนักถั่ว:กรัม
-1300016		Brew time:sec	เวลาชง: วินาที
-1300017		Test grind sizes	ทดสอบขนาดบด
+1300016		Brew time:sec	เวลาการชง: วินาที
+1300017		Test grind sizes	ขนาดการบดทดสอบ
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
 1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
 1300023		(To see grind sizes fineness before brewing.)	(เพื่อดูความละเอียดของขนาดบดก่อนปรุง)
-1300024		3. Test brew coffee	3. ทดสอบการชงกาแฟ
+1300024		3. Test brew coffee	3. ทดลองชงกาแฟ
 1300025		View recipes	ดูสูตร
 1300026		Brew now	Brew now
 1300027		4. Adjust grind sizes and test again if results (weight, brewing\n	4. ปรับขนาดการบดและทดสอบอีกครั้งว่าได้ผล (น้ำหนัก การชง\n
 1300028		time) aren't up to standard.	เวลา) ตามมาตรฐานหรือไม่
-1300029		Set grind sizes	กำหนดขนาดบด
+1300029		Set grind sizes	ตั้งค่าขนาดการบด
 1300030		Set as default	ตั้งให้เป็นค่าเริ่มต้น
 1300031		(Set as default when meet standard)	(ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน)
-1300032		Brew recipes	สูตรชง
+1300032		Brew recipes	สูตรการชง
 1300033		Brew order	ลำดับการชง
 1300034		Ingredient	วัตถุดิบ
 1300035		Recipes	สูตรอาหาร
 1300036		Save editing	บันทึกการแก้ไข
 1300037		Cancel edting	ยกเลิกการแก้ไข
-1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
-1300039		Insert cup manually	ใส่ถ้วยด้วยตนเอง
+1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดและสูตรการชงที่เลือกอีกครั้ง
+1300039		Insert cup manually	ใส่ถ้วยด้วยมือ
 1300040		2. Select arm	2. เลือกแขน
-1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยลงในแขนที่เลือก
+1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยเข้าในแขนที่เลือก
 1300042		Test	ทดสอบ
 1300043		Grind	บด
 1300044		Pay beans from slot *	จ่ายเมล็ดกาแฟจาก *

inter/tha/support_langs

@@ -1 +1 @@
-ENG,THAI,MSC,MYANMAR
+ENG,THAI,MSC,JAPAN,MYS,MYANMAR

inter/tha/xml/multi/control_and_lang_swith.ev

@@ -27,6 +27,7 @@ Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml
 
 DEBUGVAR BoostEnergyPro
 
+OpenRedirect "/taobin_project//xml/page_catalog_group_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 OpenRedirect "/taobin_project//xml/page_catalog_group_other_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
@@ -92,8 +93,8 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
 
 Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
 
-
-Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+TabMenuLock 15
+OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
 
 TabMenuVisibleInst 99
 

inter/tha/xml/multi/menu_catalog_new.lxml

@@ -60,7 +60,7 @@
 
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_open_instance.lxml"
    
 
     RefreshAll

inter/tha/xml/multi/page_catalog.lxml

@@ -1047,7 +1047,7 @@
 <Button>
 <X> 225 </X>
 <Y> 424 </Y>
-<State> "Enable" </State>
+<State> ShowButtonClick2 </State>
 <Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -1071,7 +1071,7 @@
 <Button>
 <X> 696 </X>
 <Y> 424 </Y>
-<State> "Enable" </State>
+<State> ButtontoTopupMenu </State>
 <Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
 <FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>

inter/tha/xml/multi/tab_menu.lxml

@@ -75,6 +75,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu0Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_tao_pun.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_tao_pun.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -90,6 +91,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu1Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -110,6 +112,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu2Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -125,6 +128,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu3Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -143,6 +147,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -159,6 +164,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu7Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -173,6 +179,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu11Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -189,6 +196,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -206,6 +214,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -220,6 +229,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -233,6 +243,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu61Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -247,6 +258,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu62Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -261,6 +273,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

inter/tha/xml/multi/tab_menu_open_instance.lxml

@@ -0,0 +1 @@
+OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"

inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json

@@ -5,5 +5,5 @@
   "type": "IMAGE",
   "media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
   "media_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
-  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
-}
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
+}

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -118,7 +118,8 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
+				TabMenuVisibleInst 99
+OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>

menu/new-layout.tsv

@@ -130,7 +130,7 @@ IGNORE		ดับเบิลเอสเพรสโซ่	Double \nEspresso
 		เอสเย็นแบบไทยๆ	Thai \nIced Espresso	กาแฟ นม และ น้ำแข็ง	Espresso, Milk, Sugar,Ice	-	12-11-02-0001	12-11-03-0001	bn_iced_epsresso.png	-	12-31-02-0001	12-31-03-0001	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
 		ลาเต้	Latte	กาแฟ นม และ ฟองนม	Espresso, Milk, Foamed milk	12-01-01-0004	12-01-02-0002	12-01-03-0002	bn_hot_latte.png	12-21-01-0004	12-21-02-0002	12-21-03-0002	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		คาปูชิโน่	Cappuccino	กาแฟ นม และ ฟองนม	Espresso, Milk, Foamed milk	12-01-01-0005	12-11-02-0002	12-11-03-0002	bn_hot_cappuccino.png	12-21-01-0005	12-31-02-0002	12-31-03-0002	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
-		มอคค่า	Mocha	กาแฟ นม โกโก้ และ น้ำตาล	Espresso, Cocoa, Milk, Sugar	12-01-01-0006	12-01-02-0003	12-01-03-0003	bn_hot_mocha.png	12-21-01-0006	12-21-02-0003	12-21-03-0003	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
+		 	Mocha	กาแฟ นม โกโก้ และ น้ำตาล	Espresso, Cocoa, Milk, Sugar	12-01-01-0006	12-01-02-0003	12-01-03-0003	bn_hot_mocha.png	12-21-01-0006	12-21-02-0003	12-21-03-0003	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		คาราเมลลาเต้	Caramel Latte	กาแฟ นม และ นม\nคาราเมล	Espresso, Milk,\nCaramel 	12-01-01-0007	12-01-02-0004	12-01-03-0004	bn_hot_caramel_latte.png	12-21-01-0007	12-21-02-0004	12-21-03-0004	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		กาแฟมัทฉะลาเต้	Matcha \nCafe Latte	กาแฟ นม ชาเขียวมัทฉะ \nและ นม	Espresso, Matcha, Milk	12-01-01-0031	12-01-02-0031	12-01-03-0031	bn_hot_greenteacoffee_lattle.png	12-21-01-0031	12-21-02-0031	12-21-03-0031	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		กาแฟมัทฉะลาเต้	Matcha \nCafe Latte	กาแฟ นม ชาเขียวมัทฉะ \nและ นม	Espresso, Matcha, Milk	12-01-01-0008	12-01-02-0005	12-01-03-0005	bn_hot_greenteacoffee_lattle.png	12-21-01-0008	12-21-02-0005	12-21-03-0005	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
@@ -140,7 +140,7 @@ IGNORE		ดับเบิลเอสเพรสโซ่	Double \nEspresso
 		กาแฟชาไทย	Thai Tea\nCafe Latte	กาแฟ ชาไทย นม น้ำตาล	Espresso, Thai tea, Milk, Sugar	12-01-01-0029	12-01-02-0029	12-01-03-0029	bn_hot_coffee_thai_milk_tea.png	12-21-01-0029	12-21-02-0029	12-21-03-0029	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		กาแฟชาไทย	Thai Tea\nCafe Latte	กาแฟ ชาไทย นม น้ำตาล	Espresso, Thai tea, Milk, Sugar	12-01-01-0055	12-01-02-0055	12-01-03-0055	bn_hot_coffee_thai_milk_tea_SingPark.png	12-21-01-0055	12-21-02-0055	12-21-03-0055	posi1	-	-	-	-
 		กาแฟชานมไต้หวัน	Taiwanese\nCafe Latte	กาแฟ ชาไต้หวัน น้ำตาล \nและ นม	Espresso, Taiwanese Tea,\nMilk, Sugar	12-01-01-0030	12-01-02-0030	12-01-03-0030	bn_hot_taiwantea_macchiato.png	12-21-01-0030	12-21-02-0030	12-21-03-0030	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
-		ลิ้นจี่กาโน่	Lycheecano	กาแฟ น้ำ และ ลิ้นจี่	Espresso, Lychee,\nSugar, Water	12-01-01-0017	12-01-02-0017	-	bn_hot_lychee_espresso.png	12-21-01-0017	12-21-02-0017	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
+		 	Lycheecano	กาแฟ น้ำ และ ลิ้นจี่	Espresso, Lychee,\nSugar, Water	12-01-01-0017	12-01-02-0017	-	bn_hot_lychee_espresso.png	12-21-01-0017	12-21-02-0017	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		ยูซุกาโน่	Yuzucano	กาแฟ น้ำ และ ยูซุ	Espresso, Yuzu,\nSugar, Water	12-01-01-0040	12-01-02-0040	-	bn_Yuzu_americano.png	12-21-01-0040	12-21-02-0040	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 
 		ลาเต้โตเกียวบานาน่า	Tokyo Banana \nLatte	กาแฟ น้ำ นม และ กล้วย	Espresso, Tokyo Banana,\nSugar, Water	12-01-01-0042	12-01-02-0042	12-01-03-0042	bn_hot_Banana_cafe_latte.png	12-21-01-0042	12-21-02-0042	12-21-03-0042	posi1	-	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!

ui/lang.tsv

@@ -1269,42 +1269,42 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบถาดชัตเตอร์
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
 1300010		Draw back	หมุนกลับ
-1300011		Grind beans	บดถั่ว
-1300012		Grind sizes	ขนาดบด
+1300011		Grind beans	บดเมล็ดถั่ว
+1300012		Grind sizes	ขนาดการบด
 1300013		Standard	มาตรฐาน
 1300014		Result	ผลลัพธ์
 1300015		Bean weight:g	น้ำหนักถั่ว:กรัม
-1300016		Brew time:sec	เวลาชง: วินาที
-1300017		Test grind sizes	ทดสอบขนาดบด
+1300016		Brew time:sec	เวลาการชง: วินาที
+1300017		Test grind sizes	ขนาดการบดทดสอบ
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
 1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
 1300023		(To see grind sizes fineness before brewing.)	(เพื่อดูความละเอียดของขนาดบดก่อนปรุง)
-1300024		3. Test brew coffee	3. ทดสอบการชงกาแฟ
+1300024		3. Test brew coffee	3. ทดลองชงกาแฟ
 1300025		View recipes	ดูสูตร
 1300026		Brew now	Brew now
 1300027		4. Adjust grind sizes and test again if results (weight, brewing\n	4. ปรับขนาดการบดและทดสอบอีกครั้งว่าได้ผล (น้ำหนัก การชง\n
 1300028		time) aren't up to standard.	เวลา) ตามมาตรฐานหรือไม่
-1300029		Set grind sizes	กำหนดขนาดบด
+1300029		Set grind sizes	ตั้งค่าขนาดการบด
 1300030		Set as default	ตั้งให้เป็นค่าเริ่มต้น
 1300031		(Set as default when meet standard)	(ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน)
-1300032		Brew recipes	สูตรชง
+1300032		Brew recipes	สูตรการชง
 1300033		Brew order	ลำดับการชง
 1300034		Ingredient	วัตถุดิบ
 1300035		Recipes	สูตรอาหาร
 1300036		Save editing	บันทึกการแก้ไข
 1300037		Cancel edting	ยกเลิกการแก้ไข
-1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
-1300039		Insert cup manually	ใส่ถ้วยด้วยตนเอง
+1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดและสูตรการชงที่เลือกอีกครั้ง
+1300039		Insert cup manually	ใส่ถ้วยด้วยมือ
 1300040		2. Select arm	2. เลือกแขน
-1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยลงในแขนที่เลือก
+1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยเข้าในแขนที่เลือก
 1300042		Test	ทดสอบ
 1300043		Grind	บด
 1300044		Pay beans from slot *	จ่ายเมล็ดกาแฟจาก *

xml/page_board.xml

@@ -65,7 +65,7 @@
 
 
 	Cart "DeleteMenuID" "ALL"
-	Var MultiPayEnable = "false"
+	;Var MultiPayEnable = "false"
 	;Var MultiPayEnable = "true"
 	Var PayType = ""
 
@@ -406,7 +406,7 @@
 
 
 
-
+	CartTaoBin "CLEAR" "-" "-" "-"
 
 
 
@@ -1151,8 +1151,14 @@
 
 			Var TextPriceMenuSize = 12
 			Var TextPriceMenuY = 266
+			Var TextPriceMenuColdx = 113
 			Var TextPriceMenuBlendX = 180
 			Var TextPriceMenuHotX = 48
+
+			Var TextHotMenuX = 19
+			Var TextColdMenuX = 84
+			Var TextBlendMenuX = 148
+
 			Var ShowButtonClick2 = "Invisible"
 			Var ButtontoTopupMenu = "Invisible"
 
@@ -1325,6 +1331,12 @@
 	TRY "ROOT/taobin_project/inter/tha/configure.ev"
 
 
+	If BoxID = 173372 Then
+		Var SpiralOnline = "true"
+				
+		Var InternationalShow = 1
+	EndIf
+
 	If EnableMultiInstanceFromBoxID = 1 Then
 		If CountryName = "Thailand" Then
 
@@ -1376,6 +1388,7 @@
 				Var InternationalShow = 0
 			EndIf
 
+
 			If BoxID = 210699 Then
 				Var SpiralOnline = "true"
 				Var SpiralModeFrozenFruit = 1
@@ -1732,6 +1745,8 @@
 	   	OpenInst 2 PepsiFullScreenPageBoard
 	EndIf
 
+
+
 </EventOpen>
 
 <EventActionOk>
@@ -2121,14 +2136,7 @@ PRICE "Reset" "-"
 
 				Var OpenFromPageBoard = 1
 
-				If DoorCupPosition = "bottom" Then
-					If CupOnArm = "true" Then
-
-					Else
-						__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
-					EndIf
-				EndIf
-
+				
 
 
 				DEBUGVAR InternationalEnable
@@ -2137,6 +2145,17 @@ PRICE "Reset" "-"
 				If CurrHelpCenter = 1 Then
 					OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
 				Else
+
+
+					If DoorCupPosition = "bottom" Then
+						If CupOnArm = "true" Then
+
+						Else
+							__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
+						EndIf
+					EndIf
+
+
 					Var BaseOnPageBoard = 0
 					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
 
@@ -2208,6 +2227,44 @@ PRICE "Reset" "-"
 
 	EndIf
 
+	DEBUGVAR startTaobinML
+	DEBUGVAR CountDownOpenTaobinML
+
+	If CountDownOpenTaobinML > 0 Then
+
+	Else
+		Var CountDownOpenTaobinML = 0
+	EndIf
+
+	If EnableCameraStraw = "true" Then
+
+		If startTaobinML = "true" Then
+
+		Else
+			Var CountDownOpenTaobinML = CountDownOpenTaobinML + 1
+				
+				If CountDownOpenTaobinML = 70 Then
+					TrickTaoBinML "START"
+					Var	startTaobinML = "true"
+					DEBUGVAR startTaobinML
+				EndIf
+				
+
+		EndIf
+
+		DEBUGVAR NeedTrickTaobinML
+
+		If NeedTrickTaobinML = "true" Then
+
+			TrickTaoBinML "TRICKER"
+			Var NeedTrickTaobinML = "false"
+			DEBUGVAR NeedTrickTaobinML
+
+		EndIf
+	EndIf
+
+
+
 
 	If CupOnArm = "true" Then
 

xml/page_catalog_group_coffee.xml

@@ -15873,39 +15873,39 @@ Iced Espresso" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 21
-	; 12-01-01-0006 12-01-02-0003 12-01-03-0003 
+	; ==================> Len = 20
+	; 12-01-02-0003 12-01-03-0003 bn_hot_mocha.png 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0006.Button,12-01-02-0003.Button,12-01-03-0003.Button,$Sum120101000612010200031201030003) </State> 
+	<State> Flag( 12-01-02-0003.Button,12-01-03-0003.Button,bn_hot_mocha.png.Button,$Sum12010200031201030003bn_hot_mocha.png) </State> 
 	<Button>
-	<State> $Sum120101000612010200031201030003 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-01-01-0006, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<State> $Sum12010200031201030003bn_hot_mocha.png </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//12-21-01-0006" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//12-21-01-0006" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//12-21-01-0006" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-01-02-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_-.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Mocha"
-		Var NameDrinkTH = "มอคค่า"
-		Var DrinkDescriptionTH = "กาแฟ นม โกโก้ และ น้ำตาล"
-		Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var NameDrink = "กาแฟ นม โกโก้ และ น้ำตาล"
+		Var NameDrinkTH = "Mocha"
+		Var DrinkDescriptionTH = "Espresso, Cocoa, Milk, Sugar"
+		Var DrinkDescription = "12-01-01-0006"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "12-21-01-0006"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-01-01-0006.Price
-		Var PriceD2 = $12-01-02-0003.Price
-		Var PriceD3 = $12-01-03-0003.Price
-		Var PD_CODE1 = "12-01-01-0006"
-		Var PD_CODE2 = "12-01-02-0003"
-		Var PD_CODE3 = "12-01-03-0003"
-		Var PD_STAGE_1 = $12-01-01-0006.Button
-		Var PD_STAGE_2 = $12-01-02-0003.Button
-		Var PD_STAGE_3 = $12-01-03-0003.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0006, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var PriceD1 = $12-01-02-0003.Price
+		Var PriceD2 = $12-01-03-0003.Price
+		Var PriceD3 = $bn_hot_mocha.png.Price
+		Var PD_CODE1 = "12-01-02-0003"
+		Var PD_CODE2 = "12-01-03-0003"
+		Var PD_CODE3 = "bn_hot_mocha.png"
+		Var PD_STAGE_1 = $12-01-02-0003.Button
+		Var PD_STAGE_2 = $12-01-03-0003.Button
+		Var PD_STAGE_3 = $bn_hot_mocha.png.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_-.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -15922,28 +15922,28 @@ Iced Espresso" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0003"
+			Topping "Load" "12-01-03-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0006"
+			Topping "Load" "12-01-02-0003"
 			Else
-			Topping "Load" "12-01-03-0003"
+			Topping "Load" "bn_hot_mocha.png"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-01-01-0006.NameE
-		Var menu_desc_eng_hot = $12-01-01-0006.descriptionE
-		Var menu_name_thai_hot = $12-01-01-0006.Name
-		Var menu_desc_thai_hot = $12-01-01-0006.description
+		Var menu_name_eng_hot = $12-01-02-0003.NameE
+		Var menu_desc_eng_hot = $12-01-02-0003.descriptionE
+		Var menu_name_thai_hot = $12-01-02-0003.Name
+		Var menu_desc_thai_hot = $12-01-02-0003.description
 		
-		Var menu_name_eng_cold = $12-01-02-0003.NameE
-		Var menu_desc_eng_cold = $12-01-02-0003.descriptionE
-		Var menu_name_thai_cold = $12-01-02-0003.Name
-		Var menu_desc_thai_cold = $12-01-02-0003.description
+		Var menu_name_eng_cold = $12-01-03-0003.NameE
+		Var menu_desc_eng_cold = $12-01-03-0003.descriptionE
+		Var menu_name_thai_cold = $12-01-03-0003.Name
+		Var menu_desc_thai_cold = $12-01-03-0003.description
 		
-		Var menu_name_eng_blender = $12-01-03-0003.NameE
-		Var menu_desc_eng_blender = $12-01-03-0003.descriptionE
-		Var menu_name_thai_blender = $12-01-03-0003.Name
-		Var menu_desc_thai_blender = $12-01-03-0003.description
+		Var menu_name_eng_blender = $bn_hot_mocha.png.NameE
+		Var menu_desc_eng_blender = $bn_hot_mocha.png.descriptionE
+		Var menu_name_thai_blender = $bn_hot_mocha.png.Name
+		Var menu_desc_thai_blender = $bn_hot_mocha.png.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@@ -15964,7 +15964,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มอคค่า" </Value>
+	<Value> "Mocha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -15974,7 +15974,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม โกโก้ และ น้ำตาล" </Value>
+	<Value> "Espresso, Cocoa, Milk, Sugar" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -15985,7 +15985,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Mocha" </Value>
+	<Value> "กาแฟ นม โกโก้ และ น้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -15995,7 +15995,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Cocoa, Milk, Sugar" </Value>
+	<Value> "12-01-01-0006" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -16005,7 +16005,7 @@ Iced Espresso" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-01-01-0006.Button </State>
+	<State> $12-01-02-0003.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -16017,15 +16017,15 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-01-0006.Button </State>
-	<Value> StringFmt(  $12-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-01-02-0003.Button </State>
+	<Value> StringFmt(  $12-01-02-0003.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-01-02-0003.Button </State>
+	<State> $12-01-03-0003.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -16035,15 +16035,15 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-02-0003.Button </State>
-	<Value> StringFmt( $12-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-01-03-0003.Button </State>
+	<Value> StringFmt( $12-01-03-0003.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> $12-01-03-0003.Button </State>
+	<State> $bn_hot_mocha.png.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@@ -16053,8 +16053,8 @@ Iced Espresso" </Value>
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-03-0003.Button </State>
-	<Value> StringFmt(  $12-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $bn_hot_mocha.png.Button </State>
+	<Value> StringFmt(  $bn_hot_mocha.png.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -16063,7 +16063,7 @@ Iced Espresso" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum120101000612010200031201030003 = "Disable" Then
+			If $Sum12010200031201030003bn_hot_mocha.png = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@@ -16083,10 +16083,10 @@ Iced Espresso" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum120101000612010200031201030003 = "Disable" Then
-				STRCONTAIN "ERR" $12-01-01-0006.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-01-02-0003.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-01-03-0003.TAG tag3_is_disable
+			If $Sum12010200031201030003bn_hot_mocha.png = "Disable" Then
+				STRCONTAIN "ERR" $12-01-02-0003.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-03-0003.TAG tag2_is_disable
+				STRCONTAIN "ERR" $bn_hot_mocha.png.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -16122,43 +16122,43 @@ Iced Espresso" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum120101000612010200031201030003 </State> 
+	<State> $Sum12010200031201030003bn_hot_mocha.png </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; 12-21-01-0006 12-21-02-0003 12-21-03-0003 
+	; 12-21-02-0003 12-21-03-0003 posi1 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0006.Button,12-21-02-0003.Button,12-21-03-0003.Button,$Sum122101000612210200031221030003) </State> 
+	<State> Flag( 12-21-02-0003.Button,12-21-03-0003.Button,posi1.Button,$Sum12210200031221030003posi1) </State> 
 	<Button>
-	<State> $Sum122101000612210200031221030003 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
+	<State> $Sum12210200031221030003posi1 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//12-21-01-0006" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//12-21-01-0006" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//12-21-01-0006" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<OverlayImage> xmlpro( 12-21-01-0006, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-21-02-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_-.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "Mocha"
-		Var NameDrinkTH = "มอคค่า"
-		Var DrinkDescriptionTH = "กาแฟ นม โกโก้ และ น้ำตาล"
-		Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var NameDrink = "กาแฟ นม โกโก้ และ น้ำตาล"
+		Var NameDrinkTH = "Mocha"
+		Var DrinkDescriptionTH = "Espresso, Cocoa, Milk, Sugar"
+		Var DrinkDescription = "12-01-01-0006"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "12-21-01-0006"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-21-01-0006.Price
-		Var PriceD2 = $12-21-02-0003.Price
-		Var PriceD3 = $12-21-03-0003.Price
-		Var PD_CODE1 = "12-21-01-0006"
-		Var PD_CODE2 = "12-21-02-0003"
-		Var PD_CODE3 = "12-21-03-0003"
-		Var PD_STAGE_1 = $12-21-01-0006.Button
-		Var PD_STAGE_2 = $12-21-02-0003.Button
-		Var PD_STAGE_3 = $12-21-03-0003.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0006, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var PriceD1 = $12-21-02-0003.Price
+		Var PriceD2 = $12-21-03-0003.Price
+		Var PriceD3 = $posi1.Price
+		Var PD_CODE1 = "12-21-02-0003"
+		Var PD_CODE2 = "12-21-03-0003"
+		Var PD_CODE3 = "posi1"
+		Var PD_STAGE_1 = $12-21-02-0003.Button
+		Var PD_STAGE_2 = $12-21-03-0003.Button
+		Var PD_STAGE_3 = $posi1.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-21-02-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_-.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -16175,28 +16175,28 @@ Iced Espresso" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-21-02-0003"
+			Topping "Load" "12-21-03-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-21-01-0006"
+			Topping "Load" "12-21-02-0003"
 			Else
-			Topping "Load" "12-21-03-0003"
+			Topping "Load" "posi1"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-21-01-0006.NameE
-		Var menu_desc_eng_hot = $12-21-01-0006.descriptionE
-		Var menu_name_thai_hot = $12-21-01-0006.Name
-		Var menu_desc_thai_hot = $12-21-01-0006.description
+		Var menu_name_eng_hot = $12-21-02-0003.NameE
+		Var menu_desc_eng_hot = $12-21-02-0003.descriptionE
+		Var menu_name_thai_hot = $12-21-02-0003.Name
+		Var menu_desc_thai_hot = $12-21-02-0003.description
 		
-		Var menu_name_eng_cold = $12-21-02-0003.NameE
-		Var menu_desc_eng_cold = $12-21-02-0003.descriptionE
-		Var menu_name_thai_cold = $12-21-02-0003.Name
-		Var menu_desc_thai_cold = $12-21-02-0003.description
+		Var menu_name_eng_cold = $12-21-03-0003.NameE
+		Var menu_desc_eng_cold = $12-21-03-0003.descriptionE
+		Var menu_name_thai_cold = $12-21-03-0003.Name
+		Var menu_desc_thai_cold = $12-21-03-0003.description
 		
-		Var menu_name_eng_blender = $12-21-03-0003.NameE
-		Var menu_desc_eng_blender = $12-21-03-0003.descriptionE
-		Var menu_name_thai_blender = $12-21-03-0003.Name
-		Var menu_desc_thai_blender = $12-21-03-0003.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
@@ -16217,7 +16217,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มอคค่า" </Value>
+	<Value> "Mocha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -16227,7 +16227,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม โกโก้ และ น้ำตาล" </Value>
+	<Value> "Espresso, Cocoa, Milk, Sugar" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -16238,7 +16238,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Mocha" </Value>
+	<Value> "กาแฟ นม โกโก้ และ น้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -16248,7 +16248,7 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Cocoa, Milk, Sugar" </Value>
+	<Value> "12-01-01-0006" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -16258,7 +16258,7 @@ Iced Espresso" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-21-01-0006.Button </State>
+	<State> $12-21-02-0003.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -16270,36 +16270,18 @@ Iced Espresso" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-21-01-0006.Button </State>
-	<Value> StringFmt(  $12-21-01-0006.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-21-02-0003.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-21-02-0003.Button </State>
 	<Value> StringFmt(  $12-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
-	<X> 146 </X>
+	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $12-21-03-0003.Button </State>
 	</Image>
 	<Text>
-	<X> 183 </X>
+	<X> 115 </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
 	<Width>220</Width>
@@ -16310,13 +16292,31 @@ Iced Espresso" </Value>
 	<Value> StringFmt(  $12-21-03-0003.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
 		
-			If $Sum122101000612210200031221030003 = "Disable" Then
+			If $Sum12210200031221030003posi1 = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@@ -16336,10 +16336,10 @@ Iced Espresso" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum122101000612210200031221030003 = "Disable" Then
-				STRCONTAIN "ERR" $12-21-01-0006.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-21-02-0003.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-21-03-0003.TAG tag3_is_disable
+			If $Sum12210200031221030003posi1 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-02-0003.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-03-0003.TAG tag2_is_disable
+				STRCONTAIN "ERR" $posi1.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -16375,7 +16375,7 @@ Iced Espresso" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum122101000612210200031221030003 </State> 
+	<State> $Sum12210200031221030003posi1 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -20981,39 +20981,39 @@ Milk, Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 21
-	; 12-01-01-0017 12-01-02-0017 - 
+	; ==================> Len = 20
+	; 12-01-02-0017 - bn_hot_lychee_espresso.png 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0017.Button,12-01-02-0017.Button,$Sum12010100171201020017) </State> 
+	<State> Flag( 12-01-02-0017.Button,bn_hot_lychee_espresso.png.Button,$Sum1201020017bn_hot_lychee_espresso.png) </State> 
 	<Button>
-	<State> $Sum12010100171201020017 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_lychee_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lychee_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-01-01-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<State> $Sum1201020017bn_hot_lychee_espresso.png </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//12-21-01-0017" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//12-21-01-0017" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//12-21-01-0017" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-01-02-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_-.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Lycheecano"
-		Var NameDrinkTH = "ลิ้นจี่กาโน่"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่"
-		Var DrinkDescription = "Espresso, Lychee, Sugar, Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png"
+		Var NameDrink = "กาแฟ น้ำ และ ลิ้นจี่"
+		Var NameDrinkTH = "Lycheecano"
+		Var DrinkDescriptionTH = "Espresso, Lychee, Sugar, Water"
+		Var DrinkDescription = "12-01-01-0017"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "12-21-01-0017"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-01-01-0017.Price
-		Var PriceD2 = $12-01-02-0017.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-01-01-0017"
-		Var PD_CODE2 = "12-01-02-0017"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-01-01-0017.Button
-		Var PD_STAGE_2 = $12-01-02-0017.Button
-		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var PriceD1 = $12-01-02-0017.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $bn_hot_lychee_espresso.png.Price
+		Var PD_CODE1 = "12-01-02-0017"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "bn_hot_lychee_espresso.png"
+		Var PD_STAGE_1 = $12-01-02-0017.Button
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $bn_hot_lychee_espresso.png.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_-.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -21030,28 +21030,28 @@ Milk, Sugar" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0017"
+			Topping "Load" "12-01-02-0017"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "bn_hot_lychee_espresso.png"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-01-01-0017.NameE
-		Var menu_desc_eng_hot = $12-01-01-0017.descriptionE
-		Var menu_name_thai_hot = $12-01-01-0017.Name
-		Var menu_desc_thai_hot = $12-01-01-0017.description
+		Var menu_name_eng_hot = $12-01-02-0017.NameE
+		Var menu_desc_eng_hot = $12-01-02-0017.descriptionE
+		Var menu_name_thai_hot = $12-01-02-0017.Name
+		Var menu_desc_thai_hot = $12-01-02-0017.description
 		
-		Var menu_name_eng_cold = $12-01-02-0017.NameE
-		Var menu_desc_eng_cold = $12-01-02-0017.descriptionE
-		Var menu_name_thai_cold = $12-01-02-0017.Name
-		Var menu_desc_thai_cold = $12-01-02-0017.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 = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
+		Var menu_name_eng_blender = $bn_hot_lychee_espresso.png.NameE
+		Var menu_desc_eng_blender = $bn_hot_lychee_espresso.png.descriptionE
+		Var menu_name_thai_blender = $bn_hot_lychee_espresso.png.Name
+		Var menu_desc_thai_blender = $bn_hot_lychee_espresso.png.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@@ -21072,7 +21072,7 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ลิ้นจี่กาโน่" </Value>
+	<Value> "Lycheecano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21082,7 +21082,8 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ ลิ้นจี่" </Value>
+	<Value> "Espresso, Lychee,
+Sugar, Water" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21093,7 +21094,7 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Lycheecano" </Value>
+	<Value> "กาแฟ น้ำ และ ลิ้นจี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21103,8 +21104,7 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Lychee,
-Sugar, Water" </Value>
+	<Value> "12-01-01-0017" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -21114,7 +21114,7 @@ Sugar, Water" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-01-01-0017.Button </State>
+	<State> $12-01-02-0017.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -21126,15 +21126,15 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-01-0017.Button </State>
-	<Value> StringFmt(  $12-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-01-02-0017.Button </State>
+	<Value> StringFmt(  $12-01-02-0017.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-01-02-0017.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -21144,15 +21144,15 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-02-0017.Button </State>
-	<Value> StringFmt( $12-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<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> "Invisible" </State>
+	<State> $bn_hot_lychee_espresso.png.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@@ -21162,8 +21162,8 @@ Sugar, Water" </Value>
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $bn_hot_lychee_espresso.png.Button </State>
+	<Value> StringFmt(  $bn_hot_lychee_espresso.png.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -21172,7 +21172,7 @@ Sugar, Water" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum12010100171201020017 = "Disable" Then
+			If $Sum1201020017bn_hot_lychee_espresso.png = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@@ -21192,10 +21192,10 @@ Sugar, Water" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum12010100171201020017 = "Disable" Then
-				STRCONTAIN "ERR" $12-01-01-0017.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-01-02-0017.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+			If $Sum1201020017bn_hot_lychee_espresso.png = "Disable" Then
+				STRCONTAIN "ERR" $12-01-02-0017.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $bn_hot_lychee_espresso.png.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -21231,43 +21231,43 @@ Sugar, Water" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum12010100171201020017 </State> 
+	<State> $Sum1201020017bn_hot_lychee_espresso.png </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; 12-21-01-0017 12-21-02-0017 - 
+	; 12-21-02-0017 - posi1 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0017.Button,12-21-02-0017.Button,$Sum12210100171221020017) </State> 
+	<State> Flag( 12-21-02-0017.Button,posi1.Button,$Sum1221020017posi1) </State> 
 	<Button>
-	<State> $Sum12210100171221020017 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_lychee_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lychee_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" </FilenameDisable>
+	<State> $Sum1221020017posi1 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//12-21-01-0017" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//12-21-01-0017" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//12-21-01-0017" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
-	<OverlayImage> xmlpro( 12-21-01-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-21-02-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_-.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "Lycheecano"
-		Var NameDrinkTH = "ลิ้นจี่กาโน่"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่"
-		Var DrinkDescription = "Espresso, Lychee, Sugar, Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png"
+		Var NameDrink = "กาแฟ น้ำ และ ลิ้นจี่"
+		Var NameDrinkTH = "Lycheecano"
+		Var DrinkDescriptionTH = "Espresso, Lychee, Sugar, Water"
+		Var DrinkDescription = "12-01-01-0017"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "12-21-01-0017"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-21-01-0017.Price
-		Var PriceD2 = $12-21-02-0017.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-21-01-0017"
-		Var PD_CODE2 = "12-21-02-0017"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-21-01-0017.Button
-		Var PD_STAGE_2 = $12-21-02-0017.Button
-		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var PriceD1 = $12-21-02-0017.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $posi1.Price
+		Var PD_CODE1 = "12-21-02-0017"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "posi1"
+		Var PD_STAGE_1 = $12-21-02-0017.Button
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $posi1.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-21-02-0017, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_-.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -21284,28 +21284,28 @@ Sugar, Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-21-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-21-01-0017"
+			Topping "Load" "12-21-02-0017"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "posi1"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-21-01-0017.NameE
-		Var menu_desc_eng_hot = $12-21-01-0017.descriptionE
-		Var menu_name_thai_hot = $12-21-01-0017.Name
-		Var menu_desc_thai_hot = $12-21-01-0017.description
+		Var menu_name_eng_hot = $12-21-02-0017.NameE
+		Var menu_desc_eng_hot = $12-21-02-0017.descriptionE
+		Var menu_name_thai_hot = $12-21-02-0017.Name
+		Var menu_desc_thai_hot = $12-21-02-0017.description
 		
-		Var menu_name_eng_cold = $12-21-02-0017.NameE
-		Var menu_desc_eng_cold = $12-21-02-0017.descriptionE
-		Var menu_name_thai_cold = $12-21-02-0017.Name
-		Var menu_desc_thai_cold = $12-21-02-0017.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 = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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
@@ -21326,7 +21326,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ลิ้นจี่กาโน่" </Value>
+	<Value> "Lycheecano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21336,7 +21336,8 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ ลิ้นจี่" </Value>
+	<Value> "Espresso, Lychee,
+Sugar, Water" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21347,7 +21348,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Lycheecano" </Value>
+	<Value> "กาแฟ น้ำ และ ลิ้นจี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -21357,8 +21358,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Lychee,
-Sugar, Water" </Value>
+	<Value> "12-01-01-0017" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -21368,7 +21368,7 @@ Sugar, Water" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-21-01-0017.Button </State>
+	<State> $12-21-02-0017.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -21380,36 +21380,18 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-21-01-0017.Button </State>
-	<Value> StringFmt(  $12-21-01-0017.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-21-02-0017.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-21-02-0017.Button </State>
 	<Value> StringFmt(  $12-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
-	<X> 146 </X>
+	<X> 81 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 183 </X>
+	<X> 115 </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
 	<Width>220</Width>
@@ -21420,13 +21402,31 @@ Sugar, Water" </Value>
 	<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
 		
-			If $Sum12210100171221020017 = "Disable" Then
+			If $Sum1221020017posi1 = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@@ -21446,10 +21446,10 @@ Sugar, Water" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum12210100171221020017 = "Disable" Then
-				STRCONTAIN "ERR" $12-21-01-0017.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-21-02-0017.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+			If $Sum1221020017posi1 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-02-0017.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"
@@ -21485,7 +21485,7 @@ Sugar, Water" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum12210100171221020017 </State> 
+	<State> $Sum1221020017posi1 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>

xml/page_payment_cashMore.xml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xFFFFFF" </Background>
+<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
@@ -290,15 +290,31 @@
 
 	EndIf
 
+	Var PathAlarm = ""
+	Var ordersummaryText = ""
+	Var subtotalText = ""
+	Var itemText = ""
+	Var backtext = ""
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var PathAlarm = "ROOT/taobin_project/image/cart_en"
+		Var ordersummaryText = "Order Summary"
+		Var subtotalText = "Subtotal ("
+		Var itemText = "Items )"
+		Var backtext = "Back"
 
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var PathAlarm = "ROOT/taobin_project/image/cart_th"
+		Var ordersummaryText = "รายการสินค้า"
+		Var subtotalText = "รวมสินค้า ("
+		Var itemText = "ชิ้น )"
+		Var backtext = "กลับ"
 	EndIf
 
 	;inter-image
@@ -400,6 +416,8 @@
 		Var PayState5 = "Disable"
 	EndIf
 
+
+
 </EventOpen>
 
 <EventActionOk>
@@ -780,6 +798,10 @@
 	EndIf
 </EventChangeStatus>
 
+<EventUnitTest1>
+ 	Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
+</EventUnitTest1>
+
 <EventCoin>
 	TimerReset
 
@@ -970,6 +992,11 @@
 		Var cart1_en = "Enable"
 
 		Var PriceDrinkMulti = CART1_PRICE
+
+		Var cardBottomY = 760
+		Var lineBottomY = 750
+		Var subtotalBottomY = 810
+
 	EndIf
 
 	If CART_COUNT >= 2 Then
@@ -979,6 +1006,10 @@
 		Var cart2_en = "Enable"
 
 		Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE
+
+		Var cardBottomY = 910
+		Var lineBottomY = 900
+		Var subtotalBottomY = 960
 	EndIf
 
 	If CART_COUNT = 3 Then
@@ -988,6 +1019,10 @@
 		Var cart3_en = "Enable"
 
 		Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE
+
+		Var cardBottomY = 1050
+		Var lineBottomY = 1040
+		Var subtotalBottomY = 1100
 	EndIf
 
 
@@ -1119,17 +1154,7 @@
 ;</EventClick>
 ;</Button>
 
-<Image>
-<X> 0 </X>
-<Y> 1172 </Y>
-<Filename> Var( DirImage + "/Rectangle0.png" )</Filename>
-</Image>
 
-<Image>
-<X> 0 </X>
-<Y> 1012 </Y>
-<Filename> Var( DirImage + "/Rectangle.png" )</Filename>
-</Image>
 
 <Button>
 <X> 0 </X>
@@ -1591,168 +1616,445 @@
 </EventClick>
 </Button>
 
+; card head 
 
 
 <Image>
-<X> 60 </X>
-<Y> 412 </Y>
-<Width> 148 </Width>
-<Height> 200 </Height>
-<Filename> cart1_pic </Filename>
+<X> 40 </X>
+<Y> 480 </Y>
+<Width> 1000 </Width>
+<Height> 150 </Height>
+<Filename> "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/cartTop.png" </Filename>
 </Image>
 
-<Text>
-<X> 876 </X>
-<Y> 467 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> cart1_price </Value>
-</Text>
-
-<Text>
-<X> 236 </X>
-<Y> 470 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0x513C2F </Color>
-<Value> cart1_name </Value>
-</Text>
 
 <Button>
-<X> 1016 </X>
-<Y> 500 </Y>
-<State> cart1_en </State>
-<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
-<EventClick> 
-	If CoinInFlag = 0 Then
-		If Seeker.IntVendingCredit > 0 Then
-			Var BmiYear = Seeker.IntVendingCredit
-			Var GetScore = "useCredit"
-			AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
-			Var Seeker.IntVendingCredit = 0
-		EndIf
-		Cart "DeleteMenuID" 1
-	EndIf
+<X> 750 </X>
+<Y> 510 </Y>
+<State> "Enable" </State> 
+<Filename> Var( PathAlarm + "/additem_bn.png") </Filename>
+<FilenamePress> Var( PathAlarm + "/additem_bp.png") </FilenamePress>
+<FilenameDisable> Var( PathAlarm + "/additem_bd.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOnClick> 
 
-</EventClick> 
+	Open "ROOT/taobin_project/spiral/xml/page_board.xml"
+
+</EventOnClick>
 </Button>
 
-<Image>
-<X> 60 </X>
-<Y> 612 </Y>
-<Width> 148 </Width>
-<Height> 200 </Height>
-<Filename> cart2_pic </Filename>
-</Image>
-
 <Text>
-<X> 876 </X>
-<Y> 667 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> cart2_price </Value>
-</Text>
-
-<Text>
-<X> 236 </X>
-<Y> 670 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
+<X> 100 </X>
+<Y> 520 </Y>
+<Width> 500 </Width>
+<Size> 37 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
-<Value> cart2_name </Value>
+<Value> ordersummaryText </Value>
 </Text>
 
-<Button>
-<X> 1016 </X>
-<Y> 700 </Y>
-<State> cart2_en </State>
-<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
-<EventClick> 
-If CoinInFlag = 0 Then
-	If Seeker.IntVendingCredit > 0 Then
-		Var BmiYear = Seeker.IntVendingCredit
-		Var GetScore = "useCredit"
-		AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
-		Var Seeker.IntVendingCredit = 0
-	EndIf
-	Cart "DeleteMenuID" 2
-EndIf
-</EventClick> 
-</Button>
-
 
 <Image>
-<X> 60 </X>
-<Y> 812 </Y>
-<Width> 148 </Width>
-<Height> 200 </Height>
-<Filename> cart3_pic </Filename>
+<X> 50 </X>
+<Y> 590 </Y>
+<Width> 980 </Width>
+<Height> 50 </Height>
+<Filename> "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/line.png" </Filename>
 </Image>
 
-<Text>
-<X> 876 </X>
-<Y> 872 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> cart3_price </Value>
-</Text>
 
-<Text>
-<X> 236 </X>
-<Y> 872 </Y>
-<Width> 1080</Width>
-<Size> 50 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0x513C2F </Color>
-<Value> cart3_name </Value>
-</Text>
 
-<Button>
-<X> 1016 </X>
-<Y> 900 </Y>
-<State> cart3_en </State>
-<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
-<EventClick> 
-If CoinInFlag = 0 Then
-	If Seeker.IntVendingCredit > 0 Then
-		Var BmiYear = Seeker.IntVendingCredit
-		Var GetScore = "useCredit"
-		AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
-		Var Seeker.IntVendingCredit = 0
-	EndIf
-	Cart "DeleteMenuID" 3
-EndIf
+<FrameScroll> 
+<X> 10 </X>
+<Y> 620 </Y>
+<Width> 1080 </Width>
+<Height> 620 </Height>
+<Scroll> "Vertical" </Scroll>
+<Column> 1 </Column>
+<Script>
+	 Var block_index_override = 0
+	 Var block_index_move = 0
+</Script>
+
+<Block>
+	<MarginLeft> 0 </MarginLeft>
+	<MarginTop> 0 </MarginTop>
+	<Width> 1080 </Width>
+	<Height> "auto" </Height>
+	<State> cart1_en </State>
+
+	<Image>
+	<X> 30 </X>
+	<Y> 0 </Y>
+	<Width> 1000 </Width>
+	<Height> 150 </Height>
+	<Color> "0xFFFFFF" </Color>
+	</Image>
 	
-</EventClick> 
-</Button>
+	<Image>
+	<X> 50 </X>
+	<Y> 0 </Y>
+    <Width> 250 </Width>
+	<Height> 100 </Height>
+	<State> "Enable" </State>
+	<Filename> cart1_pic </Filename>
+	</Image>
+	<Text>
+	<X> 350 </X>
+	<Y> 30 </Y>
+    <Width> 500 </Width>
+	<Size> 32 </Size>
+	;<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> "Enable" </State>
+	<Value> cart1_name </Value>
+	</Text>
+    <Text>
+	<X> 950 </X>
+	<Y> 5 </Y>
+	<Size> 28 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> cart1_price </Value>
+	</Text>
+
+    <Button>
+    <X> 770 </X>
+	<Y> 30 </Y>
+	<State> cart1_add_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bd.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+
+
+	</EventOnClick>
+	</Button>
+
+    <Button>
+    <X> 880 </X>
+	<Y> 30 </Y>
+	<State> cart1_remove_clear_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+			If CoinInFlag = 0 Then
+				If Seeker.IntVendingCredit > 0 Then
+					Var BmiYear = Seeker.IntVendingCredit
+					Var GetScore = "useCredit"
+					AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
+					Var Seeker.IntVendingCredit = 0
+				EndIf
+				Cart "DeleteMenuID" 1
+			EndIf
+				
+	</EventOnClick>
+	</Button>
+
+	
+
+	<Text>
+	<X> 840 </X>
+	<Y> 5 </Y>
+	<Size> 30 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> "1" </Value>
+	</Text>
+
+</Block>
+
+
+<Block>
+	<MarginLeft> 0 </MarginLeft>
+	<MarginTop> 0 </MarginTop>
+	<Width> 1080 </Width>
+	<Height> "auto" </Height>
+	<State> cart2_en </State>
+
+	<Image>
+	<X> 30 </X>
+	<Y> 0 </Y>
+	<Width> 1000 </Width>
+	<Height> 150 </Height>
+	<Color> "0xFFFFFF" </Color>
+	</Image>
+	
+	<Image>
+	<X> 50 </X>
+	<Y> 0 </Y>
+    <Width> 250 </Width>
+	<Height> 100 </Height>
+	<State> "Enable" </State>
+	<Filename> cart2_pic </Filename>
+	</Image>
+	<Text>
+	<X> 350 </X>
+	<Y> 30 </Y>
+    <Width> 500 </Width>
+	<Size> 32 </Size>
+	;<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> "Enable" </State>
+	<Value> cart2_name </Value>
+	</Text>
+    <Text>
+	<X> 950 </X>
+	<Y> 5 </Y>
+	<Size> 28 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> cart2_price </Value>
+	</Text>
+
+    <Button>
+    <X> 770 </X>
+	<Y> 30 </Y>
+	<State> cart2_add_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bd.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+
+
+	</EventOnClick>
+	</Button>
+
+    <Button>
+    <X> 880 </X>
+	<Y> 30 </Y>
+	<State> cart2_remove_clear_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+			If CoinInFlag = 0 Then
+				If Seeker.IntVendingCredit > 0 Then
+					Var BmiYear = Seeker.IntVendingCredit
+					Var GetScore = "useCredit"
+					AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
+					Var Seeker.IntVendingCredit = 0
+				EndIf
+				Cart "DeleteMenuID" 2
+			EndIf
+				
+	</EventOnClick>
+	</Button>
+
+	
+
+	<Text>
+	<X> 840 </X>
+	<Y> 5 </Y>
+	<Size> 30 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> "1" </Value>
+	</Text>
+
+</Block>
+
+
+<Block>
+	<MarginLeft> 0 </MarginLeft>
+	<MarginTop> 0 </MarginTop>
+	<Width> 1080 </Width>
+	<Height> "auto" </Height>
+	<State> cart3_en </State>
+
+	<Image>
+	<X> 30 </X>
+	<Y> 0 </Y>
+	<Width> 1000 </Width>
+	<Height> 150 </Height>
+	<Color> "0xFFFFFF" </Color>
+	</Image>
+	
+	<Image>
+	<X> 50 </X>
+	<Y> 0 </Y>
+    <Width> 250 </Width>
+	<Height> 100 </Height>
+	<State> "Enable" </State>
+	<Filename> cart3_pic </Filename>
+	</Image>
+	<Text>
+	<X> 350 </X>
+	<Y> 30 </Y>
+    <Width> 500 </Width>
+	<Size> 32 </Size>
+	;<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> "Enable" </State>
+	<Value> cart3_name </Value>
+	</Text>
+    <Text>
+	<X> 950 </X>
+	<Y> 5 </Y>
+	<Size> 28 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> cart3_price </Value>
+	</Text>
+
+    <Button>
+    <X> 770 </X>
+	<Y> 30 </Y>
+	<State> cart3_add_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/plus_slip_bd.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+
+
+	</EventOnClick>
+	</Button>
+
+    <Button>
+    <X> 880 </X>
+	<Y> 30 </Y>
+	<State> cart3_remove_clear_state </State> 
+	<Filename> "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bn.png" </Filename>
+	<FilenamePress>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenamePress>
+	<FilenameDisable>  "ROOT/taobin_project/spiral/image/page_spiral/clear_slip_bp.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+			If CoinInFlag = 0 Then
+				If Seeker.IntVendingCredit > 0 Then
+					Var BmiYear = Seeker.IntVendingCredit
+					Var GetScore = "useCredit"
+					AddData 24 Seeker.TNumberTaobinCredit  BmiYear PointCrm GetScore
+					Var Seeker.IntVendingCredit = 0
+				EndIf
+				Cart "DeleteMenuID" 3
+			EndIf
+				
+	</EventOnClick>
+	</Button>
+
+	
+
+	<Text>
+	<X> 840 </X>
+	<Y> 5 </Y>
+	<Size> 30 </Size>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> "Enable" </State>
+	<Value> "1" </Value>
+	</Text>
+
+</Block>
+
+
+</FrameScroll>
+
+
+; cartBottom
+
+
+<Image>
+<X> 40 </X>
+<Y> cardBottomY </Y>
+<Width> 1000 </Width>
+<Height> 150 </Height>
+<Filename> "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/cartBottom.png" </Filename>
+</Image>
+
+
+; line buttom
+
+<Image>
+<X> 50 </X>
+<Y> lineBottomY </Y>
+<Width> 980 </Width>
+<Height> 50 </Height>
+<Filename> "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/line.png" </Filename>
+</Image>
+
+
+; Subtotal
+
 
 <Text>
-<X> 876 </X>
-<Y> 1038 </Y>
-<Width> 1080</Width>
-<Size> 72 </Size>
+<X> 100 </X>
+<Y> subtotalBottomY </Y>
+<Size> 37 </Size>
 <Font> KanitMediumTTF </Font>
-<Color> 0xDE794E </Color>
+<Color> 0x513C2F </Color>
+<State> "Enable" </State>
+<Value> subtotalText </Value>
+</Text>
+
+<Text>
+<X> 270 </X>
+<Y> subtotalBottomY </Y>
+<Size> 37 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<State> "Enable" </State>
+<Value> CART_COUNT </Value>
+</Text>
+
+
+<Text>
+<X> 310 </X>
+<Y> subtotalBottomY </Y>
+<Size> 37 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<State> "Enable" </State>
+<Value> itemText </Value>
+</Text>
+
+
+<Text>
+<X> 900 </X>
+<Y> subtotalBottomY </Y>
+<Size> 37 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<State> "Enable" </State>
 <Value> showRemaining </Value>
 </Text>
 
-<Text>
-<X> 80 </X>
-<Y> 1038 </Y>
-<Width> 1080</Width>
-<Size> 72 </Size>
-<Font> KanitMediumTTF </Font>
-<Color> 0x513C2F </Color>
-<Value> cartNumText </Value>
-</Text>
+
+;<Text>
+;<X> 80 </X>
+;<Y> 1038 </Y>
+;<Width> 1080</Width>
+;<Size> 72 </Size>
+;<Font> KanitMediumTTF </Font>
+;<Color> 0x513C2F </Color>
+;<Value> cartNumText </Value>
+;</Text>
 
 
 

xml/page_payment_multi.xml

@@ -45,6 +45,10 @@
 	Var PriceDrinkMulti = 0
 	Var CART_INDEX = 0
 
+	Var cardBottomY = 0
+	Var lineBottomY = 0
+	Var subtotalBottomY = 0
+
 
 
 	If show_eng = "true" Then 
@@ -56,6 +60,9 @@
 			Var cart1_en = "Enable"
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE
+			Var cardBottomY = 760
+			Var lineBottomY = 750
+			Var subtotalBottomY = 810
 
 		EndIf
 
@@ -67,6 +74,10 @@
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE
 
+			Var cardBottomY = 910
+			Var lineBottomY = 900
+			Var subtotalBottomY = 960
+
 		EndIf
 
 		If CART_COUNT = 3 Then
@@ -76,6 +87,11 @@
 			Var cart3_en = "Enable"
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE
+
+			Var cardBottomY = 1050
+			Var lineBottomY = 1040
+			Var subtotalBottomY = 1100
+			
 		EndIf
 
 
@@ -91,6 +107,10 @@
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE
 
+			Var cardBottomY = 760
+			Var lineBottomY = 750
+			Var subtotalBottomY = 810
+
 		EndIf
 
 		If CART_COUNT >= 2 Then
@@ -101,6 +121,10 @@
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE
 
+			Var cardBottomY = 910
+			Var lineBottomY = 900
+			Var subtotalBottomY = 960
+
 		EndIf
 
 		If CART_COUNT = 3 Then
@@ -110,6 +134,10 @@
 			Var cart3_en = "Enable"
 
 			Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE
+
+			Var cardBottomY = 1050
+			Var lineBottomY = 1040
+			Var subtotalBottomY = 1100
 		EndIf
 	EndIf
 

xml/page_thankyouConti.xml

@@ -60,14 +60,12 @@
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
 
-		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
 	EndIf
 
 	If LanguageShow = "MSC" Then
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
 
-		Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc"
 	EndIf
 
 	;DEBUGVAR StarwState
@@ -117,24 +115,42 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR NextOrderStatus
 
+	; Default dir image
 	Var DirImage = "ROOT/taobin_project/image/complete/"
+	Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
+
+	If InternationalEnable = 1 Then
+
+		If LanguageShow = "THAI" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete/"
+		EndIf
+
+		If LanguageShow = "ENG" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
+		EndIf
+
+		;inter-image
+		If LanguageShow = "MYANMAR" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
+		EndIf
+
+		If LanguageShow = "MSC" Then
+			Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
+		EndIf
+
+		If LanguageShow = "MTC" Then
+			Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
+		EndIf
+	Else
+		If show_eng = "true" Then
+
+		Else
+			Var DirImage2 = "ROOT/taobin_project/image/complete/"
+		EndIf
 
-	If LanguageShow = "ENG" Then
-	    Var DirImage = "ROOT/taobin_project/image/complete_en/"
 	EndIf
 
-	;inter-image
-	If LanguageShow = "MYANMAR" Then
-		Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
-	EndIf
 
-	If LanguageShow = "MSC" Then
-		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
-	EndIf
-
-	If LanguageShow = "MTC" Then
-		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
-	EndIf
 
 	Var txtDrinkOKState = "Invisible"
 	Var buttonRemoveCup = "Invisible"
@@ -151,8 +167,10 @@
 
 	Var buttonRemoveCup = "Invisible"
 
-	SAVELOG "Thank you conti version TCV9"
+	Var thankyouContiVersion = "TCV9 "
+	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
+	SAVELOG "DirImage detele. use DirImage2"
 
     DEBUGVAR NextSmoothie
     DEBUGVAR Seeker.SmoothieToPayment
@@ -559,7 +577,7 @@
 <Width> 1080 </Width>
 <Align> end </Align>
 <Color> 0xFF0000 </Color>
-<Value> "TCT6 "</Value>
+<Value> thankyouContiVersion </Value>
 </Text>
 
 

xml/page_topping_select7.xml

@@ -320,6 +320,8 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR btnAddCart
+
 	Var LidDeactiveButton = "Invisible"
 	Var StrawDeactiveButton = "Invisible"
 
@@ -595,7 +597,8 @@
 	EndIf
 
 
-
+	DEBUGVAR SelectDrinkType
+	
 	If SelectDrinkType = 1 Then
 
 		If MenuReady = "YES" Then
@@ -8019,6 +8022,75 @@
 </Function2>
 
 
+; add cart
+<Button>
+<State> btnAddCart  </State>
+<X> 285 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_add.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	Var PriceDrink = PriceDrinkTmp
+	SAVELOG "USER press next ( topping ) - new"
+	DEBUGVAR topping1
+	DEBUGVAR topping2
+	DEBUGVAR topping3
+
+	DEBUGVAR LidState
+	DEBUGVAR StrawState
+	DEBUGVAR UserSelectProductCode
+	DEBUGVAR HAVE_UV_DOOR_LID
+
+
+	If StrawState = "Press" Then
+		Machine StrawOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	If LidState = "Press" Then
+		Machine LidOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	Var StrawState = "Enable"
+	Var LidState = "Enable"
+	; 
+		
+
+	
+
+	Var SelectDrink = UserSelectProductCode
+	; Set drink 
+	Topping "Select" UserSelectProductCode
+
+	; Set option toppinng and pack 
+	Topping "Select1-ID" topping1
+	Topping "Select2-ID" topping2
+	Topping "Select3-ID" topping3
+
+	; Pack
+	Topping "Pack" ExtendData
+
+	Var Seeker.ExtendData = ExtendData
+
+	If CART1_STATUS = "EMPTY" Then
+		Cart "AddMenuID" 1
+	Else
+		If CART2_STATUS = "EMPTY" Then
+			Cart "AddMenuID" 2
+		Else
+			If CART3_STATUS = "EMPTY" Then
+				Cart "AddMenuID" 3
+			EndIf
+		EndIf
+	EndIf
+	
+	Var CartUpdate = "true"
+</EventClick>
+</Button>
 
 
 

xml/page_topping_select8.xml

@@ -853,8 +853,8 @@
 
 	TRY "ROOT/taobin_project/speical/call_from_topping.ev"
 
-	DEBUGVAR $12-02-03-0043.Name
-	DEBUGVAR $12-02-03-0043.NameE
+	DEBUGVAR SpeicalButtonPositionX
+	DEBUGVAR TextShowSpecialButton
 	
 	If show_eng = "true" Then
 		Var showname = NameDrink
@@ -1821,10 +1821,17 @@
 				Var CustomMilkState[1] = "Enable"
 				Var CustomMilkState[2] = "Enable"
 			Else
-				Var CustomMilkState[0] = "Disable"
-				Var CustomMilkState[1] = "Disable"
-				Var CustomMilkState[2] = "Disable"
+				If TOPPING11 = "milk-level" Then
+					Var CustomMilkState[0] = "Enable"
+					Var CustomMilkState[1] = "Enable"
+					Var CustomMilkState[2] = "Enable"
+				Else
+					Var CustomMilkState[0] = "Disable"
+					Var CustomMilkState[1] = "Disable"
+					Var CustomMilkState[2] = "Disable"
+				EndIf
 			EndIf
+
 		Else
 			Var CustomMilkState[0] = "Disable"
 			Var CustomMilkState[1] = "Disable"
@@ -2215,15 +2222,22 @@
 					Var showShotNormalSoda = "Invisible"
 					Var showShotEnableSoda = "Invisible"
 				Else
-					Var showShotNormalSoda = "Disable"
-					Var showShotEnableSoda = "Disable"
+					If toppingID13index2Status = "Enable" Then
+						Var showShotEnableSoda = "Enable"	
+						Var showShotNormalSoda = "Enable"						
+					Else
+						Var showShotNormalSoda = "Disable"
+						Var showShotEnableSoda = "Disable"
+					EndIf
 				EndIf
 			EndIf
 			
+		Else
+			Var showShotNormalSoda = "Disable"
+			Var showShotEnableSoda = "Disable"
 		EndIf
 
 
-
 		DEBUGVAR SubMenuGroupIDSlot6_1
 
 		DEBUGVAR TOPPING3
@@ -2623,6 +2637,20 @@
 				Var CustomMilkState[2] = "Disable"
 			EndIf
 
+			If TOPPING13 = "shot coffee" Then
+				If showShotNormalSoda = "Enable" Then
+					If showShotEnableSoda = "Enable" Then
+						Var showShotNormalSoda = "Press"
+					EndIf
+				EndIf
+			Else
+				If showShotNormal = "Enable" Then
+					If showShotEnable = "Enable" Then
+						Var showShotNormal = "Press"
+					EndIf
+				EndIf
+			EndIf
+
 			Var SelectToppingType = 1
 		EndIf
 
@@ -2682,34 +2710,30 @@
 				EndIf
 			EndIf
 
-			If CustomMilkState[0] = "Enable" Then
-				Var CustomMilkState[0] = "Disable"
-			EndIf
+			If TOPPING11 = "milk-level" Then
 
-			If CustomMilkState[1] = "Enable" Then
-				Var CustomMilkState[1] = "Disable"
-			EndIf
-			If CustomMilkState[2] = "Enable" Then
-				Var CustomMilkState[2] = "Disable"
-			EndIf
+				If CustomMilkState[0] = "Disable" Then
+					Var CustomMilkState[0] = "Enable"
+				EndIf
 
-			If CustomMilkState[0] = "PressForever" Then
-				Var CustomMilkState[0] = "Disable"
-			EndIf
+				If CustomMilkState[1] = "Disable" Then
+					Var CustomMilkState[1] = "Enable"
+				EndIf
+				If CustomMilkState[2] = "Disable" Then
+					Var CustomMilkState[2] = "Enable"
+				EndIf
 
-			If CustomMilkState[1] = "PressForever" Then
-				Var CustomMilkState[1] = "Disable"
-			EndIf
-			If CustomMilkState[2] = "PressForever" Then
-				Var CustomMilkState[2] = "Disable"
-			EndIf
-
-			If CustomMilkState[0] = "Enable" Then
-				If CustomMilkState[1] = "Enable" Then
-					If CustomMilkState[2] = "Enable" Then
-						Var CustomMilkState[1] = "PressForever" Then
+				If CustomMilkState[0] = "Enable" Then
+					If CustomMilkState[1] = "Enable" Then
+						If CustomMilkState[2] = "Enable" Then
+							Var CustomMilkState[1] = "PressForever" Then
+						EndIf
 					EndIf
 				EndIf
+			Else
+				Var CustomMilkState[0] = "Disable"
+				Var CustomMilkState[1] = "Disable"
+				Var CustomMilkState[2] = "Disable"
 			EndIf
 
 			If TOPPING13 = "shot coffee" Then

xml/topview2.xml

@@ -26,6 +26,7 @@
 			If CountryName = "HongKong" Then
 				If EnableMultiInstance = "true" Then
 					TRY topview2_script
+					TRY "ROOT/taobin_project/inter/hkg/xml/multi/GetStringTextId.ev"
 				Else
 					ENABLE_MULTI_INSTANCE "set"
 					Var InitialMultiInstance = 1
@@ -154,7 +155,9 @@
 
 		If PowderScheduleTimeOut = 0 Then
 			Var PowderScheduleTimeOut = 1
-			Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule.ev"
+				Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule_v2.ev"
+			EndIf
+			
 			TRY powder_sch_ev
 		EndIf
 	EndIf

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.90"
-	Var XMLPageVersionInt = 990
+	Var XMLPageVersion = "9.93"
+	Var XMLPageVersionInt = 993
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.90"
-	Var XMLPageVersionInt = 1090
+	Var XMLPageVersion = "10.93"
+	Var XMLPageVersionInt = 1093
 ;Oreo
 Var OreoGuarantee = 0
 

xmlprofile/y18IDCardCaffeine.json

@@ -4936,6 +4936,194 @@
     {
       "productCode": "12-05-02-0138",
       "enable": true
+    },
+    {
+      "productCode": "11-99-05-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0150",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0025",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0014",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0106",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0109",
+      "enable": false
+    },
+    {
+      "productCode": "12-06-03-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0108",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0026",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0019",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0013",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0003",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0007",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0009",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0022",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0004",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0106",
+      "enable": false
+    },
+    {
+      "productCode": "12-06-03-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0008",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0057",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0133",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0107",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0024",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0021",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0018",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0012",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0108",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0017",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0027",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0004",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0015",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0149",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0020",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0058",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0148",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0023",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0003",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0110",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0010",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0105",
+      "enable": false
     }
   ]
 }

xmlprofile/y18IDCardExTeaMilk.json

@@ -4988,6 +4988,194 @@
     {
       "productCode": "12-05-02-0138",
       "enable": true
+    },
+    {
+      "productCode": "11-99-05-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0150",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0025",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0014",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0106",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0109",
+      "enable": false
+    },
+    {
+      "productCode": "12-06-03-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0108",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0026",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0019",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0013",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0003",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0007",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0009",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0022",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0004",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0106",
+      "enable": false
+    },
+    {
+      "productCode": "12-06-03-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0008",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0057",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0133",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0107",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0024",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0021",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0018",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0012",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0108",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0017",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0027",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0004",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0015",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0149",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0020",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0058",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0148",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0023",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0003",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0110",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0010",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0105",
+      "enable": false
     }
   ]
 }

xmlprofile/y18IDCardSoda.json

@@ -4936,6 +4936,194 @@
     {
       "productCode": "12-05-02-0138",
       "enable": true
+    },
+    {
+      "productCode": "11-99-05-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0150",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0025",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0014",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0106",
+      "enable": false
+    },
+    {
+      "productCode": "12-03-03-0109",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0005",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0108",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0026",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0019",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0013",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0003",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0007",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0009",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0022",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0004",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-03-0092",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0106",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0008",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0002",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0057",
+      "enable": false
+    },
+    {
+      "productCode": "12-05-03-0133",
+      "enable": false
+    },
+    {
+      "productCode": "12-02-03-0107",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0024",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0021",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0018",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0012",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0108",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0001",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0017",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0027",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0004",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0015",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0149",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0020",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0058",
+      "enable": false
+    },
+    {
+      "productCode": "12-05-03-0148",
+      "enable": false
+    },
+    {
+      "productCode": "11-99-05-0023",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0003",
+      "enable": true
+    },
+    {
+      "productCode": "12-06-03-0006",
+      "enable": true
+    },
+    {
+      "productCode": "12-03-03-0110",
+      "enable": true
+    },
+    {
+      "productCode": "11-99-05-0010",
+      "enable": true
+    },
+    {
+      "productCode": "12-02-03-0105",
+      "enable": true
     }
   ]
 }