From 6928db9591ecd70f281c8edf1862a8ef8107b51d Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Fri, 8 Mar 2024 16:40:14 +0700
Subject: [PATCH] THAI: add quota check, fix back button, add energy drink
 selection

---
 .../powerup_free_1/page_powerup_bridge.xml    |   65 +-
 .../powerup_free_1/page_powerup_catalog.xml   | 1064 +++++++++++++++++
 .../powerup_free_1/page_powerup_identity.xml  |   19 +-
 .../script_common_for_open_promotion_xml.ev   |   14 +
 xml/page_payment.xml                          |   17 +
 xml/page_thankyou.xml                         |   21 +-
 xml/page_topping_select8.xml                  |    7 +
 7 files changed, 1116 insertions(+), 91 deletions(-)
 create mode 100644 xml/event/powerup_free_1/page_powerup_catalog.xml

diff --git a/xml/event/powerup_free_1/page_powerup_bridge.xml b/xml/event/powerup_free_1/page_powerup_bridge.xml
index 3871351a..860e9eb4 100644
--- a/xml/event/powerup_free_1/page_powerup_bridge.xml
+++ b/xml/event/powerup_free_1/page_powerup_bridge.xml
@@ -6,70 +6,7 @@
     ;<Background> "0xeae6e1" </Background>
 
     <EventOpen>
-        Var NameDrink = "TAO POWER DRINK"
-		Var NameDrinkTH = "เต่าทรงพลัง"
-		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง   (มีคาเฟอีน)"
-		Var DrinkDescription = "Medicine drink & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0034.Price
-		Var PriceD3 = $12-05-03-0034.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0034"
-		Var PD_CODE3 = "12-05-03-0034"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0034.Button
-		Var PD_STAGE_3 = $12-05-03-0034.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0034, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-		DEBUGVAR OverlayMenuFilter
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0034"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "12-05-03-0034"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $12-05-02-0034.NameE
-		Var menu_desc_eng_cold = $12-05-02-0034.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0034.Name
-		Var menu_desc_thai_cold = $12-05-02-0034.description
-		
-		Var menu_name_eng_blender = $12-05-03-0034.NameE
-		Var menu_desc_eng_blender = $12-05-03-0034.descriptionE
-		Var menu_name_thai_blender = $12-05-03-0034.Name
-		Var menu_desc_thai_blender = $12-05-03-0034.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-
-		Var FromPowerUpPro = 1
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		Open "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_catalog.xml"
     </EventOpen>
 
     ; ads
diff --git a/xml/event/powerup_free_1/page_powerup_catalog.xml b/xml/event/powerup_free_1/page_powerup_catalog.xml
new file mode 100644
index 00000000..b1a284e3
--- /dev/null
+++ b/xml/event/powerup_free_1/page_powerup_catalog.xml
@@ -0,0 +1,1064 @@
+
+<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
+        ;
+        
+
+
+    
+    ; soda and other
+    Var Menu6Selected = "Enable"
+
+    SAVELOG PreviseXMLFileName2
+
+    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>
+        <Max> 2 </Max>
+        <X> 10 </X>
+        <Y> 497 </Y>
+        <Width> 1080 </Width>
+        <ScrollHeight> "auto" </ScrollHeight>
+        <Scroll> "Vertical" </Scroll>
+        <Column> 2 </Column>
+        <Script> 
+            Var block_index_override = 0
+            Var block_index_move = 0
+        </Script>
+            ; - - - 
+            ; 
+            ; - 12-05-02-0034 12-05-03-0034 
+        <Block>
+            <MarginLeft> 33 </MarginLeft>
+            <MarginTop> 22 </MarginTop>
+            <Width> 225 </Width>
+            <Height> 296 </Height>
+            <State> Flag( 12-05-02-0034.Button,12-05-03-0034.Button,$Sum12050200341205030034) </State> 
+            <Button>
+            <State> $Sum12050200341205030034 </State> 
+            <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink.png" </Filename>
+            <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink.png" </FilenamePress>
+            <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink.png" </FilenameDisable>
+            <OverlayImage> xmlpro( 12-05-03-0034, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+            <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+            <Volume> SoundVolume </Volume>
+            <EventOnClick> 
+                Var NameDrink = "TAO POWER DRINK"
+                Var NameDrinkTH = "เต่าทรงพลัง"
+                Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง   (มีคาเฟอีน)"
+                Var DrinkDescription = "Medicine drink & Ice"
+                Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png"
+                Var OpenFromXML = CurrentXMLFileName2
+                Var PriceD1 = $-.Price
+                Var PriceD2 = $12-05-02-0034.Price
+                Var PriceD3 = $12-05-03-0034.Price
+                Var PD_CODE1 = "##-##-##-####"
+                Var PD_CODE2 = "12-05-02-0034"
+                Var PD_CODE3 = "12-05-03-0034"
+                Var PD_STAGE_1 = "Disable2"
+                Var PD_STAGE_2 = $12-05-02-0034.Button
+                Var PD_STAGE_3 = "Disable2"
+                Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0034, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+                DEBUGVAR OverlayMenuFilter
+                Var SelectCountDrinkType = 0
+                Var DefaultDrinkType = 0
+                If PD_STAGE_1 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 1
+                EndIf
+                If PD_STAGE_2 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 2
+                EndIf
+                If PD_STAGE_3 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 3
+                EndIf
+                If PD_STAGE_2 = "Enable" Then
+                    Topping "Load" "12-05-02-0034"
+                Else
+                    If PD_STAGE_1 = "Enable" Then
+                    Topping "Load" "-"
+                    Else
+                    Topping "Load" "12-05-03-0034"
+                    EndIf
+                EndIf
+                Var menu_name_eng_hot = $##-##-##-####.NameE
+                Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+                Var menu_name_thai_hot = $##-##-##-####.Name
+                Var menu_desc_thai_hot = $##-##-##-####.description
+                
+                Var menu_name_eng_cold = $12-05-02-0034.NameE
+                Var menu_desc_eng_cold = $12-05-02-0034.descriptionE
+                Var menu_name_thai_cold = $12-05-02-0034.Name
+                Var menu_desc_thai_cold = $12-05-02-0034.description
+                
+                Var menu_name_eng_blender = $12-05-03-0034.NameE
+                Var menu_desc_eng_blender = $12-05-03-0034.descriptionE
+                Var menu_name_thai_blender = $12-05-03-0034.Name
+                Var menu_desc_thai_blender = $12-05-03-0034.description
+                
+                DEBUGVAR PD_STAGE_1
+                DEBUGVAR PD_STAGE_2
+                DEBUGVAR PD_STAGE_3
+                Var SelectDrinkType = 0
+                
+                Var FromPowerUpPro = 1
+		
+		
+		        Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+                
+            </EventOnClick>
+            </Button>
+            <Text>
+            <X>  16   </X>
+            <Y>  164  </Y>
+            <Size> 24 </Size>
+            <Width>220</Width>
+            <Mode> "multi2" </Mode>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x322B26 </Color>
+            <State> showthaiText </State>
+            <Value> "เต่าทรงพลัง" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 220 </Y>
+            <Size> 14 </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <State> showthaiText </State>
+            <Value> "เครื่องดื่มเต่าทรงพลัง  
+        (มีคาเฟอีน)" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 164 </Y>
+            <Size> 22 </Size>
+            <Width>220</Width>
+            <Mode> "multi2" </Mode>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x322B26 </Color>
+            <State> showengText </State>
+            <Value> "TAO POWER DRINK" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 220 </Y>
+            <Size> 14 </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <State> showengText </State>
+            <Value> "Medicine drink & Ice" </Value>
+            </Text>
+            <Image>
+            <X> 16 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+            </Image>
+            <Image>
+            <X> 16 </X>
+            <Y> 264 </Y>
+            <State> "Invisible" </State>
+            <Filename> Var( DirImage2 + "hot.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+            </Image>
+            <Text>
+            <X> 50 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> "Invisible" </State>
+            <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 81 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "cold.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+            <State> $12-05-02-0034.Button </State>
+            </Image>
+            <Text>
+            <X> 115 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> $12-05-02-0034.Button </State>
+            <Value> StringFmt( $12-05-02-0034.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 146 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "blend.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+            <State> $12-05-03-0034.Button </State>
+            </Image>
+            <Text>
+            <X> 180 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitRegularTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> $12-05-03-0034.Button </State>
+            <Value> StringFmt(  $12-05-03-0034.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 81 </X>
+            <Y> 264 </Y>
+            <State> 
+                eval( 
+                If ICE_PROCESS_STATUS = 2 Then
+                
+                    Var ice_tab_process_show = "Invisible"
+                
+                Else
+                    Var ice_tab_process_show = "Invisible"
+                EndIf
+                Var return = ice_tab_process_show
+                )
+            </State>
+            <Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+            <FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+            </Image>
+            <Image>
+            <X> 49 </X>
+            <Y> 117 </Y>
+            <State> 
+                eval( 
+                    If $Sum12050200341205030034 = "Disable" Then
+                        STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+                        STRCONTAIN "ERR" $12-05-02-0034.TAG tag2_is_disable
+                        STRCONTAIN "ERR" $12-05-03-0034.TAG tag3_is_disable
+                        Var return = "Invisible"
+                        If tag1_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                        If tag2_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                        If tag3_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                    Else
+                            Var return = "Invisible"
+                    EndIf
+                )
+            </State>
+            <Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+            </Image>
+            <Text>
+            <X> 84 </X>
+            <Y> 266 </Y>
+            <Size> 10 </Size>
+            <Font> OpunMediumTTF </Font>
+            <Color> 0xDE794E </Color>
+            <State> ice_tab_process_show </State>
+            <Value> ice_show_open </Value>
+            </Text>
+            <Text>
+            <X> 48 </X>
+            <Y> 116 </Y>
+            <Size> 32 </Size>
+            <Width>128</Width>
+            <Height>64</Height>
+            <Font> MITRegularTTF </Font>
+            <Color> 0x5A5A5A </Color>
+            <Mode> "disable-show" </Mode>
+            <State> $Sum12050200341205030034 </State> 
+            <Value> text_unavailable </Value>
+            <Align> center-vertical-horizontal </Align>
+            </Text>
+        </Block>
+
+
+
+            ; - - - 
+            ; ==================> Len = 17
+            ; - 12-05-02-0035 12-05-03-0035 
+        <Block>
+            <MarginLeft> 33 </MarginLeft>
+            <MarginTop> 22 </MarginTop>
+            <Width> 225 </Width>
+            <Height> 296 </Height>
+            <State> Flag( 12-05-02-0035.Button,12-05-03-0035.Button,$Sum12050200351205030035) </State> 
+            <Button>
+            <State> $Sum12050200351205030035 </State> 
+            <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda.png" </Filename>
+            <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda.png" </FilenamePress>
+            <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" </FilenameDisable>
+            <OverlayImage> xmlpro( 12-05-03-0035, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+            <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+            <Volume> SoundVolume </Volume>
+            <EventOnClick> 
+                Var NameDrink = "TAO POWER  DRINK SODA"
+                Var NameDrinkTH = "เต่าทรงพลังโซดา"
+                Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา  (มีคาเฟอีน)"
+                Var DrinkDescription = "Medicine drink, Soda & Ice"
+                Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png"
+                Var OpenFromXML = CurrentXMLFileName2
+                Var PriceD1 = $-.Price
+                Var PriceD2 = $12-05-02-0035.Price
+                Var PriceD3 = $12-05-03-0035.Price
+                Var PD_CODE1 = "##-##-##-####"
+                Var PD_CODE2 = "12-05-02-0035"
+                Var PD_CODE3 = "12-05-03-0035"
+                Var PD_STAGE_1 = "Disable2"
+                Var PD_STAGE_2 = $12-05-02-0035.Button
+                Var PD_STAGE_3 = "Disable2"
+                Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0035, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+                DEBUGVAR OverlayMenuFilter
+                Var SelectCountDrinkType = 0
+                Var DefaultDrinkType = 0
+                If PD_STAGE_1 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 1
+                EndIf
+                If PD_STAGE_2 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 2
+                EndIf
+                If PD_STAGE_3 = "Enable" Then
+                    Var SelectCountDrinkType = SelectCountDrinkType + 1
+                    Var DefaultDrinkType = 3
+                EndIf
+                If PD_STAGE_2 = "Enable" Then
+                    Topping "Load" "12-05-02-0035"
+                Else
+                    If PD_STAGE_1 = "Enable" Then
+                    Topping "Load" "-"
+                    Else
+                    Topping "Load" "12-05-03-0035"
+                    EndIf
+                EndIf
+                Var menu_name_eng_hot = $##-##-##-####.NameE
+                Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+                Var menu_name_thai_hot = $##-##-##-####.Name
+                Var menu_desc_thai_hot = $##-##-##-####.description
+                
+                Var menu_name_eng_cold = $12-05-02-0035.NameE
+                Var menu_desc_eng_cold = $12-05-02-0035.descriptionE
+                Var menu_name_thai_cold = $12-05-02-0035.Name
+                Var menu_desc_thai_cold = $12-05-02-0035.description
+                
+                Var menu_name_eng_blender = $12-05-03-0035.NameE
+                Var menu_desc_eng_blender = $12-05-03-0035.descriptionE
+                Var menu_name_thai_blender = $12-05-03-0035.Name
+                Var menu_desc_thai_blender = $12-05-03-0035.description
+                
+                DEBUGVAR PD_STAGE_1
+                DEBUGVAR PD_STAGE_2
+                DEBUGVAR PD_STAGE_3
+                Var SelectDrinkType = 0
+                
+                Var FromPowerUpPro = 1
+		
+		
+		        Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+                
+            </EventOnClick>
+            </Button>
+            <Text>
+            <X>  16   </X>
+            <Y>  164  </Y>
+            <Size> 24 </Size>
+            <Width>220</Width>
+            <Mode> "multi2" </Mode>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x322B26 </Color>
+            <State> showthaiText </State>
+            <Value> "เต่าทรงพลังโซดา" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 220 </Y>
+            <Size> 14 </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <State> showthaiText </State>
+            <Value> "เครื่องดื่มเต่าทรงพลัง โซดา 
+        (มีคาเฟอีน)" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 164 </Y>
+            <Size> 22 </Size>
+            <Width>220</Width>
+            <Mode> "multi2" </Mode>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x322B26 </Color>
+            <State> showengText </State>
+            <Value> "TAO POWER 
+        DRINK SODA" </Value>
+            </Text>
+            <Text>
+            <X> 16 </X>
+            <Y> 220 </Y>
+            <Size> 14 </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <State> showengText </State>
+            <Value> "Medicine drink, Soda & Ice" </Value>
+            </Text>
+            <Image>
+            <X> 16 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+            </Image>
+            <Image>
+            <X> 16 </X>
+            <Y> 264 </Y>
+            <State> "Invisible" </State>
+            <Filename> Var( DirImage2 + "hot.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+            </Image>
+            <Text>
+            <X> 50 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> "Invisible" </State>
+            <Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 81 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "cold.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+            <State> $12-05-02-0035.Button </State>
+            </Image>
+            <Text>
+            <X> 115 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitMediumTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> $12-05-02-0035.Button </State>
+            <Value> StringFmt( $12-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 146 </X>
+            <Y> 264 </Y>
+            <Filename> Var( DirImage2 + "blend.png" ) </Filename>
+            <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+            <State> $12-05-03-0035.Button </State>
+            </Image>
+            <Text>
+            <X> 180 </X>
+            <Y> TextPriceMenuY </Y>
+            <Size> TextPriceMenuSize </Size>
+            <Width>220</Width>
+            <Font> KanitRegularTTF </Font>
+            <Color> 0x6F5F51 </Color>
+            <ColorDisable> 0xEAE6E1 </ColorDisable>
+            <State> $12-05-03-0035.Button </State>
+            <Value> StringFmt(  $12-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+            </Text>
+            <Image>
+            <X> 81 </X>
+            <Y> 264 </Y>
+            <State> 
+                eval( 
+                If ICE_PROCESS_STATUS = 2 Then
+                
+                    Var ice_tab_process_show = "Invisible"
+                
+                Else
+                    Var ice_tab_process_show = "Invisible"
+                EndIf
+                Var return = ice_tab_process_show
+                )
+            </State>
+            <Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+            <FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+            </Image>
+            <Image>
+            <X> 49 </X>
+            <Y> 117 </Y>
+            <State> 
+                eval( 
+                    If $Sum12050200351205030035 = "Disable" Then
+                        STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+                        STRCONTAIN "ERR" $12-05-02-0035.TAG tag2_is_disable
+                        STRCONTAIN "ERR" $12-05-03-0035.TAG tag3_is_disable
+                        Var return = "Invisible"
+                        If tag1_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                        If tag2_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                        If tag3_is_disable = "true" Then
+                            Var return = "Enable"
+                        EndIf
+                    Else
+                            Var return = "Invisible"
+                    EndIf
+                )
+            </State>
+            <Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+            </Image>
+            <Text>
+            <X> 84 </X>
+            <Y> 266 </Y>
+            <Size> 10 </Size>
+            <Font> OpunMediumTTF </Font>
+            <Color> 0xDE794E </Color>
+            <State> ice_tab_process_show </State>
+            <Value> ice_show_open </Value>
+            </Text>
+            <Text>
+            <X> 48 </X>
+            <Y> 116 </Y>
+            <Size> 32 </Size>
+            <Width>128</Width>
+            <Height>64</Height>
+            <Font> MITRegularTTF </Font>
+            <Color> 0x5A5A5A </Color>
+            <Mode> "disable-show" </Mode>
+            <State> $Sum12050200351205030035 </State> 
+            <Value> text_unavailable </Value>
+            <Align> center-vertical-horizontal </Align>
+            </Text>
+        </Block>
+    </FrameScroll>
+    ; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+</EventClick>
+</Button>
+</Popup>
\ No newline at end of file
diff --git a/xml/event/powerup_free_1/page_powerup_identity.xml b/xml/event/powerup_free_1/page_powerup_identity.xml
index 2c8687be..e1760759 100644
--- a/xml/event/powerup_free_1/page_powerup_identity.xml
+++ b/xml/event/powerup_free_1/page_powerup_identity.xml
@@ -81,6 +81,9 @@
     Var IDNumx = "2640100003053"
 	;AddData Cid TelephoneNumber  IDNumx PointCrm GetScore
 
+    ; Reset 
+    Var IDNum = ""
+
 </EventOpen>
 
 <EventActionOk>
@@ -91,9 +94,8 @@
 
     If StepGetServer = 1 Then
 
-        If Ext1a = "0" Then
+        If Ext1a = "ok" Then
             If LegitAge = "true" Then
-                Var RoadShow = "true"
                 Open "ROOT/taobin_project/xml/page_payment.xml"
             Else
                 Var load_gif_stage = "Invisible"
@@ -101,6 +103,7 @@
             EndIf
             Refresh
         Else
+            ; Error
             Var FullQuotaState = "Enable"
         EndIf
 
@@ -247,12 +250,10 @@
 
                 If AgeNumber >= 18 Then
                     ; TODO: check quota --- AddData; Wait for new add num
-
                     Var LegitAge = "true"
-
-                    ; Then enable RoadShow
-                    ;Var RoadShow = "true"
-                    ;Open "ROOT/taobin_project/xml/page_payment.xml"
+                    DEBUGVAR IDNum
+                    GETACCEXT IDNum 33 
+                    Var StepGetServer = 1
                 EndIf
 
 
@@ -280,6 +281,8 @@
     DEBUGVAR IDCardState
     DEBUGVAR load_gif_stage
     DEBUGVAR img_popup16
+    DEBUGVAR IDNum
+    DEBUGVAR LegitAge
 
     If IDBirthdate = "" Then
         Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1
@@ -384,7 +387,6 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
@@ -399,7 +401,6 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev
index 5d3f2426..6cf8b2ca 100644
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@@ -21,6 +21,20 @@ If CocktailShow = "true" Then
 Else
 	; check profile to enable free energy drink promotion
 	STRCONTAIN "ProEnergyDrinkFreePerCardID" XMLProfile EnableFreeEnergyDrink
+
+	; Debug
+	If BoxID = 177746 Then
+		Var EnableFreeEnergyDrink = "true"
+		Var PepsiSecondCup30Enable = 0
+	EndIf
+
+
+	If EnableFreeEnergyDrink = "true" Then
+		Var FreeEnergyDrink = 1
+	EndIf
+
+	DEBUGVAR FreeEnergyDrink
+
 	;Var EnableFreeEnergyDrink = "true"
 	DEBUGVAR EnableFreeEnergyDrink
 	; zone promote
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index fe13f831..7317046e 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -336,6 +336,23 @@
 		Var Seeker.CampaignPPrice = PriceDrink - PriceDiff
 	EndIf
 
+	If FromPowerUpPro = 1 Then
+
+		If FreeEnergyDrink = 1 Then
+			If SelectDrink = "" Then
+				Var PriceDiff = PriceDrink - 1
+				Var Seeker.VendingCode = "FIX1"
+				Var Seeker.IntVendingCampaign = PriceDiff
+				Var Seeker.FreeVendingCampaign = 0
+				Var Seeker.CodeChannel = 1
+				Var Seeker.CodeNumber = IDNum
+				Var Seeker.VendingCampaignRI3 = PriceDiff
+				Var Seeker.CampaignPPrice = 1
+			EndIf
+		EndIf
+
+	EndIf
+
 	If ChildrenFree = 1 Then
 
 		Var RemainAmountStr = "Free###size=150"
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 5518129c..1e0a5722 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -280,12 +280,12 @@
 		If RoadShow = "true" Then
 
 			If FreeEnergyDrink = 1 Then
-				; reset
-				Var RoadShow = ""
 				; AddData
 
 				; +1 in quota in this id card
-				AddData <ID> <user-id> <menu?>
+				AddData 44 IDNum
+				; clear id
+				Var IDNum = ""
 			EndIf
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		Else
@@ -401,13 +401,6 @@
 					EndIf
 
 					If Seeker.FreeVendingCampaign = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-						Else
-							If Seeker.CollectPointMain = 1 Then
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-							EndIf
-						EndIf
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 					Else
 						If 	CART_INDEX >= 2  Then   
@@ -426,14 +419,6 @@
 							;	Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 							;EndIf
 
-							If Seeker.CollectPointPromotion = 1 Then
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-							Else
-								If Seeker.CollectPointMain = 1 Then
-									Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-								EndIf
-							EndIf
-
 							Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 						Else
 							If 	CART_INDEX >= 2  Then   
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 407dee4e..be7df934 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -763,6 +763,13 @@
 	
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
 	EndIf
+
+	If FreeEnergyDrink = 1 Then
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+
+	EndIf
 	
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"