Release

menu/components/menu_catalog_default_init.xml

@@ -1,4 +1,3 @@
-
     Var NextPage = "-"
 
     DEBUGVAR ICE_PROCESS_STATUS
@@ -38,68 +37,75 @@
 
     ; SpiralOnline
   
-    Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
 
-    Var Menu1Selected2 = "Invisible"
+        Var Menu1Selected2 = "Invisible"
-    Var Menu2Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
-    Var Menu3Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
-    Var Menu4Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
         
-    Var Menu6Selected2 = "Invisible"
+        Var Menu6Selected2 = "Invisible"
-    Var Menu7Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
-    Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-    Var Menu11Selected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
 
-    Var Menu21Selected2 = "Invisible"
+        Var Menu21Selected2 = "Invisible"
 
-    Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-    If SpiralOnline = "true" Then
+        If SpiralOnline = "true" Then 
-        If Seeker =  "curr" Then
+            If Seeker =  "curr" Then
-            Var MenuVSelected2 = "Enable"
+                Var MenuVSelected2 = "Enable"
+            EndIf
         EndIf 
-    EndIf
         
-    ; init default
+        ; init default
-    Var Menu1Selected = "Enable"
+        Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+        Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
+        Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
+        Var Menu4Selected = "Enable"
-    ; 5 fruit
+        ; 5 fruit
-    Var Menu5Selected = "Invisible"
+        Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
+        Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
+        Var Menu7Selected = "Enable"
-    ; 8 cocktail
+        ; 8 cocktail
-    Var Menu8Selected = "Invisible"
+        Var Menu8Selected = "Invisible"
 
-    If CocktailShow = "true" Then
+        If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
+            Var Menu8Selected = "Enable"
-    EndIf
+        EndIf
 
             
-    If AppFastEnable = "true" Then
+        If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable"
+            Var Menu11Selected = "Enable" 
-        Var Menu21Selected = "Invisible"
+            Var Menu21Selected = "Invisible" 
-        Var Menu7Selected = "Invisible"
-    Else
-        If MenuKidEnable = "true" Then
-            Var Menu11Selected = "Invisible"
-            Var Menu21Selected = "Enable"
             Var Menu7Selected = "Invisible"
         Else
-            Var Menu11Selected = "Invisible"
+            If MenuKidEnable = "true" Then
-            Var Menu21Selected = "Invisible"
+                Var Menu11Selected = "Invisible" 
-            Var Menu7Selected = "Enable"
+                Var Menu21Selected = "Enable"
+                Var Menu7Selected = "Invisible"
+            Else
+                Var Menu11Selected = "Invisible"
+                Var Menu21Selected = "Invisible" 
+                Var Menu7Selected = "Enable"
+            EndIf
         EndIf
-    EndIf
 
-    If CocktailShow = "true" Then
+        If CocktailShow = "true" Then
-        Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-    EndIf
+        EndIf 
+
+        If RecipeTag1 = "HealthTurnOn" Then
+            Var Menu22Selected = "Enable"
+        Else
+            Var Menu22Selected = "Invisible"
+        EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
+        ;
+        
 
-    If RecipeTag1 = "HealthTurnOn" Then
-        Var Menu22Selected = "Enable"
-    Else
-        Var Menu22Selected = "Invisible"
-    EndIf
-    ;

menu/components/menu_catalog_new.xml

@@ -2,11 +2,11 @@
 ; notice enable heathy menu
 
 <Image>
-    <X> 0 </X>
+<X> 0 </X>
-    <Y> 380 </Y>
+<Y> 380 </Y>
-    <Width> 1080 </Width>
+<Width> 1080 </Width>
-    <Height> 1540 </Height>
+<Height> 1540 </Height>
-    <Color> "0xeae6e1" </Color>
+<Color> "0xeae6e1" </Color>
 </Image>
 
 
@@ -26,17 +26,17 @@
     If NextPage = "-" Then
 
     Else
-        If CupOnArm = "true" Then
+            If CupOnArm = "true" Then
-            If Timeout > 9 Then
+                If Timeout > 9 Then
-                SAVELOG "COA9"
+                    SAVELOG "COA9"
-                Open NextPage
+                    Open NextPage
+                EndIf
+            Else
+                If Timeout > 30 Then
+                    SAVELOG "COA30"
+                    Open NextPage
+                EndIf
             EndIf
-        Else
-            If Timeout > 30 Then
-                SAVELOG "COA30"
-                Open NextPage
-            EndIf
-        EndIf
     EndIf
 
     If Timeout > 60 Then
@@ -70,18 +70,13 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 120 Then
-            Var stop_now = "true"
-            Var MachineErrorDetailAll = "???"
-            SAVELOG "NETCORE_LOST_CNT"
         
-            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
-        EndIf
     EndIf
 
 
     ; zone cup on arm
     If CupOnArm = "true" Then
+
         If CheckCupStateDoorCupClose = "" Then
             If buttonRemoveCup =  "Enable" Then
 
@@ -90,6 +85,7 @@
             EndIf
 
             Var buttonRemoveCup = "Enable"
+
         EndIf
 
         If CheckCupStateDoorCupClose = "done" Then
@@ -115,7 +111,7 @@
 </EventTimeout> 
 
 
-        ; under line
+; under line
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
@@ -123,7 +119,7 @@
 </Image>
 
 
-        ; under line
+; under line
 <Image>
 <X> 0 </X>
 <Y> 358 </Y>
@@ -131,7 +127,7 @@
 </Image>
 
 
-        ; back
+; back
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
@@ -147,8 +143,8 @@
             Open "ROOT/taobin_project/xml/page_catalog.xml" 
         EndIf 
     Else
-        Open "ROOT/taobin_project/xml/page_catalog.xml"
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
-    EndIf
+	EndIf
 
 </EventClick>
 </Button>
@@ -175,17 +171,17 @@
 </EventClick>
 </Button>
 
-        ;
+;
 <ListView1>
-<Width> 1080 </Width>
+    <Width> 1080 </Width>
-<Height> "auto" </Height>
+    <Height> "auto" </Height>   
-<X> 0 </X>
+    <X> 0 </X>
-<Y> 395 </Y>
+    <Y> 395 </Y>
-<Row2>
+    <Row2>
     <State>"Enable"</State>
     <Width> 896 </Width>
     <Height> 102 </Height> 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu1Selected </State>
         <Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
@@ -197,12 +193,12 @@
             Var NextPage = "-"
        
 
-            TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
         </EventClick>
-    </Button>
+        </Button>
 
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu2Selected </State>
         <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
@@ -214,9 +210,9 @@
             Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
             
         </EventClick>
-    </Button>
+        </Button>
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu3Selected </State>
         <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
@@ -226,15 +222,15 @@
         <EventClick> 
             Var NextPage = "-"
             If new_layout = "true" Then
-            Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
             Else
-            Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
             EndIf
         </EventClick>
-    </Button>
+        </Button>
 
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
         <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
@@ -244,16 +240,16 @@
         <EventClick> 
             Var NextPage = "-"
             If new_layout = "true" Then
-            Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
             Else
-            Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 
             EndIf
         </EventClick>
-    </Button>
+        </Button>
 
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu7Selected </State>
         <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
@@ -263,14 +259,14 @@
         <EventClick> 
             Var NextPage = "-"
             If new_layout = "true" Then
-            Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
             Else
-            Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
             EndIf
         </EventClick>
-    </Button>
+        </Button>
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu11Selected </State>
         <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
@@ -280,16 +276,16 @@
         <EventClick> 
             Var NextPage = "-"
             If new_layout = "true" Then
-            Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
             Else
-            Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
             EndIf
         </EventClick>
-    </Button>
+        </Button>
 
 
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
         <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
@@ -300,10 +296,10 @@
             Var NextPage = "-"
             Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
         </EventClick>
-    </Button>
+        </Button>
 
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
         <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
@@ -314,9 +310,9 @@
             Var NextPage = "-"
             Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
         </EventClick>
-    </Button>
+        </Button>
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
         <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
@@ -327,9 +323,9 @@
             Var NextPage = "-"
             Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
         </EventClick>
-    </Button>
+        </Button>
 
-    <Button>
+        <Button>
         <Layout> "linear" </Layout>
         <State> Menu6Selected </State>
         <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
@@ -339,14 +335,41 @@
         <EventClick> 
             Var NextPage = "-"
             If new_layout = "true" Then
-            Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
             Else
-            Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
             EndIf
         </EventClick>
-    </Button>
+        </Button>
 
-    <Button>
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
+        <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
         <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
@@ -357,7 +380,7 @@
             Var NextPage = "-"
             Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
         </EventClick>
-    </Button>
+        </Button>
 </Row2>
 </ListView1>
 
@@ -371,9 +394,22 @@
             Var web_telnumOK = web_telnum
             
             Var web_app_prepar = "true"
-            Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+            
+			; Handle penetrator
+
+			If Only18 = "true" Then
+				
+                Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+			Else
+				
+                Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+			EndIf
+
+            ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
 
         EndIf
+    Else
     EndIf
  
 </EventWebApp>
+

menu/new-layout.tsv

@@ -744,22 +744,22 @@ Name=Wednesday Melon,file=page_catalog_group_pro_wednesday_melon.skt
 		กาเลคซอน 	GALAYZON	น้ำเชื่อมเมล่อน น้ำเชื่อมกล้วย นม  และน้ำแข็ง	MELON , BANANA ,MILK		12-99-03-0016
 
 Name=coconut,file=page_catalog_group_pro_nam_hom_coconut.skt
-		มะพร้าวหาดใหญ่\n(มาก)	Hat Yai Beach\nCoconut	กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว	Espresso, Coconut Syrup,\nSugar, Water	-	12-01-02-0068	-	bn_hot_americano_Coconut_pro.png	-	12-21-02-0068	-	posi1
+		มะพร้าวหาดใหญ่\n(มาก)	Hat Yai Beach\nCoconut	กาแฟดำมะพร้าวน้ำหอม	Espresso, Coconut Syrup,\nSugar, Water	-	12-01-02-0068	-	bn_hot_americano_Coconut_pro.png	-	12-21-02-0068	-	posi1
-		มะพร้าวหาด\nบางแสน(ห้า)	Bangsaen Beach\nCoconut	น้ำเชื่อมมะพร้าว และน้ำ 	Coconut Syrup and Water	-	-	12-05-03-0092	bn_smoothie_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nบางแสน(ห้า)	Bangsaen Beach\nCoconut	มะพร้าวน้ำหอมปั่น	Coconut Syrup and Water	-	-	12-05-03-0092	bn_smoothie_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nจอมเทียน(พรรษา)	Jomtien Beach\nCoconut	น้ำเชื่อมมะพร้าว นม และน้ำ 	Coconut syrup, Milk,\nWater	-	12-03-02-0058	12-03-03-0058	bn_iced_milk_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nจอมเทียน(พรรษา)	Jomtien Beach\nCoconut	มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์	Coconut syrup, Milk,\nWater	-	12-03-02-0058	12-03-03-0058	bn_iced_milk_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nนางรำ(สวย)	Nang Ram Beach\nCoconut	น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ 	Coconut syrup, Cocoa, Milk,\nWater	-	12-03-02-0059	12-03-03-0059	bn_iced_Cocoa_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nนางรำ(สวย)	Nang Ram Beach\nCoconut	มะพร้าวโกโก้ปั่นนมนิวซีแลนด์	Coconut syrup, Cocoa, Milk,\nWater	-	12-03-02-0059	12-03-03-0059	bn_iced_Cocoa_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nทรายแก้ว(มังกร)	Glass Sand Beach\nCoconut	น้ำเชื่อมมะพร้าว มัทฉะ นมและน้ำ	Coconut Syrup, Matcha Milk \nWater	-	12-02-02-0060	12-02-03-0060	bn_match_milk_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nทรายแก้ว(มังกร)	Glass Sand Beach\nCoconut	มะพร้าวน้ำหอมมัทฉะลาเต้	Coconut Syrup, Matcha Milk \nWater	-	12-02-02-0060	12-02-03-0060	bn_match_milk_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nแม่พิมพ์(ดีด)	Mae Pim Beach\nCoconut	น้ำเชื่อมมะพร้าว มัทฉะ และน้ำ	Coconut Syrup, Matcha and Water	-	12-02-02-0061	12-02-03-0061	bn_iced_matcha_tea_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nแม่พิมพ์(ดีด)	Mae Pim Beach\nCoconut	ชาเขียวญี่ปุ่นมะพร้าวน้ำหอม	Coconut Syrup, Matcha and Water	-	12-02-02-0061	12-02-03-0061	bn_iced_matcha_tea_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nแสงจันทร์(ลงทัณฑ์)	Moonlight Beach\nCoconut	น้ำเชื่อมมะพร้าว ชาไทย  นมและน้ำ	Coconut Syrup, Thai Tea,  Milk \nWater	-	12-02-02-0062	12-02-03-0062	bn_hot_thai_milk_tea_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nแสงจันทร์(ลงทัณฑ์)	Moonlight Beach\nCoconut	มะพร้าวชาไทยนมนิวซีแลนด์	Coconut Syrup, Thai Tea,  Milk \nWater	-	12-02-02-0062	12-02-03-0062	bn_hot_thai_milk_tea_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nพัทยา(พารา)	Pattaya Beach\nCoconut	น้ำเชื่อมมะพร้าว ชาไทย และน้ำ	Coconut Syrup, Thai Tea and Water	-	12-02-02-0063	12-02-03-0063	bn_black_tea_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nพัทยา(พารา)	Pattaya Beach\nCoconut	ชาดำเย็นมะพร้าวน้ำหอม	Coconut Syrup, Thai Tea and Water	-	12-02-02-0063	12-02-03-0063	bn_black_tea_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nสวนสน(ใจไหม)	Suan Son Beach\nCoconut	น้ำเชื่อมมะพร้าว ชามะลิ  นมและน้ำ	Coconut Syrup, Jasmine Tea,  Milk \nWater	-	12-02-02-0064	12-02-03-0064	bn_jasmine_milk_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nสวนสน(ใจไหม)	Suan Son Beach\nCoconut	มะพร้าวชามะลินมนิวซีแลนด์	Coconut Syrup, Jasmine Tea,  Milk \nWater	-	12-02-02-0064	12-02-03-0064	bn_jasmine_milk_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nแหลมสิง(หไกรภพ)	Laem Sing Beach\nCoconut	น้ำเชื่อมมะพร้าว ชามะลิ และน้ำ	Coconut Syrup, Jasmine Tea and Water	-	12-02-02-0065	12-02-03-0065	bn_jasmine_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nแหลมสิง(หไกรภพ)	Laem Sing Beach\nCoconut	ชามะลิมะพร้าวน้ำหอม	Coconut Syrup, Jasmine Tea and Water	-	12-02-02-0065	12-02-03-0065	bn_jasmine_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nเติมรัก(ฉันทำไม)	Toem Rak Beach\nCoconut	น้ำเชื่อมมะพร้าว และโซดา	Coconut Syrup and Soda	-	12-05-02-0090	-	bn_iced_Coconut_soda_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nเติมรัก(ฉันทำไม)	Toem Rak Beach\nCoconut	มะพร้าวน้ำหอมโซดา	Coconut Syrup and Soda	-	12-05-02-0090	-	bn_iced_Coconut_soda_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nยาว(ไปยาวไป)	Long Beach Coconut	น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา	Coconut Syrup, Pepsi and Soda	-	12-05-02-0091	12-05-03-0091	bn_iced_pepsi_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nยาว(ไปยาวไป)	Long Beach Coconut	มะพร้าวน้ำหอมเป๊ปซี่	Coconut Syrup, Pepsi and Soda	-	12-05-02-0091	12-05-03-0091	bn_iced_pepsi_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด\nยาว(ไปยาวไป)	Long Beach Coconut	น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา	Coconut Syrup, Pepsi and Soda		12-05-02-0114	12-05-03-0114	bn_iced_pepsi_coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด\nยาว(ไปยาวไป)	Long Beach Coconut	มะพร้าวน้ำหอมเป๊ปซี่	Coconut Syrup, Pepsi and Soda		12-05-02-0114	12-05-03-0114	bn_iced_pepsi_coconut_pro.png	-	-	-	posi1
-		มะพร้าวหาด(ใกล้ฉัน)	Hat Beach Coconut	น้ำเชื่อมมะพร้าว ลิ้นจี่ โซดา	Coconut Syrup, Lychee Syrup and Soda	-	12-05-02-0093	-	bn_iced_Lychee_Coconut_pro.png	-	-	-	posi1
+		มะพร้าวหาด(ใกล้ฉัน)	Hat Beach Coconut	มะพร้าวน้ำหอมลิ้นจี่โซดา	Coconut Syrup, Lychee Syrup and Soda	-	12-05-02-0093	-	bn_iced_Lychee_Coconut_pro.png	-	-	-	posi1
-		หาดนี้มีกล้วยช็อก	Banana Choc Beach	โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล	Tokyo Banana Syrup, Milk, Sugar	-	12-03-02-0024	12-03-03-0024	bn_ChocoBanana_milk_pro.png	-	-	-	posi1
+		หาดนี้มีกล้วยช็อก	Banana Choc Beach	นมช็อกโกโตเกียว\nบานาน่า	Tokyo Banana Syrup, Milk, Sugar	-	12-03-02-0024	12-03-03-0024	bn_ChocoBanana_milk_pro.png	-	-	-	posi1
-		ภูเขาโอริโอ้ระเบิดหา\nกล้วยมอด	Oreo Bomb Banana-Beach	น้ำเชื่อมกล้วย นม น้ำตาล Oreo	Banana Syrup, Milk,\nSugar, Oreo	-	-	12-03-03-0029	bn_BananaOreo_smoothie_pro.png	-	-	-	posi1
+		ภูเขาโอริโอ้ระเบิดหา\nกล้วยมอด	Oreo Bomb Banana-Beach	นมกล้วยปั่น\nโอริโอ้ภูเขาไฟ	Banana Syrup, Milk,\nSugar, Oreo	-	-	12-03-03-0029	bn_BananaOreo_smoothie_pro.png	-	-	-	posi1
 
 
 Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt

menu/page_catalog_group_other_other.skt

@@ -0,0 +1,49 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<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
+    ?>
+    
+    ; soda and other
+    Var Menu62Selected = "PressForever"
+
+    SAVELOG PreviseXMLFileName2
+
+    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>

menu/page_catalog_group_pepsi_7up.skt

@@ -0,0 +1,48 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<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
+    ?>
+    
+    ; pepsi 7up
+    Var Menu61Selected  = "PressForever"
+    SAVELOG PreviseXMLFileName2
+
+    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>

video/sync_1.file

@@ -1,20 +1,3 @@
-total 128136
+-rw-rw---- 1 root sdcard_rw 10109243 2024-04-05 15:35 main_page_event_pro1.mp4
--rw-rw---- 1 root sdcard_rw  9526548 2023-09-18 18:44 brewing_adv3.mp4
+-rw-rw---- 1 root sdcard_rw 10341034 2024-04-30 10:11 main_page_event_pro2.mp4
--rw-rw---- 1 root sdcard_rw 15576511 2024-05-23 14:42 brewing_adv4.mp4
+-rw-rw---- 1 root sdcard_rw 10602981 2024-05-03 09:26 main_page_event_pro3.mp4
--rw-rw---- 1 root sdcard_rw    23569 2023-09-18 18:44 brewing_txt_adv1.png
--rw-rw---- 1 root sdcard_rw    28097 2023-09-18 18:44 brewing_txt_adv1_en.png
--rw-rw---- 1 root sdcard_rw    30982 2023-09-18 18:44 brewing_txt_adv3.png
--rw-rw---- 1 root sdcard_rw    35550 2023-09-18 18:44 brewing_txt_adv3_en.png
--rw-rw---- 1 root sdcard_rw    43362 2024-05-28 11:04 brewing_txt_adv4.png
--rw-rw---- 1 root sdcard_rw    42997 2024-05-28 11:04 brewing_txt_adv4_en.png
--rw-rw---- 1 root sdcard_rw  2424594 2024-05-24 16:01 main_page_event_pro3.mp4
--rw-rw---- 1 root sdcard_rw      507 2024-03-22 12:45 script1.ev
--rw-rw---- 1 root sdcard_rw      307 2024-03-18 16:03 script2.ev
--rw-rw---- 1 root sdcard_rw      546 2024-05-28 11:14 script3_brew.ev
--rw-rw---- 1 root sdcard_rw        0 2021-03-18 15:09 sync_1.file
--rw-rw---- 1 root sdcard_rw  4806758 2023-09-18 18:44 taobin_save_world1.mp4
--rw-rw---- 1 root sdcard_rw  6428830 2023-09-18 18:44 taobin_save_world2.mp4
--rw-rw---- 1 root sdcard_rw  4634942 2023-09-18 18:44 taobin_save_world3.mp4
--rw-rw---- 1 root sdcard_rw  2084830 2023-09-18 18:44 taobin_thank1.mp4
--rw-rw---- 1 root sdcard_rw  6749397 2023-12-21 13:15 taobin_thank1_event.mp4
--rw-rw---- 1 root sdcard_rw  1631940 2023-09-18 18:44 taobin_thank2.mp4

xml/event/promotion_energy_drink_1_bath.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -499,6 +504,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
@@ -13052,91 +13084,6 @@ LIMENADE SODA" </Value>
 
 
 
-<Button>
-    <X> 42 </X>
-    <Y> 518 </Y>
-
-<State> BigButtonEnable </State>
-    <Filename>
-     eval( 
-        If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
-        Else
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
-        EndIf
-        )
-     </Filename>
-    <FilenamePress> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
-        Else
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
-        EndIf
-        )
-     </FilenamePress>
-    <FilenameDisable> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
-        Else
-            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
-        EndIf
-        )
-     </FilenameDisable>
-<EventOnClick> 
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
-        
-</EventOnClick>
-
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_th.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
-</Video>
-
-</Button>
-
-<EventUnitTest1>
-    Var BigButtonEnable = "Enable"  
-    Refresh
-</EventUnitTest1>
-<EventUnitTest2>
-    Var BigButtonEnable = "Invisible"
-    Refresh
-</EventUnitTest2>
-
 
 <Button>
 <X> 780 </X>

xml/menu_catalog_default_init.xml

@@ -101,6 +101,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 

xml/menu_catalog_new.xml

@@ -342,6 +342,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/menutab/page_catalog_group_pro_nam_hom_coconut.xml

@@ -585,7 +585,7 @@
 	<EventOnClick> 
 		Var NameDrink = "Hat Yai Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาดใหญ่ (มาก)"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว"
+		Var DrinkDescriptionTH = "กาแฟดำมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Espresso, Coconut Syrup, Sugar, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -670,7 +670,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" </Value>
+	<Value> "กาแฟดำมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -839,7 +839,7 @@ Sugar, Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Hat Yai Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาดใหญ่ (มาก)"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว"
+		Var DrinkDescriptionTH = "กาแฟดำมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Espresso, Coconut Syrup, Sugar, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -924,7 +924,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" </Value>
+	<Value> "กาแฟดำมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1094,7 +1094,7 @@ Sugar, Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Bangsaen Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด บางแสน(ห้า)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น"
 		Var DrinkDescription = "Coconut Syrup and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1179,7 +1179,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว และน้ำ " </Value>
+	<Value> "มะพร้าวน้ำหอมปั่น" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1349,7 +1349,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Jomtien Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด จอมเทียน(พรรษา)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut syrup, Milk, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1434,7 +1434,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว นม และน้ำ " </Value>
+	<Value> "มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1605,7 +1605,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Nang Ram Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด นางรำ(สวย)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวโกโก้ปั่นนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut syrup, Cocoa, Milk, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cocoa_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1690,7 +1690,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ " </Value>
+	<Value> "มะพร้าวโกโก้ปั่นนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1861,7 +1861,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Glass Sand Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ทรายแก้ว(มังกร)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว มัทฉะ นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมมัทฉะลาเต้"
 		Var DrinkDescription = "Coconut Syrup, Matcha Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_match_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1946,7 +1946,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว มัทฉะ นมและน้ำ" </Value>
+	<Value> "มะพร้าวน้ำหอมมัทฉะลาเต้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2117,7 +2117,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Mae Pim Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แม่พิมพ์(ดีด)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว มัทฉะ และน้ำ"
+		Var DrinkDescriptionTH = "ชาเขียวญี่ปุ่นมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Matcha and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_matcha_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2202,7 +2202,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว มัทฉะ และน้ำ" </Value>
+	<Value> "ชาเขียวญี่ปุ่นมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2372,7 +2372,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Moonlight Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แสงจันทร์(ลงทัณฑ์)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชาไทย  นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวชาไทยนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut Syrup, Thai Tea,  Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2457,7 +2457,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชาไทย  นมและน้ำ" </Value>
+	<Value> "มะพร้าวชาไทยนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2628,7 +2628,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Pattaya Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด พัทยา(พารา)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชาไทย และน้ำ"
+		Var DrinkDescriptionTH = "ชาดำเย็นมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Thai Tea and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_black_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2713,7 +2713,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชาไทย และน้ำ" </Value>
+	<Value> "ชาดำเย็นมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2883,7 +2883,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Suan Son Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด สวนสน(ใจไหม)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชามะลิ  นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวชามะลินมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut Syrup, Jasmine Tea,  Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2968,7 +2968,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชามะลิ  นมและน้ำ" </Value>
+	<Value> "มะพร้าวชามะลินมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3139,7 +3139,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Laem Sing Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แหลมสิง(หไกรภพ)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชามะลิ และน้ำ"
+		Var DrinkDescriptionTH = "ชามะลิมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Jasmine Tea and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3224,7 +3224,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชามะลิ และน้ำ" </Value>
+	<Value> "ชามะลิมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3394,7 +3394,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Toem Rak Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด เติมรัก(ฉันทำไม)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมโซดา"
 		Var DrinkDescription = "Coconut Syrup and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Coconut_soda_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3479,7 +3479,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3649,7 +3649,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Long Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ยาว(ไปยาวไป)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมเป๊ปซี่"
 		Var DrinkDescription = "Coconut Syrup, Pepsi and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3734,7 +3734,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมเป๊ปซี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3903,7 +3903,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Long Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ยาว(ไปยาวไป)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมเป๊ปซี่"
 		Var DrinkDescription = "Coconut Syrup, Pepsi and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3988,7 +3988,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมเป๊ปซี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4157,7 +4157,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Hat Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด(ใกล้ฉัน)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ลิ้นจี่ โซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมลิ้นจี่โซดา"
 		Var DrinkDescription = "Coconut Syrup, Lychee Syrup and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4241,7 +4241,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ลิ้นจี่ โซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมลิ้นจี่โซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4410,7 +4410,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Banana Choc Beach"
 		Var NameDrinkTH = "หาดนี้มีกล้วยช็อก"
-		Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
+		Var DrinkDescriptionTH = "นมช็อกโกโตเกียว บานาน่า"
 		Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4494,7 +4494,8 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" </Value>
+	<Value> "นมช็อกโกโตเกียว
+บานาน่า" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4663,7 +4664,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Oreo Bomb Banana-Beach"
 		Var NameDrinkTH = "ภูเขาโอริโอ้ระเบิดหา กล้วยมอด"
-		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescriptionTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ"
 		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4748,7 +4749,8 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </Value>
+	<Value> "นมกล้วยปั่น
+โอริโอ้ภูเขาไฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_board.xml

@@ -1183,7 +1183,7 @@
 </EventUnitTest4>
 
 <EventDrink>
-	SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink EventDrink "
+	SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
 </EventDrink>
 
 <Timeout> 1000 </Timeout>

xml/page_catalog.xml

@@ -12,13 +12,13 @@
 
 	If SpiralOnline = "true" Then
 		If Seeker = "next" Then
-			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog3.xml"
 		Else
 			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
 		EndIf
 	Else
 
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog3.xml"
 		
 	EndIf
 	

xml/page_catalog3.xml

@@ -0,0 +1,729 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	
+	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+	
+	; page_catalog3 split menu group _other.skt to _pepsi_7up.skt and _other_other.skt
+
+	TopView "show"
+	; On open
+
+	Var IgnoreCollectPointByMe = 0
+
+	Var ChildrenFree = 0
+	Var NightTime = 0
+
+	Machine WakeUp
+
+	DEBUGVAR ToppingNewShow
+
+	Var NextPage = "-"
+
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
+	WEB "DISABLE"
+
+	Var web_readyOK = "false"
+	Var web_telnumOK = ""
+
+	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
+	
+	If CocktailShow = "true" Then 
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	EndIf
+	
+	If TermTemOnline = "true" Then
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
+	EndIf
+	 	
+	If Seeker = "curr" Then 	
+		Machine DoorLidClose
+	EndIf
+
+	Var GetPayInfoFlag = 0
+	Var countDownRetrun = 30
+
+	CoinVending OFF
+
+
+	Var text_price_6 = ""
+	
+	; zone sound
+	
+	; Clear value
+	Topping "clear" "-"
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_en"
+
+		Var text_unavailable = "UNAVAILABLE###size=16"
+	
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+		
+		; Play Sound #zone
+		If SoundBackToSchoolEnable = 1 Then
+			
+			If SoundBackToSchoolType = 1 Then 
+				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
+			EndIf
+			If SoundBackToSchoolType = 2 Then 
+				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
+			EndIf
+			Var PlaySoundLag = RootPathSoundBackToSchool + "taobin_sawade.wav"
+		EndIf
+
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_th"
+
+		Var text_unavailable = "หมด###size=32"
+	EndIf
+
+
+	Var StrawAutoRelease1 = "false"
+	Var StrawAutoRelease2 = "false"
+
+
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in catalog2.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
+	
+	EndIf
+
+
+	If SELLONLINE = 1 Then
+		Var ShowButtonClick2 = "Enable"
+	Else
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+	If SELLONLINE = 1 Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+
+		;GenHashWithTimeStamp QRCODE99x
+		WEB "ENABLE"
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+
+		Var QRCODE99 = ""
+		WEB "DISABLE"
+
+	EndIf
+
+	; 1035 is Coke.
+	STRCONTAIN "1035" MaterialAvailable CokeUI 
+
+	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+
+
+	Var countClick = 0
+
+
+	DEBUGVAR CART_COUNT
+
+
+	Var QRCODE99_Y = 1718
+
+    Var showCart = "Invisible"
+    If MultiPayEnable = "true" Then 
+	    
+	    If CART_COUNT = 1 Then
+	        Var showCart = "Enable"
+	  		Var cart_image_bn = DirImageCart + "/bn_cart1.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart1.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+	    
+	    If CART_COUNT = 2 Then
+	        Var showCart = "Enable"
+	    	Var cart_image_bn = DirImageCart + "/bn_cart2.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart2.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+
+    
+
+	    If CART_COUNT = 3 Then
+	    		Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+	    EndIf
+
+    EndIf
+
+	If Seeker = "next" Then
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+
+	If XMLProfile = "taobin_notopup" Then
+		Var ButtontoTopupMenu = "Invisible"
+	
+	EndIf
+
+	
+	Var menu_name_eng_hot = ""
+	Var menu_desc_eng_hot = ""
+	Var menu_name_thai_hot = ""
+	Var menu_desc_thai_hot = ""
+
+	Var menu_name_eng_cold = ""
+	Var menu_desc_eng_cold = ""
+	Var menu_name_thai_cold = ""
+	Var menu_desc_thai_cold = ""
+
+
+	Var menu_name_eng_blender = ""
+	Var menu_desc_eng_blender = ""
+	Var menu_name_thai_blender = ""
+	Var menu_desc_thai_blender = ""
+
+
+	
+	
+	If BoxID = 0 Then 
+		RebootWithCause "BoxID was zero"
+	EndIf
+	
+
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+
+	; zone cup on arm
+	If CupOnArm = "true" Then
+
+		If CheckCupStateDoorCupClose = "" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+		If CheckCupStateDoorCupClose = "done" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+	Else
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		EndIf
+	EndIf
+
+	If CounterEnable = 1 Then
+		If OnTaobinVending = 1 Then
+			Open "ROOT/taobin_project/xml/counter/taobinvd/page_wait_order.xml"
+		EndIf
+	EndIf
+
+	If EnableMultiInstance = "true" Then
+		Open "ROOT/taobin_project/xml/menutab/page_catalog.xml"
+	EndIf
+
+	Var Price5Active = 0
+</EventOpen>
+<EventLanguageChange>
+	; 
+	DEBUGVAR LangEng
+	If LangEng = "true" Then
+
+	EndIf
+
+	DEBUGVAR LangThai
+	If LangThai = "true" Then
+
+	EndIf
+
+</EventLanguageChange>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
+
+	If countDownRetrun = 0 Then
+
+
+		If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+	EndIf
+
+	; zone cup on arm
+    If CupOnArm = "true" Then
+
+		If CheckCupStateDoorCupClose = "" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+		If CheckCupStateDoorCupClose = "done" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+	Else
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		EndIf
+	EndIf
+
+
+
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventChangeStatus>
+	;If ChangeStatus = "payout-end" Then 
+	;	Var ChangeOK = 1
+	;EndIf
+</EventChangeStatus>
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99 Then
+			Cart "DeleteMenuID" "ALL"
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+		
+
+		
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+		EndIf
+		
+	Else
+	EndIf
+ 
+</EventWebApp>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	If  Seeker = "next" Then 
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+
+		
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 990 </X>
+<Y> 438 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	If show_eng = "true" Then 
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+	Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+
+
+
+<Image>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(DirImage + "/text1.png")  </Filename>
+</Image>
+
+
+
+; menu row 1
+<Button>
+<X> 220 </X>
+<Y> 844 </Y>
+<Filename> Var(DirImage + "/bn_diy.png")   </Filename>
+<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+
+
+		; zone promote
+        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+        
+</EventClick>
+</Button>
+
+<Button>
+<X> 564 </X>
+<Y> 844 </Y>
+<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+
+</EventClick>
+</Button>
+
+; menu row 2
+<Button>
+<X> 47 </X>
+<Y> 1188 </Y>
+<Filename> Var(DirImage + "/bn_tea.png") </Filename>
+<FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 391 </X>
+<Y> 1188 </Y>
+<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 748 </X>
+<Y> 1188 </Y>
+<Filename> bnSodaAndOther </Filename>
+<FilenamePress> bpSodaAndOther </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+
+</EventClick>
+</Button>
+
+;=============================================================================
+
+<Button>
+<X> 48 </X>
+<Y> 1532 </Y>
+<Filename> Var(DirImage + "/bn_Pepsi_7up.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_Pepsi_7up.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 392 </X>
+<Y> 1532 </Y>
+<State>WheyButtonState</State>
+<Filename> Var(DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 392 </X>
+<Y> 1532 </Y>
+<State>MenuKidButtonState</State>
+<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
+<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 392 </X>
+<Y> 1532 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+
+</EventClick>
+</Button>
+;=============================================================================
+
+<Button>
+<X> 736 </X>
+<Y> 1532 </Y>
+<State> "Enable" </State>
+<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+	Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 225 </X>
+<Y> 424 </Y>
+<State> ShowButtonClick2 </State>
+<Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Open "ROOT/taobin_project/xml/page_check_member.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 696 </X>
+<Y> 424 </Y>
+<State> ButtontoTopupMenu </State>
+<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Var PayDetail=""
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+
+		;Var TestLoopMakeDrink = 1
+
+	EndIf
+	DEBUGVAR countClick
+
+	If countClick = 5 Then
+		If ToppingNewEnable = "false" Then
+			Var ToppingNewEnable = "true"
+		Else
+			Var ToppingNewEnable = "false"
+		EndIf
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+	EndIf
+
+	Refresh
+</EventClick>
+</Button>
+
+;<QRCode>
+;<X> 895 </X>
+;<Y> QRCODE99_Y</Y>
+;<Width> 178 </Width>
+;<Height> 178 </Height>
+;<State> "Enable" </State>
+;<Service> testservice </Service>
+;</QRCode>
+
+
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+	Machine DoorLidOpen
+
+	Var CheckCupStateDoorCupClose = "reset"
+	Var buttonRemoveCup = "Invisible"
+
+</EventClick>
+</Button>
+
+
+
+
+; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<Filename> cart_image_bp  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<Interval> 400</Interval>
+<EventClick> 
+
+		
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+		
+	
+</EventClick>
+</Button>
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99x Then
+
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+			
+			Var web_app_prepar = "true"
+
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+		EndIf
+	Else
+	EndIf
+ 
+</EventWebApp>
+<EventUnitTest1>
+	SAVELOG "MENU TAB ENTRY"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
+</EventUnitTest1>
+<EventUnitTest2>
+
+</EventUnitTest2>
+
+<EventUnitTest3>
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_soft_serve.xml"
+</EventUnitTest3>
+<EventUnitTest4>
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
+</EventUnitTest4>
+
+
+</Popup>

xml/page_catalog_group_appfast.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -490,6 +495,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_cocktail.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -482,6 +487,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_coffee.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -482,6 +487,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_forkid.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -491,6 +496,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_health.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -482,6 +487,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_milk.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -480,6 +485,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_oreo.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_other.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -481,6 +486,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_other_other.skt

@@ -16,7 +16,7 @@
     ?>
     
     ; soda and other
-    Var Menu6Selected = "PressForever"
+    Var Menu62Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
 

xml/page_catalog_group_other_other.xml

@@ -111,13 +111,18 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
 
     
     ; soda and other
-    Var Menu6Selected = "PressForever"
+    Var Menu62Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
 
@@ -481,6 +486,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pepsi_7up.skt

@@ -15,9 +15,8 @@
         #include=menu_catalog_default_init.py
     ?>
     
-    ; soda and other
+    ; pepsi 7up
-    Var Menu6Selected = "PressForever"
+    Var Menu61Selected  = "PressForever"
-
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0

xml/page_catalog_group_pepsi_7up.xml

@@ -111,14 +111,18 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
 
     
-    ; soda and other
+    ; pepsi 7up
-    Var Menu6Selected = "PressForever"
+    Var Menu61Selected  = "PressForever"
-
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
@@ -481,6 +485,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pepsi_pro.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_15THB.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -500,6 +505,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_bad_valentine.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_buble_tea.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -477,6 +482,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_freefile.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_lipit.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_melon.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -476,6 +481,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_monday_banana.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_mymint.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_nam_hom_coconut.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -477,6 +482,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
@@ -556,7 +588,7 @@
 	<EventOnClick> 
 		Var NameDrink = "Hat Yai Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาดใหญ่ (มาก)"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว"
+		Var DrinkDescriptionTH = "กาแฟดำมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Espresso, Coconut Syrup, Sugar, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -640,7 +672,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" </Value>
+	<Value> "กาแฟดำมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -809,7 +841,7 @@ Sugar, Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Hat Yai Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาดใหญ่ (มาก)"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว"
+		Var DrinkDescriptionTH = "กาแฟดำมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Espresso, Coconut Syrup, Sugar, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -893,7 +925,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว" </Value>
+	<Value> "กาแฟดำมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1063,7 +1095,7 @@ Sugar, Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Bangsaen Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด บางแสน(ห้า)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น"
 		Var DrinkDescription = "Coconut Syrup and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1147,7 +1179,7 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว และน้ำ " </Value>
+	<Value> "มะพร้าวน้ำหอมปั่น" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1317,7 +1349,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Jomtien Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด จอมเทียน(พรรษา)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut syrup, Milk, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1401,7 +1433,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว นม และน้ำ " </Value>
+	<Value> "มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1572,7 +1604,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Nang Ram Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด นางรำ(สวย)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ "
+		Var DrinkDescriptionTH = "มะพร้าวโกโก้ปั่นนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut syrup, Cocoa, Milk, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cocoa_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1656,7 +1688,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ " </Value>
+	<Value> "มะพร้าวโกโก้ปั่นนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1827,7 +1859,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Glass Sand Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ทรายแก้ว(มังกร)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว มัทฉะ นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมมัทฉะลาเต้"
 		Var DrinkDescription = "Coconut Syrup, Matcha Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_match_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1911,7 +1943,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว มัทฉะ นมและน้ำ" </Value>
+	<Value> "มะพร้าวน้ำหอมมัทฉะลาเต้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2082,7 +2114,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Mae Pim Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แม่พิมพ์(ดีด)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว มัทฉะ และน้ำ"
+		Var DrinkDescriptionTH = "ชาเขียวญี่ปุ่นมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Matcha and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_matcha_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2166,7 +2198,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว มัทฉะ และน้ำ" </Value>
+	<Value> "ชาเขียวญี่ปุ่นมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2336,7 +2368,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Moonlight Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แสงจันทร์(ลงทัณฑ์)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชาไทย  นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวชาไทยนมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut Syrup, Thai Tea,  Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2420,7 +2452,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชาไทย  นมและน้ำ" </Value>
+	<Value> "มะพร้าวชาไทยนมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2591,7 +2623,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Pattaya Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด พัทยา(พารา)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชาไทย และน้ำ"
+		Var DrinkDescriptionTH = "ชาดำเย็นมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Thai Tea and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_black_tea_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2675,7 +2707,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชาไทย และน้ำ" </Value>
+	<Value> "ชาดำเย็นมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2845,7 +2877,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Suan Son Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด สวนสน(ใจไหม)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชามะลิ  นมและน้ำ"
+		Var DrinkDescriptionTH = "มะพร้าวชามะลินมนิวซีแลนด์"
 		Var DrinkDescription = "Coconut Syrup, Jasmine Tea,  Milk  Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2929,7 +2961,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชามะลิ  นมและน้ำ" </Value>
+	<Value> "มะพร้าวชามะลินมนิวซีแลนด์" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3100,7 +3132,7 @@ Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Laem Sing Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด แหลมสิง(หไกรภพ)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ชามะลิ และน้ำ"
+		Var DrinkDescriptionTH = "ชามะลิมะพร้าวน้ำหอม"
 		Var DrinkDescription = "Coconut Syrup, Jasmine Tea and Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3184,7 +3216,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ชามะลิ และน้ำ" </Value>
+	<Value> "ชามะลิมะพร้าวน้ำหอม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3354,7 +3386,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Toem Rak Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด เติมรัก(ฉันทำไม)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมโซดา"
 		Var DrinkDescription = "Coconut Syrup and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Coconut_soda_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3438,7 +3470,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3608,7 +3640,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Long Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ยาว(ไปยาวไป)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมเป๊ปซี่"
 		Var DrinkDescription = "Coconut Syrup, Pepsi and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3692,7 +3724,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมเป๊ปซี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3861,7 +3893,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Long Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด ยาว(ไปยาวไป)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมเป๊ปซี่"
 		Var DrinkDescription = "Coconut Syrup, Pepsi and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3945,7 +3977,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว เป๊ปซี่ และโซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมเป๊ปซี่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4114,7 +4146,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Hat Beach Coconut"
 		Var NameDrinkTH = "มะพร้าวหาด(ใกล้ฉัน)"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว ลิ้นจี่ โซดา"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมลิ้นจี่โซดา"
 		Var DrinkDescription = "Coconut Syrup, Lychee Syrup and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_Coconut_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4197,7 +4229,7 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว ลิ้นจี่ โซดา" </Value>
+	<Value> "มะพร้าวน้ำหอมลิ้นจี่โซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4366,7 +4398,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Banana Choc Beach"
 		Var NameDrinkTH = "หาดนี้มีกล้วยช็อก"
-		Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล"
+		Var DrinkDescriptionTH = "นมช็อกโกโตเกียว บานาน่า"
 		Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4449,7 +4481,8 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" </Value>
+	<Value> "นมช็อกโกโตเกียว
+บานาน่า" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4618,7 +4651,7 @@ Coconut" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Oreo Bomb Banana-Beach"
 		Var NameDrinkTH = "ภูเขาโอริโอ้ระเบิดหา กล้วยมอด"
-		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescriptionTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ"
 		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_pro.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4702,7 +4735,8 @@ Coconut" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </Value>
+	<Value> "นมกล้วยปั่น
+โอริโอ้ภูเขาไฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_pro_peach.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_pepsi_second_cup_30.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_pepween.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -507,6 +512,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_rerun.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -480,6 +485,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_tea_time.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_pro_wednesday_melon.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -479,6 +484,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_recommend.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -499,6 +504,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_soft_serve.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_songkran.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_tea.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -482,6 +487,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_group_whey.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -487,6 +492,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_catalog_momday.xml

@@ -111,6 +111,11 @@
         Else
             Var Menu22Selected = "Invisible"
         EndIf
+
+        Var Menu6Selected  = "Invisible"
+        Var Menu61Selected  = "Enable"
+        Var Menu62Selected  = "Enable"
+        
         ;
         
 
@@ -478,6 +483,33 @@
         </EventClick>
         </Button>
 
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>

xml/page_payment.xml

@@ -475,6 +475,11 @@
 		;include="ROOT/taobin_project/inc/return_condition.ev"
 	EndIf
 
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_payment.xml"
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
 	If Seeker = "curr" Then
 		If web_ready = "false" Then
 			If Delay = 0 Then

xml/page_remove_cup.xml

@@ -25,7 +25,7 @@
 	EndIf
 
 	If StrCountryShort = "SGP" Then
-		Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"
+		;Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"
 	EndIf
 
 
@@ -47,6 +47,7 @@
 	Var TimeoutInstance0 = 0
 	Var CheckCupStateDoorCupClose = "-"
 	Var CheckCupStateDoorCupCloseCnt = 0
+	Var CoundUpDelayCertainStage = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -55,12 +56,12 @@
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
 
-	DEBUGVAR HaveCup
+	;DEBUGVAR HaveCup
-	DEBUGVAR CupOnArm
+	;DEBUGVAR CupOnArm
-	DEBUGVAR DoorCupPosition
+	;DEBUGVAR DoorCupPosition
-	DEBUGVAR CupChecking
+	;DEBUGVAR CupChecking
-	DEBUGVAR CupArmMove
+	;DEBUGVAR CupArmMove
-	DEBUGVAR buttonRemoveCup
+	;DEBUGVAR buttonRemoveCup
 
 	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
 	If HaveCup = "false" Then
@@ -130,6 +131,7 @@
 
 	Else
 		Var buttonRemoveCup = "Invisible"
+		Var CoundUpDelayCertainStage = 0
 	EndIf
 	
 	If CupArmMove = "true" Then
@@ -144,7 +146,10 @@
 			If HaveCup = "true" Then
 				If DoorCupPosition = "bottom" Then
 					If buttonRemoveCup = "Invisible" Then
-						Var buttonRemoveCup = "Enable"
+						Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
+						If CoundUpDelayCertainStage > 2 Then
+							Var buttonRemoveCup = "Enable"
+						EndIf
 					EndIf
 				EndIf
 			EndIf

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.54"
+	Var XMLPageVersion = "8.55"
-	Var XMLPageVersionInt = 854
+	Var XMLPageVersionInt = 855
 ;Oreo
 Var OreoGuarantee = 0