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

animation01/play_list.tsv

@@ -1350,3 +1350,10 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 เป๊ปซี่ทรอปิคอล	12-05-02-0148	1	14	34	62	23					24	100	7:40	32
 เป๊ปซี่มะนาว	12-05-02-0149	1	14	13	12	23					24	100	7:40	32
 เป๊ปซี่คาราเมล	12-05-02-0150	1	14	13	22	23					24	100	7:40	32
+
+มัทฉะลาเต้พรีเมียมร้อน	12-02-01-0103	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้พรีเมียมเย็น	12-02-02-0103	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้พรีเมียมปั่น	12-02-03-0103	1	8	9	70	23	41				24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ร้อน	12-02-01-0104	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 เย็น	12-02-02-0104	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ปั่น	12-02-03-0104	1	8	9	70	23	41				24	100	7:40	32

inc/video.inc

@@ -119,7 +119,7 @@
     Else
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
-            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
+            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
                 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
 
@@ -160,6 +160,9 @@
                 EndIf
 
             Else
+                DEBUGVAR "NotBackToMain"
+                DEBUGVAR CurrPageInst0
+                DEBUGVAR CurrentXMLFileName2
                 Var AdvTaobinMenu = DefaultNormBanner
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
             EndIf
@@ -179,6 +182,19 @@
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
 
                 EndIf
+            Else
+                DEBUGVAR "NotEmptyCurrInst2"
+                DEBUGVAR CurrPageInst0
+                DEBUGVAR CurrentXMLFileName2
+
+                If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
+
+                    Var AdvTaobinMenu = DefaultLargeBanner
+                    Var DisplayAds = AdvTaobinMenu + ".mp4"
+                    DEBUGVAR "Detect page board"
+
+                EndIf
+
             EndIf
         Else
                 Var AdvTaobinMenu = DefaultNormBanner
@@ -254,7 +270,7 @@
         If CountryName = "Singapore" Then
             DEBUGVAR CountryName
             DEBUGVAR CurrentXMLFileName2
-            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
+            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
                  If CountDownPauseVideo2 < 2 Then
                     Var AdvTaobinMenu = DefaultNormBanner
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
@@ -283,6 +299,9 @@
             EndIf
 
             ;page_remove_cup-SGP_blue.lxml
+            DEBUGVAR "VideoEnd"
+            DEBUGVAR CurrPageInst0
+            DEBUGVAR CurrentXMLFileName2
 
         Else
 
@@ -323,7 +342,7 @@
     Else
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
-            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
+            If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
                  If CountDownPauseVideo2 < 1 Then
                     Var AdvTaobinMenu = DefaultNormBanner
                     Var DisplayAds = AdvTaobinMenu + ".mp4"

inter/hkg/xml/multi/page_catalog.lxml

@@ -205,7 +205,7 @@
 	Var menu_name_thai_blender = ""
 	Var menu_desc_thai_blender = ""
 
-	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
 
 	TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
 

inter/hkg/xml/multi/page_catalog_group_coffee.lxml

@@ -224,13 +224,13 @@
 	<State> Flag( 54-21-01-0061.Button,54-21-02-0061.Button,$Sum54210100615421020061) </State> 
 	<Button>
 	<State> $Sum54210100615421020061 </State> 
-	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_ginger_cafe_latte.png" </Filename>
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_santa_ginger.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_ginger_cafe_latte.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_santa_ginger.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_ginger_cafe_latte.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_santa_ginger.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_ginger_cafe_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_santa_ginger.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $54-21-01-0061.Price

inter/hkg/xml/multi/page_catalog_group_milk.lxml

@@ -6561,13 +6561,13 @@
 		Var PD_CODE2 = "54-03-02-0081"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "ICED  SANTA GINGER"
+		Var aliasName[0] = "GINGER LATTE"
 		Var aliasDesc[0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
-		Var aliasName[1] = "冰圣诞生姜荼"
+		Var aliasName[1] = "生姜焦糖牛奶"
 		Var aliasDesc[1] = "生姜、牛奶、焦糖糖浆、水"
-		Var aliasName[2] = "冰聖誕生薑荼"
+		Var aliasName[2] = "生薑焦糖牛奶"
 		Var aliasDesc[2] = "生薑、牛奶、焦糖糖漿、水"
-		Var aliasName[3] = "冰聖誕生薑荼"
+		Var aliasName[3] = "生薑焦糖牛奶"
 		Var aliasDesc[3] = "生薑、牛奶、焦糖糖漿、水"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
@@ -6585,7 +6585,7 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "GINGER CAFE LATTE"
+		Var NameLang[1][0] = "GINGER LATTE"
 		Var NameLang[1][1] = "生姜拿铁咖啡"
 		Var NameLang[1][2] = "生薑拿鐵咖啡"
 		Var NameLang[1][3] = ""
@@ -6684,12 +6684,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>ICED  SANTA GINGER</LanguageSlot1>
+		<LanguageSlot1>GINGER LATTE</LanguageSlot1>
-		<LanguageSlot2>冰圣诞生姜荼</LanguageSlot2>
+		<LanguageSlot2>生姜焦糖牛奶</LanguageSlot2>
-		<LanguageSlot3>冰聖誕生薑荼</LanguageSlot3>
+		<LanguageSlot3>生薑焦糖牛奶</LanguageSlot3>
-		<LanguageSlot4>ICED  SANTA GINGER</LanguageSlot4>
+		<LanguageSlot4>GINGER LATTE</LanguageSlot4>
-		<LanguageSlot5>冰圣诞生姜荼</LanguageSlot5>
+		<LanguageSlot5>生姜焦糖牛奶</LanguageSlot5>
-		<LanguageSlot6>冰聖誕生薑荼</LanguageSlot6>
+		<LanguageSlot6>生薑焦糖牛奶</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>

inter/hkg/xml/multi/page_catalog_group_other.lxml

@@ -2934,7 +2934,7 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "7UP TAO POWER\nPLUM SODA"
-		Var aliasDesc[0] = "7Up , Medicine drink, Ume, Ice"
+		Var aliasDesc[0] = "7Up , Energy drink, Ume, Ice"
 		Var aliasName[1] = "特鳖能量梅子七喜"
 		Var aliasDesc[1] = "七喜、特鳖能量水、梅子，冰"
 		Var aliasName[2] = "特鳖能量梅子七喜"
@@ -3072,10 +3072,10 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>7Up , Medicine drink, Ume, Ice</LanguageSlot1>
+		<LanguageSlot1>7Up , Energy drink, Ume, Ice</LanguageSlot1>
 		<LanguageSlot2>七喜、特鳖能量水、梅子，冰</LanguageSlot2>
 		<LanguageSlot3>七喜、特鳖能量水、梅子、冰</LanguageSlot3>
-		<LanguageSlot4>7Up , Medicine drink, Ume, Ice</LanguageSlot4>
+		<LanguageSlot4>7Up , Energy drink, Ume, Ice</LanguageSlot4>
 		<LanguageSlot5>七喜、特鳖能量水、梅子，冰</LanguageSlot5>
 		<LanguageSlot6>七喜、特鳖能量水、梅子、冰</LanguageSlot6>
 	</LanguageGroup>

inter/hkg/xml/multi/page_catalog_group_recommend.lxml

@@ -96,7 +96,7 @@
     
 
     Var LanguageButtonEnable = "Invisible"
-	Var BtnLangToggleIndex = "Enable"
+    Var BtnLangToggleIndex = "Enable"
     
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
     RefreshAll
@@ -223,7 +223,7 @@
     
 
     Var LanguageButtonEnable = "Invisible"
-	Var BtnLangToggleIndex = "Enable"
+    Var BtnLangToggleIndex = "Enable"
 
 
     

inter/hkg/xml/multi/page_catalog_group_tea.lxml

@@ -1746,12 +1746,12 @@
 		; begin lang 
 		Var aliasName[0] = "GINGER MILK TEA\nOREO SMOOTHIE"
 		Var aliasDesc[0] = "Ginger, Milk, Oreo"
-		Var aliasName[1] = "-"
+		Var aliasName[1] = "火山生薑奧利奧沙冰"
-		Var aliasDesc[1] = "-"
+		Var aliasDesc[1] = "生薑、牛奶、糖、奥利奥、冰"
-		Var aliasName[2] = "-"
+		Var aliasName[2] = "火山生薑奧利奧沙冰"
-		Var aliasDesc[2] = "-"
+		Var aliasDesc[2] = "生薑、牛奶、糖、奥利奥、冰"
-		Var aliasName[3] = "-"
+		Var aliasName[3] = "火山生薑奧利奧沙冰"
-		Var aliasDesc[3] = "-"
+		Var aliasDesc[3] = "生薑、牛奶、糖、奥利奥、冰"
 		Var aliasName[4] = "TEH SUSU HALIA\nOREO SMOOTHIE"
 		Var aliasDesc[4] = "Ginger, Milk, Oreo"
 		Var aliasName[5] = ""
@@ -1868,11 +1868,11 @@
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
 		<LanguageSlot1>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot1>
-		<LanguageSlot2>-</LanguageSlot2>
+		<LanguageSlot2>火山生薑奧利奧沙冰</LanguageSlot2>
-		<LanguageSlot3>-</LanguageSlot3>
+		<LanguageSlot3>火山生薑奧利奧沙冰</LanguageSlot3>
 		<LanguageSlot4>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot4>
-		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot5>火山生薑奧利奧沙冰</LanguageSlot5>
-		<LanguageSlot6>-</LanguageSlot6>
+		<LanguageSlot6>火山生薑奧利奧沙冰</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -1884,11 +1884,11 @@
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
 		<LanguageSlot1>Ginger, Milk, Oreo</LanguageSlot1>
-		<LanguageSlot2>-</LanguageSlot2>
+		<LanguageSlot2>生薑、牛奶、糖、奥利奥、冰</LanguageSlot2>
-		<LanguageSlot3>-</LanguageSlot3>
+		<LanguageSlot3>生薑、牛奶、糖、奥利奥、冰</LanguageSlot3>
 		<LanguageSlot4>Ginger, Milk, Oreo</LanguageSlot4>
-		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot5>生薑、牛奶、糖、奥利奥、冰</LanguageSlot5>
-		<LanguageSlot6>-</LanguageSlot6>
+		<LanguageSlot6>生薑、牛奶、糖、奥利奥、冰</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>

inter/hkg/xml/page_catalog_group_coffee.lxml

@@ -701,13 +701,13 @@
 	<State> Flag( 54-21-01-0061.Button,54-21-02-0061.Button,$Sum54210100615421020061) </State> 
 	<Button>
 	<State> $Sum54210100615421020061 </State> 
-	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_ginger_cafe_latte.png" </Filename>
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_santa_ginger.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_ginger_cafe_latte.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_santa_ginger.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_ginger_cafe_latte.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_santa_ginger.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_ginger_cafe_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_santa_ginger.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $54-21-01-0061.Price
 		Var PriceD2 = $54-21-02-0061.Price

inter/hkg/xml/page_catalog_group_milk.lxml

@@ -6427,13 +6427,13 @@
 		Var PD_CODE2 = "54-03-02-0081"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "ICED  SANTA GINGER"
+		Var aliasName[0] = "GINGER LATTE"
 		Var aliasDesc[0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
 		Var aliasName[1] = "ซานต้าจินเจอร์"
 		Var aliasDesc[1] = "ขิง นม น้ำเชื่อมคาราเมล และน้ำ"
-		Var aliasName[2] = "冰圣诞生姜荼"
+		Var aliasName[2] = "生姜焦糖牛奶"
 		Var aliasDesc[2] = "生姜、牛奶、焦糖糖浆、水"
-		Var aliasName[3] = "冰聖誕生薑荼"
+		Var aliasName[3] = "生薑焦糖牛奶"
 		Var aliasDesc[3] = "生薑、牛奶、焦糖糖漿、水"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
@@ -6451,7 +6451,7 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "GINGER CAFE LATTE"
+		Var NameLang[1][0] = "GINGER LATTE"
 		Var NameLang[1][1] = "生姜拿铁咖啡"
 		Var NameLang[1][2] = "生薑拿鐵咖啡"
 		Var NameLang[1][3] = ""
@@ -6522,9 +6522,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>ICED  SANTA GINGER</LanguageSlot1>
+		<LanguageSlot1>GINGER LATTE</LanguageSlot1>
 		<LanguageSlot2>ซานต้าจินเจอร์</LanguageSlot2>
-		<LanguageSlot3>ICED  SANTA GINGER</LanguageSlot3>
+		<LanguageSlot3>GINGER LATTE</LanguageSlot3>
 		<LanguageSlot4>ซานต้าจินเจอร์</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ซานต้าจินเจอร์</LanguageSlot6>

inter/hkg/xml/page_catalog_group_other.lxml

@@ -3146,7 +3146,7 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "7UP TAO POWER\nPLUM SODA"
-		Var aliasDesc[0] = "7Up , Medicine drink, Ume, Ice"
+		Var aliasDesc[0] = "7Up , Energy drink, Ume, Ice"
 		Var aliasName[1] = "เซเว่นอัพชูกำลัง\nบ๊วยโซดา"
 		Var aliasDesc[1] = "เซเว่นอัพ   เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง"
 		Var aliasName[2] = "特鳖能量梅子七喜"
@@ -3256,9 +3256,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>7Up , Medicine drink, Ume, Ice</LanguageSlot1>
+		<LanguageSlot1>7Up , Energy drink, Ume, Ice</LanguageSlot1>
 		<LanguageSlot2>เซเว่นอัพ   เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot2>
-		<LanguageSlot3>7Up , Medicine drink, Ume, Ice</LanguageSlot3>
+		<LanguageSlot3>7Up , Energy drink, Ume, Ice</LanguageSlot3>
 		<LanguageSlot4>เซเว่นอัพ   เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>เซเว่นอัพ   เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot6>

inter/hkg/xml/page_catalog_group_tea.lxml

@@ -2092,10 +2092,10 @@
 		Var aliasDesc[0] = "Ginger, Milk, Oreo"
 		Var aliasName[1] = "ชานมขิงโอริโอ้ปั่น"
 		Var aliasDesc[1] = "ขิง นม Oreo"
-		Var aliasName[2] = "-"
+		Var aliasName[2] = "火山生薑奧利奧沙冰"
-		Var aliasDesc[2] = "-"
+		Var aliasDesc[2] = "生薑、牛奶、糖、奥利奥、冰"
-		Var aliasName[3] = "-"
+		Var aliasName[3] = "火山生薑奧利奧沙冰"
-		Var aliasDesc[3] = "-"
+		Var aliasDesc[3] = "生薑、牛奶、糖、奥利奥、冰"
 		Var aliasName[4] = "TEH SUSU HALIA\nOREO SMOOTHIE"
 		Var aliasDesc[4] = "Ginger, Milk, Oreo"
 		Var aliasName[5] = ""

inter/mys/menu/lang.tsv

@@ -1036,7 +1036,7 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 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. เลือกทิศทาง

inter/mys/xml/menu_new_layout_gen_v2.py

@@ -1,4 +1,8 @@
   if "v2" in param:
+
+    # python3 menu_inter_gen.py sheet sheet ../taobin_project/ mys new-inter-v2-gcpm
+
+
     def find_templatable_product_codes(str_pd):
         # find sep `|`
         str_pd_spl = str_pd.split('|')

inter/mys/xml/page_catalog_group_coffee.lxml

@@ -1739,7 +1739,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0003.Button,@Slot 12-01-02-0001.Button or 12-01-22-0001.Button,$Sum12010100031201X20001) </State> 
+	<State> Flag( @Slot 12-01-01-0003.Button,@Slot 12-01-02-0001.Button or 12-01-22-0001.Button,$Sum12010100031201X20001) </State>
 	<Button>
 	<State> $Sum12010100031201X20001 </State>
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_america_no.png" </Filename>
@@ -1750,10 +1750,10 @@
 	<EventOnClick>
 		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-01-01-0003.Price
+		Var PriceD1 !assigned @AutoVar $12-01-{1201XX0001XSlotPrefix[0]}2-0001.Price
 		Var PriceD2 !assigned @AutoVar $12-01-{1201XX0001XSlotPrefix[1]}2-0001.Price
 		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-01-01-0003"
+		Var PD_CODE1 !assigned @AutoVar "12-01-{1201XX0001XSlotPrefix[0]}2-0001"
 		Var PD_CODE2 !assigned @AutoVar "12-01-{1201XX0001XSlotPrefix[1]}2-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang
@@ -1806,7 +1806,7 @@
 		Var DescLang[2][4] = ""
 		Var DescLang[2][5] = ""
 		; end lang
-		Var PD_STAGE_1 = $12-01-01-0003.Button
+		Var PD_STAGE_1 !assigned @AutoVar $12-01-{1201XX0001XSlotPrefix[0]}2-0001.Button
 		Var PD_STAGE_2 !assigned @AutoVar $12-01-{1201XX0001XSlotPrefix[1]}2-0001.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
@@ -1832,7 +1832,9 @@
 			EndIf
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0003"
+    			If XSlot[0] = 1 Then
+    			    Topping "Load" "12-01-01-0003"
+    			EndIf
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -1889,7 +1891,7 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-01-01-0003.Button </State>
+	<State> @AutoVar $12-01-{1201XX0001XSlotPrefix[0]}2-0001.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -1901,8 +1903,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-01-0003.Button </State>
+	<State> @AutoVar $12-01-{1201XX0001XSlotPrefix[0]}2-0001.Button </State>
-	<Value> StringFmt(  $12-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> @AutoVar StringFmt( $12-01-{1201XX0001XSlotPrefix[0]}2-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2018,7 +2020,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0003.Button,@Slot 12-21-02-0001.Button or 12-21-22-0001.Button,$Sum12210100031221X20001) </State> 
+	<State> Flag( @Slot 12-21-01-0003.Button,@Slot 12-21-02-0001.Button or 12-21-22-0001.Button,$Sum12210100031221X20001) </State>
 	<Button>
 	<State> $Sum12210100031221X20001 </State>
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_america_no.png" </Filename>
@@ -2027,12 +2029,19 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick>
+
+	    DEBUGVAR 1221XX0003XSlotPrefix[0]
+
+		DEBUGVAR 1221XX0001XSlotPrefix[1]
+
+		DEBUGVAR 1221XX0001XSlotPrefix[2]
+
 		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-21-01-0003.Price
+		Var PriceD1 !assigned @AutoVar $12-21-{1221XX0003XSlotPrefix[0]}1-0003.Price
 		Var PriceD2 !assigned @AutoVar $12-21-{1221XX0001XSlotPrefix[1]}2-0001.Price
 		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-21-01-0003"
+		Var PD_CODE1 !assigned @AutoVar "12-21-{1221XX0003XSlotPrefix[0]}1-0003"
 		Var PD_CODE2 !assigned @AutoVar "12-21-{1221XX0001XSlotPrefix[1]}2-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang
@@ -2085,7 +2094,7 @@
 		Var DescLang[2][4] = ""
 		Var DescLang[2][5] = ""
 		; end lang
-		Var PD_STAGE_1 = $12-21-01-0003.Button
+		Var PD_STAGE_1 !assigned @AutoVar $12-21-{1221XX0003XSlotPrefix[0]}1-0003.Button
 		Var PD_STAGE_2 !assigned @AutoVar $12-21-{1221XX0001XSlotPrefix[1]}2-0001.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
@@ -2111,7 +2120,9 @@
 			EndIf
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-21-01-0003"
+			    If XSlot[0] = 1 Then
+					Topping "Load" "12-21-01-0003"
+				EndIf
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2168,7 +2179,7 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-21-01-0003.Button </State>
+	<State> @AutoVar $12-21-{1221XX0003XSlotPrefix[0]}1-0003.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -2180,8 +2191,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-21-01-0003.Button </State>
+	<State> @AutoVar $12-21-{1221XX0003XSlotPrefix[0]}1-0003.Button </State>
-	<Value> StringFmt(  $12-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> @AutoVar StringFmt( $12-21-{1221XX0003XSlotPrefix[0]}1-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2247,7 +2258,7 @@
 	<State>
 		eval(
 			If $Sum12210100031221X20001 = "Disable" Then
-				STRCONTAIN "ERR" $12-21-01-0003.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-{1221XX0003XSlotPrefix[0]}1-0003.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-21-{1221XX0001XSlotPrefix[1]}2-0001.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"

inter/mys/xml/page_catalog_group_milk.lxml

@@ -4214,7 +4214,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-01-0022.Button,@Slot 12-03-02-0022.Button or 12-03-22-0022.Button,12-03-03-0022.Button,$Sum12030100221203X200221203030022) </State> 
+	<State> Flag( @Slot 12-03-01-0022.Button,@Slot 12-03-02-0022.Button or 12-03-22-0022.Button,@Slot 12-03-03-0022.Button,$Sum12030100221203X200221203030022) </State>
 	<Button>
 	<State> $Sum12030100221203X200221203030022 </State>
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_Melon_smoothie.png" </Filename>
@@ -4225,12 +4225,12 @@
 	<EventOnClick>
 		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-03-01-0022.Price
+		Var PriceD1 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[0]}1-0022.Price
 		Var PriceD2 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[1]}2-0022.Price
-		Var PriceD3 = $12-03-03-0022.Price
+		Var PriceD3 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[2]}3-0022.Price
-		Var PD_CODE1 = "12-03-01-0022"
+		Var PD_CODE1 !assigned @AutoVar "12-03-{1203XX0022XSlotPrefix[0]}1-0022"
 		Var PD_CODE2 !assigned @AutoVar "12-03-{1203XX0022XSlotPrefix[1]}2-0022"
-		Var PD_CODE3 = "12-03-03-0022"
+		Var PD_CODE3 !assigned @AutoVar "12-03-{1203XX0022XSlotPrefix[2]}3-0022"
 		; begin lang
 		Var aliasName[0] = "MELON MILK"
 		Var aliasDesc[0] = "Milk & Melon Syrup"
@@ -4281,9 +4281,9 @@
 		Var DescLang[2][4] = "Susu, Sirap Melon, Ais"
 		Var DescLang[2][5] = ""
 		; end lang
-		Var PD_STAGE_1 = $12-03-01-0022.Button
+		Var PD_STAGE_1 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[0]}1-0022.Button
 		Var PD_STAGE_2 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[1]}2-0022.Button
-		Var PD_STAGE_3 = $12-03-03-0022.Button
+		Var PD_STAGE_3 !assigned @AutoVar $12-03-{1203XX0022XSlotPrefix[2]}3-0022.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -4307,9 +4307,13 @@
 			EndIf
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-03-01-0022"
+    			If XSlot[0] = 1 Then
+                    Topping "Load" "12-03-01-0022"
+    			EndIf
 			Else
-			Topping "Load" "12-03-03-0022"
+    			If XSlot[2] = 1 Then
+    				Topping "Load" "12-03-03-0022"
+    			EndIf
 			EndIf
 		EndIf
 
@@ -4364,7 +4368,7 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-03-01-0022.Button </State>
+	<State> @AutoVar $12-03-{1203XX0022XSlotPrefix[0]}1-0022.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -4376,8 +4380,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-03-01-0022.Button </State>
+	<State> @AutoVar $12-03-{1203XX0022XSlotPrefix[0]}1-0022.Button </State>
-	<Value> StringFmt(  $12-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> @AutoVar StringFmt( $12-03-{1203XX0022XSlotPrefix[0]}1-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4402,7 +4406,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-03-03-0022.Button </State>
+	<State> @AutoVar $12-03-{1203XX0022XSlotPrefix[2]}3-0022.Button</State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -4412,8 +4416,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-03-03-0022.Button </State>
+	<State> @AutoVar $12-03-{1203XX0022XSlotPrefix[2]}3-0022.Button </State>
-	<Value> StringFmt(  $12-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> @AutoVar StringFmt( $12-03-{1203XX0022XSlotPrefix[2]}3-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4443,9 +4447,9 @@
 	<State>
 		eval(
 			If $Sum12030100221203X200221203030022 = "Disable" Then
-				STRCONTAIN "ERR" $12-03-01-0022.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-03-{1203XX0022XSlotPrefix[0]}1-0022.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-03-{1203XX0022XSlotPrefix[1]}2-0022.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-03-03-0022.TAG tag3_is_disable
+				STRCONTAIN "ERR" $12-03-{1203XX0022XSlotPrefix[2]}3-0022.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"

inter/mys/xml/page_collect_point_3.lxml

@@ -1199,18 +1199,18 @@
 <Image>
 <X> 172 </X>
 <Y> 1570 </Y>
-<Filename> Var( DirImage + "/text8.png" )</Filename>
+<Filename> Var( DirImage + "/text8_mys.png" )</Filename>
 </Image>
 
-<Text>
+;<Text>
-<X> xPointEndDate </X>
+;<X> xPointEndDate </X>
-<Y> 1576 </Y>
+;<Y> 1576 </Y>
-<Size> 25 </Size>
+;<Size> 25 </Size>
-<Width> 500 </Width>
+;<Width> 500 </Width>
-<Font> KanitRegularTTF </Font>
+;<Font> KanitRegularTTF </Font>
-<Color> 0xDE794E </Color>
+;<Color> 0xDE794E </Color>
-<Value> PointEndDate </Value>
+;<Value> PointEndDate </Value>
-</Text>
+;</Text>
 
 <Text>
 <X> 310 </X>
@@ -1253,4 +1253,3 @@
 
 
 </Popup>
-	

inter/sgp/menu/lang.tsv

@@ -174,6 +174,8 @@ TextID	Note	English	Thai
 000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
 		Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
 		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xA6B2FF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xA6B2FF,Align=Center,LineHeight=50
 000411		Press Here	กดที่นี่
 
 
@@ -1285,3 +1287,447 @@ TextID	Note	English	Thai
 2100056		Please check before confirming	Please check before confirming
 2100057		Fan module	Fan module
 2200000		Fan	พัดลม
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	EOF
+9999999		Load language finish	Load language finish

inter/tha/animation01/play_list.tsv

@@ -1350,3 +1350,10 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 เป๊ปซี่ทรอปิคอล	12-05-02-0148	1	14	34	62	23					24	100	7:40	32
 เป๊ปซี่มะนาว	12-05-02-0149	1	14	13	12	23					24	100	7:40	32
 เป๊ปซี่คาราเมล	12-05-02-0150	1	14	13	22	23					24	100	7:40	32
+
+มัทฉะลาเต้พรีเมียมร้อน	12-02-01-0103	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้พรีเมียมเย็น	12-02-02-0103	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้พรีเมียมปั่น	12-02-03-0103	1	8	9	70	23	41				24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ร้อน	12-02-01-0104	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 เย็น	12-02-02-0104	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ปั่น	12-02-03-0104	1	8	9	70	23	41				24	100	7:40	32

inter/tha/xml/event/script_common_for_open_promotion_xml.ev

@@ -12,8 +12,26 @@ Var RecommendPage = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recomm
 Var RecommendPageMulti = "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_recommend.lxml"
 
 
-If MyanmarLangEnable = "true" Then
+If RedirectToNormalVersion = 1 Then
+	SAVELOG " ===================== RedirectToNormalVersion 1 =========================="
 
+	If LanguageShow = "ENG" Then
+		Var show_eng = "true"
+	EndIf
+
+	If LanguageShow = "THAI" Then
+		Var show_eng = "false"
+	EndIf
+
+	If LanguageShow = "MYANMAR" Then
+		Var show_eng = "true"
+	EndIf
+	
+	SAVELOG " ===================== RedirectToNormalVersion set =========================="
+	; use this first for test
+	TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" 
+
+Else	
 	; nothing to do 
 
 
@@ -31,41 +49,6 @@ If MyanmarLangEnable = "true" Then
 		EndIf
 	EndIf
 
-Else	
-	SAVELOG " ===================== MyanmarLangEnable false =========================="
-
-	If LanguageShow = "ENG" Then
-		Var show_eng = "true"
-	EndIf
-
-	If LanguageShow = "THAI" Then
-		Var show_eng = "false"
-	EndIf
-
-	If LanguageShow = "MYANMAR" Then
-		Var show_eng = "true"
-	EndIf
-	
-	SAVELOG " ===================== MyanmarLangEnable false 2 =========================="
-	; use this first for test
-	If InternationalEnable = 1 Then
-		; don not thing
-		If OpenFromPageBoard = 1 Then
-			If EnableMultiInstance = "true" Then
-				OpenInst 2 RecommendPageMulti
-			Else
-				OpenInst 2 RecommendPage
-			EndIf
-		Else
-			If EnableMultiInstance = "true" Then
-				OpenInst 2 RecommendPageMulti
-			Else
-				Open RecommendPage
-			EndIf
-		EndIf
-	Else
-		TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" 
-	EndIf
 EndIf
 
 Var OpenFromPageBoard = 0

inter/tha/xml/multi/InstanceGetSetString.inc

@@ -1,25 +1,17 @@
     InstanceGetString SaveStringInst
-    DEBUGVAR SaveStringInst
+    ;DEBUGVAR SaveStringInst
-    DEBUGVAR show_eng
+    ;DEBUGVAR show_eng
 
 
 
     If SaveStringInst = "RefreshNow" Then
         RefreshAll
 	Else
-		If EnabledBlocksDrawInst6 = EnabledBlockUpdateInst6 Then
+		
-			Var StatusRefresh = "NoRefresh"
-			DEBUGVAR StatusRefresh
-		Else 
-			Var StatusRefresh = "Refresh"
-			DEBUGVAR StatusRefresh
-			GetXMLFileNameCurrentRunning CurrentOpenFile2
-			Open CurrentOpenFile2
-		EndIf
 
     EndIf
-     InstanceSetString "-"
+    InstanceSetString "-"
-	DEBUGVAR LanguageShow
+	;DEBUGVAR LanguageShow
 
 
 

inter/tha/xml/multi/tab_menu.lxml

@@ -71,13 +71,12 @@
             Var OpenFromMulti = 1
             Var OpenFromPageBoard = 1
             
-            ;Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-		    ;TRY OpenFileXML
-
             RootLayoutVisible 3 "hide"
             RootLayoutVisible 13 "hide"
         
             TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
+            
+
         </EventClick>
         </Button>
 

inter/tha/xml/multi/v3/page_catalog_group_other.lxml

@@ -20556,9 +20556,9 @@
 		; 12-06-01-0002 - - 
 		<Menu>
 		<State> Flag( 12-06-01-0002.Button,$Sum1206010002) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//-" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//-" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//-" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Hongkong Congee</LanguageSlot1>
@@ -20650,7 +20650,7 @@
 			<Value> $Sum1206010002TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "-"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $12-06-01-0002.Price
@@ -21003,233 +21003,6 @@
 			
 			
 			
-		</EventOnClick>
-		</Menu>
-
-			; ==================> Len = 3
-		; - 12-05-02-0016 - 
-		<Menu>
-		<State> Flag( 12-05-02-0016.Button,$Sum1205020016) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_water_roomtemp.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_water_roomtemp.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_water_roomtemp.png" </DisableImage>
-		<Name>
-			<LanguageGroup>
-				<LanguageSlot1>Drinking Water</LanguageSlot1>
-				<LanguageSlot2>น้ำดื่ม</LanguageSlot2>
-				<LanguageSlot3>Drinking Water</LanguageSlot3>
-				<LanguageSlot4>น้ำดื่ม</LanguageSlot4>
-				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>น้ำดื่ม</LanguageSlot6>
-			</LanguageGroup>
-		</Name>
-		<Description>
-			<LanguageGroup>
-				<LanguageSlot1>Water</LanguageSlot1>
-				<LanguageSlot2>น้ำ</LanguageSlot2>
-				<LanguageSlot3>Water</LanguageSlot3>
-				<LanguageSlot4>น้ำ</LanguageSlot4>
-				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>น้ำ</LanguageSlot6>
-			</LanguageGroup>
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0016.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
-		If $##-##-##-####.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </HotPrice>
-		<IcePrice> eval( 
-		If $12-05-02-0016.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </IcePrice>
-		<BlendPrice> eval( 
-		If $##-##-##-####.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<ConditionalDisable>
-			<Script>
-				If $Sum1205020016 = "Disable" Then
-					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag1_is_disable
-					STRCONTAIN "STG=CLOSE" $12-05-02-0016.TAG tag2_is_disable
-					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag3_is_disable
-					If tag1_is_disable = "true" Then
-						Var $Sum1205020016Tag = $##-##-##-####.TAG
-					EndIf
-					If tag2_is_disable = "true" Then
-						Var $Sum1205020016Tag = $12-05-02-0016.TAG
-					EndIf
-					If tag3_is_disable = "true" Then
-						Var $Sum1205020016Tag = $##-##-##-####.TAG
-					EndIf
-					Var $Sum1205020016TextValue !assigned GETS($Sum1205020016Tag,"MSG")
-					Var $Sum1205020016TextID !assigned GETS($Sum1205020016Tag,"TextID")
-					If $Sum1205020016TextID != "" Then
-						Var $Sum1205020016TextValue = ""
-					EndIf
-					If $Sum1205020016TextValue = "" Then
-						If $Sum1205020016TextID = "" Then
-							Var $Sum1205020016TextID = "000013"
-						EndIf
-					EndIf
-				EndIf
-			</Script>
-			<ID> $Sum1205020016TextID </ID>
-			<Value> $Sum1205020016TextValue </Value>
-		</ConditionalDisable>
-		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
-			GetInstanceIDMenuTab OpenFromInstMenuTab
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0016.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0016"
-			Var PD_CODE3 = "##-##-##-####"
-			; begin lang
-			Var aliasName[0] = "Drinking Water"
-			Var aliasDesc[0] = "Water"
-			Var aliasName[1] = "น้ำดื่ม"
-			Var aliasDesc[1] = "น้ำ"
-			Var aliasName[2] = "水"
-			Var aliasDesc[2] = "水"
-			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
-			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "သောက်ရေ"
-			Var aliasDesc[5] = "‌သောက်ရေ"
-			Var NameLang[0][0] = ""
-			Var NameLang[0][1] = ""
-			Var NameLang[0][2] = ""
-			Var NameLang[0][3] = ""
-			Var NameLang[0][4] = ""
-			Var NameLang[0][5] = ""
-			Var DescLang[0][0] = ""
-			Var DescLang[0][1] = ""
-			Var DescLang[0][2] = ""
-			Var DescLang[0][3] = ""
-			Var DescLang[0][4] = ""
-			Var DescLang[0][5] = ""
-			Var NameLang[1][0] = "ICED Drinking Water"
-			Var NameLang[1][1] = "น้ำดื่ม"
-			Var NameLang[1][2] = "饮用水"
-			Var NameLang[1][3] = "-"
-			Var NameLang[1][4] = "-"
-			Var NameLang[1][5] = "ICED သောက်ရေ"
-			Var DescLang[1][0] = "Water"
-			Var DescLang[1][1] = "น้ำ"
-			Var DescLang[1][2] = "水"
-			Var DescLang[1][3] = "-"
-			Var DescLang[1][4] = "-"
-			Var DescLang[1][5] = "ရေ"
-			Var NameLang[2][0] = ""
-			Var NameLang[2][1] = ""
-			Var NameLang[2][2] = ""
-			Var NameLang[2][3] = ""
-			Var NameLang[2][4] = ""
-			Var NameLang[2][5] = ""
-			Var DescLang[2][0] = ""
-			Var DescLang[2][1] = ""
-			Var DescLang[2][2] = ""
-			Var DescLang[2][3] = ""
-			Var DescLang[2][4] = ""
-			Var DescLang[2][5] = ""
-			; end lang
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0016.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0016"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml"
-			
-			
-			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
-			If RedirectToNormalVersion = 1 Then
-				Var menu_name_eng_hot = NameLang[0][0]
-				Var menu_desc_eng_hot = DescLang[0][0]
-				Var menu_name_eng_cold = NameLang[1][0]
-				Var menu_desc_eng_cold = DescLang[1][0]
-				Var menu_name_eng_blender = NameLang[2][0]
-				Var menu_desc_eng_blender = DescLang[2][0]
-				
-				
-				
-				Var menu_name_thai_hot = NameLang[0][1]
-				Var menu_desc_thai_hot = DescLang[0][1]
-				Var menu_name_thai_cold = NameLang[1][1]
-				Var menu_desc_thai_cold = DescLang[1][1]
-				Var menu_name_thai_blender = NameLang[2][1]
-				Var menu_desc_thai_blender = DescLang[2][1]
-				DEBUGVAR menu_name_thai_cold
-				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
-				Var show_eng =  "true"
-			EndIf
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
-			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
-			EndIf
-			
-			
-			
 		</EventOnClick>
 		</Menu>
 

inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml

@@ -3940,15 +3940,16 @@
 				Var SelectCountDrinkType = SelectCountDrinkType + 1
 				Var DefaultDrinkType = 3
 			EndIf
+		; default topping 3
+		If PD_STAGE_3 = "Enable" Then
+				Topping "Load" "12-05-03-0040"
+		Else
 			If PD_STAGE_2 = "Enable" Then
 				Topping "Load" "12-05-02-0040"
 			Else
-				If PD_STAGE_1 = "Enable" Then
 				Topping "Load" "12-05-01-0040"
-				Else
-				Topping "Load" "12-05-03-0040"
-				EndIf
 			EndIf
+		EndIf
 			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
 			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
 			
@@ -4167,15 +4168,16 @@
 				Var SelectCountDrinkType = SelectCountDrinkType + 1
 				Var DefaultDrinkType = 3
 			EndIf
+		; default topping 3
+		If PD_STAGE_3 = "Enable" Then
+				Topping "Load" "12-05-03-0041"
+		Else
 			If PD_STAGE_2 = "Enable" Then
 				Topping "Load" "12-05-02-0041"
 			Else
-				If PD_STAGE_1 = "Enable" Then
 				Topping "Load" "-"
-				Else
-				Topping "Load" "12-05-03-0041"
-				EndIf
 			EndIf
+		EndIf
 			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
 			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
 			
@@ -4394,15 +4396,16 @@
 				Var SelectCountDrinkType = SelectCountDrinkType + 1
 				Var DefaultDrinkType = 3
 			EndIf
+		; default topping 3
+		If PD_STAGE_3 = "Enable" Then
+				Topping "Load" "12-05-03-0023"
+		Else
 			If PD_STAGE_2 = "Enable" Then
 				Topping "Load" "12-05-02-0023"
 			Else
-				If PD_STAGE_1 = "Enable" Then
 				Topping "Load" "-"
-				Else
-				Topping "Load" "12-05-03-0023"
-				EndIf
 			EndIf
+		EndIf
 			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
 			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
 			
@@ -15137,233 +15140,6 @@
 			
 			
 			
-		</EventOnClick>
-		</Menu>
-
-			; ==================> Len = 3
-		; - 12-05-02-0016 - 
-		<Menu>
-		<State> Flag( 12-05-02-0016.Button,$Sum1205020016) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_water_roomtemp.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_water_roomtemp.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_water_roomtemp.png" </DisableImage>
-		<Name>
-			<LanguageGroup>
-				<LanguageSlot1>Drinking Water</LanguageSlot1>
-				<LanguageSlot2>น้ำดื่ม</LanguageSlot2>
-				<LanguageSlot3>Drinking Water</LanguageSlot3>
-				<LanguageSlot4>น้ำดื่ม</LanguageSlot4>
-				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>น้ำดื่ม</LanguageSlot6>
-			</LanguageGroup>
-		</Name>
-		<Description>
-			<LanguageGroup>
-				<LanguageSlot1>Water</LanguageSlot1>
-				<LanguageSlot2>น้ำ</LanguageSlot2>
-				<LanguageSlot3>Water</LanguageSlot3>
-				<LanguageSlot4>น้ำ</LanguageSlot4>
-				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>น้ำ</LanguageSlot6>
-			</LanguageGroup>
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0016.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
-		If $##-##-##-####.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </HotPrice>
-		<IcePrice> eval( 
-		If $12-05-02-0016.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </IcePrice>
-		<BlendPrice> eval( 
-		If $##-##-##-####.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
-		) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<ConditionalDisable>
-			<Script>
-				If $Sum1205020016 = "Disable" Then
-					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag1_is_disable
-					STRCONTAIN "STG=CLOSE" $12-05-02-0016.TAG tag2_is_disable
-					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag3_is_disable
-					If tag1_is_disable = "true" Then
-						Var $Sum1205020016Tag = $##-##-##-####.TAG
-					EndIf
-					If tag2_is_disable = "true" Then
-						Var $Sum1205020016Tag = $12-05-02-0016.TAG
-					EndIf
-					If tag3_is_disable = "true" Then
-						Var $Sum1205020016Tag = $##-##-##-####.TAG
-					EndIf
-					Var $Sum1205020016TextValue !assigned GETS($Sum1205020016Tag,"MSG")
-					Var $Sum1205020016TextID !assigned GETS($Sum1205020016Tag,"TextID")
-					If $Sum1205020016TextID != "" Then
-						Var $Sum1205020016TextValue = ""
-					EndIf
-					If $Sum1205020016TextValue = "" Then
-						If $Sum1205020016TextID = "" Then
-							Var $Sum1205020016TextID = "000013"
-						EndIf
-					EndIf
-				EndIf
-			</Script>
-			<ID> $Sum1205020016TextID </ID>
-			<Value> $Sum1205020016TextValue </Value>
-		</ConditionalDisable>
-		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
-			GetInstanceIDMenuTab OpenFromInstMenuTab
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0016.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0016"
-			Var PD_CODE3 = "##-##-##-####"
-			; begin lang
-			Var aliasName[0] = "Drinking Water"
-			Var aliasDesc[0] = "Water"
-			Var aliasName[1] = "น้ำดื่ม"
-			Var aliasDesc[1] = "น้ำ"
-			Var aliasName[2] = "水"
-			Var aliasDesc[2] = "水"
-			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
-			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "သောက်ရေ"
-			Var aliasDesc[5] = "‌သောက်ရေ"
-			Var NameLang[0][0] = ""
-			Var NameLang[0][1] = ""
-			Var NameLang[0][2] = ""
-			Var NameLang[0][3] = ""
-			Var NameLang[0][4] = ""
-			Var NameLang[0][5] = ""
-			Var DescLang[0][0] = ""
-			Var DescLang[0][1] = ""
-			Var DescLang[0][2] = ""
-			Var DescLang[0][3] = ""
-			Var DescLang[0][4] = ""
-			Var DescLang[0][5] = ""
-			Var NameLang[1][0] = "ICED Drinking Water"
-			Var NameLang[1][1] = "น้ำดื่ม"
-			Var NameLang[1][2] = "饮用水"
-			Var NameLang[1][3] = "-"
-			Var NameLang[1][4] = "-"
-			Var NameLang[1][5] = "ICED သောက်ရေ"
-			Var DescLang[1][0] = "Water"
-			Var DescLang[1][1] = "น้ำ"
-			Var DescLang[1][2] = "水"
-			Var DescLang[1][3] = "-"
-			Var DescLang[1][4] = "-"
-			Var DescLang[1][5] = "ရေ"
-			Var NameLang[2][0] = ""
-			Var NameLang[2][1] = ""
-			Var NameLang[2][2] = ""
-			Var NameLang[2][3] = ""
-			Var NameLang[2][4] = ""
-			Var NameLang[2][5] = ""
-			Var DescLang[2][0] = ""
-			Var DescLang[2][1] = ""
-			Var DescLang[2][2] = ""
-			Var DescLang[2][3] = ""
-			Var DescLang[2][4] = ""
-			Var DescLang[2][5] = ""
-			; end lang
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0016.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0016"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
-			
-			
-			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
-			If RedirectToNormalVersion = 1 Then
-				Var menu_name_eng_hot = NameLang[0][0]
-				Var menu_desc_eng_hot = DescLang[0][0]
-				Var menu_name_eng_cold = NameLang[1][0]
-				Var menu_desc_eng_cold = DescLang[1][0]
-				Var menu_name_eng_blender = NameLang[2][0]
-				Var menu_desc_eng_blender = DescLang[2][0]
-				
-				
-				
-				Var menu_name_thai_hot = NameLang[0][1]
-				Var menu_desc_thai_hot = DescLang[0][1]
-				Var menu_name_thai_cold = NameLang[1][1]
-				Var menu_desc_thai_cold = DescLang[1][1]
-				Var menu_name_thai_blender = NameLang[2][1]
-				Var menu_desc_thai_blender = DescLang[2][1]
-				DEBUGVAR menu_name_thai_cold
-				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
-				Var show_eng =  "true"
-			EndIf
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
-			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
-			EndIf
-			
-			
-			
 		</EventOnClick>
 		</Menu>
 

inter/tha/xml/page_smoothie_suggest_and_process.xml

@@ -0,0 +1,287 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	SAVELOG "======================================= page_smoothie_suggest_and_process.xml ================================"
+	; On open
+
+	TopView "show"
+	; On open
+
+	Machine WakeUp
+
+	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+
+	DEBUGVAR ToppingNewShow
+
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev"
+
+	DEBUGVAR OpenFromPageBoard
+	If OpenFromPageBoard = 1 Then
+		Var OpenFromPageBoard = 0
+		Var langnext1 = "true"
+		Var langnext2 = "true"
+		Var langnext3 = "true"
+		Var langnext4 = "true"
+		Var langnext5 = "true"
+		Var langnext6 = "true"
+		Var langnext7 = "true"
+		Var langnext8 = "true"
+		Var langnext9 = "true"
+	EndIf
+
+	Var NextPage = "-"
+
+
+	If Seeker = "curr" Then
+		Machine DoorLidClose
+	EndIf
+
+	CoinVending OFF
+
+
+	; Clear value
+	Topping "clear" "-"
+
+
+	Var DirImage = "ROOT/taobin_project/image/smoothie/proccess"
+
+
+    Var ProcessCupDebugText = ""
+    Var TimeOutSmoothiesProcess = 120
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+	;SAVELOG SoundPlaying
+
+	If TimeOutSmoothiesProcess > 0 Then
+		Var TimeOutSmoothiesProcess = countDownRetrun - 1
+	EndIf
+
+	If TimeOutSmoothiesProcess = 0 Then
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	EndIf
+
+
+
+
+	Refresh
+	TimerReset
+</EventTimeout>
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+<EventLanguageOnChange>
+	DEBUGVAR LanguageShow
+
+
+	Var LanguageButtonEnable = "Enable"
+	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+	RefreshAll
+</EventLanguageOnChange>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+</EventClick>
+</Button>
+
+;
+;
+;
+;  zone 
+;
+;
+;
+
+
+
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/animation01/TaoBin2_draft02_art41.mp4" </Filename>
+</Video>
+
+
+
+<Text>
+<X> 0 </X>
+<Y> 1337 </Y>
+<Width> 1080 </Width>
+<Height> 85 </Height>
+<Align> Center </Align>
+<Language>
+	<ID> 001201 </ID>
+</Language>
+</Text>
+
+
+
+
+<Button>
+<X> 77 </X>
+<Y> 1531 </Y>
+<Filename> Var(DirImage + "/bn_main_button.png") </Filename>
+<FilenamePress> Var(DirImage + "/pn_main_button.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+        
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1571 </Y>
+<Width> 1080 </Width>
+<Height> 85 </Height>
+<Language>
+	<ID> 001202 </ID>
+</Language>
+</Text>
+
+
+
+<Button>
+<X> 337 </X>
+<Y> 1743 </Y>
+<Filename> Var(DirImage + "/bn_cancel.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cancel.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1757 </Y>
+<Width> 1080 </Width>
+<Height> 85 </Height>
+<Language>
+	<ID> 001204 </ID>
+</Language>
+</Text>
+
+
+
+
+
+
+
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ProcessCupDebugText </Value>
+</Text>
+
+
+
+
+<Text>
+<X> 1 </X>
+<Y> 1 </Y>
+<Font> KanitTTF </Font>
+<Size> 22 </Size>
+<Width> 1080 </Width>
+<Align> end </Align>
+<Color> 0xFF0000 </Color>
+<Value> "V01 "</Value>
+</Text>
+
+
+<EventUnitTest1>
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+</EventUnitTest1>
+
+<EventUnitTest4>
+	Var StrawGetMoreState = "Invisible"
+	Var bg_lidProblem_ST = "Enable"
+	Var GetLidButtonState2 = "Invisible"
+	Var bg_lidProblem_ST2 ="Enable"
+
+	Var XStraw = 376
+	Var EnableGetMoreStrawFileName2 = "Invisible"
+	Var bg_strawProblem_ST2 ="Enable"
+</EventUnitTest4>
+
+<EventUnitTest2>
+	Var MachineState_Result = 0
+	Var waitAckPay = 1
+	Var BREW_COUNT_DOWN_FROM_APP = "on"
+	Var CountDownBrewing = 122
+	Var MachineStage = "testing"
+	Var BREW_CNT = 122
+
+	Var InternationalEnable = 1
+	DEBUGVAR InternationalEnable
+	Var LanguageObjectShow = "Enable"
+	Var NoLangObjectShow = "Invisible"
+
+
+	Var Top2Timeout = 19
+	DEBUGVAR CountDownBrewing
+	;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml"
+</EventUnitTest2>
+; Initial for jump to page_brewing3.xml
+<EventUnitTest3>
+
+	;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml"
+
+	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+</EventUnitTest3>
+
+<EventUnitTest5>
+
+
+	Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
+</EventUnitTest5>
+
+<EventUnitTest6>
+
+	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+</EventUnitTest6>
+
+<EventUnitTest7>
+
+
+	Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml"
+</EventUnitTest7>
+
+<EventUnitTest8>
+
+
+	Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
+</EventUnitTest8>
+
+</Popup>

inter/uae_dubai/menu/lang.tsv

@@ -1095,7 +1095,7 @@ TextID	Note	English	arabic
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -3528,7 +3528,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7082,7 +7082,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7094,7 +7094,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10370,7 +10370,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -16908,7 +16908,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "BROWN SUGAR CAFÉ SMOOTHIE"
-		Var NameLang[2][1] = "عصير براون شوجر كافيه"
+		Var NameLang[2][1] = "مشروب براون شوجر كافيه"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""

inter/uae_dubai/xml/page_catalog_group_forkid.lxml

@@ -2176,7 +2176,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -2188,7 +2188,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""
@@ -2996,7 +2996,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
-		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
+		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""

inter/uae_dubai/xml/page_catalog_group_health.lxml

@@ -4347,7 +4347,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Matcha and Hot water"
-		Var DescLang[0][1] = "ماتشا وماء ساخن"
+		Var DescLang[0][1] = "ماتشا والماء الساخن"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7099,7 +7099,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
-		Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
+		Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_milk.lxml

@@ -3797,7 +3797,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
-		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
+		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
@@ -4061,7 +4061,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -4073,7 +4073,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend.lxml

@@ -6488,7 +6488,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6500,7 +6500,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10054,7 +10054,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10066,7 +10066,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""
@@ -12179,20 +12179,7 @@
 
 
 
-<Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
-<X> btnRemoveCupX </X>
-<Y> btnRemoveCupYNotPageBoard </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> bnRemoveCup </Filename>
-<Filename> bpRemoveCup </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
 
 
 

inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -5850,7 +5850,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -5862,7 +5862,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -9416,7 +9416,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -9428,7 +9428,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
-		Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
+		Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""

inter/uae_dubai/xml/page_catalog_group_whey.lxml

@@ -2936,8 +2936,8 @@
 		; begin lang 
 		Var aliasName[0] = "ESPRESSO SHAKE"
 		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk"
-		Var aliasName[1] = "เอสเพรสโซ่โปรตีน"
+		Var aliasName[1] = "إسبرسو شيك"
-		Var aliasDesc[1] = "เวย์โปรตีน กาแฟ นม"
+		Var aliasDesc[1] = "بروتين مصل اللبن، إسبرسو وحليب"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
@@ -3030,11 +3030,11 @@
 	<Color> HeadlineColor </Color>
 	<LanguageGroup>
 		<LanguageSlot1>ESPRESSO SHAKE</LanguageSlot1>
-		<LanguageSlot2>เอสเพรสโซ่โปรตีน</LanguageSlot2>
+		<LanguageSlot2>إسبرسو شيك</LanguageSlot2>
 		<LanguageSlot3>ESPRESSO SHAKE</LanguageSlot3>
-		<LanguageSlot4>เอสเพรสโซ่โปรตีน</LanguageSlot4>
+		<LanguageSlot4>إسبرسو شيك</LanguageSlot4>
 		<LanguageSlot5>ESPRESSO SHAKE</LanguageSlot5>
-		<LanguageSlot6>เอสเพรสโซ่โปรตีน</LanguageSlot6>
+		<LanguageSlot6>إسبرسو شيك</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3046,11 +3046,11 @@
 	<Color> BodyTextColor </Color>
 	<LanguageGroup>
 		<LanguageSlot1>Whey protein, Espresso\n& Milk</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน กาแฟ นม</LanguageSlot2>
+		<LanguageSlot2>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot2>
 		<LanguageSlot3>Whey protein, Espresso\n& Milk</LanguageSlot3>
-		<LanguageSlot4>เวย์โปรตีน กาแฟ นม</LanguageSlot4>
+		<LanguageSlot4>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot4>
 		<LanguageSlot5>Whey protein, Espresso\n& Milk</LanguageSlot5>
-		<LanguageSlot6>เวย์โปรตีน กาแฟ นม</LanguageSlot6>
+		<LanguageSlot6>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>

inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml

@@ -481,7 +481,12 @@
 
 	Var QR_POPUP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment/img_tap_card_5_sec.png"
 
-	Var CountDownAllowCancel = 5
+	Var CountDownAllowCancel = 9999999
+
+	Var VendingIsQueueCounter = 0
+	Var VendingIsFail = 0
+	Var VendingIsUnknown = 0
+	Var VendingIsIdleByPressingBtn = 0
 
 </EventOpen>
 
@@ -708,6 +713,8 @@
 		Var PayInfoCFlag = 1
     EndIf
 
+    DEBUGVAR VendingCashless
+    DEBUGVAR Timeout
 
 	If VendingCashless = "OK" Then
 		DEBUGVAR CashlessCode
@@ -717,6 +724,8 @@
 		Var QRErrorState = "Invisible"
 		Var LOADING_STATE = "Invisible"
 
+		Var CountDownAllowCancel = 9999999
+
 		If ViewBill > 0 Then
 				CoinVending BILLREJECT
 		EndIf
@@ -737,6 +746,23 @@
 	Else
 		DEBUGVAR "VendingCashless get ActOk not ok"
 		DEBUGVAR VendingCashless
+
+		If VendingCashless = "QUEUE" Then
+		    Var VendingIsQueueCounter = VendingIsQueueCounter + 1
+			SAVELOG "State::QUEUE.ActOk.add(1)"
+		EndIf
+
+		If VendingCashless = "ERROR" Then
+		    Var VendingIsError = VendingIsError + 1
+			SAVELOG "State::ERROR.ActOk.add(1)"
+		EndIf
+
+		If VendingCashless = "FAIL" Then
+		    Var VendingIsError = VendingIsError + 1
+			SAVELOG "State::FAIL.ActOk.add(1) cnt as Error"
+		EndIf
+
+
 	EndIf
 
 </EventActionOk>
@@ -786,6 +812,9 @@
 		If alphaState = "Enable" Then
 			Var QRErrorState = "Enable"
 			Var LOADING_STATE = "Invisible"
+
+			Var CountDownAllowCancel = 0
+
 		EndIf
 
 	EndIf
@@ -803,6 +832,7 @@
 	DEBUGVAR VendingCashless
 	DEBUGVAR UserChoosePayment
 	DEBUGVAR CoinInFlag
+	DEBUGVAR Timeout
 
 
 
@@ -812,7 +842,7 @@
 
 			DEBUGVAR UserChoosePayment
 			DEBUGVAR VendingCashless
-
+			If Timeout < 120 Then
 				If UserChoosePayment = "CreditCashless" Then
 					If VendingCashless = "READY" Then
 						Var QRCODE99 = ""
@@ -824,6 +854,11 @@
 						Var alphaState = "Enable"
 						Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
 						CashlessPay RemainAmountX CreditCardRef
+
+
+						SAVELOG "Cashless by pressing button"
+						Var CountDownAllowCancel = 9999999
+
 						Var CashlessPayFlag = 1
 					EndIf
 				EndIf
@@ -841,10 +876,16 @@
 						CashlessPay RemainAmountX CreditCardRef
 						Var CashlessPayFlag = 1
 
+						SAVELOG "Cashless without pressing button"
+						Var CountDownAllowCancel = 9999999
+
 						Var UserChoosePayment = "CreditCashless"
 					EndIf
 				EndIf
-
+			Else
+			    SAVELOG "User tried to pay but timeout is > 120"
+				DEBUGVAR Timeout
+			EndIf
 		EndIf
 
 	Else
@@ -868,11 +909,122 @@
 
 	DEBUGVAR VendingCashless
 	DEBUGVAR CountDownAllowCancel
+	DEBUGVAR VendingIsQueueCounter
+	DEBUGVAR VendingIsError
+	DEBUGVAR VendingIsUnknown
+	DEBUGVAR VendingIsIdleByPressingBtn
 
 	If CountDownAllowCancel > 0 Then
 	   Var CountDownAllowCancel = CountDownAllowCancel - 1
 	EndIf
 
+	If VendingCashless = "" Then
+    	Var VendingIsUnknown = VendingIsUnknown + 1
+        SAVELOG "VendingCashless is empty"
+	EndIf
+
+	If VendingCashless = "START" Then
+    	Var VendingIsIdleByPressingBtn = VendingIsIdleByPressingBtn + 1
+        SAVELOG "VendingCashless is IDLE(START)"
+	EndIf
+
+	If VendingCashless = "ERROR" Then
+	    Var VendingIsError = VendingIsError + 1
+		SAVELOG "VendingCashless is ERROR, Timeout"
+	EndIf
+
+	If VendingCashless = "FAIL" Then
+	    Var VendingIsError = VendingIsError + 1
+		SAVELOG "VendingCashless is FAIL, Timeout"
+	EndIf
+
+	If VendingCashless = "QUEUE" Then
+	    Var VendingIsQueueCounter = VendingIsQueueCounter + 1
+		SAVELOG "VendingCashless is QUEUE"
+	EndIf
+
+	If VendingIsQueueCounter > 0 Then
+
+	    If VendingIsQueueCounter > 4 Then
+			SAVELOG "UnexpectedQueueCounter"
+			DEBUGVAR VendingIsQueueCounter
+		EndIf
+
+	    If VendingCashless = "ERROR" Then
+			SAVELOG "VendingError::hasQueueMoreThan1 ---> Error"
+    	    Var CountDownAllowCancel = 0
+    		Var VendingIsQueueCounter = 0
+    		Var VendingIsError = 0
+    		Var VendingIsUnknown = 0
+		EndIf
+
+		If VendingCashless = "FAIL" Then
+			SAVELOG "VendingError::hasQueueMoreThan1 ---> Fail"
+    	    Var CountDownAllowCancel = 0
+    		Var VendingIsQueueCounter = 0
+    		Var VendingIsError = 0
+    		Var VendingIsUnknown = 0
+		EndIf
+	EndIf
+
+	If VendingIsUnknown > 59 Then
+		SAVELOG "VendingIsUnknown::AllowCancel60s"
+		Var CountDownAllowCancel = 0
+		Var VendingIsUnknown = 0
+	EndIf
+
+	If VendingIsIdleByPressingBtn > 9 Then
+	    SAVELOG "Vending IDLE 10 s, auto exit"
+
+		Var LOADING_STATE = "Invisible"
+    	  Var QRErrorState = "Invisible"
+    	  Var alphaState = "Invisible"
+    	  Var CountDownAllowCancel = 9999999
+
+
+    	  Var QRCODE99 = ""
+    	  ;CoinVending ON
+    	  ;VendingQR OFF
+
+    	  CashlessReq OFF ""
+
+    	If CashlessPayFlag = 0 Then
+    		If UserChoosePayment = "CreditCashless" Then
+    			Var CashlessPayFlag = 0
+    			CashlessReq FAIL ""
+    		EndIf
+
+    		If UserChoosePayment = "" Then
+    			Var CashlessPayFlag = 0
+    			CashlessReq FAIL ""
+    		EndIf
+    	EndIf
+
+
+    	  If CashlessPayFlag = 1 Then
+    		Var CashlessPayFlag = 0
+    		CashlessReq FAIL ""
+    	  EndIf
+
+
+    	  Refresh
+
+
+	    Var VendingIsIdleByPressingBtn = 0
+	EndIf
+
+
+	; ok
+	If VendingCashless = "END" Then
+	    Var VendingIsQueueCounter = 0
+		Var VendingIsUnknown = 0
+		Var VendingIsError = 0
+		Var VendingIsIdleByPressingBtn = 0
+		SAVELOG "VendingCashless is END, resetAll"
+	EndIf
+
+
+
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
 		DEBUGVAR UserChoosePayment
@@ -1017,8 +1169,9 @@
 		EndIf
 
 	Else
-		Var PayState5 = "Enable"
+	    If Timeout < 120 Then
-
+			Var PayState5 = "Enable"
+		EndIf
 	EndIf
 
 	Var stringLog = "Timeout " + Timeout
@@ -1645,7 +1798,7 @@ If alphaState = "Invisible" Then
 			DEBUGVAR QR_POPUP
 			Refresh
             Var alphaState = "Enable"
-            Var CountDownAllowCancel = 5
+            Var CountDownAllowCancel = 9999999
             Coin CARD
         EndIf
 	EndIf
@@ -1873,6 +2026,10 @@ EndIf
 	  Var LOADING_STATE = "Invisible"
 	  Var QRErrorState = "Invisible"
 	  Var alphaState = "Invisible"
+	  Var CountDownAllowCancel = 9999999
+	  Var VendingIsIdleByPressingBtn = 0
+
+
 	  Var QRCODE99 = ""
 	  ;CoinVending ON
 	  ;VendingQR OFF

inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml

@@ -27,6 +27,14 @@
 
 	LED LedDoorDoor 5 255 255 255 255
 
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
+
+	Var ShowMenuNameAndImage = "Invisible"
+	Var RemoveCupOnArmID = -1
+	Var remove_cup_name = ""
+	Var remove_cup_image = ""
+
+
 	Var CheckCupStateDoorCupClose = ""
 	Var CheckCupStateDoorCupCloseCnt = 0
 
@@ -50,59 +58,50 @@
 	;SAVELOG MachineErrorDetail
 	Var MachineErrorDetailAll = MachineErrorDetailEng
 
-
+    If HaveCup = "false" Then
-	If MachineStage = "show-menu" Then
+    	If MachineStage = "show-menu" Then
-		Open "ROOT/taobin_project/xml/page_board.xml"
+    		Open "ROOT/taobin_project/xml/page_board.xml"
-
+    	EndIf
 	EndIf
+
+	If CupOnArm = "true" Then
+    	If MachineStage = "show-menu" Then
+    		Open "ROOT/taobin_project/xml/page_board.xml"
+    	EndIf
+	EndIf
+
 	If MachineStage = "close-maintenance" Then
 		Open "ROOT/taobin_project/xml/page_show_error.lxml"
 	EndIf
 
-	Var Timeout = Timeout + 1
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
+
 	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
 
-		DEBUGVAR DoorCupPosition
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml
-	; protect lock
-	;
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
 
 </EventTimeout>
 
+;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc
+
 <Text>
   <X> 50 </X>
   <Y> 852 </Y>
@@ -134,11 +133,9 @@
 <EventClick>
 
 
-	Machine RemoveCup
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
-	Machine DoorLidOpen
+
-	Var buttonRemoveCup = "Invisible"
+	Refresh
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -150,6 +147,37 @@
 </Button>
 
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
+
 <Text>
 <X> 5 </X>
 <Y> 1868 </Y>

menu/new-layout.tsv

@@ -439,7 +439,7 @@ IGNORE		เป๊ปซี่ยูซุ	Pepsi Yuzu	เป๊ปซี่ ย
 		โจ๊กใส่โปรตีนจากพืช	Congee With \nPlant Protein	ข้าว ผัก โปรตีนจากพืช น้ำ	Rice, Plant-based protein, Water	12-06-01-0001	-	-	bn_Congee.png	-	-	-	posi1	-	-	-	-	#REF!	-	-	#REF!	NN
 		โจ๊กผักฮ้องกง	Hongkong Congee	ข้าว ผัก โปรตีนจากพืช น้ำ	Rice, Plant-based protein, Water	12-06-01-0002	-	-		-	-	-	posi1	-	-	-	-	#REF!	-	-	#REF!	NN
 		น้ำแข็ง	Ice	น้ำแข็ง	Ice	-	12-05-02-0017	-	bn_iced.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
-		น้ำดื่ม	Drinking Water	น้ำ	Water	-	12-05-02-0016	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
+IGNORE		น้ำดื่ม	Drinking Water	น้ำ	Water	-	12-05-02-0016	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
 		น้ำ (น้ำร้อน / น้ำเย็น)	Water (Hot Water\n/ Water With Iced)	น้ำ (น้ำร้อน / น้ำ และน้ำแข็ง)	Water (Hot Water\n/ Water With Iced)	12-05-01-0002	12-05-02-0018	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 
 
@@ -578,7 +578,7 @@ IGNORE		น้ำสตรอเบอรี	Strawberry Drink	สตรอเบ
 		โจ๊กใส่โปรตีนจากพืช	Congee With \nPlant Protein	ข้าว ผัก โปรตีนจากพืช น้ำ	Rice, Plant-based protein, Water	12-06-01-0001	-	-	bn_Congee.png	-	-	-	posi1	-	-	-	-	#REF!	-	-	#REF!	NN
 		โจ๊กผักฮ้องกง	Hongkong Congee	ข้าว ผัก โปรตีนจากพืช น้ำ	Rice, Plant-based protein, Water	12-06-01-0002	-	-		-	-	-	posi1	-	-	-	-	#REF!	-	-	#REF!	NN
 		น้ำแข็ง	Ice	น้ำแข็ง	Ice	-	12-05-02-0017	-	bn_iced.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
-		น้ำดื่ม	Drinking Water	น้ำ	Water	-	12-05-02-0016	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
+IGNORE		น้ำดื่ม	Drinking Water	น้ำ	Water	-	12-05-02-0016	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
 		น้ำ (น้ำร้อน / น้ำเย็น)	Water (Hot Water\n/ Water With Iced)	น้ำ (น้ำร้อน / น้ำ และน้ำแข็ง)	Water (Hot Water\n/ Water With Iced)	12-05-01-0002	12-05-02-0018	-	bn_water_roomtemp.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 
 
@@ -670,7 +670,7 @@ Name=Health,file=page_catalog_group_health.skt
 		มอคค่า	Mocha	[ร้อน 55 Cal. , เย็น 99 Cal.] กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล	[Hot 55 Cal. , Iced 99 Cal.] Espresso, Cocoa,\nMilk, Sugar	12-01-01-1006	12-01-02-1003	-	bn_hot_Mocha_Healthy.png	12-21-01-1006	12-21-02-1003	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		คาปูชิโน่	Cappuccino	[ร้อน 54 Cal. , เย็น 89 Cal.] กาแฟ นม และ ฟองนม	[Hot 54 Cal. , Iced 89 Cal.] Espresso, Milk,\nFoamed Milk	12-01-01-1099	12-01-02-1099	-	bn_hot_Cappu_Healthy.png	12-21-01-1099	12-21-02-1099	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		ชานมไทย	Thai Milk Tea	[ร้อน 5 Cal. , เย็น 5 Cal.] ชาไทย และ นมอุ่น	[Hot 5 Cal. , Iced 5 Cal.] Thai Tea, Sugar, Milk	12-02-01-1024	12-02-02-1024	-	bn_hot_thai_milk_tea_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
-										-	-	-	posi1	-	-	-	-
+
 		ชานมไต้หวัน	Taiwanese \nMilk Tea	[ร้อน 57 Cal. , เย็น 90 Cal.]  ชาไต้หวัน และ นมอุ่น	[Hot 57 Cal. , Iced 90 Cal.] Taiwanese Tea, Sugar, \nAnd Milk	12-02-01-1025	12-02-02-1025	-	bn_hot_taiwan_milk_tea_Jason_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		มัทฉะลาเต้	Matcha Latte	[ร้อน 61 Cal. , เย็น 97 Cal.] ชาเขียวมัทฉะ และ นมอุ่น 	[Hot 61 Cal. , Iced 97 Cal.] Matcha And Warm Milk	12-02-01-1026	12-02-02-1026	-	bn_hot_matcha_latte_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		ชาเขียวญี่ปุ่น	Matcha	[ร้อน 3 Cal. , เย็น 6 Cal.] ชาเชียว และน้ำ	[Hot 3 Cal. , Iced 6 Cal.] Matcha And Hot Water	12-02-01-1027	12-02-02-1027	-	bn_hot_matcha_tea_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!

xml/event/tricker.ev

@@ -198,6 +198,18 @@ If ConfigNumer >= 1762 Then
 	Var ToppingNewUINewSystem = 1
 EndIf
 
+If ConfigNumer >= 1763 Then
+	Var ToppingNewUINewSystemStep2 = 1
+EndIf
+
+If BoxID = 123456 Then
+	Var SmoothieMode= "Enable"
+Else
+	Var SmoothieMode = "Invisible"
+EndIf
+DEBUGVAR SmoothieMode
+
+
 ; override again
 
 Var CleanFeedbackFlag = 1

xml/menu_new_layout_gen.py

@@ -393,17 +393,19 @@
           str_con_var += spl[6] + '-'
 
         str_con_var = str_con_var.replace("-", "")
+        try:
+          if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
+            str_con += f'DateTimeStart="{spl[12].strip()}",'
+          if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
+            str_con += f'DateTimeEnd="{spl[13].strip()}",'
 
-        if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
+          if re.match(r'^\w.*', spl[14].strip()):
-          str_con += f'DateTimeStart="{spl[12].strip()}",'
+            str_con += f'Var={spl[14].strip()},'
-        if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
-          str_con += f'DateTimeEnd="{spl[13].strip()}",'
 
-        if re.match(r'^\w.*', spl[14].strip()):
+          if recommend_page:
-          str_con += f'Var={spl[14].strip()},'
+            str_con += "Disable=Invisible,"
-
+        except Exception:
-        if recommend_page:
+          print("ProductCode = " + spl[4] + " Ignore")
-          str_con += "Disable=Invisible,"
 
         str_con += "$Sum" + str_con_var
 
@@ -1111,6 +1113,9 @@
         ###############################################################################
         if "all" in verbose:
           print("sp[2]" + spl[2])
+        if( len( spl) < 10):
+          print(list(map(str, spl)))
+          return
         out_xml( '\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \r\n')
         if spl[8] != '-' or spl[9] != '-' or spl[10] != '-':
           menu_img = spl[7]

xml/open_file_instance0_to_instance2.inc

@@ -0,0 +1,8 @@
+
+    Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+    OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+
+
+    TopView "show"
+    OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

xml/page_board.xml

@@ -758,15 +758,21 @@
 		DEBUGVAR CupPlastic9502Enable
 		DEBUGVAR CupPaper9512Enable
 
+		SET-MENU-SHOW "Hot" 1
+        SET-MENU-SHOW "Cold" 1
+        SET-MENU-SHOW "Blend" 1
+
 		If CupPlastic9502Enable = "true" Then
-            SET-MENU-SHOW 1
+            SET-MENU-SHOW "Cold" 1
         Else
             If CupPaper9512Enable = "true" Then
-                SET-MENU-SHOW 2
+                SET-MENU-SHOW "Cold" 2
             EndIf
         Endif
 
-        DEBUGVAR XSlot
+        DEBUGVAR XSlot[0]
+        DEBUGVAR XSlot[1]
+        DEBUGVAR XSlot[2]
 
 
 
@@ -1236,17 +1242,8 @@
 
 			Var MyanmarLangEnable = "true"
 
-			Var CatalogLayoutV3 = 0
+			Var CatalogLayoutV3 = 1
 
-			If BoxID = 123456 Then
-				Var CatalogLayoutV3 = 1
-			EndIf
-			If BoxID = 173149 Then
-				Var CatalogLayoutV3 = 1
-			EndIf
-			If BoxID = 105005 Then
-				Var CatalogLayoutV3 = 1
-			EndIf
 			
 			; test payment
 			Var New_Payment = 1

xml/page_catalog_group_other_other.xml

@@ -4107,13 +4107,13 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "12-05-02-0040"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-05-01-0040"
-			Else
 			Topping "Load" "12-05-03-0040"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0040"
+			Else
+			Topping "Load" "12-05-01-0040"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-05-01-0040.NameE
@@ -4362,13 +4362,13 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "12-05-02-0041"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "12-05-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0041"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -4615,13 +4615,13 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "12-05-02-0023"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "12-05-03-0023"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0023"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -16686,257 +16686,6 @@ Plant Protein" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 21
-	; - 12-05-02-0016 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0016.Button,$Sum1205020016) </State> 
-	<Button>
-	<State> $Sum1205020016 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_water_roomtemp.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-05-02-0016, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "Drinking Water"
-		Var NameDrinkTH = "น้ำดื่ม"
-		Var DrinkDescriptionTH = "น้ำ"
-		Var DrinkDescription = "Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0016.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0016"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0016.Button
-		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0016, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-		DEBUGVAR OverlayMenuFilter
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0016"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $12-05-02-0016.NameE
-		Var menu_desc_eng_cold = $12-05-02-0016.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0016.Name
-		Var menu_desc_thai_cold = $12-05-02-0016.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> "น้ำดื่ม" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> "น้ำ" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 164 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> "Drinking Water" </Value>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> "Water" </Value>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-05-02-0016.Button </State>
-	</Image>
-	<Text>
-	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-02-0016.Button </State>
-	<Value> StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			Var ice_tab_process_show = "Invisible"
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum1205020016 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Font> MITRegularTTF </Font>
-	<Color> 0x5A5A5A </Color>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum1205020016 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 21

xml/page_catalog_group_pro_ovaltine_school.xml

@@ -1,6 +1,821 @@
-Traceback (most recent call last):
+
-  File "/Users/wanloprungsiyangkul/project/taobin_admin/./menu_gen_new.py", line 155, in eval_exe
+
-    exec( str, globals())
+<Popup>
-  File "<string>", line 1780, in <module>
+<Cache> "Enable" </Cache>
-  File "<string>", line 398, in GenListMenu
+<Width> 1080 </Width>
-IndexError: list index out of range
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+
+<FrameScroll> 
+<X> 10 </X>
+<Y> 497 </Y>
+<Width> 1080 </Width>
+<ScrollHeight> "auto" </ScrollHeight>
+<Scroll> "Vertical" </Scroll>
+<Column> 4 </Column>
+<Script>
+		Var block_index_override = 0
+		Var block_index_move = 0
+</Script>
+;dummy_layout.inc
+; menu_new_list 3
+	; ==================> Len = 16
+	; 12-03-01-0019 12-03-02-0019 12-03-03-0019 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-01-0019.Button,12-03-02-0019.Button,12-03-03-0019.Button,$Sum120301001912030200191203030019) </State> 
+	<Button>
+	<State> $Sum120301001912030200191203030019 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_ovaltine.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_ovaltine.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_ovaltine.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-01-0019, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Ovaltine"
+		Var NameDrinkTH = "โอวัลติน"
+		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล "
+		Var DrinkDescription = "Ovaltine, Milk, Cocoa, and Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ovaltine.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-03-01-0019.Price
+		Var PriceD2 = $12-03-02-0019.Price
+		Var PriceD3 = $12-03-03-0019.Price
+		Var PD_CODE1 = "12-03-01-0019"
+		Var PD_CODE2 = "12-03-02-0019"
+		Var PD_CODE3 = "12-03-03-0019"
+		Var PD_STAGE_1 = $12-03-01-0019.Button
+		Var PD_STAGE_2 = $12-03-02-0019.Button
+		Var PD_STAGE_3 = $12-03-03-0019.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-01-0019, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0019"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0019"
+			Else
+			Topping "Load" "12-03-03-0019"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-03-01-0019.NameE
+		Var menu_desc_eng_hot = $12-03-01-0019.descriptionE
+		Var menu_name_thai_hot = $12-03-01-0019.Name
+		Var menu_desc_thai_hot = $12-03-01-0019.description
+		
+		Var menu_name_eng_cold = $12-03-02-0019.NameE
+		Var menu_desc_eng_cold = $12-03-02-0019.descriptionE
+		Var menu_name_thai_cold = $12-03-02-0019.Name
+		Var menu_desc_thai_cold = $12-03-02-0019.description
+		
+		Var menu_name_eng_blender = $12-03-03-0019.NameE
+		Var menu_desc_eng_blender = $12-03-03-0019.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0019.Name
+		Var menu_desc_thai_blender = $12-03-03-0019.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลติน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลติน นม โกโก้ และน้ำตาล " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "Ovaltine" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Ovaltine, Milk, Cocoa,
+and Sugar" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-03-01-0019.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-01-0019.Button </State>
+	<Value> StringFmt(  $12-03-01-0019.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-03-02-0019.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-03-02-0019.Button </State>
+	<Value> StringFmt( $12-03-02-0019.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-03-03-0019.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-03-0019.Button </State>
+	<Value> StringFmt(  $12-03-03-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120301001912030200191203030019 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum120301001912030200191203030019 = "Disable" Then
+				STRCONTAIN "ERR" $12-03-01-0019.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-03-02-0019.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0019.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum120301001912030200191203030019 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; - - 12-03-03-0094 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0094.Button,$Sum1203030094) </State> 
+	<Button>
+	<State> $Sum1203030094 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Ovaltine_cocoa_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Ovaltine_cocoa_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0094, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Mini Bus Ovaltine Volcano"
+		Var NameDrinkTH = "โอวัลตินรถโรงเรียน ภูเขาไฟ"
+		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล "
+		Var DrinkDescription = "Ovaltine, Milk, Cocoa, and Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Ovaltine_cocoa_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0094.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0094"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0094.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0094, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0094"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-03-03-0094.NameE
+		Var menu_desc_eng_blender = $12-03-03-0094.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0094.Name
+		Var menu_desc_thai_blender = $12-03-03-0094.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลตินรถโรงเรียน
+ภูเขาไฟ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลติน นม โกโก้ และน้ำตาล " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "Mini Bus Ovaltine
+Volcano" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Ovaltine, Milk, Cocoa,
+and Sugar" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-03-03-0094.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-03-0094.Button </State>
+	<Value> StringFmt(  $12-03-03-0094.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1203030094 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0094.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1203030094 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; - - 12-03-03-0095 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0095.Button,$Sum1203030095) </State> 
+	<Button>
+	<State> $Sum1203030095 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0095, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Mini Bus Ovaltine Super Volcano"
+		Var NameDrinkTH = "โอวัลตินรถโรงเรียน ซุปเปอร์ภูเขาไฟ"
+		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล "
+		Var DrinkDescription = "Ovaltine, Milk, Cocoa, and Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0095.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0095"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0095.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0095, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0095"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-03-03-0095.NameE
+		Var menu_desc_eng_blender = $12-03-03-0095.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0095.Name
+		Var menu_desc_thai_blender = $12-03-03-0095.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลตินรถโรงเรียน
+ซุปเปอร์ภูเขาไฟ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "โอวัลติน นม โกโก้ และน้ำตาล " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "Mini Bus Ovaltine
+Super Volcano" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Ovaltine, Milk, Cocoa,
+and Sugar" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-03-03-0095.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-03-0095.Button </State>
+	<Value> StringFmt(  $12-03-03-0095.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1203030095 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0095.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1203030095 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+</FrameScroll>
+; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+</EventClick>
+</Button>
+
+
+
+
+</Popup>

xml/page_payment.xml

@@ -10,7 +10,32 @@
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 
 	
-	;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml"
+	If Seeker = "curr" Then
+		If MachineStage = "remove-cup" Then
+			SAVELOG "MachineStage = remove-cup"
+			If HaveCup = "true" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+
+		EndIf
+
+		If CupChecking = "true" Then
+			If HaveCup = "true" Then
+				SAVELOG "Have cup"
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+		EndIf
+
+		If DoorCupPosition = "bottom" Then
+
+		Else
+			SAVELOG "DoorCupPosition not bottom"
+			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+		EndIf
+	Else
+
+	EndIf
+
 	
 	Var IndoQR = 0
 
@@ -187,6 +212,7 @@
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
+		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
 
 		If SongkranSoundCampaign = 1 Then
 			Var PlaySoundLag = SelectPayMethodSound[SoundCampaignIndex]
@@ -194,10 +220,8 @@
 
 		If CountryName = "HongKong" Then
 			Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
+			Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3"
 		EndIf
-
-
-		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
 	EndIf
 
 

xml/page_payment_cash-AUS.xml

@@ -860,7 +860,7 @@
 		Var LOADING_STATE = "Enable"
 		Var alphaState = "Enable"
 		Var PopupCancelButtonState = "Enable"
-		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+		Var RemainAmountX = RemainAmount
 		CashlessPay RemainAmountX CreditCardRef
 		Var CashlessPayFlag = 1
 	EndIf

xml/page_payment_cash-HKG.xml

@@ -1137,7 +1137,6 @@
         If EnablingCountDown = 0 Then
             Var Timeout = 0
             Var UserChoosePayment = "CreditCard"
-            Var QRErrorState = "Enable"
             Var QR_POPUP = DirQR_popup + "/img_tap_card_5_sec.png"
             Var VendingCashless = "-"
 
@@ -1178,7 +1177,6 @@
         If EnablingCountDown = 0 Then
             Var Timeout = 0
             Var UserChoosePayment = "QRCode"
-            Var QRErrorState = "Enable"
             Var QR_POPUP = DirQR_popup + "/img_use_qr_code.png"
             Var VendingCashless = "-"
             Var LOADING_STATE = "Invisible"

xml/page_payment_cash.xml

@@ -2010,7 +2010,7 @@
 			Var QRErrorState = "Invisible"
 			Var VendingCashless = "-"
 			Var ServiceCharge = 3
-			Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+			Var RemainAmountX = RemainAmount
 			Var RemainAmountX = RemainAmountX + ServiceCharge
 			CashlessPay RemainAmountX CreditCardRef
 			Var CashlessPayFlag = 1
@@ -2028,7 +2028,7 @@
 			Var QR_POPUP = "/img_popup8-2.png"
 			Var VendingCashless = "-"
 			Var LOADING_STATE = "Enable"
-			Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+			Var RemainAmountX = RemainAmount
 			CashlessPay RemainAmountX CreditCardRef
 			Var CashlessPayFlag = 1
 		EndIf

xml/test_video_loop.xml

@@ -47,6 +47,13 @@
 
 	Var HeadVideoFilename = HeadVideoFilename + ".mp4"
 
+	If CountryName = "Singapore" Then
+		If UsePepsiTheme = 1 Then
+		    Var HeadVideoFilename = DefaultLargeBanner + ".mp4"
+		EndIf
+	EndIf
+
+
 	DEBUGVAR VideoAdvIndex
 	DEBUGVAR HeadVideoFilename
 

xml/topview2.xml

@@ -122,7 +122,7 @@
 	EndIf
 
 	If FirstTimeOpenFile = "" Then
-		;Var Not#CountDownForMulti = 5
+		;Var Not#CountDownForMulti = 2
 		Var FirstTimeOpenFile = "done"
 	EndIf
 

xml/vending_info.xml

@@ -25,8 +25,9 @@
 	Var info_13Y = 1090
 
 	Var info_14Y = 1160
+	Var info_15Y = 1230
 
-	Var info_cancel_y = info_14Y + 50
+	Var info_cancel_y = info_15Y + 50
 
 
 	Var info_text_startX = info_startX + 22
@@ -46,6 +47,7 @@
 	Var info_text_13Y = info_13Y + 18
 
 	Var info_text_14Y = info_14Y + 18
+	Var info_text_15Y = info_15Y + 18
 
 
 	Var info2_startX = 550
@@ -173,7 +175,7 @@
 	DEBUGVAR TestArrary[2]
 	DEBUGVAR TestArrary[3]
 
-
+	DEBUGVAR SmoothieMode
 
 
 </EventOpen>
@@ -279,6 +281,18 @@
 
 	DEBUGVAR EnableNewBrewUI
 
+	DEBUGVAR GPRSStatus
+	DEBUGVAR GPRSState
+
+	Var GPRSStr = ""
+	Var GPRSStr = GPRSStr + GPRSStatus
+	Var GPRSStr = GPRSStr + ", "
+	Var GPRSStr = GPRSStr + GPRSState
+
+
+
+
+
 	Refresh
 	TimerReset
 
@@ -962,6 +976,53 @@
 </Text>
 
 
+;GPRS
+<Image>
+<X> info1_startX </X>
+<Y> info_13Y </Y>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	DEBUGVAR GPRSStatus
+	DEBUGVAR GPRSState
+</EventClick>
+</Image>
+
+<Text>
+<X> info1_text_startX </X>
+<Y> info_text_13Y </Y>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+<Value> GPRSStr </Value>
+</Text>
+
+
+
+
+
+<Image>
+<X> info1_startX </X>
+<Y> info_14Y </Y>
+<State> SmoothieMode</State>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	;include="ROOT/taobin_project/xml/open_file_instance0_to_instance2.inc"
+	OpenInst  2 "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+
+</EventClick>
+</Image>
+
+<Text>
+<X> info1_text_startX </X>
+<Y> info_text_14Y </Y>
+<Size> 30 </Size>
+<State> SmoothieMode</State>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+<Value> "   Smoothie menu." </Value>
+</Text>
+
+
 
 <Button>
 <X> 431  </X>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.72"
+	Var XMLPageVersion = "9.74"
-	Var XMLPageVersionInt = 972
+	Var XMLPageVersionInt = 974
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup.xml_new_layout

@@ -1,154 +0,0 @@
-<BeginX>28</BeginX>
-<BeginY>255</BeginY>
-<OverrideBackground> "ROOT/ui/bg_main_menu2.png"</OverrideBackground>
-<Page>
-
-<Width> 1024 </Width>
-<Height> 600 </Height>
-<Background> "/ROOT/pictures/startup.bmp" </Background>
-<Timeout> 3000 </Timeout>
-<EventTimeout> 
-	Open "/ROOT/xml/main.xml" 
-</EventTimeout>
-<EventOpen>
-	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4"
-	Var video_menu_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00.mp4"
-	Var video_menu_1 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_00.mp4"
-	Var MenuLangTH = 1
-	Var VendingCampaign = 0
-	Var VendingDiscount = 0
-	Var VendingClass = ""
-	TopView "hide"
-	Var NetworkStatus = "DOWN"
-	Var MachineErrorDetail = ""
-	Var SetVideo = 1
-	Var AdvSoundWorking  = ""
-	Var AdvSoundWorking = "/ROOT/sounds/adv_working_01.wav"
-	Var AdvIndex = 1
-	Var SetSoundPlay = 0
-	Var CheckAutoZero = 0.0
-	Var DeffZero = 0.0
-	Var CountZero = 0
-	Var AdvWorking = ""
-	Var AdvCoin = ""
-	Var AdvAmount = ""
-	Var AdvMobile = ""
-	Var AdvId = "00"
-	;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
-	Var AdvertiseProfile1 = "00"
-	Var AdvertiseProfile2 = "00"
-	Var AdvertiseProfile3 = "00"
-	Var AdvertiseProfile4 = "00"
-	Var AdvertiseProfile5 = "00"
-	Var AdvertiseProfile6 = "00"
-	Var AdvertiseProfile7 = "00"
-	Var AdvertiseProfile8 = "00"
-	Var AdvertiseProfile9 = "00"
-	Var AdvertiseProfile10 = "00"
-	Var AdvertiseProfile11 = "00"
-	Var AdvertiseProfile12 = "00"
-	Var AdvertiseProfile13 = "00"
-	Var AdvertiseProfile14 = "00"
-	Var AdvertiseProfile15 = "00"
-	Var AdvertiseProfile16 = "00"
-	Var AdvertiseProfile17 = "00"
-	Var AdvertiseProfile18 = "00"
-	
-	Var ExtSlot1 = ""
-	Var ExtSlot2 = ""
-	Var ExtSlot3 = ""
-	Var ExtSlot4 = ""
-	Var ExtSlot5 = ""
-	Var ExtSlot6 = ""
-	
-	Var AdvExt1 = ".mp4"
-	Var AdvExt2 = ".mp4"
-	Var AdvExt3 = ".mp4"
-	Var AdvExt4 = ".bmp"
-	Var AdvExt5 = ".bmp"
-	Var AdvExt6 = ".bmp"
-	Var AdvExt7 = ".mp4"
-	Var AdvExt8 = ".mp4"
-	Var AdvExt9 = ".bmp"
-	Var AdvExt10 = ".bmp"
-	Var AdvExt11 = ".mp4"
-	Var AdvExt12 = ".bmp"
-	Var AdvExt13 = ".bmp"
-	Var AdvExt14 = ".bmp"
-	Var AdvExt15 = ".bmp"
-	Var AdvExt16 = ".mp4"
-	Var AdvExt17 = ".mp4"
-	Var AdvExt18 = ".bmp"
-	Var AdvExt19 = ".mp4"
-	Var AdvExt20 = ".bmp"
-
-;Dtac		
-	Var RandomPromotion = 0
-;true_move
-	Var RandomPromotion1 = 0
-	Var RandomPromotionAIS = 0
-	Var RandomPromotionCAT = 0
-	Var RandomPromotionOper168 = 0
-	Var RandomPromotionImobile = 0
-	Var RandomPromotionWhitespace = 0
-	Var RandomPromotionTOT = 0
-	Var RandomPromotionMyworld = 0
-	Var RandomSalePackage = 0
-
-	Var XMLPageVersion = "6.51"
-	Var XMLPageVersionInt = 651
-</EventOpen>
-
-<Text>
-	<X> 644 </X>
-	<Y> 350 </Y>
-	<Size> 20 </Size>
-	<Font> fontType1 </Font>
-	<Color> 0xEA068A </Color>
-	<Transparent> 0 </Transparent>
-	<Value> "Engine" </Value>
-</Text>
-
-<Text>
-	<X> 724 </X>
-	<Y> 350 </Y>
-	<Size> 20 </Size>
-	<Font> fontType1 </Font>
-	<Color> 0xEA068A </Color>
-	<Transparent> 0 </Transparent>
-	<Value> SoftwareVersion </Value>
-</Text>
-
-<Text>
-	<X> 628 </X>
-	<Y> 380 </Y>
-	<Size> 20 </Size>
-	<Font> fontType1 </Font>
-	<Color> 0xEA068A </Color>
-	<Transparent> 0 </Transparent>
-	<Value> "Software version" </Value>
-</Text>
-
-<Text>
-	<X> 802 </X>
-	<Y> 380 </Y>
-	<Size> 20 </Size>
-	<Font> fontType1 </Font>
-	<Color> 0xEA068A </Color>
-	<Transparent> 0 </Transparent>
-	<Value> XMLPageVersion </Value>
-</Text>
-
-<TextRunner>
-	<Visible> False </Visible>
-	<Y> 430 </Y>
-	<Size> 50 </Size>
-	<Size> 20 </Size>
-	<Font> fontType1 </Font>
-	<Repeat> True </Repeat>
-	<Color> 0xFFFF00 </Color>
-	<BgColor> 0x0000A0 </BgColor>
-	<Filename> "/ROOT/text/runner.txt" </Filename>
-</TextRunner>
-
-</Page>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.72"
+	Var XMLPageVersion = "10.74"
-	Var XMLPageVersionInt = 1072
+	Var XMLPageVersionInt = 1074
 ;Oreo
 Var OreoGuarantee = 0