update Wednesday melon promotion & extend Monday banana pro

xml/event/multi_promotion_config_melon_coffee.json

@@ -12,6 +12,19 @@
             "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_coffee_drink_1_bath.xml"
         }
     },
+    {
+        "name": "monday_banana",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        }
+    },
     {
         "name": "wednesday_melon",
         "template": "/event/promotion_video_template.inc",

xml/event/multi_promotion_config_melon_energy.json

@@ -12,6 +12,19 @@
             "event_on_click": "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
         }
     },
+    {
+        "name": "monday_banana",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        }
+    },
     {
         "name": "wednesday_melon",
         "template": "/event/promotion_video_template.inc",

xml/event/promotion_monday_banana.xml

@@ -12582,7 +12582,7 @@ LIMENADE SODA" </Value>
      </FilenameDisable>
 <EventOnClick> 
 
-               Open "ROOT/taobin_project/xml/event/page_catalog_group_pro_monday_banana.xml"
+               Open "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
 
         
 </EventOnClick>

xml/event/script_common_for_open_promotion_xml.ev

@@ -61,27 +61,47 @@ Else
 		If EnergyDrink1BathPro = 1 Then
 			Var PromotionState1 = "Enable"
 			Var CountEnablePromotion = CountEnablePromotion + 1
-		
+
-			If WednesdayMelonPro = 1 Then
+			If MondayBananaPro = 1 Then
 				Var PromotionState2 = "Enable"
 				Var CountEnablePromotion = CountEnablePromotion + 1
-				Var FileRecommendToOpen =  "ROOT/taobin_project/xml/event/double_promotion_energy_drink_1_bath_and_wednesday_melon.xml"
+			EndIf
+		
+			If WednesdayMelonPro = 1 Then
+				Var PromotionState3 = "Enable"
+				Var CountEnablePromotion = CountEnablePromotion + 1
+			EndIf
+
+			If CountEnablePromotion > 1 Then
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_energy_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
 			Else
-				Var FileRecommendToOpen =  "ROOT/taobin_project/xml/event/promotion_energy_drink_1_bath.xml"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_energy_drink_1_bath.xml"
 			EndIf
 		Else
 			If CoffeeDrink1BathPro = 1 Then
 				Var PromotionState1 = "Enable"
 				Var CountEnablePromotion = CountEnablePromotion + 1
 
-				If WednesdayMelonPro = 1 Then
+				If MondayBananaPro = 1 Then
 					Var PromotionState2 = "Enable"
 					Var CountEnablePromotion = CountEnablePromotion + 1
-					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_coffee_drink_1_bath_and_wednesday_melon.xml"
+				EndIf
+
+				If WednesdayMelonPro = 1 Then
+					Var PromotionState3 = "Enable"
+					Var CountEnablePromotion = CountEnablePromotion + 1
+				EndIf
+
+				If CountEnablePromotion > 1 Then
+					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_coffee_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
 				Else
 					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coffee_drink_1_bath.xml"
 				EndIf
 			Else
+				If MondayBananaPro = 1 Then
+					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_monday_banana.xml"
+				EndIf
+				
 				If WednesdayMelonPro = 1 Then
 					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_wednesday_melon.xml"
 				EndIf

xml/event/tricker.ev

@@ -269,6 +269,17 @@ If SystemDateMonthInt = 5 Then
 		Var WednesdayMelonPro = 1
 	EndIf
 
+	If SystemDateDayInt = 13 Then
+		Var MondayBananaPro = 1
+	EndIf
+
+	If SystemDateDayInt = 20 Then
+		Var MondayBananaPro = 1
+	EndIf
+
+	If SystemDateDayInt = 27 Then
+		Var MondayBananaPro = 1
+	EndIf
 EndIf
 
 If SystemDateMonthInt = 6 Then

xml/event/triple_promotion_coffee_drink_1_bath_and_monday_banana_and_wednesday_melon.xml

@@ -616,6 +616,53 @@
 
 <Button>
 
+<State> BigButtonEnable </State>
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+       Open "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        
+</EventOnClick>
+
+</Button>
+</Block>
+;endblock2
+;block3
+<Block>
+	<State> PromotionState3 </State>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 484 </Width>
+	<Height> 602 </Height>
+
+<Button>
+
 <State> BigButtonEnable </State>
     <Filename>
      eval( 
@@ -685,21 +732,39 @@
 
 </Button>
 </Block>
-;endblock2
+;endblock3
-;block3
+;block4-expand
 	<Block>
 		<State> "Enable" </State> 
 		<Width> 1032 </Width>
 		<Height> 636 </Height>
 		<FrameScroll>
-			<Max> 8 </Max>
+			<Max>
+eval(
+	If CountEnablePromotion > 2 Then
+		Var max_count = 4
+	Else
+		Var max_count = 8
+	EndIf
+	Var return = max_count
+)
+</Max>
 			<X> 0 </X>
 			<Y> 0 </Y>
 			<Width> 1032 </Width>
 			<Height> 636 </Height>
 			<ScrollHeight> "auto" </ScrollHeight>
 			<Scroll> "Vertical" </Scroll>
-			<Column> 4 </Column>
+			<Column>
+eval(
+	If CountEnablePromotion > 2 Then
+		Var column_count = 2
+	Else
+		Var column_count = 4
+	EndIf
+	Var return = column_count
+)
+</Column>
 			<Script>
 				Var block_index_override = 0
 				Var block_index_move = 0
@@ -12162,8 +12227,7 @@ Water" </Value>
 	; - - - 
 		</FrameScroll>
 		</Block>
-;endblock3
+;endblock4-expand
-;block4;endblock4
 </FrameScroll>
 ; Cart
 <Button>

xml/event/triple_promotion_energy_drink_1_bath_and_monday_banana_and_wednesday_melon.xml

@@ -616,6 +616,53 @@
 
 <Button>
 
+<State> BigButtonEnable </State>
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+       Open "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        
+</EventOnClick>
+
+</Button>
+</Block>
+;endblock2
+;block3
+<Block>
+	<State> PromotionState3 </State>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 484 </Width>
+	<Height> 602 </Height>
+
+<Button>
+
 <State> BigButtonEnable </State>
     <Filename>
      eval( 
@@ -685,21 +732,39 @@
 
 </Button>
 </Block>
-;endblock2
+;endblock3
-;block3
+;block4-expand
 	<Block>
 		<State> "Enable" </State> 
 		<Width> 1032 </Width>
 		<Height> 636 </Height>
 		<FrameScroll>
-			<Max> 8 </Max>
+			<Max>
+eval(
+	If CountEnablePromotion > 2 Then
+		Var max_count = 4
+	Else
+		Var max_count = 8
+	EndIf
+	Var return = max_count
+)
+</Max>
 			<X> 0 </X>
 			<Y> 0 </Y>
 			<Width> 1032 </Width>
 			<Height> 636 </Height>
 			<ScrollHeight> "auto" </ScrollHeight>
 			<Scroll> "Vertical" </Scroll>
-			<Column> 4 </Column>
+			<Column>
+eval(
+	If CountEnablePromotion > 2 Then
+		Var column_count = 2
+	Else
+		Var column_count = 4
+	EndIf
+	Var return = column_count
+)
+</Column>
 			<Script>
 				Var block_index_override = 0
 				Var block_index_move = 0
@@ -12162,8 +12227,7 @@ Water" </Value>
 	; - - - 
 		</FrameScroll>
 		</Block>
-;endblock3
+;endblock4-expand
-;block4;endblock4
 </FrameScroll>
 ; Cart
 <Button>

xml/page_catalog_group_pro_buble_tea.skt

@@ -0,0 +1,61 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+;BigLogoLayout
+
+<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 buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

xml/page_catalog_group_pro_buble_tea.xml

@@ -0,0 +1,577 @@
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	    Var NextPage = "-"
+
+    DEBUGVAR ICE_PROCESS_STATUS
+    DEBUGVAR ICE_PROCESS_TXT
+
+    
+    If show_eng = "true" Then 
+        Var showthaiText = "Invisible"
+        Var showengText = "Enable"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+        Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
+
+    Else
+        Var showengText = "Invisible"
+        Var showthaiText = "Enable"
+        
+        Var DirImage = "ROOT/taobin_project/image/page3"
+        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
+    EndIf
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    ; SpiralOnline
+  
+        Var MenuVSelected2 = "Invisible"
+
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        Var Menu21Selected2 = "Invisible"
+
+        Var MenuVSelected2 = "Invisible"
+        If SpiralOnline = "true" Then 
+            If Seeker =  "curr" Then
+                Var MenuVSelected2 = "Enable"
+            EndIf
+        EndIf 
+        
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
+        Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu21Selected = "Invisible" 
+            Var Menu7Selected = "Invisible"
+        Else
+            If MenuKidEnable = "true" Then
+                Var Menu11Selected = "Invisible" 
+                Var Menu21Selected = "Enable"
+                Var Menu7Selected = "Invisible"
+            Else
+                Var Menu11Selected = "Invisible"
+                Var Menu21Selected = "Invisible" 
+                Var Menu7Selected = "Enable"
+            EndIf
+        EndIf
+
+        If CocktailShow = "true" Then
+            Var Menu7Selected = "Invisible"
+        EndIf 
+
+        If RecipeTag1 = "HealthTurnOn" Then
+            Var Menu22Selected = "Enable"
+        Else
+            Var Menu22Selected = "Invisible"
+        EndIf
+        ;
+        
+
+
+
+    Var Timeout = 0
+
+
+    
+    If show_eng = "true" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+    Else
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+    EndIf
+
+
+</EventOpen>
+
+
+
+; notice enable heathy menu
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    If NextPage = "-" Then
+
+    Else
+            If CupOnArm = "true" Then
+                If Timeout > 9 Then
+                    SAVELOG "COA9"
+                    Open NextPage
+                EndIf
+            Else
+                If Timeout > 30 Then
+                    SAVELOG "COA30"
+                    Open NextPage
+                EndIf
+            EndIf
+    EndIf
+
+    If Timeout > 60 Then
+        SAVELOG "Timeout"
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            SAVELOG "Back"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+    EndIf
+
+    If BrewCommand = "RefreshAll" Then
+        Var BrewCommand = "-"
+        Open CurrentXMLFileName2
+    EndIf
+
+    If Seeker = "curr" Then
+        If DoorCupPosition = "bottom" Then
+            ; It normal 
+            Var EmergencyStop = "false"
+        Else
+            Var EmergencyStop = "true"
+            
+            ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" 
+
+        EndIf
+    EndIf
+
+    If IgnoreNetCore = "true" Then
+
+    Else
+        ;stop_now
+        
+    EndIf
+
+
+    ; zone cup on arm
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            If buttonRemoveCup =  "Enable" Then
+
+            Else
+                Refresh
+            EndIf
+
+            Var buttonRemoveCup = "Enable"
+
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            If buttonRemoveCup =  "Enable" Then
+
+            Else
+                Refresh
+            EndIf
+            
+            Var buttonRemoveCup = "Enable"
+       
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+            Refresh
+        EndIf
+    EndIf
+
+
+    Var Timeout = Timeout + 1
+    TimerReset
+</EventTimeout> 
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 494 </Y>
+<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
+</Image>
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 358 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 381 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    If SpiralOnline = "true" Then
+        If Seeker =  "curr" Then
+            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+        Else
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf 
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 1000 </X>
+<Y> 381 </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"
+        Var text_unavailable = "หมด###size=32"
+    Else
+        Var show_eng = "true"
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    EndIf
+
+
+    Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+;
+<ListView1>
+    <Width> 1080 </Width>
+    <Height> "auto" </Height>   
+    <X> 0 </X>
+    <Y> 395 </Y>
+    <Row2>
+    <State>"Enable"</State>
+    <Width> 896 </Width>
+    <Height> 102 </Height> 
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu1Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            SAVELOG "Click rec"
+            Var NextPage = "-"
+       
+
+                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu2Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+            
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu3Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu4Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+            EndIf
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu7Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu11Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu21Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu22Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu8Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu6Selected </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 = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> MenuVSelected2 </State>
+        <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
+        </EventClick>
+        </Button>
+</Row2>
+</ListView1>
+
+<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"
+            
+			; 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>
+
+
+
+
+
+<FrameScroll> 
+<X> 10 </X>
+<Y> 497 </Y>
+<Width> 1080 </Width>
+<ScrollHeight> "auto" </ScrollHeight>
+<Scroll> "Vertical" </Scroll>
+<Column> 4 </Column>
+<Script>
+	 Var block_index_override = 0
+	 Var block_index_move = 0
+</Script>
+; menu_new_list 0
+</FrameScroll>
+; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+</EventClick>
+</Button>
+
+
+
+
+;BigLogoLayout
+
+<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 buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

xml/page_catalog_group_pro_nam_hom_coconut.skt

@@ -0,0 +1,61 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+;BigLogoLayout
+
+<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 buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

xml/page_catalog_group_pro_wednesday_melon.xml

@@ -2099,7 +2099,7 @@ Sugar, Oreo" </Value>
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2121,7 +2121,7 @@ Sugar, Oreo" </Value>
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0105.Button
 		Var PD_STAGE_3 = $12-05-03-0105.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0

xml/page_payment.xml

@@ -80,25 +80,23 @@
 	If FromRerunPro = 1 Then
 		Var PromoPriceDrink = PriceDrink
 		Var PriceDrink = OldPrice
-
-		DEBUGVAR PriceDrink
-		DEBUGVAR PromoPriceDrink
 	EndIf
 
 	If FromMondayBananaPro = 1 Then
 		Var PriceDrink = OriginalPrice
+	EndIf
 
-		DEBUGVAR PriceDrink
+	If FromWednesdayMelonPro = 1 Then
-		DEBUGVAR PromotionPriceDrink
+		Var PriceDrink = OriginalPrice
 	EndIf
 
 	If FromPowerUpPro = 1 Then
 		Var PriceDrink = OriginalPrice
-
-		DEBUGVAR PriceDrink
-		DEBUGVAR PromotionPriceDrink
 	EndIf
 
+	DEBUGVAR PriceDrink
+	DEBUGVAR PromotionPriceDrink
+
 	Var PriceFromCatalog = PromotionPriceDrink
 
 	;Var AdultFlag = 1