diff --git a/inter/mys/xml/page_catalog_group_coffee.lxml b/inter/mys/xml/page_catalog_group_coffee.lxml
index ae45afee..f642755f 100644
--- a/inter/mys/xml/page_catalog_group_coffee.lxml
+++ b/inter/mys/xml/page_catalog_group_coffee.lxml
@@ -20881,8 +20881,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "AMERICANO KELAPA"
+		Var aliasDesc[4] = "Espresso, Sirap Kelapa, Gula & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -20972,7 +20972,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Americano</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>AMERICANO KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -20988,7 +20988,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Espresso, Coconut Syrup,\nSugar, Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Espresso, Sirap Kelapa, Gula & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
diff --git a/inter/mys/xml/page_catalog_group_milk.lxml b/inter/mys/xml/page_catalog_group_milk.lxml
index b1f403e8..521e2ea8 100644
--- a/inter/mys/xml/page_catalog_group_milk.lxml
+++ b/inter/mys/xml/page_catalog_group_milk.lxml
@@ -2306,8 +2306,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SUSU KOKO KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -2326,25 +2326,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SUSU KOKO KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nChocolate milk SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU KOKO KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -2397,7 +2397,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nChocolate milk</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SUSU KOKO KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -2413,7 +2413,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut syrup, Cocoa, Milk,\nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Koko, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -5566,8 +5566,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SUSU KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -5586,25 +5586,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SUSU KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Susu & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut milk SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -5657,7 +5657,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut milk</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SUSU KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -5673,7 +5673,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut syrup, Milk,\nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml
index 21341cfa..66ee3ac7 100644
--- a/inter/mys/xml/page_catalog_group_other.lxml
+++ b/inter/mys/xml/page_catalog_group_other.lxml
@@ -1,627 +1,627 @@
-
-
-<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
-
-
-    DEBUGVAR LanguageShow
-    DEBUGVAR CountryName
-    
-    If LanguageShow = "ENG" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-        
-    EndIf
-    If LanguageShow = "THAI" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var DirImage = "ROOT/taobin_project/image/page3"
-    EndIf
-
-    ;inter-image
-    If CountryName = "Malaysia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
-    
-
-    ;inter-image
-    If CountryName = "Australia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    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 = "PressForever"
-
-    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
-        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
-
-    Var Timeout = Timeout + 1
-    TimerReset
-</EventTimeout> 
-
-<EventLanguageOnChange>
-    DEBUGVAR LanguageShow
-    If LanguageShow = "ENG" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
-    EndIf
-    If LanguageShow = "THAI" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
-    ;inter-image
-   If CountryName = "Malaysia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en/"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
-
-    SAVELOG "EventLanguageOnChange menu -list"
-
-    Var LanguageButtonEnable = "Enable"
-	Var ButtonLanguageCurrentXPosition = 990
-	Var ButtonLanguageCurrentYPosition = 400
-    
-    Var ButtonLanguageListXPosition = 970 
-    Var ButtonLanguageListYPosition = 430 - 38
-    OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-
-    RefreshAll
-</EventLanguageOnChange>
-
-
-; 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.lxml" 
-        EndIf 
-    Else
-	   Open "ROOT/taobin_project/xml/page_catalog.lxml" 
-	EndIf
-
-</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 = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_recommend.lxml" 
-
-            Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-            ;inter-xml-open
-            If CountryName = "Malaysia" Then 
-                ; zone promote
-                TRY OpenFileXML
-            EndIf
-
-            If CountryName = "Thailand" Then 
-                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
-            EndIf
-            
-
-        </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.lxml" 
-            
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" 
-            Else
-                Open OpenFileXML
-            EndIf
-
-        </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 = "-"
-            
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" 
-   
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" 
-            Else
-                Open OpenFileXML
-            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 = "-"
-            
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
-
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" 
-            Else
-                Open OpenFileXML
-            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 = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" 
-        
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" 
-            Else
-                Open OpenFileXML
-            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 = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" 
-
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" 
-            Else
-                Open OpenFileXML
-            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.lxml" 
-            
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" 
-            Else
-                Open OpenFileXML
-            EndIf
-
-        </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.lxml" 
-
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" 
-            Else
-                Open OpenFileXML
-            EndIf
-        </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.lxml" 
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" 
-            Else
-                Open OpenFileXML
-            EndIf
-        </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 = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" 
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml"
-    
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            If CountryName = "Thailand" Then 
-                Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" 
-            Else
-                Open OpenFileXML
-            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>
-
-
-<Text>
-<X> 940 </X>
-<Y> 462 </Y>
-<Size> 22 </Size>
-<Width> 170 </Width>
-<Height> 30 </Height>
-<Font> KanitMediumTTF </Font>
-<Color> 0x6F5F51 </Color>
-<Value> PriceUnitText </Value>
-</Text>
-
-<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>
-
-
-
-
-
-
-
+
+
+<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
+
+
+    DEBUGVAR LanguageShow
+    DEBUGVAR CountryName
+    
+    If LanguageShow = "ENG" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+        
+    EndIf
+    If LanguageShow = "THAI" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var DirImage = "ROOT/taobin_project/image/page3"
+    EndIf
+
+    ;inter-image
+    If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+    
+
+    ;inter-image
+    If CountryName = "Australia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    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 = "PressForever"
+
+    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
+        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
+
+    Var Timeout = Timeout + 1
+    TimerReset
+</EventTimeout> 
+
+<EventLanguageOnChange>
+    DEBUGVAR LanguageShow
+    If LanguageShow = "ENG" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+    EndIf
+    If LanguageShow = "THAI" Then 
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+    EndIf
+    ;inter-image
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en/"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
+    SAVELOG "EventLanguageOnChange menu -list"
+
+    Var LanguageButtonEnable = "Enable"
+	Var ButtonLanguageCurrentXPosition = 990
+	Var ButtonLanguageCurrentYPosition = 400
+    
+    Var ButtonLanguageListXPosition = 970 
+    Var ButtonLanguageListYPosition = 430 - 38
+    OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+    RefreshAll
+</EventLanguageOnChange>
+
+
+; 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.lxml" 
+        EndIf 
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.lxml" 
+	EndIf
+
+</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 = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_recommend.lxml" 
+
+            Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
+            ;inter-xml-open
+            If CountryName = "Malaysia" Then 
+                ; zone promote
+                TRY OpenFileXML
+            EndIf
+
+            If CountryName = "Thailand" Then 
+                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+            EndIf
+            
+
+        </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.lxml" 
+            
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" 
+            Else
+                Open OpenFileXML
+            EndIf
+
+        </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 = "-"
+            
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" 
+   
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" 
+            Else
+                Open OpenFileXML
+            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 = "-"
+            
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
+
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" 
+            Else
+                Open OpenFileXML
+            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 = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" 
+        
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" 
+            Else
+                Open OpenFileXML
+            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 = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" 
+
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" 
+            Else
+                Open OpenFileXML
+            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.lxml" 
+            
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" 
+            Else
+                Open OpenFileXML
+            EndIf
+
+        </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.lxml" 
+
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" 
+            Else
+                Open OpenFileXML
+            EndIf
+        </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.lxml" 
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" 
+            Else
+                Open OpenFileXML
+            EndIf
+        </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 = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" 
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml"
+    
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            If CountryName = "Thailand" Then 
+                Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" 
+            Else
+                Open OpenFileXML
+            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>
+
+
+<Text>
+<X> 940 </X>
+<Y> 462 </Y>
+<Size> 22 </Size>
+<Width> 170 </Width>
+<Height> 30 </Height>
+<Font> KanitMediumTTF </Font>
+<Color> 0x6F5F51 </Color>
+<Value> PriceUnitText </Value>
+</Text>
+
+<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>
+
+
+
+
+
+
+
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -7148,8 +7148,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "PEPSI KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Pepsi & Soda"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -7168,13 +7168,13 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "PEPSI KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Pepsi & Soda"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -7239,7 +7239,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>COCONUT PEPSI</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>PEPSI KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -7255,7 +7255,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Pepsi and Soda</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Pepsi & Soda</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -7418,8 +7418,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "PEPSI KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Pepsi & Soda"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -7438,13 +7438,13 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "PEPSI KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Pepsi & Soda"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -7506,11 +7506,11 @@
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
 		<LanguageSlot1>COCONUT PEPSI</LanguageSlot1>
-		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>COCONUT PEPSI</LanguageSlot3>
-		<LanguageSlot4></LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6></LanguageSlot6>
+		<LanguageSlot4>-</LanguageSlot4>
+		<LanguageSlot5>PEPSI KELAPA</LanguageSlot5>
+		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -7522,11 +7522,11 @@
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
 		<LanguageSlot1>Coconut Syrup, Pepsi and Soda</LanguageSlot1>
-		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Pepsi and Soda</LanguageSlot3>
-		<LanguageSlot4></LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6></LanguageSlot6>
+		<LanguageSlot4>-</LanguageSlot4>
+		<LanguageSlot5>Sirap Kelapa, Pepsi & Soda</LanguageSlot5>
+		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -11198,8 +11198,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SODA LAICI KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Sirap Laici & Soda"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -11218,13 +11218,13 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SODA LAICI KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Lychee Syrup and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Sirap Laici & Soda"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -11289,7 +11289,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nLychee Soda</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SODA LAICI KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11305,7 +11305,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Lychee Syrup and Soda</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Sirap Laici & Soda</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11468,8 +11468,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SODA KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa & Soda"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -11488,13 +11488,13 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SODA KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa & Soda"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -11559,7 +11559,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Soda</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SODA KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11575,7 +11575,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup and Soda</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa & Soda</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -14986,8 +14986,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SMOOTHIE KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -15018,13 +15018,13 @@
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -15077,7 +15077,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Smoothie</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SMOOTHIE KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -15093,7 +15093,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup and Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -16329,8 +16329,8 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-
-</Popup>
+
+
+
+
+</Popup>
diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml
index f6467139..664e28bd 100644
--- a/inter/mys/xml/page_catalog_group_tea.lxml
+++ b/inter/mys/xml/page_catalog_group_tea.lxml
@@ -5329,8 +5329,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "TEH SUSU THAI KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Teh Thai, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -5349,25 +5349,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "TEH SUSU THAI KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Thai Tea,  Milk \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Teh Thai, Susu & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nThai Milk Tea SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE TEH SUSU THAI KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Thai Tea,  Milk \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Teh Thai, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -5420,7 +5420,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nThai Milk Tea</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>TEH SUSU THAI KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -5436,7 +5436,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Thai Tea,  Milk \nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Teh Thai, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -6421,8 +6421,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "TEH JASMINE KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Teh Jasmine & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -6441,25 +6441,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "TEH JASMINE KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Jasmine Tea and Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Teh Jasmine & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nJasmine tea SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE TEH JASMINE KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Teh Jasmine & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -6512,7 +6512,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nJasmine tea</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>TEH JASMINE KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -6528,7 +6528,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Jasmine Tea and Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Teh Jasmine & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -6965,8 +6965,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "TEH SUSU JASMINE KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Teh Jasmine & Susu"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -6985,25 +6985,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "TEH SUSU JASMINE KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Jasmine Tea,  Milk"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Teh Jasmine & Susu"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nJasmine milk tea SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE TEH SUSU JASMINE KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea,  Milk"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Teh Jasmine & Susu"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -7056,7 +7056,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nJasmine milk tea</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>TEH SUSU JASMINE KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -7072,7 +7072,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Jasmine Tea,  Milk</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Teh Jasmine & Susu</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -8331,8 +8331,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "MATCHA LATTE KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Mathca, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -8351,25 +8351,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "MATCHA LATTE KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Matcha Milk \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Matcha, Susu & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nMatcha latte SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE MACTHA LATTE KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Matcha Milk \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Matcha, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -8422,7 +8422,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nMatcha latte</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>MATCHA LATTE KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -8438,7 +8438,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Matcha Milk \nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Mathca, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -9697,8 +9697,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "MATCHA KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Matcha & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -9717,25 +9717,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "MATCHA KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Matcha and Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Matcha & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut Matcha SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE MATCHA KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Matcha and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Matcha & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -9788,7 +9788,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Matcha</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>MATCHA KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -9804,7 +9804,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Matcha and Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Matcha & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11885,8 +11885,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "TEH THAI KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Teh Thai & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -11905,25 +11905,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "TEH THAI KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut Syrup, Thai Tea and Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Teh Thai & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut\nThai Black Tea SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE TEH THAI KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut Syrup, Thai Tea and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Teh Thai & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -11976,7 +11976,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nThai Black Tea</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>TEH THAI KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11992,7 +11992,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Syrup, Thai Tea and Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Teh Thai & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
diff --git a/inter/mys/xml/page_topping_select6.lxml b/inter/mys/xml/page_topping_select6.lxml
index 06ffa126..b339f611 100644
--- a/inter/mys/xml/page_topping_select6.lxml
+++ b/inter/mys/xml/page_topping_select6.lxml
@@ -689,6 +689,13 @@
 			EndIf
 		EndIf
 
+		STRCONTAIN "12-04" UserSelectProductCode IsWheyMenu
+
+		If IsWheyMenu = "true" Then
+			Var showOreoAddEnable = "Enable"
+			Var showText8 = "Invisible" 
+		EndIf
+
 		STRCONTAIN "9701" BrewParam IgnoreLidStraw 
 
 		DEBUGVAR BrewParam