Merge branch 'masterpiece' into new_flow_payment

image/event/image_template1

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+normal_eng=ROOT/taobin_project/image/event/pro_peach.png
-normal_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+normal_thai=ROOT/taobin_project/image/event/pro_peach.png
-press_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+press_eng=ROOT/taobin_project/image/event/pro_peach.png
-press_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+press_thai=ROOT/taobin_project/image/event/pro_peach.png
-disable_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+disable_eng=ROOT/taobin_project/image/event/pro_peach.png
-disable_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+disable_thai=ROOT/taobin_project/image/event/pro_peach.png

inter/aus/menu/lang.tsv

@@ -11,7 +11,7 @@ TextID	Note	English	Thai
 000004		Vending\nMachine	ตู้สินค้า
 000005		Coffee	กาแฟ
 000006		Tea	ชา
-000007		Milk, Caramel\n& Cocoa	นม, โกโก้ และ \nคาราเมล
+000007		Milkshack\n& Chocolate	นม, โกโก้ และ \nคาราเมล
 000008		Protein\nShake	โปรตีนเชค
 000009		Soda & others	โซดา และ อื่นๆ
 000010		Healthier\nChoice	ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]

inter/aus/xml/menu_catalog_new.lxml

@@ -104,6 +104,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -256,8 +257,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

inter/aus/xml/menu_tab.py

@@ -40,8 +40,8 @@ out_xml(' ; bn_bestseller
 <Button>
 <X> 545 </X>
 <Y> 418 </Y>
-<Filename> Var( DirName + "/bn_cho_ca.png") </Filename>
+<Filename> Var( "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_cho_ca.png") </Filename>
-<FilenamePress> Var( DirName + "/bp_cho_ca.png") </FilenamePress>
+<FilenamePress> Var( "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_cho_ca.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>

inter/aus/xml/page_catalog_group_appfast.lxml

@@ -263,6 +263,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -415,8 +416,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

inter/aus/xml/page_catalog_group_coffee.lxml

@@ -255,6 +255,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -407,8 +408,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -1729,7 +1730,7 @@
 		Var PD_CODE2 = "51-01-02-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำ"
@@ -1739,7 +1740,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1749,7 +1750,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1816,9 +1817,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>
@@ -1995,7 +1996,7 @@
 		Var PD_CODE2 = "51-21-02-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำ"
@@ -2005,7 +2006,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -2015,7 +2016,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -2082,9 +2083,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>
@@ -5453,7 +5454,7 @@
 		Var PD_CODE2 = "51-01-02-0041"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "SODACANO"
+		Var aliasName[0] = "SPARCKING ESPRESSO"
 		Var aliasDesc[0] = "Espresso & Soda"
 		Var aliasName[1] = "โซดากาโน่"
 		Var aliasDesc[1] = "กาแฟ และ โซดา"
@@ -5540,9 +5541,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>SODACANO</LanguageSlot1>
+		<LanguageSlot1>SPARCKING ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>โซดากาโน่</LanguageSlot2>
-		<LanguageSlot3>SODACANO</LanguageSlot3>
+		<LanguageSlot3>SPARCKING ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>โซดากาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โซดากาโน่</LanguageSlot6>
@@ -5715,7 +5716,7 @@
 		Var PD_CODE2 = "51-21-02-0041"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "SODACANO"
+		Var aliasName[0] = "SPARCKING ESPRESSO"
 		Var aliasDesc[0] = "Espresso & Soda"
 		Var aliasName[1] = "โซดากาโน่"
 		Var aliasDesc[1] = "กาแฟ และ โซดา"
@@ -5735,7 +5736,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "SODACANO"
+		Var NameLang[1][0] = "SPARCKING ESPRESSO"
 		Var NameLang[1][1] = "โซดากาโน่"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -5802,9 +5803,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>SODACANO</LanguageSlot1>
+		<LanguageSlot1>SPARCKING ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>โซดากาโน่</LanguageSlot2>
-		<LanguageSlot3>SODACANO</LanguageSlot3>
+		<LanguageSlot3>SPARCKING ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>โซดากาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โซดากาโน่</LanguageSlot6>
@@ -12333,7 +12334,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "THAI Iced ESPRESSO"
+		Var NameLang[1][0] = "THAI Iced COFFEE"
 		Var NameLang[1][1] = "เอสเย็นแบบไทยๆ"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -12343,7 +12344,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Susu, Gula, Ais"
-		Var NameLang[2][0] = "THAI Iced ESPRESSO SMOOTHIE"
+		Var NameLang[2][0] = "THAI Iced COFFEE SMOOTHIE"
 		Var NameLang[2][1] = "เอสเพรสโซ่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -12595,7 +12596,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "THAI Iced ESPRESSO"
+		Var NameLang[1][0] = "THAI Iced COFFEE"
 		Var NameLang[1][1] = "เอสเย็นแบบไทยๆ"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -12605,7 +12606,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Susu, Gula, Ais"
-		Var NameLang[2][0] = "THAI Iced ESPRESSO SMOOTHIE"
+		Var NameLang[2][0] = "THAI Iced COFFEE SMOOTHIE"
 		Var NameLang[2][1] = "เอสเพรสโซ่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -14995,7 +14996,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais"
-		Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -15261,7 +15262,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais"
-		Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -15527,7 +15528,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais"
-		Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -15793,7 +15794,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Matcha, Susu, Gula, Ais"
-		Var NameLang[2][0] = "MATCHA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "MATCHA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟมัทฉะลาเต้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -16571,7 +16572,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot MELON CAFÉ LATTE"
+		Var NameLang[0][0] = "Hot MELON COFFEE LATTE"
 		Var NameLang[0][1] = "กาแฟเมล่อนลาเต้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -16581,7 +16582,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Sirap Melon, Gula, Air"
-		Var NameLang[1][0] = "Iced MELON CAFÉ LATTE"
+		Var NameLang[1][0] = "Iced MELON COFFEE LATTE"
 		Var NameLang[1][1] = "กาแฟเมล่อนลาเต้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -16837,7 +16838,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot MELON CAFÉ LATTE"
+		Var NameLang[0][0] = "Hot MELON COFFEE LATTE"
 		Var NameLang[0][1] = "กาแฟเมล่อนลาเต้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -16847,7 +16848,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Sirap Melon, Gula, Air"
-		Var NameLang[1][0] = "Iced MELON CAFÉ LATTE"
+		Var NameLang[1][0] = "Iced MELON COFFEE LATTE"
 		Var NameLang[1][1] = "กาแฟเมล่อนลาเต้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -17093,7 +17094,7 @@
 		Var PD_CODE2 = "51-01-02-0006"
 		Var PD_CODE3 = "51-01-03-0006"
 		; begin lang 
-		Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE"
+		Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar"
 		Var aliasName[1] = "กาแฟชานมไต้หวัน"
 		Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม"
@@ -17103,7 +17104,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -17113,7 +17114,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula"
-		Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -17180,9 +17181,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot1>
+		<LanguageSlot1>DIRTY TEA\nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>กาแฟชานมไต้หวัน</LanguageSlot2>
-		<LanguageSlot3>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot3>
+		<LanguageSlot3>DIRTY TEA\nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>กาแฟชานมไต้หวัน</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟชานมไต้หวัน</LanguageSlot6>
@@ -17359,7 +17360,7 @@
 		Var PD_CODE2 = "51-21-02-0006"
 		Var PD_CODE3 = "51-21-03-0006"
 		; begin lang 
-		Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE"
+		Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar"
 		Var aliasName[1] = "กาแฟชานมไต้หวัน"
 		Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม"
@@ -17369,7 +17370,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -17379,7 +17380,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula"
-		Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -17446,9 +17447,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot1>
+		<LanguageSlot1>DIRTY TEA\nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>กาแฟชานมไต้หวัน</LanguageSlot2>
-		<LanguageSlot3>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot3>
+		<LanguageSlot3>DIRTY TEA\nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>กาแฟชานมไต้หวัน</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟชานมไต้หวัน</LanguageSlot6>
@@ -17645,7 +17646,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced THAI TEA CAFÉ LATTE"
+		Var NameLang[1][0] = "Iced THAI TEA COFFEE LATTE"
 		Var NameLang[1][1] = "กาแฟชาไทยเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -17655,7 +17656,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Teh Thai, Susu, Gula, Ais"
-		Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "THAI TEA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟชาไทยปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -17901,7 +17902,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot THAI TEA CAFÉ LATTE"
+		Var NameLang[0][0] = "Hot THAI TEA COFFEE LATTE"
 		Var NameLang[0][1] = "กาแฟชาไทยร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -17911,7 +17912,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Teh Thai, Susu, Gula"
-		Var NameLang[1][0] = "Iced THAI TEA CAFÉ LATTE"
+		Var NameLang[1][0] = "Iced THAI TEA COFFEE LATTE"
 		Var NameLang[1][1] = "กาแฟชาไทยเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -17921,7 +17922,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Teh Thai, Susu, Gula, Ais"
-		Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
+		Var NameLang[2][0] = "THAI TEA COFFEE LATTE SMOOTHIE"
 		Var NameLang[2][1] = "กาแฟชาไทยปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -18689,7 +18690,7 @@
 		Var PD_CODE2 = "51-01-02-0017"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "LYCHEECANO"
+		Var aliasName[0] = "LYCHEE ESPRESSO"
 		Var aliasDesc[0] = "Espresso, Lychee,\nSugar, Water"
 		Var aliasName[1] = "ลิ้นจี่กาโน่"
 		Var aliasDesc[1] = "กาแฟ น้ำ และ ลิ้นจี่"
@@ -18776,9 +18777,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>LYCHEECANO</LanguageSlot1>
+		<LanguageSlot1>LYCHEE ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>ลิ้นจี่กาโน่</LanguageSlot2>
-		<LanguageSlot3>LYCHEECANO</LanguageSlot3>
+		<LanguageSlot3>LYCHEE ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>ลิ้นจี่กาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ลิ้นจี่กาโน่</LanguageSlot6>
@@ -18955,7 +18956,7 @@
 		Var PD_CODE2 = "51-21-02-0017"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "LYCHEECANO"
+		Var aliasName[0] = "LYCHEE ESPRESSO"
 		Var aliasDesc[0] = "Espresso, Lychee,\nSugar, Water"
 		Var aliasName[1] = "ลิ้นจี่กาโน่"
 		Var aliasDesc[1] = "กาแฟ น้ำ และ ลิ้นจี่"
@@ -19042,9 +19043,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>LYCHEECANO</LanguageSlot1>
+		<LanguageSlot1>LYCHEE ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>ลิ้นจี่กาโน่</LanguageSlot2>
-		<LanguageSlot3>LYCHEECANO</LanguageSlot3>
+		<LanguageSlot3>LYCHEE ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>ลิ้นจี่กาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ลิ้นจี่กาโน่</LanguageSlot6>
@@ -19221,7 +19222,7 @@
 		Var PD_CODE2 = "51-01-02-0040"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "YUZUCANO"
+		Var aliasName[0] = "YUZU ESPRESSO"
 		Var aliasDesc[0] = "Espresso, Yuzu,\nSugar, Water"
 		Var aliasName[1] = "ยูซุกาโน่"
 		Var aliasDesc[1] = "กาแฟ น้ำ และ ยูซุ"
@@ -19308,9 +19309,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>YUZUCANO</LanguageSlot1>
+		<LanguageSlot1>YUZU ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>ยูซุกาโน่</LanguageSlot2>
-		<LanguageSlot3>YUZUCANO</LanguageSlot3>
+		<LanguageSlot3>YUZU ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>ยูซุกาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุกาโน่</LanguageSlot6>
@@ -19487,7 +19488,7 @@
 		Var PD_CODE2 = "51-21-02-0040"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "YUZUCANO"
+		Var aliasName[0] = "YUZU ESPRESSO"
 		Var aliasDesc[0] = "Espresso, Yuzu,\nSugar, Water"
 		Var aliasName[1] = "ยูซุกาโน่"
 		Var aliasDesc[1] = "กาแฟ น้ำ และ ยูซุ"
@@ -19574,9 +19575,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>YUZUCANO</LanguageSlot1>
+		<LanguageSlot1>YUZU ESPRESSO</LanguageSlot1>
 		<LanguageSlot2>ยูซุกาโน่</LanguageSlot2>
-		<LanguageSlot3>YUZUCANO</LanguageSlot3>
+		<LanguageSlot3>YUZU ESPRESSO</LanguageSlot3>
 		<LanguageSlot4>ยูซุกาโน่</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุกาโน่</LanguageSlot6>
@@ -19753,7 +19754,7 @@
 		Var PD_CODE2 = "51-01-02-0042"
 		Var PD_CODE3 = "51-01-03-0042"
 		; begin lang 
-		Var aliasName[0] = "TOKYO BANANA \nLATTE"
+		Var aliasName[0] = "TOKYO BANANA \nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water"
 		Var aliasName[1] = "ลาเต้โตเกียวบานาน่า"
 		Var aliasDesc[1] = "กาแฟ น้ำ นม และ กล้วย"
@@ -19763,7 +19764,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot TOKYO BANANA \nLATTE"
+		Var NameLang[0][0] = "Hot TOKYO BANANA \nESPRESSO LATTE"
 		Var NameLang[0][1] = "ลาเต้โตเกียวบานาน่าร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -19773,7 +19774,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Sirap Pisang Tokyo, Gula, Air"
-		Var NameLang[1][0] = "Iced TOKYO BANANA \nLATTE"
+		Var NameLang[1][0] = "Iced TOKYO BANANA \nESPRESSO LATTE"
 		Var NameLang[1][1] = "ลาเต้โตเกียวบานาน่าเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -19783,7 +19784,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Espresso, Sirap Pisang Tokyo, Gula, Air, Ais"
-		Var NameLang[2][0] = "TOKYO BANANA \nLATTE SMOOTHIE"
+		Var NameLang[2][0] = "Hot TOKYO BANANA \nESPRESSO LATTE"
 		Var NameLang[2][1] = "ลาเต้โตเกียวบานาน่าปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -19840,9 +19841,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TOKYO BANANA \nLATTE</LanguageSlot1>
+		<LanguageSlot1>TOKYO BANANA \nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>ลาเต้โตเกียวบานาน่า</LanguageSlot2>
-		<LanguageSlot3>TOKYO BANANA \nLATTE</LanguageSlot3>
+		<LanguageSlot3>TOKYO BANANA \nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>ลาเต้โตเกียวบานาน่า</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ลาเต้โตเกียวบานาน่า</LanguageSlot6>
@@ -20019,7 +20020,7 @@
 		Var PD_CODE2 = "51-21-02-0042"
 		Var PD_CODE3 = "51-21-03-0042"
 		; begin lang 
-		Var aliasName[0] = "TOKYO BANANA \nLATTE"
+		Var aliasName[0] = "TOKYO BANANA \nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water"
 		Var aliasName[1] = "ลาเต้โตเกียวบานาน่า"
 		Var aliasDesc[1] = "กาแฟ น้ำ นม และ กล้วย"
@@ -20106,9 +20107,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TOKYO BANANA \nLATTE</LanguageSlot1>
+		<LanguageSlot1>TOKYO BANANA \nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>ลาเต้โตเกียวบานาน่า</LanguageSlot2>
-		<LanguageSlot3>TOKYO BANANA \nLATTE</LanguageSlot3>
+		<LanguageSlot3>TOKYO BANANA \nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>ลาเต้โตเกียวบานาน่า</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ลาเต้โตเกียวบานาน่า</LanguageSlot6>
@@ -20285,7 +20286,7 @@
 		Var PD_CODE2 = "51-21-02-0057"
 		Var PD_CODE3 = "51-21-03-0057"
 		; begin lang 
-		Var aliasName[0] = "MINT CAFE LATTE"
+		Var aliasName[0] = "MINT ESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Mint Syrup,\nSugar, Milk"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -20295,7 +20296,7 @@
 		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot MINT CAFE LATTE"
+		Var NameLang[0][0] = "Hot MINT ESPRESSO LATTE"
 		Var NameLang[0][1] = "กาแฟมินต์ลาเต้ร้อน"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -20305,7 +20306,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced MINT CAFE LATTE"
+		Var NameLang[1][0] = "Iced MINT ESPRESSO LATTE"
 		Var NameLang[1][1] = "กาแฟมินต์ลาเต้เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -20315,7 +20316,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = " MINT CAFE LATTE\nSMOOTHIE"
+		Var NameLang[2][0] = "MINT ESPRESSO LATTE\nSMOOTHIE"
 		Var NameLang[2][1] = "กาแฟมินต์ลาเต้ปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -20372,9 +20373,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>MINT CAFE LATTE</LanguageSlot1>
+		<LanguageSlot1>MINT ESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>MINT CAFE LATTE</LanguageSlot3>
+		<LanguageSlot3>MINT ESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -20551,7 +20552,7 @@
 		Var PD_CODE2 = "51-21-02-0058"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "MINTCANO"
+		Var aliasName[0] = "MINT ESPRESSO"
 		Var aliasDesc[0] = "Espresso, Mint Syrup,\nSugar, Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -20561,7 +20562,7 @@
 		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot MINTCANO"
+		Var NameLang[0][0] = "Hot MINT ESPRESSO"
 		Var NameLang[0][1] = "มินต์กาโน่ร้อน"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -20571,7 +20572,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced MINTCANO"
+		Var NameLang[1][0] = "Iced MINT ESPRESSO"
 		Var NameLang[1][1] = "มินต์กาโน่เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -20638,9 +20639,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>MINTCANO</LanguageSlot1>
+		<LanguageSlot1>MINT ESPRESSO</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>MINTCANO</LanguageSlot3>
+		<LanguageSlot3>MINT ESPRESSO</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -20817,7 +20818,7 @@
 		Var PD_CODE2 = "51-01-02-0030"
 		Var PD_CODE3 = "51-01-03-0030"
 		; begin lang 
-		Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE"
+		Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar"
 		Var aliasName[1] = "กาแฟชานมไต้หวัน"
 		Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม"
@@ -20827,7 +20828,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -20837,7 +20838,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula"
-		Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -20904,9 +20905,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot1>
+		<LanguageSlot1>DIRTY TEA\nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>กาแฟชานมไต้หวัน</LanguageSlot2>
-		<LanguageSlot3>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot3>
+		<LanguageSlot3>DIRTY TEA\nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>กาแฟชานมไต้หวัน</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟชานมไต้หวัน</LanguageSlot6>
@@ -21083,7 +21084,7 @@
 		Var PD_CODE2 = "51-21-02-0030"
 		Var PD_CODE3 = "51-21-03-0030"
 		; begin lang 
-		Var aliasName[0] = "TAIWANESE TEA\nCAFÉ LATTE"
+		Var aliasName[0] = "DIRTY TEA\nESPRESSO LATTE"
 		Var aliasDesc[0] = "Espresso, Taiwanese Tea,\nMilk, Sugar"
 		Var aliasName[1] = "กาแฟชานมไต้หวัน"
 		Var aliasDesc[1] = "กาแฟ ชาไต้หวัน น้ำตาล \nและ นม"
@@ -21093,7 +21094,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[0][0] = "Hot DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -21103,7 +21104,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Teh Taiwan, Susu, Gula"
-		Var NameLang[1][0] = "Iced TAIWANESE TEACAFÉ LATTE"
+		Var NameLang[1][0] = "Iced DIRTY TEA\nESPRESSO LATTE"
 		Var NameLang[1][1] = "กาแฟชานมไต้หวันเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -21170,9 +21171,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot1>
+		<LanguageSlot1>DIRTY TEA\nESPRESSO LATTE</LanguageSlot1>
 		<LanguageSlot2>กาแฟชานมไต้หวัน</LanguageSlot2>
-		<LanguageSlot3>TAIWANESE TEA\nCAFÉ LATTE</LanguageSlot3>
+		<LanguageSlot3>DIRTY TEA\nESPRESSO LATTE</LanguageSlot3>
 		<LanguageSlot4>กาแฟชานมไต้หวัน</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟชานมไต้หวัน</LanguageSlot6>

inter/aus/xml/page_catalog_group_forkid.lxml

@@ -264,6 +264,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -416,8 +417,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -1735,7 +1736,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -1745,7 +1746,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1755,7 +1756,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1765,7 +1766,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -1822,9 +1823,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -2267,7 +2268,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0010"
 		; begin lang 
-		Var aliasName[0] = "STRAWCOCOA \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY CHOC\nMILK"
 		Var aliasDesc[0] = "Milk, Cocoa, Strawberry Syrup"
 		Var aliasName[1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nโกโก้ และน้ำแข็ง"
@@ -2297,7 +2298,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWCOCOA SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY CHOC MILK"
 		Var NameLang[2][1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2354,9 +2355,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWCOCOA \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY CHOC\nMILK</LanguageSlot1>
 		<LanguageSlot2>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWCOCOA \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY CHOC\nMILK</LanguageSlot3>
 		<LanguageSlot4>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -4101,7 +4102,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo, Ice"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -4131,7 +4132,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4188,9 +4189,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>

inter/aus/xml/page_catalog_group_health.lxml

@@ -255,6 +255,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -407,8 +408,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -662,7 +663,7 @@
 		Var PD_CODE2 = "51-01-02-1001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
@@ -672,7 +673,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -682,7 +683,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -749,9 +750,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6>
@@ -928,7 +929,7 @@
 		Var PD_CODE2 = "51-21-02-1001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
@@ -938,7 +939,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -948,7 +949,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1015,9 +1016,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6>
@@ -5716,7 +5717,7 @@
 		Var PD_CODE2 = "51-03-02-1002"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -5803,9 +5804,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>

inter/aus/xml/page_catalog_group_milk.lxml

@@ -253,6 +253,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -405,8 +406,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -1194,7 +1195,7 @@
 		Var PD_CODE2 = "51-03-02-0004"
 		Var PD_CODE3 = "51-03-03-0004"
 		; begin lang 
-		Var aliasName[0] = "CARAMEL COCOA"
+		Var aliasName[0] = "CARAMEL CHOC"
 		Var aliasDesc[0] = "Cocoa, Milk,Sugar,\nCaramel Syrup"
 		Var aliasName[1] = "คาราเมลโกโก้"
 		Var aliasDesc[1] = "โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล"
@@ -1204,7 +1205,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot CARAMEL COCOA"
+		Var NameLang[0][0] = "Hot CARAMEL CHOC"
 		Var NameLang[0][1] = "คาราเมลโกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1214,7 +1215,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Koko, Susu, Gula, Sirap Karamel"
-		Var NameLang[1][0] = "Iced CARAMEL COCOA"
+		Var NameLang[1][0] = "Iced CARAMEL CHOC"
 		Var NameLang[1][1] = "คาราเมลโกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1224,7 +1225,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Koko, Susu, Gula, Sirap Karamel"
-		Var NameLang[2][0] = "CARAMEL COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CARAMEL CHOC SMOOTHIE"
 		Var NameLang[2][1] = "คาราเมลโกโก้ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -1281,9 +1282,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>CARAMEL COCOA</LanguageSlot1>
+		<LanguageSlot1>CARAMEL CHOC</LanguageSlot1>
 		<LanguageSlot2>คาราเมลโกโก้</LanguageSlot2>
-		<LanguageSlot3>CARAMEL COCOA</LanguageSlot3>
+		<LanguageSlot3>CARAMEL CHOC</LanguageSlot3>
 		<LanguageSlot4>คาราเมลโกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>คาราเมลโกโก้</LanguageSlot6>
@@ -1988,7 +1989,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -1998,7 +1999,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -2008,7 +2009,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -2018,7 +2019,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2075,9 +2076,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -2254,7 +2255,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0010"
 		; begin lang 
-		Var aliasName[0] = "STRAWCOCOA \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY CHOC\nMILK"
 		Var aliasDesc[0] = "Milk, Cocoa, Strawberry Syrup"
 		Var aliasName[1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nโกโก้ และน้ำแข็ง"
@@ -2284,7 +2285,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWCOCOA SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY CHOC MILK"
 		Var NameLang[2][1] = "โกโก้สตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2341,9 +2342,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWCOCOA \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY CHOC\nMILK</LanguageSlot1>
 		<LanguageSlot2>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWCOCOA \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY CHOC\nMILK</LanguageSlot3>
 		<LanguageSlot4>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้สตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -2516,7 +2517,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0011"
 		; begin lang 
-		Var aliasName[0] = "STRAWMILK \nSMOOTHIE"
+		Var aliasName[0] = "STRAWBERRY \nMILK"
 		Var aliasDesc[0] = "Milk, Strawberry Syrup"
 		Var aliasName[1] = "นมสตอเบอร์รี่ปั่น"
 		Var aliasDesc[1] = "นม น้ำเชื่อมสตอเบอร์รี่ \nและน้ำแข็ง"
@@ -2546,7 +2547,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWMILK SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY MILK"
 		Var NameLang[2][1] = "นมสตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2603,9 +2604,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWMILK \nSMOOTHIE</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY \nMILK</LanguageSlot1>
 		<LanguageSlot2>นมสตอเบอร์รี่ปั่น</LanguageSlot2>
-		<LanguageSlot3>STRAWMILK \nSMOOTHIE</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY \nMILK</LanguageSlot3>
 		<LanguageSlot4>นมสตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>นมสตอเบอร์รี่ปั่น</LanguageSlot6>
@@ -2778,7 +2779,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo, Ice"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -2808,7 +2809,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -2865,9 +2866,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>
@@ -4096,7 +4097,7 @@
 		Var PD_CODE2 = "51-03-02-0025"
 		Var PD_CODE3 = "51-03-03-0025"
 		; begin lang 
-		Var aliasName[0] = "COCOA YUZU"
+		Var aliasName[0] = "CHOC YUZU"
 		Var aliasDesc[0] = "Cocoa and Yuzu syrup"
 		Var aliasName[1] = "โกโก้ยูซุ"
 		Var aliasDesc[1] = "โกโก้ และยูซุ"
@@ -4106,7 +4107,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot Cocoa Yuzu"
+		Var NameLang[0][0] = "Hot Choc Yuzu"
 		Var NameLang[0][1] = "โกโก้ยูซุร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -4116,7 +4117,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Yuzu"
-		Var NameLang[1][0] = "Iced Cocoa Yuzu"
+		Var NameLang[1][0] = "Iced Choc Yuzu"
 		Var NameLang[1][1] = "โกโก้ยูซุเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -4126,7 +4127,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Yuzu, Ais"
-		Var NameLang[2][0] = "Cocoa Yuzu SMOOTHIE"
+		Var NameLang[2][0] = "Choc Yuzu SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้ยูซุปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4183,9 +4184,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA YUZU</LanguageSlot1>
+		<LanguageSlot1>CHOC YUZU</LanguageSlot1>
 		<LanguageSlot2>โกโก้ยูซุ</LanguageSlot2>
-		<LanguageSlot3>COCOA YUZU</LanguageSlot3>
+		<LanguageSlot3>CHOC YUZU</LanguageSlot3>
 		<LanguageSlot4>โกโก้ยูซุ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้ยูซุ</LanguageSlot6>
@@ -4890,7 +4891,7 @@
 		Var PD_CODE2 = "51-03-02-0024"
 		Var PD_CODE3 = "51-03-03-0024"
 		; begin lang 
-		Var aliasName[0] = "CHOCO TOKYO\nBANANA MILK"
+		Var aliasName[0] = "CHOC TOKYO\nBANANA MILK"
 		Var aliasDesc[0] = "Tokyo Banana Syrup, Milk, Sugar"
 		Var aliasName[1] = "นมช็อกโกโตเกียว\nบานาน่า"
 		Var aliasDesc[1] = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
@@ -4900,7 +4901,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "CHOCO TOKYO\nBANANA MILK"
+		Var NameLang[0][0] = "CHOC TOKYO\nBANANA MILK"
 		Var NameLang[0][1] = "นมช็อกโกโตเกียว\nบานาน่า"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -4910,7 +4911,7 @@
 		Var DescLang[0][2] = "-"
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "Sirap Pisang Tokyo, Susu, Gula"
-		Var NameLang[1][0] = "Iced CHOCO TOKYO BANANA MILK"
+		Var NameLang[1][0] = "Iced CHOC TOKYO BANANA MILK"
 		Var NameLang[1][1] = "นมช็อกโกโตเกียวบานาน่าเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -4920,7 +4921,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Sirap Laici, Ais"
-		Var NameLang[2][0] = "CHOCO TOKYO BANANA MILK\nSMOOTHIE"
+		Var NameLang[2][0] = "CHOC TOKYO BANANA MILK\nSMOOTHIE"
 		Var NameLang[2][1] = "นมช็อกโกโตเกียวบานาน่าปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -4977,9 +4978,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>CHOCO TOKYO\nBANANA MILK</LanguageSlot1>
+		<LanguageSlot1>CHOC TOKYO\nBANANA MILK</LanguageSlot1>
 		<LanguageSlot2>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot2>
-		<LanguageSlot3>CHOCO TOKYO\nBANANA MILK</LanguageSlot3>
+		<LanguageSlot3>CHOC TOKYO\nBANANA MILK</LanguageSlot3>
 		<LanguageSlot4>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>นมช็อกโกโตเกียว\nบานาน่า</LanguageSlot6>
@@ -5418,7 +5419,7 @@
 		Var PD_CODE2 = "51-03-02-0035"
 		Var PD_CODE3 = "51-03-03-0035"
 		; begin lang 
-		Var aliasName[0] = "COCOA MINT"
+		Var aliasName[0] = "CHOC MINT"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Cocoa"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -5428,7 +5429,7 @@
 		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot Cocoa Mint"
+		Var NameLang[0][0] = "Hot Choc Mint"
 		Var NameLang[0][1] = "โกโก้มิ้นท์ร้อน"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -5438,7 +5439,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "Iced Cocoa Mint"
+		Var NameLang[1][0] = "Iced Choc Mint"
 		Var NameLang[1][1] = "โกโก้มิ้นท์เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -5448,7 +5449,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = " Cocoa Mint smoothie"
+		Var NameLang[2][0] = " Choc Mint smoothie"
 		Var NameLang[2][1] = "โกโก้มิ้นท์ปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -5505,9 +5506,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA MINT</LanguageSlot1>
+		<LanguageSlot1>CHOC MINT</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>COCOA MINT</LanguageSlot3>
+		<LanguageSlot3>CHOC MINT</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -5950,7 +5951,7 @@
 		Var PD_CODE2 = "51-03-02-0037"
 		Var PD_CODE3 = "51-03-03-0037"
 		; begin lang 
-		Var aliasName[0] = "STRAWBERRY\nMINT MILK"
+		Var aliasName[0] = "STRAWBERRY\n& MINT MILK"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nStrawberry Syrup"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -5970,7 +5971,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = " Iced STRAWBERRY MINT MILK"
+		Var NameLang[1][0] = " Iced STRAWBERRY & MINT MILK"
 		Var NameLang[1][1] = "นมสตรอร์เบอร์รี่มินต์เย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -5980,7 +5981,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = " STRAWBERRY MINT MILK\nSMOOTHIE"
+		Var NameLang[2][0] = " STRAWBERRY & MINT MILK\nSMOOTHIE"
 		Var NameLang[2][1] = "นมสตรอร์เบอร์รี่มินต์ปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -6037,9 +6038,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWBERRY\nMINT MILK</LanguageSlot1>
+		<LanguageSlot1>STRAWBERRY\n& MINT MILK</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>STRAWBERRY\nMINT MILK</LanguageSlot3>
+		<LanguageSlot3>STRAWBERRY\n& MINT MILK</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>

inter/aus/xml/page_catalog_group_other.lxml

@@ -254,6 +254,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -406,8 +407,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

inter/aus/xml/page_catalog_group_recommend.lxml

@@ -261,6 +261,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -413,8 +414,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -1463,7 +1464,7 @@
 		Var PD_CODE2 = "51-01-02-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำ"
@@ -1473,7 +1474,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1483,7 +1484,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1550,9 +1551,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>
@@ -1729,7 +1730,7 @@
 		Var PD_CODE2 = "51-21-02-0001"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "AMERICANO"
+		Var aliasName[0] = "LONG BLACK"
 		Var aliasDesc[0] = "Espresso, Water"
 		Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
 		Var aliasDesc[1] = "กาแฟ และน้ำ"
@@ -1739,7 +1740,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot AMERICANO"
+		Var NameLang[0][0] = "Hot LONG BLACK"
 		Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -1749,7 +1750,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Espresso, Air"
-		Var NameLang[1][0] = "Iced AMERICANO"
+		Var NameLang[1][0] = "Iced LONG BLACK"
 		Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -1816,9 +1817,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>AMERICANO</LanguageSlot1>
+		<LanguageSlot1>LONG BLACK</LanguageSlot1>
 		<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
-		<LanguageSlot3>AMERICANO</LanguageSlot3>
+		<LanguageSlot3>LONG BLACK</LanguageSlot3>
 		<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>
@@ -8911,7 +8912,7 @@
 		Var PD_CODE2 = "51-03-02-0002"
 		Var PD_CODE3 = "51-03-03-0002"
 		; begin lang 
-		Var aliasName[0] = "COCOA"
+		Var aliasName[0] = "CHOCOLATE"
 		Var aliasDesc[0] = "Milk, Cocoa, Sugar"
 		Var aliasName[1] = "โกโก้"
 		Var aliasDesc[1] = "โกโก้ นมและน้ำตาล"
@@ -8921,7 +8922,7 @@
 		Var aliasDesc[3] = "-"
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
-		Var NameLang[0][0] = "Hot COCOA"
+		Var NameLang[0][0] = "Hot CHOCOLATE"
 		Var NameLang[0][1] = "โกโก้ร้อน"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
@@ -8931,7 +8932,7 @@
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = "Susu, Koko, Gula"
-		Var NameLang[1][0] = "Iced COCOA"
+		Var NameLang[1][0] = "Iced CHOCOLATE"
 		Var NameLang[1][1] = "โกโก้เย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
@@ -8941,7 +8942,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = "Susu, Koko, Gula, Ais"
-		Var NameLang[2][0] = "COCOA SMOOTHIE"
+		Var NameLang[2][0] = "CHOCOLATE SMOOTHIE"
 		Var NameLang[2][1] = "โกโก้เย็นปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -8998,9 +8999,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCOA</LanguageSlot1>
+		<LanguageSlot1>CHOCOLATE</LanguageSlot1>
 		<LanguageSlot2>โกโก้</LanguageSlot2>
-		<LanguageSlot3>COCOA</LanguageSlot3>
+		<LanguageSlot3>CHOCOLATE</LanguageSlot3>
 		<LanguageSlot4>โกโก้</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โกโก้</LanguageSlot6>
@@ -9735,7 +9736,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "STRAWMILK SMOOTHIE"
+		Var NameLang[2][0] = "STRAWBERRY MILK"
 		Var NameLang[2][1] = "นมสตอเบอร์รี่ปั่น"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -10233,7 +10234,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0009"
 		; begin lang 
-		Var aliasName[0] = "OREO SMOOTHIE \nVOLCANO"
+		Var aliasName[0] = "OREO VOLCANO"
 		Var aliasDesc[0] = "Milk, Sugar, Oreo"
 		Var aliasName[1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "นม น้ำตาล โอริโอ้ \n"
@@ -10263,7 +10264,7 @@
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
-		Var NameLang[2][0] = "OREO SMOOTHIE VOLCANO"
+		Var NameLang[2][0] = "OREO VOLCANO"
 		Var NameLang[2][1] = "โอริโอ้ปั่นภูเขาไฟ"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
@@ -10320,9 +10321,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>

inter/aus/xml/page_catalog_group_tea.lxml

@@ -255,6 +255,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -407,8 +408,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

inter/aus/xml/page_catalog_group_whey.lxml

@@ -260,6 +260,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -412,8 +413,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

menu/new-layout.tsv

@@ -533,15 +533,38 @@ NameRerun,file=page_catalog_group_pro_rerun.skt
 
 
 Bad Valentine
-			tokyo banana mocha	กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย	Espresso, Banana Syrup,\ncocoa, Milk	-	12-01-02-0061	12-01-03-0061
+		เป็นเด็กดื้อโดนตี เป็นเด็กดีโดนทิ้งตลอด	Bad kid got smacked, good ones get ditched.	กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย	Espresso, Banana Syrup,\ncocoa, Milk	-	12-01-02-0061	12-01-03-0061
-			tokyo banana matcha cafe latte	กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย	Espresso, Banana Syrup,\nMatcha, Milk	-	12-01-02-0062	-
+		ตัดบทบอกฝันดี = เขาไม่อยากคุย	Ghosted, sending a "night" means the convo's dead.	กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย	Espresso, Banana Syrup,\nMatcha, Milk	-	12-01-02-0062	-
-			tokyo banana straw cocoa	น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ นม และโกโก้	banana syrup, Strawberry syrup,\nMilk, cocoa	-	-	12-03-03-0044
+		ที่ทำดีด้วยเขาไม่ได้มีใจ แต่เขามีเมตตา	He's the kindness fix, zero romance drama.	น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ นม และโกโก้	banana syrup, Strawberry syrup,\nMilk, cocoa	-	-	12-03-03-0044
-			tokyo banana straw milk	น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ และนม 	banana syrup, Strawberry syrup,\nMilk	-	-	12-03-03-0045
+		ตกอยู่ในสถานะสแตนด์บาย	Love's on mute, stuck in suspense.	น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ และนม 	banana syrup, Strawberry syrup,\nMilk	-	-	12-03-03-0045
-			tokyo Banana Milk Oreo Smoothie	น้ำเชื่อมกล้วย นม น้ำตาล Oreo	Banana Syrup, Milk,\nSugar, Oreo	-	-	12-03-03-0029
+		บอกว่าคุยได้พอทักไปก็หาย	Promised a chat, but poof, gone once you say "hey."	น้ำเชื่อมกล้วย นม น้ำตาล Oreo	Banana Syrup, Milk,\nSugar, Oreo	-	-	12-03-03-0029
-			tokyo banana ginger tea	น้ำเชื่อมกล้วย ขิง และน้ำแข็ง	Banana Syrup, Ginger and Ice	-	12-02-02-0053	-
+		เขาจะกลับมาก็ต่อเมื่อไม่เหลือใคร	Pops up when the rest bail on you.	น้ำเชื่อมกล้วย ขิง และน้ำแข็ง	Banana Syrup, Ginger and Ice	-	12-02-02-0053	-
-			tokyo banana thai milk tea	น้ำเชื่อมกล้วย  ชาไทย นม และน้ำแข็ง	Banana Syrup, Thai tea, milk and Ice	-	12-02-02-0054	-
+		รักหมดใจ เจ็บหมดตัวมีอยู่จริง	Love deep, broke hard, that's the real deal.	น้ำเชื่อมกล้วย  ชาไทย นม และน้ำแข็ง	Banana Syrup, Thai tea, milk and Ice	-	12-02-02-0054	-
-			tokyo banana matcha	น้ำเชื่อมกล้วย  มัทฉะ  และน้ำแข็ง	Banana Syrup, Matcha and Ice	-	12-02-02-0055	-
+		คนลืมก่อนชนะ โอเคเราแพ้	Forget love before winning, fine, we'll take the L.	น้ำเชื่อมกล้วย  มัทฉะ  และน้ำแข็ง	Banana Syrup, Matcha and Ice	-	12-02-02-0055	-
-			tokyo banana power drink soda	น้ำเชื่อมกล้วย เต่าทรงพลัง  \n(มีคาเฟอีน)  	Banana Syrup, Medicine drink, Soda and Ice	-	12-05-02-0078	-
+		ถ้าแชทหนักขวาเป็นกีฬา เราคงได้เหรียญทองไปแล้ว	Chatting's our sport, gold in the "No Reply" event.	น้ำเชื่อมกล้วย เต่าทรงพลัง  \n(มีคาเฟอีน)  	Banana Syrup, Medicine drink, Soda and Ice	-	12-05-02-0078	-
+
+
+ Valentine
+		พีชเทลมีเลิฟ	PEACH Tell me love	กาแฟ น้ำ และ น้ำเชื่อมพีช	Espresso, Peach Syrup,\nSugar, Water	12-01-01-0059	12-01-02-0059	-
+		พีชบีมายด์ลาสท์เลิฟ	PEACH be my last love	กาแฟ น้ำ นม และ น้ำเชื่อมพีช	Espresso, Peach Syrup,\nSugar, Milk	12-01-01-0060	12-01-02-0060	12-01-03-0060
+		พีชสเตย์บายมายไซด์	PEACH, stay by my side	น้ำเชื่อมพีช ชาไทย และน้ำ 	Peach syrup, Thai tea,\nWater	12-02-01-0051	12-02-02-0051	12-02-03-0051
+		พีชโกรโอลด์วิทมี	PEACH grow old with me	น้ำเชื่อมพีช ชามะลิ และน้ำ 	Peach syrup, Jasmine tea,\nWater	-	12-02-02-0052	-
+		แคนยูพีชเลิฟมีทู	Can you PEACH love me too	น้ำเชื่อมพีช นม และน้ำ 	Peach syrup, Milk,\nWater	12-03-01-0038	12-03-02-0038	12-03-03-0038
+		พีช โชว์เวอร์มีวิทยัวเลิฟ	PEACH, shower me with your love.	น้ำเชื่อมพีช นม โกโก้ และน้ำ 	Peach syrup, Milk, Cocoa\nWater	-	12-03-02-0039	12-03-03-0039
+		ฟอลอินเลิฟวิทมี (พีช~)	Fall in love with me PEACH	น้ำเชื่อมพีช นม น้ำตาล Oreo	Peach syrup, Milk, Oreo & Ice	-	-	12-03-03-0040
+		พีชทีชมีฮาวทูเลิฟ	PEACH teach me how to love	น้ำเชื่อมพีช น้ำ และน้ำแข็ง 	Peach syrup,Water and Ice	-	12-05-02-0068	-
+		พีชฟีลมายเอ็มทีฮาร์ต	PEACH, fill my empty heart 	น้ำเชื่อมพีช โซดา และน้ำแข็ง 	Peach syrup,Soda and Ice	-	12-05-02-0069	-
+		พีชด๊อนคีพมายฮาร์ตเวททิ่ง	PEACH, don't keep my heart waiting.	น้ำเชื่อมพีช  น้ำเชื่อมมินต์ และโซดา	Peach Syrup, Mint Syrup, Soda & Ice	-	12-05-02-0070	-
+		พีชเทลมียูนีสมีทู	PEACH tell me you need me	น้ำเชื่อมพีช   เป๊ปซี่ และโซดา	Peach Syrup, Pepsi & Ice	-	12-05-02-0072	-
+		ยูอาเดอะมิสซิงพีช	You're the missing PEACH	น้ำเชื่อมพีช  น้ำเชื่อมสตรอเบอร์รี่ และโซดา	Peach Syrup, Strawberry Syrup, Soda & Ice	-	12-05-02-0073	-
+
+
+
+
+
+
+
+
 
 
 

xml/event/out_put_file1.txt

@@ -1 +1 @@
-/event/promotion_mymint.xml
+/event/promotion_peach.xml

xml/event/promotion_15THB.xml

@@ -2083,6 +2083,517 @@ VOLCANO" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; - - 12-03-03-0029 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) </State> 
+	<Button>
+	<State> $Sum1203030029 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_BananaOreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_BananaOreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_BananaOreo_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0029, "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 = "BANANA MILK OREO  VOLCANO"
+		Var NameDrinkTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ"
+		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0029.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0029"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0029.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0029, "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-0029"
+			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-0029.NameE
+		Var menu_desc_eng_blender = $12-03-03-0029.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0029.Name
+		Var menu_desc_thai_blender = $12-03-03-0029.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> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </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> "BANANA MILK OREO 
+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> "Banana Syrup, Milk,
+Sugar, Oreo" </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-0029.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-0029.Button </State>
+	<Value> StringFmt(  $12-03-03-0029.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 $Sum1203030029 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0029.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> $Sum1203030029 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) </State> 
+	<Button>
+	<State> $Sum120301002412030200241203030024 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_ChocoBanana_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_ChocoBanana_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_ChocoBanana_milk.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-01-0024, "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 = "CHOCO TOKYO BANANA MILK"
+		Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า"
+		Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
+		Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-03-01-0024.Price
+		Var PriceD2 = $12-03-02-0024.Price
+		Var PriceD3 = $12-03-03-0024.Price
+		Var PD_CODE1 = "12-03-01-0024"
+		Var PD_CODE2 = "12-03-02-0024"
+		Var PD_CODE3 = "12-03-03-0024"
+		Var PD_STAGE_1 = $12-03-01-0024.Button
+		Var PD_STAGE_2 = $12-03-02-0024.Button
+		Var PD_STAGE_3 = $12-03-03-0024.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-01-0024, "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-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-03-01-0024.NameE
+		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
+		Var menu_name_thai_hot = $12-03-01-0024.Name
+		Var menu_desc_thai_hot = $12-03-01-0024.description
+		
+		Var menu_name_eng_cold = $12-03-02-0024.NameE
+		Var menu_desc_eng_cold = $12-03-02-0024.descriptionE
+		Var menu_name_thai_cold = $12-03-02-0024.Name
+		Var menu_desc_thai_cold = $12-03-02-0024.description
+		
+		Var menu_name_eng_blender = $12-03-03-0024.NameE
+		Var menu_desc_eng_blender = $12-03-03-0024.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0024.Name
+		Var menu_desc_thai_blender = $12-03-03-0024.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> "CHOCO TOKYO
+BANANA MILK" </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> "Tokyo Banana Syrup, Milk, 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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-01-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt( $12-03-02-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then
+				STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0024.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> $Sum120301002412030200241203030024 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 17

xml/event/promotion_onclick1.inc

@@ -1 +1 @@
-Var BigButtonEnable = "Invisible"
+        Var BigButtonEnable = "Invisible"

xml/event/promotion_rerun.xml

@@ -2083,6 +2083,517 @@ VOLCANO" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; - - 12-03-03-0029 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) </State> 
+	<Button>
+	<State> $Sum1203030029 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_BananaOreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_BananaOreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_BananaOreo_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0029, "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 = "BANANA MILK OREO  VOLCANO"
+		Var NameDrinkTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ"
+		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0029.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0029"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0029.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0029, "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-0029"
+			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-0029.NameE
+		Var menu_desc_eng_blender = $12-03-03-0029.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0029.Name
+		Var menu_desc_thai_blender = $12-03-03-0029.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> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </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> "BANANA MILK OREO 
+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> "Banana Syrup, Milk,
+Sugar, Oreo" </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-0029.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-0029.Button </State>
+	<Value> StringFmt(  $12-03-03-0029.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 $Sum1203030029 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0029.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> $Sum1203030029 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) </State> 
+	<Button>
+	<State> $Sum120301002412030200241203030024 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_ChocoBanana_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_ChocoBanana_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_ChocoBanana_milk.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-01-0024, "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 = "CHOCO TOKYO BANANA MILK"
+		Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า"
+		Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
+		Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-03-01-0024.Price
+		Var PriceD2 = $12-03-02-0024.Price
+		Var PriceD3 = $12-03-03-0024.Price
+		Var PD_CODE1 = "12-03-01-0024"
+		Var PD_CODE2 = "12-03-02-0024"
+		Var PD_CODE3 = "12-03-03-0024"
+		Var PD_STAGE_1 = $12-03-01-0024.Button
+		Var PD_STAGE_2 = $12-03-02-0024.Button
+		Var PD_STAGE_3 = $12-03-03-0024.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-01-0024, "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-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-03-01-0024.NameE
+		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
+		Var menu_name_thai_hot = $12-03-01-0024.Name
+		Var menu_desc_thai_hot = $12-03-01-0024.description
+		
+		Var menu_name_eng_cold = $12-03-02-0024.NameE
+		Var menu_desc_eng_cold = $12-03-02-0024.descriptionE
+		Var menu_name_thai_cold = $12-03-02-0024.Name
+		Var menu_desc_thai_cold = $12-03-02-0024.description
+		
+		Var menu_name_eng_blender = $12-03-03-0024.NameE
+		Var menu_desc_eng_blender = $12-03-03-0024.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0024.Name
+		Var menu_desc_thai_blender = $12-03-03-0024.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> "CHOCO TOKYO
+BANANA MILK" </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> "Tokyo Banana Syrup, Milk, 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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-01-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt( $12-03-02-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then
+				STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0024.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> $Sum120301002412030200241203030024 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 17

xml/event/promotion_template1.inc

@@ -33,7 +33,7 @@
      </FilenameDisable>
 <EventOnClick> 
 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_mymint.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml"
         
 </EventOnClick>
 
@@ -53,7 +53,7 @@
             EndIf
         ) 
     </State>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/pro_peach_th.mp4" </Filename>
 </Video>
 
 <Video>
@@ -71,7 +71,7 @@
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/pro_peach_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/event/script_common_for_open_promotion_xml.ev

@@ -16,15 +16,15 @@ Else
 	; zone promote
 	If OpenFromPageBoard = 1 Then
 
-		If RerunProEnable = 1 Then
+		If ProPeachEnable = 1 Then
 			Var BigButtonEnable = "Enable"
-			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_rerun.xml"
+			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_peach.xml"
 			Var OpenFromPageBoard = 0
 		
 		Else
-			If pro15THBEnable = 1 Then
+			If RerunProEnable = 1 Then
 				Var BigButtonEnable = "Enable"
-				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
+				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_rerun.xml"
 				Var OpenFromPageBoard = 0
 			
 			Else
@@ -40,9 +40,9 @@ Else
 			Open "ROOT/taobin_project/xml/event/promotion_rerun.xml"
 
 		Else
-			If pro15THBEnable = 1 Then
+			If ProPeachEnable = 1 Then
 				Var BigButtonEnable = "Enable"
-				Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
+				Open "ROOT/taobin_project/xml/event/promotion_peach.xml"
 		
 			Else
 				Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 

xml/event/tricker.ev

@@ -57,6 +57,9 @@ Var FromMyMintPro = 0
 Var RerunProEnable = 0
 Var FromRerunPro = 0
 
+; Enable pro Peach, Feb 1 - 13
+Var ProPeachEnable = 0
+
 Var NewCollectPoint = 1
 
 If SystemDateMonthInt = 10 Then
@@ -104,14 +107,25 @@ If SystemDateMonthInt = 1 Then
 EndIf
 
 
+If SystemDateMonthInt = 2 Then
+	If SystemDateDayInt >= 1 Then
+		If SystemDateDayInt <= 13 Then
+			Var ProPeachEnable = 1
+		EndIf
+	EndIf
+
+EndIf
+
 
 
 If BoxID = 173149 Then
-	Var RerunProEnable = 1
+	Var RerunProEnable = 0
+	Var ProPeachEnable = 1
 EndIf
 
 If BoxID = 105005 Then
-	Var RerunProEnable = 1
+	Var RerunProEnable = 0
+	Var ProPeachEnable = 1
 EndIf
 
 If BoxID = 175668 Then
@@ -169,6 +183,7 @@ If InternationalEnable = 1 Then
 	Var MysteryProEnable = 0
 	Var PepweenEnable = 0
 	Var RerunProEnable = 0
+	Var ProPeachEnable = 0
 EndIf
 
 

xml/page_board.xml

@@ -1238,8 +1238,8 @@
 
 	If BrewTimeoutExtend = 1 Then
 		DEBUGVAR BrewTimeoutExtend 
-		DEBUGVAR DoorLidPosition 
+		DEBUGVAR DoorCupPosition 
-		If DoorLidPosition = "bottom" Then
+		If DoorCupPosition = "bottom" Then
 			SAVELOG "BrewTimeoutExtend = 0 Clear Error Flag"
 			Var BrewTimeoutExtend = 0 
 			; clear stage
@@ -1256,8 +1256,9 @@
 			EndIf
 		EndIf
 	Else
-		If DoorLidPosition = "Bottom" Then
+		If DoorCupPosition = "Bottom" Then
 			Var BrewTimeoutExtend = 0 
+
 		Else
 			Var BrewTimeoutExtend = 0 
 		EndIf

xml/page_catalog_group_coffee.xml

@@ -544,7 +544,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 60
+; menu_new_list 61
 	; ==================> Len = 17
 	; 12-01-01-0001 - - 
 <Block>
@@ -22007,6 +22007,505 @@ Sugar, Milk" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 12
+	; - 12-01-02-0056 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-02-0056.Button,$Sum1201020056) </State> 
+	<Button>
+	<State> $Sum1201020056 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_PEPSI_COFFEE.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_PEPSI_COFFEE.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_PEPSI_COFFEE.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-01-02-0056, "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 = "PEPDANOO"
+		Var NameDrinkTH = "เป๊ปดาโน่"
+		Var DrinkDescriptionTH = "กาแฟ เป๊ปซี่ และโซดา"
+		Var DrinkDescription = "Espreeso, Pepsi, Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PEPSI_COFFEE.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-01-02-0056.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-01-02-0056"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-01-02-0056.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-02-0056, "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-01-02-0056"
+		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-01-02-0056.NameE
+		Var menu_desc_eng_cold = $12-01-02-0056.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0056.Name
+		Var menu_desc_thai_cold = $12-01-02-0056.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> "PEPDANOO" </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> "Espreeso, Pepsi, Soda" </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-01-02-0056.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-01-02-0056.Button </State>
+	<Value> StringFmt( $12-01-02-0056.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 $Sum1201020056 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-02-0056.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> $Sum1201020056 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - 12-21-02-0056 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-21-02-0056.Button,$Sum1221020056) </State> 
+	<Button>
+	<State> $Sum1221020056 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_PEPSI_COFFEE.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_PEPSI_COFFEE.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_PEPSI_COFFEE.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<OverlayImage> xmlpro( 12-21-02-0056, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<EventOnClick> 
+		Var NameDrink = "PEPDANOO"
+		Var NameDrinkTH = "เป๊ปดาโน่"
+		Var DrinkDescriptionTH = "กาแฟ เป๊ปซี่ และโซดา"
+		Var DrinkDescription = "Espreeso, Pepsi, Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PEPSI_COFFEE.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-21-02-0056.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-21-02-0056"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-21-02-0056.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-21-02-0056, "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-21-02-0056"
+		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-21-02-0056.NameE
+		Var menu_desc_eng_cold = $12-21-02-0056.descriptionE
+		Var menu_name_thai_cold = $12-21-02-0056.Name
+		Var menu_desc_thai_cold = $12-21-02-0056.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> "PEPDANOO" </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> "Espreeso, Pepsi, Soda" </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-21-02-0056.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-21-02-0056.Button </State>
+	<Value> StringFmt( $12-21-02-0056.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> 183 </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>
+	<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 $Sum1221020056 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-02-0056.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> $Sum1221020056 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

xml/page_catalog_group_pro_bad_valentine.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_catalog_group_pro_peach.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_catalog_group_recommend.xml

@@ -595,7 +595,7 @@
 	</QRCode>
 </Block>
 ;dummy_layout.inc
-; menu_new_list 38
+; menu_new_list 40
 	;TAGESP
 	; ==================> Len = 17
 	; 12-02-01-0039 12-02-02-0039 12-02-03-0039 
@@ -1104,6 +1104,517 @@ VOLCANO" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
+	; - - 12-03-03-0029 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0029.Button,Disable=Invisible,$Sum1203030029) </State> 
+	<Button>
+	<State> $Sum1203030029 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_BananaOreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_BananaOreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_BananaOreo_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0029, "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 = "BANANA MILK OREO  VOLCANO"
+		Var NameDrinkTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ"
+		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0029.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0029"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0029.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0029, "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-0029"
+			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-0029.NameE
+		Var menu_desc_eng_blender = $12-03-03-0029.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0029.Name
+		Var menu_desc_thai_blender = $12-03-03-0029.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> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </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> "BANANA MILK OREO 
+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> "Banana Syrup, Milk,
+Sugar, Oreo" </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-0029.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-0029.Button </State>
+	<Value> StringFmt(  $12-03-03-0029.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 $Sum1203030029 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0029.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> $Sum1203030029 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-01-0024.Button,12-03-02-0024.Button,12-03-03-0024.Button,Disable=Invisible,$Sum120301002412030200241203030024) </State> 
+	<Button>
+	<State> $Sum120301002412030200241203030024 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_ChocoBanana_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_ChocoBanana_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_ChocoBanana_milk.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-01-0024, "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 = "CHOCO TOKYO BANANA MILK"
+		Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า"
+		Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
+		Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-03-01-0024.Price
+		Var PriceD2 = $12-03-02-0024.Price
+		Var PriceD3 = $12-03-03-0024.Price
+		Var PD_CODE1 = "12-03-01-0024"
+		Var PD_CODE2 = "12-03-02-0024"
+		Var PD_CODE3 = "12-03-03-0024"
+		Var PD_STAGE_1 = $12-03-01-0024.Button
+		Var PD_STAGE_2 = $12-03-02-0024.Button
+		Var PD_STAGE_3 = $12-03-03-0024.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-01-0024, "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-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-03-01-0024.NameE
+		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
+		Var menu_name_thai_hot = $12-03-01-0024.Name
+		Var menu_desc_thai_hot = $12-03-01-0024.description
+		
+		Var menu_name_eng_cold = $12-03-02-0024.NameE
+		Var menu_desc_eng_cold = $12-03-02-0024.descriptionE
+		Var menu_name_thai_cold = $12-03-02-0024.Name
+		Var menu_desc_thai_cold = $12-03-02-0024.description
+		
+		Var menu_name_eng_blender = $12-03-03-0024.NameE
+		Var menu_desc_eng_blender = $12-03-03-0024.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0024.Name
+		Var menu_desc_thai_blender = $12-03-03-0024.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> "CHOCO TOKYO
+BANANA MILK" </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> "Tokyo Banana Syrup, Milk, 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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-01-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt( $12-03-02-0024.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-0024.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-0024.Button </State>
+	<Value> StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120301002412030200241203030024 = "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 $Sum120301002412030200241203030024 = "Disable" Then
+				STRCONTAIN "ERR" $12-03-01-0024.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-03-02-0024.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0024.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> $Sum120301002412030200241203030024 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 17

xml/page_payment_cash-MYR.xml

@@ -450,8 +450,8 @@
 
 	__CMD "prepar-cup-from-order" 0 "-" "-"
 
-	Var PayState5 = "Disable"
+	;Var PayState5 = "Enable"
-	
+	DEBUGVAR PayState5
 	;Open "ROOT/taobin_project/xml/page_page_camera.xml" 
 
 	;Var PayState4 = "Invisible"
@@ -1783,7 +1783,7 @@ EndIf
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + QR_POPUPX )</Filename>
+<Filename> Var( DirImage + QR_POPUP )</Filename>
 </Image>
 
 

xml/page_payment_cash.xml

@@ -175,6 +175,10 @@
 		Var Seeker.CodeChannel = 0
 	EndIf
 
+	If FromRerunPro = 1 Then
+		Var Seeker.CodeChannel = 1
+	EndIf
+
 	If From15THBPro = 1 Then
 		Var Seeker.CodeChannel = 1
 	EndIf 

xml/page_show_error.xml

@@ -151,6 +151,20 @@
 	
 	Var EmergencyStop = "-"
 	
+	If DoorCupPosition = "bottom" Then
+
+		If stop_now_from_door_cup = 1 Then
+			Var stop_now = "false"
+			Var EmergencyStop = "false"
+			SAVELOG "stop_now_from_door_cup is set"
+			Var stop_now_from_door_cup = 0
+			Var MachineErrorDetailAll = " --- "
+
+		EndIf
+	Else
+		Var EmergencyStop = "true"
+	EndIf
+
 	If EmergencyStop = "true" Then
 		If DoorCupPosition = "bottom" Then
 			; It normal 
@@ -224,13 +238,7 @@
 					Var stop_now_from_netcore_event = 0
 				EndIf
 
-				If stop_now_from_door_cup = 1 Then
-					Var stop_now = "false"
-					SAVELOG "stop_now_from_door_cup is set"
-					Var stop_now_from_door_cup = 0
-					Var MachineErrorDetailAll = " --- "
 				
-				EndIf
 
 				If MachineStage = "" Then
 					

xml/page_topping_select7.xml

@@ -501,8 +501,39 @@
 
 			If  Seeker = "next" Then 
 				If CupRemain > 0 Then
-					OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+
-					Open "ROOT/taobin_project/xml/page_payment.xml" 
+					If Only18 = "true" Then
+						DEBUGVAR SelectDrink
+						MenuProfile SelectDrink "IsMenuInProfile"
+
+						; disable old verification
+						Var AdultState1 = "Invisible"
+
+						DEBUGVAR IsMenuInProfile
+
+						If IsMenuInProfile = "true" Then
+
+							; Check profile
+							
+							If EnableLiveness = "true" Then
+								DEBUGVAR EnableLiveness				
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+								; full 
+								Open "ROOT/taobin_project/xml/page_identity_verification.xml" 
+							Else
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+								; Only IDCard
+								Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+							EndIf
+
+						Else
+							OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+							Open "ROOT/taobin_project/xml/page_payment.xml" 
+						EndIf
+					Else
+						OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+						Open "ROOT/taobin_project/xml/page_payment.xml" 
+					EndIf
 				EndIf
 
 			Else
@@ -1415,6 +1446,21 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+
+
+
+
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var SugarState5 = "Disable"
+				;	Var SugarState6 = "Disable"
+
+				;EndIf
+
+
+
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1452,6 +1498,14 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var SugarState5 = "Disable"
+				;	Var SugarState6 = "Disable"
+
+				;EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1500,6 +1554,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1547,6 +1613,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1597,6 +1675,19 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1644,6 +1735,14 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState5 = "Disable"
+					Var SugarState6 = "Disable"
+
+				EndIf
+				
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
 				EndIf
@@ -1685,6 +1784,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState3 = "PressForever"
 				EndIf
@@ -1727,6 +1838,19 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+				
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
 				EndIf
@@ -1826,6 +1950,17 @@
 			EndIf
 
 			
+			If TOPPING2 = "shot coffee termtem" Then
+		
+				Var ShotCoffeeBG = "Enable"
+				Var showShotEnable = "Enable"
+				
+				Var ExtraTopping = "Enable"
+				
+				DEBUGVAR TOPPING2
+				Refresh
+			EndIf
+
 			If TOPPING2 = "shot coffee 1003" Then
 		
 				If toppingID2index3 = "" Then
@@ -2089,8 +2224,20 @@
 			Topping "Pack" ExtendDataCurr
 			Var Seeker.ExtendDataCurr = ExtendDataCurr
 
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+
-			Open "ROOT/taobin_project/xml/page_payment.xml"
+			If RestrictedDrink = "true" Then
+
+				DEBUGVAR RestrictedDrink
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+			Else
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_payment.xml"
+
+			EndIf
+
 		EndIf
 	
 		
@@ -2486,6 +2633,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2524,6 +2679,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2533,6 +2696,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2576,6 +2747,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2584,6 +2763,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 
 		EndIf
@@ -2619,6 +2806,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2627,6 +2822,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2635,6 +2838,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2669,6 +2880,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2677,6 +2896,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2685,6 +2912,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2754,6 +2989,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2793,6 +3037,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2803,6 +3056,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2840,6 +3102,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2850,6 +3121,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2887,6 +3168,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2897,6 +3187,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2905,6 +3204,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2941,6 +3249,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2951,6 +3268,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2959,6 +3285,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2995,6 +3330,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -3005,6 +3349,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3013,6 +3366,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3082,6 +3444,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3119,6 +3489,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3154,6 +3532,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3188,6 +3574,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3257,6 +3651,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3294,6 +3696,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3329,6 +3739,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3363,6 +3781,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -5072,6 +5498,14 @@
 	
 	__CMD "statement" 0 StatementCheckMenu "-"
 
+	;If HalfPrice = "true" Then
+	;	; Discount 50
+	;	DEBUGVAR HalfPrice
+	;	__CMD "invoke-discount-50" UserSelectProductCode "-" "-"
+	;	
+	;Else
+	;	Var PriceDrink = PriceDrinkTmp		
+	;EndIf
 
 	DEBUGVAR PriceDrinkTmp
 	
@@ -5079,6 +5513,8 @@
 	
 	Var PriceDrink = PriceDrinkTmp
 
+	DEBUGVAR PriceDrink
+	
 	SAVELOG "USER press next ( topping ) - new"
 
 	If SugarState1 = "PressForever" Then

xml/vending_info.xml

@@ -152,6 +152,7 @@
 
 	
 	Var CanResetTouch = 0
+	Var CountDownReset = 0
 	Var strTouchScreen = "   Reset Touch : disable."
 
 </EventOpen>
@@ -239,11 +240,20 @@
 	Var Text2_9 = Text2_9 + android_text3_2
 
 
+
+
 	If AndroidTouchScreenHeartBeat = "-" Then
 		Var strTouchScreen = "   Reset Touch : Disable."
 	Else
-		Var strTouchScreen = "   Reset Touch : " + AndroidTouchScreenHeartBeat
+		DEBUGVAR CountDownReset
-		Var CanResetTouch = 1
+		If CountDownReset = 0 Then
+			Var strTouchScreen = "   Reset Touch : " + AndroidTouchScreenHeartBeat
+			Var CanResetTouch = 1
+		Else
+			Var Timeout = 0
+			Var strTouchScreen = "   Reset Touch : " + CountDownReset
+			Var CanResetTouch = 1
+		EndIf
 	EndIf 
 
 	Refresh

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.14"
+	Var XMLPageVersion = "8.15"
-	Var XMLPageVersionInt = 814
+	Var XMLPageVersionInt = 815
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>