Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/configure.ev

@@ -1,6 +1,6 @@
 
 	If BoxID = 200027 Then
-		Var EnableMultiInstanceFromBoxID = 0
+		Var EnableMultiInstanceFromBoxID = 1
 	EndIf
 
 	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig

inter/aus/xml/event/script_common_for_open_promotion_xml.ev

@@ -18,10 +18,24 @@ If TasteTheJourneyPro = 1 Then
     Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_taste_the_journey.lxml"
 EndIf
 
-If OpenFromPageBoard = 1 Then
+If CatalogLayoutV3 = 1 Then
-	OpenInst 2 RecommendPage
+
+	SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/v3/event/script_open_promotion_v3.ev"
 Else
-	Open RecommendPage
+
+	If OpenFromPageBoard = 1 Then
+
+		DEBUGVAR BigButtonEnable
+
+		OpenInst 2 FileRecommendToOpen
+		Var OpenFromPageBoard = 0
+
+	Else
+
+		Open FileRecommendToOpen
+
+	EndIf
 EndIf
 
 Var OpenFromPageBoard = 0

inter/aus/xml/multi/control_and_lang_swith.ev

@@ -23,7 +23,8 @@ Var InstanceTabOpenFile4 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVe
 Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml"
 
 OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/other.ev"
-Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_other.lxml"
 
 If AppFastButtonState = "Enable" Then
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
@@ -48,15 +49,20 @@ EndIf
 
 
 If CocktailShow = "true" Then
-    OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_cocktail.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/health.ev"
+    OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_cocktail.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/dessert.ev"
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_cocktail.lxml"
 Else
-    OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/health.ev"
+    OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/dessert.ev"
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_dessert.lxml"
 EndIfi
 
+OpenRedirect "/taobin_project/inter/aus/xml/page_catalog_group_energy_drink.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/energy_drink.ev"
+Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/aus/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile7 = InstanceTabOpenFile7 + "/page_catalog_group_energy_drink.lxml"
+
+
 
 OpenRedirect "taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/recommend.ev"
 

inter/aus/xml/multi/dessert.ev

@@ -1,3 +1,3 @@
-SAVELOG "Call health.ev"
+SAVELOG "Call dessert.ev"
 TabMenuVisibleInst 6
 Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"

inter/aus/xml/multi/energy_drink.ev

@@ -0,0 +1,3 @@
+SAVELOG "Call energy_drink.ev"
+TabMenuVisibleInst 7
+Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

inter/aus/xml/multi/menu_catalog_default_init.lxml

@@ -108,18 +108,16 @@
             Var Menu7Selected = "Invisible"
         EndIf
 
-        If RecipeTag1 = "HealthTurnOn" Then
+        Var Menu22Selected = "Enable"
-            Var Menu22Selected = "Enable"
+        Var Menu23Selected = "Enable"
-        Else
+        Var Menu62Selected = "Enable"
-            Var Menu22Selected = "Invisible"
-        EndIf
 
-        If WinterWarmersCatalogFlag = 1 Then
+        ;If WinterWarmersCatalogFlag = 1 Then
-            Var MenuWinterWarmersCatalogState = "Enable"
+        ;    Var MenuWinterWarmersCatalogState = "Enable"
-        Else
+        ;Else
-            Var MenuWinterWarmersCatalogState = "Invisible"
+        ;    Var MenuWinterWarmersCatalogState = "Invisible"
-        EndIf
+        ;EndIf
-        DEBUGVAR WinterWarmersCatalogFlag
+        ;DEBUGVAR WinterWarmersCatalogFlag
-        DEBUGVAR MenuWinterWarmersCatalogState
+        ;DEBUGVAR MenuWinterWarmersCatalogState
         ;
 

inter/aus/xml/multi/menu_catalog_new.lxml

@@ -9,135 +9,46 @@
 <Color> "0xeae6e1" </Color>
 </Image>
 
+<EventOnShow>
+    InstanceGetString SaveStringInst
+    DEBUGVAR SaveStringInst
+    DEBUGVAR show_eng
 
 
-<Timeout> 1000 </Timeout>
+    If SaveStringInst = "RefreshNow" Then
-<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
-
-    ; zone cup on arm
-    If Seeker = "curr" Then
-        If CupOnArm = "true" Then
-            Var buttonRemoveCup = "Enable"
-            Refresh
-        Else
-            If buttonRemoveCup = "Enable" Then
-                Var buttonRemoveCup = "Invisible"
-                Refresh
-            EndIf
-        EndIf
-    Else
-        Var buttonRemoveCup = "Invisible"
         Refresh
     EndIf
 
-    Var Timeout = Timeout + 1
+
-    TimerReset
+</EventOnShow>
-</EventTimeout>
 
 <EventLanguageOnChange>
     DEBUGVAR LanguageShow
-    If LanguageShow = "ENG" Then
+    ;inter-image
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+    Var show_eng = "true"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+    Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+    Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/page3_2_en/"
 
-    EndIf
+    DEBUGVAR DirImageAlter
-    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
-    ;inter-image
-   If CountryName = "Australia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterAus = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
 
-    Refresh
+
 
     Var LanguageButtonEnable = "Enable"
-    Var ButtonLanguageCurrentXPosition = 990
-    Var ButtonLanguageCurrentYPosition = 438 - 38
 
-    Var ButtonLanguageListXPosition = 970
+
-    Var ButtonLanguageListYPosition = 430 - 38
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_open_instance.lxml"
+
+
+    RefreshAll
+
+
+    Script "-" "-"
+
+    Var Timeout = 0
 
 </EventLanguageOnChange>
 
@@ -167,300 +78,17 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-    If SpiralOnline = "true" Then
+    SAVELOG "  Back multi inst"
-        If Seeker =  "curr" Then
+    TabMenuVisibleInst 99
-            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
 
+    RootLayoutVisible 13 "hide"
+
+    Var OpenFromMulti = 1
+    OpenInst 2 "ROOT/taobin_project/inter/aus/xml/multi/page_catalog.lxml"
 </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_recommend3.png" )</Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            SAVELOG "Click rec"
-            Var NextPage = "-"
-
-            Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-		    TRY OpenFileXML
-        </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( DirImageAlterAus + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlterAus + "/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( DirImageAlterAus + "/bn_dessert.png") </Filename>
-        <FilenamePress> Var( DirImageAlterAus + "/bp_dessert.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            Var NextPage = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
-
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
-
-            DEBUGVAR CountryRootPath
-            DEBUGVAR OpenFileXML
-
-            Open OpenFileXML
-        </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>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> MenuWinterWarmersCatalogState </State>
-        <Filename> "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_winter_warmers.png" </Filename>
-        <FilenamePress> "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_winter_warmers.png" </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            Var NextPage = "-"
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
-            Open OpenFileXML
-        </EventClick>
-        </Button>
-</Row2>
-</ListView1>
-
-
 <Text>
 <X> 940 </X>
 <Y> 462 </Y>

inter/aus/xml/multi/menu_new_layout_gen_v2.py

@@ -1,619 +0,0 @@
-  if "v2" in param:
-    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code):
-        print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
-        out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
-        menu_img = spl[ idx_img][1]
-        out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n')
-        
-        out_xml( '<Block>\r\n')
-        out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
-        out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
-        out_xml('\t<Width> 225 </Width>\r\n')
-        out_xml('\t<Height> 296 </Height>\r\n')
-        str_con = "" 
-        str_con_var = ""
-        #print("#########################################################################################################################")
-        #print( str( spl))
-        #print("#########################################################################################################################")
-        if str_hot_product_code != '-':
-          str_con += str_hot_product_code + '.Button,'
-        
-        if str_cold_product_code != '-':
-          str_con += str_cold_product_code + '.Button,'
-        
-        if str_blend_product_code != '-':
-          str_con += str_blend_product_code + '.Button,'
-   
-        if str_hot_product_code != '-':
-          str_con_var += str_hot_product_code + '-'
-        
-        if str_cold_product_code != '-':
-          str_con_var += str_cold_product_code + '-'
-        
-        if str_blend_product_code != '-':
-          str_con_var += str_blend_product_code + '-'
-   
-        str_con_var = str_con_var.replace("-", "")
-        if touch_less_gen == True:
-          str_con += "Disable=Invisible,"
-        
-        str_con += "$Sum" + str_con_var
-
-        out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
-        
-        pd_code_1 = str_hot_product_code
-        pd_stage1 = '$' + str_hot_product_code + '.Button'
-        if str_hot_product_code == "-" or len(str_hot_product_code) == 0 :
-          pd_code_1 = pd_code_available
-          pd_stage1 = '"Disable2"'
-
-        pd_code_2 = str_cold_product_code
-        pd_stage2 = '$' + str_cold_product_code + '.Button'
-        if str_cold_product_code == "-" or len(str_cold_product_code) == 0:
-          pd_code_2 = pd_code_available
-          pd_stage2 = '"Disable2"'
-        
-        pd_code_3 = str_blend_product_code
-        pd_stage3 = '$' + str_blend_product_code + '.Button'
-        if str_blend_product_code == "-" or len(str_blend_product_code) == 0:
-          pd_code_3 = pd_code_available
-          pd_stage3 = '"Disable2"'
-
-        
-
-        
-        out_xml( '\t<Button>\r\n')
-        out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
-        out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
-        out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')
-        out_xml( '\t<FilenameDisable> "' + new_default_dir_disable + '/'+ menu_img +'" </FilenameDisable>\r\n')
-        out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
-        out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
-        out_xml( '\t<EventOnClick> \r\n')
-        
-        # Default 
-        #out_xml( '\t\tVar NameDrink = "' + spl[ idx_of_eng_des].replace("\\n", " ") + '"\r\n')
-        #out_xml( '\t\tVar NameDrinkTH = "' + spl[ idx_of_eng].replace("\\n", " ") + '"\r\n')
-        #out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[ idx_of_thai].replace("\\n", " ") + '"\r\n')
-        #out_xml( '\t\tVar DrinkDescription = "' + spl[ idx_of_thai_des].replace("\\n", " ") + '"\r\n')
-        out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
-              
-        out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
-
-        out_xml( '\t\tVar PriceD1 = $' + str_hot_product_code + '.Price\r\n')
-        out_xml( '\t\tVar PriceD2 = $' + str_cold_product_code + '.Price\r\n')
-        out_xml( '\t\tVar PriceD3 = $' + str_blend_product_code + '.Price\r\n')
-        
-        out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
-        out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
-        out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n')
-
-        out_xml( '\t\t; begin lang \r\n')
-        for x in range( max_can_have_lang):
-          if x < len( spl[ idx_name]):
-            out_xml( '\t\tVar aliasName['+ str(x) +'] = "'+ spl[ idx_name][ x + 1]+'"\r\n')
-            out_xml( '\t\tVar aliasDesc['+ str(x) +'] = "'+ spl[ idx_desc][ x + 1]+'"\r\n')
-
-
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar NameLang[0]['+ str(x) +'] = "'+ get_name_lang( pd_code_1 , x)+'"\r\n')
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar DescLang[0]['+ str(x) +'] = "'+ get_desc_lang( pd_code_1 , x)+'"\r\n')
-
-        
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar NameLang[1]['+ str(x) +'] = "'+ get_name_lang( pd_code_2 , x)+'"\r\n')
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar DescLang[1]['+ str(x) +'] = "'+ get_desc_lang( pd_code_2 , x)+'"\r\n')
-
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar NameLang[2]['+ str(x) +'] = "'+ get_name_lang( pd_code_3 , x)+'"\r\n')
-        for x in range( max_can_have_lang):
-          out_xml( '\t\tVar DescLang[2]['+ str(x) +'] = "'+ get_desc_lang( pd_code_3 , x)+'"\r\n')
-
-
-
-        out_xml( '\t\t; end lang \r\n')
-        
-        out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n')
-        out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
-        out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
-
-
-        out_xml( '\t\tVar SelectCountDrinkType = 0\r\n')
-        out_xml( '\t\tVar DefaultDrinkType = 0\r\n')
-        
-        out_xml( '\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
-        out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n')
-        out_xml( '\t\t\tVar DefaultDrinkType = 1\r\n')
-        out_xml( '\t\tEndIf\r\n')
-
-
-        out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-        out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n')
-        out_xml( '\t\t\tVar DefaultDrinkType = 2\r\n')
-        out_xml( '\t\tEndIf\r\n')
-
-
-        out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
-        out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n')
-        out_xml( '\t\t\tVar DefaultDrinkType = 3\r\n')
-        out_xml( '\t\tEndIf\r\n')
-
-
-
-        out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-        #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
-        out_xml( '\t\tElse\r\n')
-        out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
-        out_xml( '\t\t\tElse\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
-        out_xml( '\t\t\tEndIf\r\n')
-        out_xml( '\t\tEndIf\r\n')
-
-
-
-        #out_xml( '\t\tVar menu_name_eng_hot = $' + pd_code_1 + '.NameE\r\n')
-        #out_xml( '\t\tVar menu_desc_eng_hot = $' + pd_code_1 + '.descriptionE\r\n')
-        #out_xml( '\t\tVar menu_name_thai_hot = $' + pd_code_1 + '.Name\r\n')
-        #out_xml( '\t\tVar menu_desc_thai_hot = $' + pd_code_1 + '.description\r\n')
-        #out_xml( '\t\t\r\n')
-        #out_xml( '\t\tVar menu_name_eng_cold = $' + pd_code_2 + '.NameE\r\n')
-        #out_xml( '\t\tVar menu_desc_eng_cold = $' + pd_code_2 + '.descriptionE\r\n')
-        #out_xml( '\t\tVar menu_name_thai_cold = $' + pd_code_2 + '.Name\r\n')
-        #out_xml( '\t\tVar menu_desc_thai_cold = $' + pd_code_2 + '.description\r\n')
-        #out_xml( '\t\t\r\n')
-        #out_xml( '\t\tVar menu_name_eng_blender = $' + pd_code_3 + '.NameE\r\n')
-        #out_xml( '\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\r\n')
-        #out_xml( '\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\r\n')
-        #out_xml( '\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\r\n')
-        
-
-
-        
-        out_xml( '\t\t\r\n')
-        out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n')
-        out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
-        out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
-        out_xml( '\t\tVar SelectDrinkType = 0\r\n')
-
-        
-        out_xml( '\t\t\r\n')
-        out_xml( '\t\t\r\n')
-        out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n')
-        out_xml( '\t\t\r\n')
-        
-        
-
-        out_xml( '\t</EventOnClick>\r\n')
-        out_xml( '\t</Button>\r\n')
-   
-    
-       
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X>  16   </X>\r\n')
-        out_xml( '\t<Y>  164  </Y>\r\n')
-        out_xml( '\t<Size> 22 </Size>\r\n')
-        out_xml( '\t<Width>222</Width>\r\n')
-        out_xml( '\t<Mode> "multi2" </Mode>\r\n')
-        out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-        out_xml( '\t<Color> 0x322B26 </Color>\r\n')
-        
-        out_xml( '\t<LanguageGroup>\r\n')
-        out_xml( '\t\t<LanguageSlot1>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot1>\r\n')
-        out_xml( '\t\t<LanguageSlot2>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot2>\r\n')
-        out_xml( '\t\t<LanguageSlot3>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot3>\r\n')
-        out_xml( '\t\t<LanguageSlot4>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot4>\r\n')
-        out_xml( '\t\t<LanguageSlot5>' + spl[ idx_name][ idx_lang_malay] + '</LanguageSlot5>\r\n')
-        out_xml( '\t\t<LanguageSlot6>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot6>\r\n')
-        out_xml( '\t</LanguageGroup>\r\n')
-        
-        out_xml( '\t</Text>\r\n')
-
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> 16 </X>\r\n')
-        out_xml( '\t<Y> 220 </Y>\r\n')
-        out_xml( '\t<Size> 14 </Size>\r\n')
-        out_xml( '\t<Width>222</Width>\r\n')
-        out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
-        #out_xml( '\t<State> showthaiText </State>\r\n')
-        out_xml( '\t<LanguageGroup>\r\n')
-        out_xml( '\t\t<LanguageSlot1>' +  spl[ idx_desc][ idx_lang_eng] + '</LanguageSlot1>\r\n')
-        out_xml( '\t\t<LanguageSlot2>' +  spl[ idx_desc][ idx_lang_thai] + '</LanguageSlot2>\r\n')
-        out_xml( '\t\t<LanguageSlot3>' +  spl[ idx_desc][ idx_lang_eng] + '</LanguageSlot3>\r\n')
-        out_xml( '\t\t<LanguageSlot4>' +  spl[ idx_desc][ idx_lang_thai] + '</LanguageSlot4>\r\n')
-        out_xml( '\t\t<LanguageSlot5>' +  spl[ idx_desc][ idx_lang_malay] + '</LanguageSlot5>\r\n')
-        out_xml( '\t\t<LanguageSlot6>' +  spl[ idx_desc][ idx_lang_thai] + '</LanguageSlot6>\r\n')
-        out_xml( '\t</LanguageGroup>\r\n')
-
-        out_xml( '\t</Text>\r\n')
-
-
-
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 16 </X>\r\n')
-        out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
-        out_xml( '\t</Image>\r\n')
-
-        ice_tab_hot_show = True
-        shw = "$" + str_hot_product_code + ".Button"
-        if str_hot_product_code == "-" :
-          shw = '"Invisible"'
-          ice_tab_hot_show = False
-
-        if len(str_hot_product_code) == 0 :
-          shw = '"Invisible"'
-          ice_tab_hot_show = False
-
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 16 </X>\r\n')
-        out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n')
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n')
-        out_xml( '\t</Image>\r\n')
-        
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> TextPriceMenuHotX </X>\r\n')
-        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
-        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
-        out_xml( '\t<Width>220</Width>\r\n')
-        out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-        
-          
-        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
-        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        
-        #out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) </Value>\r\n')
-       
-        if "inter" in param:
-          if "free" in param:
-            out_xml( '\t<Value> "Free" </Value>\r\n')
-          else:
-            out_xml( '\t<Value> StringFmt(  $' + str_hot_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
-        else:
-          out_xml( '\t<Value> Var( "฿" + $' + str_hot_product_code + '.Price ) </Value>\r\n')
-        out_xml( '\t</Text>\r\n')
-        
-        ice_tab_ice_show = True
-
-        shw = "$" + str_cold_product_code + ".Button"
-        if str_cold_product_code == "-" :
-          shw = '"Invisible"'
-          ice_tab_ice_show = False
-
-        if len(str_cold_product_code) == 0 :
-          shw = '"Invisible"'
-          ice_tab_ice_show = False
-
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 81 </X>\r\n')
-        out_xml( '\t<Y> 264 </Y>\r\n')
-        if pd_code_2 == "51-05-02-0016":
-          out_xml( '\t<Filename> Var( DirImage2 + "normal.png" ) </Filename>\r\n')
-          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
-        else:
-          out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
-          out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        out_xml( '\t</Image>\r\n')
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> 113 </X>\r\n')
-        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
-        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
-        out_xml( '\t<Width>220</Width>\r\n')
-        out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-      
-        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
-        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        if "inter" in param:
-          if "free" in param:
-            out_xml( '\t<Value> "Free" </Value>\r\n')
-          else:
-            out_xml( '\t<Value> StringFmt( $' + str_cold_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
-        else:
-          out_xml( '\t<Value> Var( "฿" + $' + str_cold_product_code + '.Price ) </Value>\r\n')
-        out_xml( '\t</Text>\r\n')
-    
-        ice_tab_blend_show = True
-
-        shw = "$" + str_blend_product_code + ".Button"
-        if str_blend_product_code == "-" :
-          shw = '"Invisible"'
-          ice_tab_blend_show = False
-
-        if len(str_blend_product_code) == 0 :
-          shw = '"Invisible"'
-          ice_tab_blend_show = False
-
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 146 </X>\r\n')
-        out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
-        out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        out_xml( '\t</Image>\r\n')
-
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> TextPriceMenuBlendX </X>\r\n')
-        out_xml( '\t<Y> TextPriceMenuY </Y>\r\n')
-        out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n')
-        out_xml( '\t<Width>220</Width>\r\n')
-        out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')
-        #out_xml( '\t<Align> end </Align>\r\n')
-    
-        out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
-        out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
-        out_xml( '\t<State> ' + shw + ' </State>\r\n')
-        if "inter" in param:
-          if "free" in param:
-            out_xml( '\t<Value> " Free" </Value>\r\n')
-          else:
-            out_xml( '\t<Value> StringFmt(  $' + str_blend_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
-        else:
-          out_xml( '\t<Value> Var( "฿" + $' + str_blend_product_code + '.Price ) </Value>\r\n')
-        out_xml( '\t</Text>\r\n')
-        
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 81 </X>\r\n')
-        out_xml( '\t<Y> 264 </Y>\r\n')
-        out_xml( '\t<State> \r\n')
-        out_xml( '\t\teval( \r\n')
-        out_xml( '\t\tIf ICE_PROCESS_STATUS = 2 Then\r\n')
-        out_xml( '\t\t\r\n')
-        if ice_tab_hot_show == True:
-
-          #out_xml( '\t\t\tDEBUGVAR $Sum' + str_con_var +'\r\n')
-          out_xml( '\t\t\tIf $Sum' + str_con_var +' = "Disable" Then\r\n')
-          out_xml( '\t\t\t\tVar ice_tab_process_show = "Disable"\r\n')
-          out_xml( '\t\t\tElse\r\n')
-          out_xml( '\t\t\t\tVar ice_tab_process_show = "Enable"\r\n')
-          out_xml( '\t\t\tEndIf\r\n')
-        else:
-          out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
-        
-        out_xml( '\t\t\r\n')
-        out_xml( '\t\tElse\r\n')
-        out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
-        out_xml( '\t\tEndIf\r\n')
-        out_xml( '\t\tVar return = ice_tab_process_show\r\n')
-        out_xml( '\t\t)\r\n')
-        out_xml( '\t</State>\r\n')
-        out_xml( '\t<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>\r\n')
-        out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>\r\n')
-        out_xml( '\t</Image>\r\n')
-
-        
-        out_xml( '\t<Image>\r\n')
-        out_xml( '\t<X> 49 </X>\r\n')
-        out_xml( '\t<Y> 117 </Y>\r\n')
-        out_xml( '\t<State> \r\n')
-        out_xml( '\t\teval( \r\n')
-        out_xml( '\t\t\tIf $Sum' + str_con_var +' = "Disable" Then\r\n')
-        out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_1 + '.TAG tag1_is_disable\r\n')
-        out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_2 + '.TAG tag2_is_disable\r\n')
-        out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_3 + '.TAG tag3_is_disable\r\n')
-        #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_1 + '.TAG\r\n')
-        #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_2 + '.TAG\r\n')
-        #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_3 + '.TAG\r\n')
-        out_xml( '\t\t\t\tVar return = "Invisible"\r\n')
-        out_xml( '\t\t\t\tIf tag1_is_disable = "true" Then\r\n')
-        out_xml( '\t\t\t\t\tVar return = "Enable"\r\n')
-        out_xml( '\t\t\t\tEndIf\r\n')
-        out_xml( '\t\t\t\tIf tag2_is_disable = "true" Then\r\n')
-        out_xml( '\t\t\t\t\tVar return = "Enable"\r\n')
-        out_xml( '\t\t\t\tEndIf\r\n')
-        out_xml( '\t\t\t\tIf tag3_is_disable = "true" Then\r\n')
-        out_xml( '\t\t\t\t\tVar return = "Enable"\r\n')
-        out_xml( '\t\t\t\tEndIf\r\n')
-        out_xml( '\t\t\tElse\r\n')
-        out_xml( '\t\t\t\t\tVar return = "Invisible"\r\n')
-
-        out_xml( '\t\t\tEndIf\r\n')
-
-        out_xml( '\t\t)\r\n')
-        out_xml( '\t</State>\r\n')
-        out_xml( '\t<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>\r\n')
-        out_xml( '\t</Image>\r\n')
-      
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> 84 </X>\r\n')
-        out_xml( '\t<Y> 266 </Y>\r\n')
-        out_xml( '\t<Size> 10 </Size>\r\n')
-        out_xml( '\t<Font> OpunMediumTTF </Font>\r\n')
-        out_xml( '\t<Color> 0xDE794E </Color>\r\n')
-        out_xml( '\t<State> ice_tab_process_show </State>\r\n')
-        out_xml( '\t<Value> ice_show_open </Value>\r\n')
-        out_xml( '\t</Text>\r\n')
-
-
-        out_xml( '\t<Text>\r\n')
-        out_xml( '\t<X> 48 </X>\r\n')
-        out_xml( '\t<Y> 116 </Y>\r\n')
-        out_xml( '\t<Size> 32 </Size>\r\n')
-        out_xml( '\t<Width>128</Width>\r\n')
-        out_xml( '\t<Height>64</Height>\r\n')
-        out_xml( '\t<Mode> "disable-show" </Mode>\r\n')
-        out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
-        out_xml( '\t<Language>\r\n')
-        out_xml( '\t\t<ID> 000013 </ID> \r\n')
-        out_xml( '\t</Language>\r\n')
-        out_xml( '\t<Align> center-vertical-horizontal </Align>\r\n')
-        out_xml( '\t</Text>\r\n')
-
-
-        out_xml( '</Block>\r\n')
-    
-    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
-        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
-        
-
-    idx_lang_malay = 5
-    idx_lang_japan = 4
-    idx_lang_china = 3
-    idx_lang_thai = 2
-    idx_lang_eng = 1
-
-
-    idx_name = 0
-    idx_desc = 1
-    idx_img = 2
-
-
-    idx_hot_product_code = 7
-    idx_cold_product_code = idx_hot_product_code + 1
-    idx_blend_product_code = idx_cold_product_code + 1
-    
-    # 
-    idx_hot_product_code2 = idx_blend_product_code + 1
-    idx_cold_product_code2 = idx_hot_product_code2 + 1
-    idx_blend_product_code2 = idx_cold_product_code2 + 1
-    idx_of_eng = 2
-    idx_of_eng_des = 3
-    idx_of_thai = 0
-    idx_of_thai_des = 1
-    print ("--------------------------------------------------------------------------------------------------------------------------")
-    
-    
-    if current_file_name == "page_catalog_group_recommend.skt":
-      touch_less_gen = True
-    else:
-      touch_less_gen = False
-    
-    out_xml('<FrameScroll> \r\n')
-    if touch_less_gen == True:
-      out_xml('<Max> 16 </Max>\r\n')
-    out_xml('<X> 10 </X>\r\n')
-    out_xml('<Y> 497 </Y>\r\n')
-    out_xml('<Width> 1080 </Width>\r\n')
-    out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n')
-    out_xml('<Scroll> "Vertical" </Scroll>\r\n')
-    out_xml('<Column> 4 </Column>\r\n')
-    out_xml('<Script>\r\n') 
-
-    print("current_file_name " + current_file_name)
-
-    
-    if touch_less_gen == False:
-
-      out_xml('\t Var block_index_override = 0\r\n')
-      out_xml('\t Var block_index_move = 0\r\n')
-    else:
-      out_xml('\t Var block_index_override = 0\r\n')
-      out_xml('\t Var block_index_move = 0\r\n')
-      #out_xml('\t Var block_index_override = 4\r\n')
-      #out_xml('\t Var block_index_move = 1\r\n')
-      #out_xml('\tIf Seeker = "curr" Then\r\n')
-      #out_xml('\t\tVar TouchLessStg = "Enable"\r\n')
-      #out_xml('\t\tVar TouchLessQrStg = "Enable"\r\n')
-      #out_xml('\tElse\r\n')
-      #out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
-      #out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
-      #out_xml('\tEndIf\r\n')
-      #out_xml('\tIf WebAppShow = "Invisible" Then\r\n')
-      #out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
-      #out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
-      #out_xml('\tEndIf\r\n')
-      
-    
-    out_xml('</Script>\r\n')
-    
-    pd_code_available = '##-##-##-####'
-    count = 0
-    count_test = 0
-    #if touch_less_gen == True:
-    #  out_xml( '<Block>\r\n')
-    #  out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
-    #  out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
-    #  out_xml('\t<Width> 225 </Width>\r\n')
-    #  out_xml('\t<Height> 296 </Height>\r\n')
-    #  out_xml('\t<State> "Enable" </State> \r\n')
-    #  out_xml('\t<Image>\r\n')
-    #  out_xml('\t<X> 0 </X>\r\n')
-    #  out_xml('\t<Y> 0 </Y>\r\n')
-    #  out_xml('\t<State> TouchLessStg </State> \r\n')
-    #  out_xml('\t<Filename> Var( DirImage + "/touch_less_order.png" )</Filename>\r\n')
-    #  out_xml('\t<FilenameDisable> Var( DirImage + "/touch_less_order_db.png" )</FilenameDisable>\r\n')
-    #  out_xml('\t</Image>\r\n')
-    #  out_xml('\t<QRCode>\r\n')
-    #  out_xml('\t<X> 40 </X>\r\n')
-    #  out_xml('\t<Y> 153 </Y>\r\n')
-    #  out_xml('\t<Width> 150 </Width>\r\n')
-    #  out_xml('\t<Color> "0xeae6e1" </Color>\r\n')
-    #  out_xml('\t<QRColor> "0x513C2F" </Color>\r\n')
-    #  out_xml('\t<Height> 150 </Height>\r\n')
-    #  
-    #  #out_xml('\t<State> TouchLessQrStg </State>\r\n')
-    #  #out_xml('\t<Service> "Herr" </Service>\r\n')
-    #  out_xml('\t<State> TouchLessQrStg </State>\r\n')
-    #  out_xml('\t<Service> testservice </Service>\r\n')
-    #  
-    #  out_xml('\t</QRCode>\r\n')
-    #  out_xml('</Block>\r\n')
-    out_xml(';dummy_layout.inc\r\n')
-#
-    #out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
-    for spl in  menu_new_list:
-        #product_code = s
-        #if spl[ idx_of_eng] == "IGNORE":
-        #  continue
-        if len(spl) == 1:
-            if spl[0].startswith("TAG"):
-                out_xml( '\t;' + spl[0] + '\r\n')  
-                print("Have TAGESP")
-                continue
-        print( '==>\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code]  + ' ' + spl[ idx_name][ idx_blend_product_code]  + ' \r\n')
-        
-        if "," in spl[ idx_name][ idx_hot_product_code] and  "," in spl[ idx_name][ idx_cold_product_code] and "," in spl[ idx_name][ idx_blend_product_code]:
-            #print(" hot = " + spl[ idx_name][ idx_hot_product_code])
-            hot_pd = spl[ idx_name][ idx_hot_product_code].split(',')
-            cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
-            blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
-
-            #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd))  + '\r\n')
-            list_size = len( hot_pd)
-            for idx in range( list_size):
-              print(' hot = ' + hot_pd[ idx] + ' cold = ' + cold_pd[ idx]+ ' blend_pd = ' +  blend_pd[ idx] + '\r\n')
-              if hot_pd[ idx] == '-' and  cold_pd[ idx] == '-' and  blend_pd[ idx] == '-':
-                  print("\t\t==> ignore ")
-              else:
-                  print("\t\t==> gen ")
-                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
-        else:
-            GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
-            #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
-            #print("++++++++++++++++++++++++++++++ " + str( count_test) )
-            #count_test = count_test + 1
-            #if count_test > 5 :
-            #  break
-            if len( spl[idx_name] ) >= 11:
-                if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
-                  GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
-
-    out_xml('</FrameScroll>\r\n')
-
-
-    out_xml('; Cart\r\n')
-    out_xml('<Button>\r\n')
-    out_xml('<X> 915 </X>\r\n')
-    out_xml('<Y> 1769 </Y>\r\n')
-    out_xml('<State> showCart </State>\r\n')
-    out_xml('<Filename> cart_image_bn  </Filename>\r\n')
-    out_xml('<FilenamePress> cart_image_bp </FilenamePress>\r\n')
-    out_xml('<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
-    out_xml('<Volume> SoundVolume </Volume>\r\n')
-    out_xml('<EventClick> \r\n')
-    out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
-    out_xml('</EventClick>\r\n')
-    out_xml('</Button>\r\n')
-  # if "v2" in param:
-    
-

inter/aus/xml/multi/other.ev

@@ -1,3 +1,3 @@
 SAVELOG "Call other"
-TabMenuVisibleInst 7
+TabMenuVisibleInst 8
 Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"

inter/aus/xml/multi/page_catalog.lxml

@@ -501,7 +501,7 @@
 		Var ColumnOverride[0] = 2
 
 		Var ColumnOverride[1] = 3
-		Var ColumnOverride[2] = 2
+		Var ColumnOverride[2] = 3
 		Var ColumnOverride[3] = 3
 
 		Var ColumnGravity[0] = 2
@@ -659,7 +659,7 @@
 
 		If Inst11MenuLoaded = "done" Then
 			Var MultiProcess = "Invisible"
-			TabMenuVisibleInst 7
+			TabMenuVisibleInst 8
 
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
 		Else
@@ -739,6 +739,40 @@
 	</Button>
 </Block>
 
+<Block>
+	<Width> 296 </Width>
+	<Height> 344 </Height>
+	<MarginLeft> 42 </MarginLeft>
+	<State> "Enable" </State>
+	<Button>
+	<State> "Enable" </State>
+	<Filename> Var(DirImageAUS + "/bn_energy_drink.png")) </Filename>
+	<FilenamePress> Var(DirImageAUS + "/bp_energy_drink.png") </FilenamePress>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventClick>
+
+		If Inst9MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
+			TabMenuVisibleInst 7
+
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
+		Else
+			Var MultiProcessTimer = 0
+			Var MultiProcess = "Enable"
+			Var SelectedMenu = "energy_drink"
+		EndIf
+
+	</EventClick>
+	<Language>
+	    <ID> 000026 </ID>
+		<X> 28 </X>
+		<Y> 202 </Y>
+		<Width> 241 </Width>
+		<Height> 82 </Height>
+	</Language>
+	</Button>
+</Block>
 
 
 </FrameScroll>

inter/aus/xml/multi/sodaother.ev

@@ -1,3 +1,3 @@
 SAVELOG "Call tea.ev"
-TabMenuVisibleInst 7
+TabMenuVisibleInst 8
 Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"

inter/aus/xml/multi/tab_menu.lxml

@@ -5,8 +5,8 @@
 <EventOpen>
 
    	;Var DirImage = "ROOT/taobin_project/image/page2_inter/"
-    Var DirImageAlter = "ROOT/taobin_project/image/page3_2_v2_en/"
+    Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-	Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/catalog/"
+	Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/page3_2_en/"
 
     DEBUGVAR DirImageAlter
 
@@ -33,22 +33,6 @@
     <Width> 1080 </Width>
     <Height> 102 </Height>
 
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu0Selected </State>
-        <Mode> "No" </Mode>
-        <Filename> Var( DirImageAlter + "/bn_tao_pun.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_tao_pun.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            Var NextPage = "-"
-            TabMenuVisibleInst 9
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-
-        </EventClick>
-        </Button>
-
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu1Selected </State>
@@ -63,9 +47,7 @@
             Var OpenFromMulti = 0
             Var OpenFromPageBoard = 1
 
-            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
+            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/v3/event/script_open_promotion_v3.ev"
-
-
         </EventClick>
         </Button>
 
@@ -81,7 +63,7 @@
         <EventClick>
             Var NextPage = "-"
             TabMenuVisibleInst 2
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
 
         </EventClick>
         </Button>
@@ -99,7 +81,7 @@
             Var NextPage = "-"
 
             TabMenuVisibleInst 3
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
 
         </EventClick>
         </Button>
@@ -109,15 +91,15 @@
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
         <Mode> "No" </Mode>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <Filename> Var( DirImageAUS + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAUS + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
             Var NextPage = "-"
             TabMenuVisibleInst 4
             OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
         </EventClick>
         </Button>
 
@@ -133,41 +115,7 @@
         <EventClick>
             Var NextPage = "-"
             TabMenuVisibleInst 5
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu11Selected </State>
-        <Mode> "No" </Mode>
-        <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 = "-"
-            TabMenuVisibleInst 5
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-        </EventClick>
-        </Button>
-
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu21Selected </State>
-        <Mode> "No" </Mode>
-        <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 = "-"
-            SAVELOG "============================ Click For Kids "============================ "
-            TabMenuVisibleInst 5
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-
         </EventClick>
         </Button>
 
@@ -176,43 +124,28 @@
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
         <Mode> "No" </Mode>
-        <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
+        <Filename> Var( DirImageAUS + "/bn_dessert.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAUS + "/bp_dessert.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            Var NextPage = "-"
-             TabMenuVisibleInst 6
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu8Selected </State>
-        <Mode> "No" </Mode>
-        <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 = "-"
             TabMenuVisibleInst 6
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
         </EventClick>
         </Button>
+
         <Button>
         <Layout> "linear" </Layout>
-        <State> Menu61Selected </State>
+        <State> Menu23Selected </State>
-        <Mode> "No" </Mode>
+        <Filename> Var( DirImageAUS + "/bn_energy_drink.png") </Filename>
-        <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+        <FilenamePress> Var( DirImageAUS + "/bp_energy_drink.png") </FilenamePress>
-        <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
             Var NextPage = "-"
-            TabMenuVisibleInst 8
+            TabMenuVisibleInst 7
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
         </EventClick>
         </Button>
 
@@ -226,48 +159,10 @@
         <Volume> SoundVolume </Volume>
         <EventClick>
             Var NextPage = "-"
-            TabMenuVisibleInst 7
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu63Selected </State>
-        <Mode> "No" </Mode>
-        <Filename> Var( DirImageAlter + "/bn_20_baht.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_20_baht.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-           Var NextPage = "-"
             TabMenuVisibleInst 8
-            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+            OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/multi/page_instance2.xml"
-
         </EventClick>
         </Button>
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> MenuVSelected2 </State>
-        <Mode> "No" </Mode>
-        <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 = "-"
-
-
-            RootLayoutVisible 3 "hide"
-            RootLayoutVisible 13 "hide"
-
-            TabMenuVisibleInst 99
-            OpenInst 2 "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
-        </EventClick>
-        </Button>
-
 </Row2>
 </ListView1>
 

inter/aus/xml/multi/v3/event/dummy_layout_promotion.py

@@ -20,7 +20,6 @@ if "v3" in param and "promotion" in param and "other_catalog" in param:
 			pro_content = str(pro_template_content)
 			pro_content = pro_content.replace("#State", pro_json["state"])
 			pro_content = pro_content.replace("#Type", pro_json["type"])
-			pro_content = pro_content.replace("#MediaThai", pro_json["media_thai"])
 			pro_content = pro_content.replace("#MediaEng", pro_json["media_eng"])
 			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
 			all_active_pro += pro_content + "\n\t"
@@ -52,7 +51,6 @@ if "v3" in param and "promotion" in param:
 			pro_content = str(pro_template_content)
 			pro_content = pro_content.replace("#State", pro_json["state"])
 			pro_content = pro_content.replace("#Type", pro_json["type"])
-			pro_content = pro_content.replace("#MediaThai", pro_json["media_thai"])
 			pro_content = pro_content.replace("#MediaEng", pro_json["media_eng"])
 			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
 			all_active_pro += pro_content + "\n"

inter/aus/xml/multi/v3/event/event_v3/promotion_template.inc

@@ -1,15 +1,7 @@
 		<Banner>
 			<State> #State </State>
 			<Type> #Type </Type>
-			<Media>
+			<Media> "#MediaEng" </Media>
-				eval(
-					If show_eng = "true" Then
-						Var return = "#MediaEng"
-					Else
-						Var return = "#MediaThai"
-					EndIf
-				)
-			</Media>
 			<EventOnClick>
 				#EventClick
 			</EventOnClick>

inter/aus/xml/multi/v3/menu_head.py

@@ -6,10 +6,10 @@
  default_dir_press = 'ROOT/taobin_project/image/page_drink_press/'
  default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/'
  
- new_default_dir = 'ROOT/taobin_project/inter/tha/image/page_drink_n/'
+ new_default_dir = 'ROOT/taobin_project/inter/aus/image/page_drink_n/'
- new_default_dir2 = 'ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/'
+ new_default_dir2 = 'ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/'
- new_default_dir_press = 'ROOT/taobin_project/inter/tha/image/page_drink_press_n/'
+ new_default_dir_press = 'ROOT/taobin_project/inter/aus/image/page_drink_press_n/'
- new_default_dir_disable = 'ROOT/taobin_project/inter/tha/image/page_drink_disable_n2/'
+ new_default_dir_disable = 'ROOT/taobin_project/inter/aus/image/page_drink_disable_n2/'
  
  menu_count = 0
  

inter/aus/xml/multi/v3/menu_new_layout_gen_v3.py

@@ -96,35 +96,109 @@
       if "show-blend-only" in xml_parameter:
         print("Hot price ignore ")
       else:
-        out_xml('\t\t<HotPrice> eval( \n')
+        out_xml('\t\t<HotPrice>\n')
+        out_xml('\t\t\teval(\n')
+        out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
+        out_xml('\t\t\t\t\tVar return = "Free"\n')
+        out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</HotPrice>\n')
 
-        out_xml( '\t\tIf $' + pd_code_1 + '.Price = -1 Then\r\n')
+        out_xml('\t\t<HotOriginalPrice>\n')
-        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml('\t\t\teval(\n')
-        out_xml( '\t\tElse\r\n')
+        out_xml('\t\t\t\tVar return = ""\n')
-        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
-        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t\t\t\tVar return = ""\n')
-        out_xml('\t\t) </HotPrice>\n')
+        out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\t\tVar return ""\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</HotOriginalPrice>\n')
 
 
       if "show-blend-only" in xml_parameter:
         print("Cold price ignore ")
       else:
-        out_xml('\t\t<IcePrice> eval( \n')
+        out_xml('\t\t<IcePrice>\n')
-        out_xml( '\t\tIf $' + pd_code_2 + '.Price = -1 Then\r\n')
+        out_xml('\t\t\teval(\n')
-        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml('\t\t\t\tIf $' + pd_code_2 +'.Price = -1 Then\n')
-        out_xml( '\t\tElse\r\n')
+        out_xml('\t\t\t\t\tVar return = "Free"\n')
-        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml('\t\t\t\tElse\n')
-        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
-        out_xml('\t\t) </IcePrice>\n')
+        out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_2 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</IcePrice>\n')
+
+        out_xml('\t\t<IceOriginalPrice>\n')
+        out_xml('\t\t\teval(\n')
+        out_xml('\t\t\t\tVar return = ""\n')
+        out_xml('\t\t\t\tIf $' + pd_code_2 +'.Price = -1 Then\n')
+        out_xml('\t\t\t\t\tVar return = ""\n')
+        out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\t\tVar return ""\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_2 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</IceOriginalPrice>\n')
 
 
-      out_xml('\t\t<BlendPrice> eval( \n')
+      out_xml('\t\t<BlendPrice>\n')
-      out_xml( '\t\tIf $' + pd_code_3 + '.Price = -1 Then\r\n')
+      out_xml('\t\t\teval(\n')
-      out_xml( '\t\t\tVar return = "Free"\r\n')
+      out_xml('\t\t\t\tIf $' + pd_code_3 +'.Price = -1 Then\n')
-      out_xml( '\t\tElse\r\n')
+      out_xml('\t\t\t\t\tVar return = "Free"\n')
-      out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+      out_xml('\t\t\t\tElse\n')
-      out_xml( '\t\tEndIf\r\n')
+      out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
-      out_xml('\t\t) </BlendPrice>\n')
+      out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tIf $' + pd_code_3 + '.Discount = > 0 Then\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t)\n')
+      out_xml('\t\t</BlendPrice>\n')
+
+      out_xml('\t\t<BlendOriginalPrice>\n')
+      out_xml('\t\t\teval(\n')
+      out_xml('\t\t\t\tVar return = ""\n')
+      out_xml('\t\t\t\tIf $' + pd_code_3 +'.Price = -1 Then\n')
+      out_xml('\t\t\t\t\tVar return = ""\n')
+      out_xml('\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
+      out_xml('\t\t\t\t\t\tVar return ""\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tIf $' + pd_code_3 + '.Discount = > 0 Then\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t)\n')
+      out_xml('\t\t</BlendOriginalPrice>\n')
 
 
       out_xml('\t\t<IceProcessingState>\n')
@@ -270,21 +344,14 @@
         out_xml( '\t\t\t\tEndIf\n')
         out_xml( '\t\t\tEndIf\n')
 
-
+      out_xml('\t\t\t;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"\n')
-
-
-      out_xml('\t\t\t;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"\n')
       current_file_name_str = current_file_name.replace(".skt", ".lxml")
-      out_xml( '\t\t\tVar OpenFromXML = "ROOT/taobin_project/inter/tha/xml/'+ current_file_name_str + '"\n')
+      out_xml( '\t\t\tVar OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/'+ current_file_name_str + '"\n')
-      #
 
       out_xml( '\t\t\t\n')
       out_xml( '\t\t\t\n')
       out_xml( '\t\t\tTabMenuVisibleInst 99\n')
 
-      out_xml( '\t\t\tDEBUGVAR RedirectToNormalVersion\n')
-      out_xml( '\t\t\tDEBUGVAR ToppingNewUINewSystem\n')
-
       out_xml( '\t\t\tIf RedirectToNormalVersion = 1 Then\n')
       out_xml( '\t\t\t\tVar menu_name_eng_hot = NameLang[0][0]\n')
       out_xml( '\t\t\t\tVar menu_desc_eng_hot = DescLang[0][0]\n')
@@ -303,17 +370,10 @@
       out_xml( '\t\t\t\tVar menu_desc_thai_blender = DescLang[2][1]\n')
       out_xml( '\t\t\t\tDEBUGVAR menu_name_thai_cold\n')
       out_xml( '\t\t\t\tDEBUGVAR menu_desc_thai_cold\n')
+      out_xml( '\t\t\t\tVar NameDrink = aliasName[0]\n')
+      out_xml( '\t\t\t\tVar DrinkDescription =  aliasDesc[0]\n')
 
-      out_xml( '\t\t\t\t\tVar NameDrink = aliasName[0]\n')
-      out_xml( '\t\t\t\t\tVar DrinkDescription =  aliasDesc[0]\n')
-      out_xml( '\t\t\t\t\tVar NameDrinkTH = aliasName[1]\n')
-      out_xml( '\t\t\t\t\tVar DrinkDescriptionTH = aliasDesc[1]\n')
-
-      out_xml( '\t\t\tIf LanguageShow = "THAI" Then\n')
-      out_xml( '\t\t\t\tVar show_eng =  "false"\n')
-      out_xml( '\t\t\tElse\n')
       out_xml( '\t\t\t\tVar show_eng =  "true"\n')
-      out_xml( '\t\t\tEndIf\n')
 
       if len( topping_xml_file) > 0 :
         print("topping_xml_file=" + topping_xml_file)
@@ -324,16 +384,16 @@
         print("xml_parameter=" + xml_parameter)
 
       if len( topping_xml_file) == 0 :
-        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\n')
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"\n')
       else:
-        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/'+ topping_xml_file +'"\n')
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/'+ topping_xml_file +'"\n')
 
       out_xml( '\t\t\tElse\n')
 
       if len( topping_xml_file) == 0 :
-        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"\n')
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"\n')
       else:
-        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/'+ topping_xml_file +'"\n')
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/'+ topping_xml_file +'"\n')
 
 
       out_xml( '\t\t\tEndIf\n')
@@ -344,33 +404,6 @@
       out_xml('\t\t</EventOnClick>\n')
       out_xml('\t\t</Menu>\n\n')
 
-    def GenBanner(type, thai_media, eng_media, event_on_click_script, start_date_time, end_date_time, state_var):
-      str_con = []
-      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', start_date_time.strip()):
-        str_con.append(f'DateTimeStart="{start_date_time.strip()}"')
-      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', end_date_time.strip()):
-        str_con.append(f'DateTimeEnd="{end_date_time.strip()}"')
-
-      if re.match(r'^\w.*', state_var.strip()):
-        str_con.append(f'Var={state_var.strip()},')
-
-      out_xml('\t\t<Banner>\n')
-      out_xml('\t\t\t<State> Flag( '+ ",".join(str_con) + ' ) </State>\n')
-      out_xml('\t\t\t<Type> ' + type + ' </Type>\n')
-      out_xml('\t\t\t<Media>\n')
-      out_xml('\t\t\t\teval(\n')
-      out_xml('\t\t\t\t\tIf show_eng = "true" Then\n')
-      out_xml('\t\t\t\t\t\tVar return = ' + eng_media + '\n')
-      out_xml('\t\t\t\t\tElse\n')
-      out_xml('\t\t\t\t\t\tVar return = ' + thai_media + '\n')
-      out_xml('\t\t\t\t\tEndIf\n')
-      out_xml('\t\t\t\t)\n')
-      out_xml('\t\t\t</Media>\n')
-      out_xml('\t\t\t<EventOnClick>\n')
-      out_xml('\t\t\t\t' + event_on_click_script.replace('\\n', '\n').replace('\\t', '\t') + '\n')
-      out_xml('\t\t\t</EventOnClick>\n')
-      out_xml('\t\t</Banner>\n')
-
     idx_lang_myanmar = 6
     idx_lang_malay = 5
     idx_lang_japan = 4
@@ -397,10 +430,6 @@
     idx_hot_product_code2 = idx_blend_product_code + 1
     idx_cold_product_code2 = idx_hot_product_code2 + 1
     idx_blend_product_code2 = idx_cold_product_code2 + 1
-    idx_of_eng = 2
-    idx_of_eng_des = 3
-    idx_of_thai = 0
-    idx_of_thai_des = 1
     print ("--------------------------------------------------------------------------------------------------------------------------")
 
 
@@ -422,7 +451,7 @@
     out_xml('\t\t\t<Color> 0x322B26 </Color>\n')
     out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
     out_xml('\t\t\t<AutoResizeConfiguration>\n')
-    out_xml('\t\t\t\t<Min> 16 </Min>\n')
+    out_xml('\t\t\t\t<Min> 10 </Min>\n')
     out_xml('\t\t\t\t<Max> 22 </Max>\n')
     out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
     out_xml('\t\t\t</AutoResizeConfiguration>\n')
@@ -441,9 +470,10 @@
     out_xml('\t\t\t<Font> KanitRegularTTF </Font>\n')
     out_xml('\t\t\t<Color> 0x6F5F51 </Color>\n')
     out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
+    out_xml('\t\t\t<ColorDiscount> 0xCC0A14 </ColorDiscount>\n')
     out_xml('\t\t\t<AutoResizeConfiguration>\n')
     out_xml('\t\t\t\t<Min> 4 </Min>\n')
-    out_xml('\t\t\t\t<Max> 20 </Max>\n')
+    out_xml('\t\t\t\t<Max> 14 </Max>\n')
     out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
     out_xml('\t\t\t</AutoResizeConfiguration>\n')
     out_xml('\t\t</MenuPriceTextConfiguration>\n')
@@ -451,6 +481,7 @@
     out_xml('\t\t<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>\n')
     out_xml('\t\t<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>\n')
     out_xml('\t\t<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>\n')
+    out_xml('\t\t<ShowOriginalPrice> "true" </ShowOriginalPrice>\n')
     out_xml('\t</Configuration>\n')
     out_xml('\t<Menus>\n')
     out_xml(';banners\n')
@@ -472,41 +503,29 @@
           out_xml( '\t;' + spl[0] + '\r\n')
           continue
 
-      if spl[idx_desc][idx_lang_eng].startswith("BANNER"):
+      [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',')
-        date_time_start = spl[idx_name][idx_date_time_start]
+      [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',')
-        date_time_end = spl[idx_name][idx_date_time_end]
+      [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',')
-        state_var = spl[idx_name][idx_product_var]
 
-        type = spl[idx_desc][idx_lang_thai]
+      # date_time_start = spl[idx_name][idx_date_time_start]
-        eng_media = spl[idx_img][idx_lang_eng]
+      # date_time_end = spl[idx_name][idx_date_time_end]
-        thai_media = spl[idx_img][idx_lang_thai]
+      # product_var = spl[idx_name][idx_product_var]
-        on_click_script = spl[idx_name][idx_lang_thai]
+      date_time_start = ""
+      date_time_end = ""
+      product_var = ""
+      try:
+        default_topping = spl[idx_name][idx_of_default_toppimg]
+      except:
+        default_topping = "0"
+      print(f"spl[{idx_name}] =", spl[idx_name])
+      # print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var}  , default_topping={default_topping}")
 
-        GenBanner(type, thai_media, eng_media, on_click_script, date_time_start, date_time_end, state_var)
+      for [hot_pd, cold_pd, blend_pd] in [[hot_pd_v1, cold_pd_v1, blend_pd_v1], [hot_pd_v2, cold_pd_v2, blend_pd_v2]]:
-      else:
+        if hot_pd == '-' and cold_pd == '-' and blend_pd == '-':
-        [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',')
+          continue
-        [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',')
+        else:
-        [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',')
+          print(f"Gen ==> hot={hot_pd}, cold={cold_pd}, blend={blend_pd}")
-
+          GenMenuV3(hot_pd, cold_pd, blend_pd, date_time_start, date_time_end, product_var, default_topping)
-        # date_time_start = spl[idx_name][idx_date_time_start]
-        # date_time_end = spl[idx_name][idx_date_time_end]
-        # product_var = spl[idx_name][idx_product_var]
-        date_time_start = ""
-        date_time_end = ""
-        product_var = ""
-        try:
-          default_topping = spl[idx_name][idx_of_default_toppimg]
-        except:
-          default_topping = "0"
-        print(f"spl[{idx_name}] =", spl[idx_name])
-        # print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var}  , default_topping={default_topping}")
-
-        for [hot_pd, cold_pd, blend_pd] in [[hot_pd_v1, cold_pd_v1, blend_pd_v1], [hot_pd_v2, cold_pd_v2, blend_pd_v2]]:
-          if hot_pd == '-' and cold_pd == '-' and blend_pd == '-':
-            continue
-          else:
-            print(f"Gen ==> hot={hot_pd}, cold={cold_pd}, blend={blend_pd}")
-            GenMenuV3(hot_pd, cold_pd, blend_pd, date_time_start, date_time_end, product_var, default_topping)
     out_xml('\t\t</Menus>\n\n')
     out_xml('</ScrollableCatalog>\n')
 

inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml

@@ -58,7 +58,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -77,9 +77,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -87,6 +88,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -94,9 +96,9 @@
 		; - 51-04-02-1018 - 
 		<Menu>
 		<State> Flag( 51-04-02-1018.Button,$Sum5104021018) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_original_BDMS.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_original_BDMS.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_original_BDMS.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_original_BDMS.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_original_BDMS.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_original_BDMS.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>APP FAST ORIGINAL</LanguageSlot1>
@@ -120,27 +122,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-04-02-1018.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-04-02-1018.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-04-02-1018.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-04-02-1018.Discount = "" Then
+						Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-04-02-1018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1018.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-04-02-1018.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-04-02-1018.Discount = "" Then
+						Var return ""
+					Else
+						If $51-04-02-1018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -188,7 +262,7 @@
 			<Value> $Sum5104021018TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_original_BDMS.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_original_BDMS.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -273,13 +347,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -298,18 +370,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -321,9 +387,9 @@
 		; - 51-04-02-1019 - 
 		<Menu>
 		<State> Flag( 51-04-02-1019.Button,$Sum5104021019) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_espresso_BDMS.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_espresso_BDMS.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_espresso_BDMS.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_espresso_BDMS.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_espresso_BDMS.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_espresso_BDMS.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>APP FAST ESPRESSO</LanguageSlot1>
@@ -347,27 +413,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-04-02-1019.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-04-02-1019.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-04-02-1019.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-04-02-1019.Discount = "" Then
+						Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-04-02-1019.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1019.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-04-02-1019.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-04-02-1019.Discount = "" Then
+						Var return ""
+					Else
+						If $51-04-02-1019.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -415,7 +553,7 @@
 			<Value> $Sum5104021019TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_espresso_BDMS.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_espresso_BDMS.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -500,13 +638,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -525,18 +661,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -548,9 +678,9 @@
 		; - 51-04-02-1020 - 
 		<Menu>
 		<State> Flag( 51-04-02-1020.Button,$Sum5104021020) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Chocolate_BDMS.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Chocolate_BDMS.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Chocolate_BDMS.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Chocolate_BDMS.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Chocolate_BDMS.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Chocolate_BDMS.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>APP FAST \nCHOCOLATE</LanguageSlot1>
@@ -574,27 +704,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-04-02-1020.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-04-02-1020.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-04-02-1020.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-04-02-1020.Discount = "" Then
+						Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-04-02-1020.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1020.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-04-02-1020.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-04-02-1020.Discount = "" Then
+						Var return ""
+					Else
+						If $51-04-02-1020.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -642,7 +844,7 @@
 			<Value> $Sum5104021020TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Chocolate_BDMS.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Chocolate_BDMS.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -727,13 +929,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -752,18 +952,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -775,9 +969,9 @@
 		; - 51-04-02-1021 - 
 		<Menu>
 		<State> Flag( 51-04-02-1021.Button,$Sum5104021021) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Thaitea_BDMS.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Thaitea_BDMS.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Thaitea_BDMS.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Thaitea_BDMS.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Thaitea_BDMS.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Thaitea_BDMS.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>APP FAST \nTHAI TEA</LanguageSlot1>
@@ -801,27 +995,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-04-02-1021.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-04-02-1021.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-04-02-1021.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-04-02-1021.Discount = "" Then
+						Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-04-02-1021.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1021.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-04-02-1021.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-04-02-1021.Discount = "" Then
+						Var return ""
+					Else
+						If $51-04-02-1021.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -869,7 +1135,7 @@
 			<Value> $Sum5104021021TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Thaitea_BDMS.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Thaitea_BDMS.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -954,13 +1220,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -979,18 +1243,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -1002,9 +1260,9 @@
 		; - 51-04-02-1022 - 
 		<Menu>
 		<State> Flag( 51-04-02-1022.Button,$Sum5104021022) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha_BDMS.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha_BDMS.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha_BDMS.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha_BDMS.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha_BDMS.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha_BDMS.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>APP FAST \nMATCHA</LanguageSlot1>
@@ -1028,27 +1286,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-04-02-1022.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-04-02-1022.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-04-02-1022.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-04-02-1022.Discount = "" Then
+						Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-04-02-1022.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1022.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-04-02-1022.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-04-02-1022.Discount = "" Then
+						Var return ""
+					Else
+						If $51-04-02-1022.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1096,7 +1426,7 @@
 			<Value> $Sum5104021022TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Matcha_BDMS.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha_BDMS.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -1181,13 +1511,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -1206,18 +1534,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			

inter/aus/xml/multi/v3/page_catalog_group_energy_drink.skt

@@ -0,0 +1,101 @@
+<?hurr
+    #include=menu_head.py
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 7 Then
+		Var SlientRefreshIndex = 8
+	EndIf
+
+    Var EnergyDrinkRefreshTimeOut = 0
+</EventOpen>
+
+<EventOnShow>
+
+	SCROLL_TO_TOP ""
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_default_init.lxml"
+
+    Var Menu23Selected = "PressForever"
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new_menu.lxml"
+
+
+    RefreshAll
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/InstanceGetSetString.inc"
+
+
+
+    GetVisible inst_show_energy_drink
+
+
+    If inst_show_energy_drink = 1 Then
+        If inst_show_energy_drink_counter > 0 Then
+            DEBUGVAR inst_show_energy_drink_counter
+
+            Var inst_show_energy_drink_counter = inst_show_energy_drink_counter - 1
+
+            If inst_show_energy_drink_counter = 0 Then
+                RefreshAll
+                Var inst_show_energy_drink_counter = 7
+            EndIf
+        EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+    EndIf
+
+
+
+     If EnergyDrinkRefreshTimeOut > 15 Then
+        Var EnergyDrinkRefreshTimeOut = 0
+        Script "-" "-"
+    EndIf
+
+    Var EnergyDrinkRefreshTimeOut = EnergyDrinkRefreshTimeOut + 1
+
+	If RefreshEnergyDrinkMenu = 1 Then
+        Var RefreshEnergyDrinkMenu = 0
+        SAVELOG "OPEN FROM 7"
+
+
+        Open "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml"
+
+    EndIf
+	; setvarint RefreshEnergyDrinkMenu 1
+
+
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new.lxml"
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/aus/xml/multi/v3/page_catalog_group_other.skt

@@ -13,8 +13,8 @@
 
 	DEBUGVAR SlientRefreshIndex
 
-	If SlientRefreshIndex = 7 Then
+	If SlientRefreshIndex = 8 Then
-		Var SlientRefreshIndex = 8
+		Var SlientRefreshIndex = 9
 	EndIf
 
     Var OtherRefreshTimeOut = 1

inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -78,9 +80,9 @@
 		; 51-01-01-0006 51-01-02-0003 51-01-03-0003 
 		<Menu>
 		<State> Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>MOCHA</LanguageSlot1>
@@ -104,27 +106,99 @@
 		<HotState> $51-01-01-0006.Button </HotState>
 		<IceState> $51-01-02-0003.Button </IceState>
 		<BlendState> $51-01-03-0003.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-01-01-0006.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-01-01-0006.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-01-01-0006.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-01-02-0003.Price = -1 Then
+						If $51-01-01-0006.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-01-03-0003.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-01-01-0006.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-01-01-0006.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-01-0006.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-01-02-0003.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-01-02-0003.Discount = "" Then
+						Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-01-02-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-01-02-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-01-02-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-02-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-01-03-0003.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-01-03-0003.Discount = "" Then
+						Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-01-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-01-03-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-01-03-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -172,7 +246,7 @@
 			<Value> $Sum510101000651010200035101030003TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-01-01-0006.Price
@@ -257,13 +331,11 @@
 				Topping "Load" "51-01-03-0003"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -282,18 +354,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -305,9 +371,9 @@
 		; 51-21-01-0006 51-21-02-0003 51-21-03-0003 
 		<Menu>
 		<State> Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>MOCHA</LanguageSlot1>
@@ -331,27 +397,99 @@
 		<HotState> $51-21-01-0006.Button </HotState>
 		<IceState> $51-21-02-0003.Button </IceState>
 		<BlendState> $51-21-03-0003.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-21-01-0006.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-21-01-0006.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-21-01-0006.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-21-02-0003.Price = -1 Then
+						If $51-21-01-0006.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-21-03-0003.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-21-01-0006.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-21-01-0006.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-01-0006.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-21-02-0003.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-02-0003.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-02-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-02-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-02-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-02-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-21-03-0003.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-03-0003.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-03-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-03-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -399,7 +537,7 @@
 			<Value> $Sum512101000651210200035121030003TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-21-01-0006.Price
@@ -484,13 +622,11 @@
 				Topping "Load" "51-21-03-0003"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -509,18 +645,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -532,9 +662,9 @@
 		; - 51-05-02-0010 51-05-03-0010 
 		<Menu>
 		<State> Flag( 51-05-02-0010.Button,51-05-03-0010.Button,$Sum51050200105105030010) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>SPARKLING\nLIMENADE</LanguageSlot1>
@@ -558,27 +688,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-05-02-0010.Button </IceState>
 		<BlendState> $51-05-03-0010.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-05-02-0010.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-05-03-0010.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-05-02-0010.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-02-0010.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-02-0010.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0010.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-02-0010.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-02-0010.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-02-0010.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-05-03-0010.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-03-0010.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-03-0010.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-03-0010.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-03-0010.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-03-0010.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-03-0010.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -626,7 +828,7 @@
 			<Value> $Sum51050200105105030010TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -711,13 +913,11 @@
 				Topping "Load" "51-05-03-0010"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -736,18 +936,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -759,9 +953,9 @@
 		; 51-03-01-0002 51-03-02-0002 51-03-03-0002 
 		<Menu>
 		<State> Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>CHOCOLATE</LanguageSlot1>
@@ -785,27 +979,99 @@
 		<HotState> $51-03-01-0002.Button </HotState>
 		<IceState> $51-03-02-0002.Button </IceState>
 		<BlendState> $51-03-03-0002.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-03-01-0002.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-03-01-0002.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-03-01-0002.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-03-02-0002.Price = -1 Then
+						If $51-03-01-0002.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-03-03-0002.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-03-01-0002.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-03-01-0002.Discount = "" Then
+						Var return ""
+					Else
+						If $51-03-01-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-03-02-0002.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-03-02-0002.Discount = "" Then
+						Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-03-02-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-03-02-0002.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-03-02-0002.Discount = "" Then
+						Var return ""
+					Else
+						If $51-03-02-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-03-03-0002.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-03-03-0002.Discount = "" Then
+						Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-03-03-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-03-03-0002.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-03-03-0002.Discount = "" Then
+						Var return ""
+					Else
+						If $51-03-03-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -853,7 +1119,7 @@
 			<Value> $Sum510301000251030200025103030002TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_cocoa.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_cocoa.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-03-01-0002.Price
@@ -938,13 +1204,11 @@
 				Topping "Load" "51-03-03-0002"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -963,18 +1227,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			

inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -78,9 +80,9 @@
 		; - 51-05-02-0044 - 
 		<Menu>
 		<State> Flag( 51-05-02-0044.Button,$Sum5105020044) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_melon_soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_melon_soda.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_melon_soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_melon_soda.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_melon_soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_melon_soda.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>SPARKLING MELON</LanguageSlot1>
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-05-02-0044.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-05-02-0044.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-05-02-0044.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-02-0044.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0044.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-02-0044.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-02-0044.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -172,7 +246,7 @@
 			<Value> $Sum5105020044TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_melon_soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_melon_soda.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -257,13 +331,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -282,18 +354,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -305,9 +371,9 @@
 		; - 51-01-02-0068 - 
 		<Menu>
 		<State> Flag( 51-01-02-0068.Button,$Sum5101020068) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
@@ -331,27 +397,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-01-02-0068.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-01-02-0068.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-01-02-0068.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-01-02-0068.Discount = "" Then
+						Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-01-02-0068.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-01-02-0068.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-01-02-0068.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-02-0068.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -399,7 +537,7 @@
 			<Value> $Sum5101020068TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -484,13 +622,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -509,18 +645,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -532,9 +662,9 @@
 		; - 51-21-02-0068 - 
 		<Menu>
 		<State> Flag( 51-21-02-0068.Button,$Sum5121020068) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
@@ -558,27 +688,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-21-02-0068.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-21-02-0068.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-21-02-0068.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-02-0068.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-02-0068.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-02-0068.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-02-0068.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-02-0068.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -626,7 +828,7 @@
 			<Value> $Sum5121020068TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -711,13 +913,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -736,18 +936,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -759,9 +953,9 @@
 		; - 51-05-02-0063 - 
 		<Menu>
 		<State> Flag( 51-05-02-0063.Button,$Sum5105020063) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Strawberry_Soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Strawberry_Soda.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Strawberry_Soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Strawberry_Soda.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Strawberry_Soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Strawberry_Soda.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>STRAWBERRY & MINT\nSPARKLING</LanguageSlot1>
@@ -785,27 +979,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-05-02-0063.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-05-02-0063.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-05-02-0063.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-02-0063.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-02-0063.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0063.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-02-0063.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-02-0063.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-02-0063.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -853,7 +1119,7 @@
 			<Value> $Sum5105020063TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Strawberry_Soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Strawberry_Soda.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -938,13 +1204,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -963,18 +1227,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			

inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -78,9 +80,9 @@
 		; - 51-05-02-0033 51-05-03-0033 
 		<Menu>
 		<State> Flag( 51-05-02-0033.Button,51-05-03-0033.Button,$Sum51050200335105030033) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Lychee_soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Lychee_soda.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Lychee_soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Lychee_soda.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Sparkling Lychee</LanguageSlot1>
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-05-02-0033.Button </IceState>
 		<BlendState> $51-05-03-0033.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-05-02-0033.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-05-03-0033.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-05-02-0033.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-02-0033.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-02-0033.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0033.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-02-0033.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-02-0033.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-02-0033.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-05-03-0033.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-03-0033.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-03-0033.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-03-0033.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-03-0033.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-03-0033.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-03-0033.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -172,7 +246,7 @@
 			<Value> $Sum51050200335105030033TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -257,13 +331,11 @@
 				Topping "Load" "51-05-03-0033"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -282,18 +354,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -305,9 +371,9 @@
 		; 51-21-01-0060 51-21-02-0060 51-21-03-0060 
 		<Menu>
 		<State> Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,$Sum512101006051210200605121030060) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Vanilla Café Latte</LanguageSlot1>
@@ -331,27 +397,99 @@
 		<HotState> $51-21-01-0060.Button </HotState>
 		<IceState> $51-21-02-0060.Button </IceState>
 		<BlendState> $51-21-03-0060.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-21-01-0060.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-21-01-0060.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-21-01-0060.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-21-02-0060.Price = -1 Then
+						If $51-21-01-0060.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-21-01-0060.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-21-03-0060.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-21-01-0060.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-21-01-0060.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-01-0060.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-21-02-0060.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-02-0060.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-02-0060.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0060.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-02-0060.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-02-0060.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-02-0060.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-21-03-0060.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-03-0060.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-03-0060.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-03-0060.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-03-0060.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-03-0060.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-03-0060.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -399,7 +537,7 @@
 			<Value> $Sum512101006051210200605121030060TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-21-01-0060.Price
@@ -484,13 +622,11 @@
 				Topping "Load" "51-21-03-0060"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -509,18 +645,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -532,9 +662,9 @@
 		; - - 51-03-03-0009 
 		<Menu>
 		<State> Flag( 51-03-03-0009.Button,$Sum5103030009) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Oreo Volcano</LanguageSlot1>
@@ -558,27 +688,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $51-03-03-0009.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-03-03-0009.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-03-03-0009.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-03-03-0009.Discount = "" Then
+						Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-03-03-0009.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-03-0009.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-03-03-0009.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-03-03-0009.Discount = "" Then
+						Var return ""
+					Else
+						If $51-03-03-0009.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -626,7 +828,7 @@
 			<Value> $Sum5103030009TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -711,13 +913,11 @@
 				Topping "Load" "51-03-03-0009"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -736,18 +936,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			

inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -78,9 +80,9 @@
 		; - 51-05-02-0045 - 
 		<Menu>
 		<State> Flag( 51-05-02-0045.Button,$Sum5105020045) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>SPARKLING YUZU</LanguageSlot1>
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $51-05-02-0045.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-05-02-0045.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-05-02-0045.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-05-02-0045.Discount = "" Then
+						Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-05-02-0045.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0045.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-05-02-0045.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-05-02-0045.Discount = "" Then
+						Var return ""
+					Else
+						If $51-05-02-0045.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -172,7 +246,7 @@
 			<Value> $Sum5105020045TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -257,13 +331,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -282,18 +354,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -305,9 +371,9 @@
 		; 51-01-01-0040 51-01-02-0040 - 
 		<Menu>
 		<State> Flag( 51-01-01-0040.Button,51-01-02-0040.Button,$Sum51010100405101020040) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>YUZU ESPRESSO</LanguageSlot1>
@@ -331,27 +397,99 @@
 		<HotState> $51-01-01-0040.Button </HotState>
 		<IceState> $51-01-02-0040.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-01-01-0040.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-01-01-0040.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-01-01-0040.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-01-02-0040.Price = -1 Then
+						If $51-01-01-0040.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-01-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-01-01-0040.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-01-01-0040.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-01-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-01-02-0040.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-01-02-0040.Discount = "" Then
+						Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-01-02-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-01-02-0040.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-01-02-0040.Discount = "" Then
+						Var return ""
+					Else
+						If $51-01-02-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -399,7 +537,7 @@
 			<Value> $Sum51010100405101020040TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-01-01-0040.Price
@@ -484,13 +622,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -509,18 +645,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -532,9 +662,9 @@
 		; 51-21-01-0040 51-21-02-0040 - 
 		<Menu>
 		<State> Flag( 51-21-01-0040.Button,51-21-02-0040.Button,$Sum51210100405121020040) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>YUZU ESPRESSO</LanguageSlot1>
@@ -558,27 +688,99 @@
 		<HotState> $51-21-01-0040.Button </HotState>
 		<IceState> $51-21-02-0040.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-21-01-0040.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-21-01-0040.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-21-01-0040.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-21-02-0040.Price = -1 Then
+						If $51-21-01-0040.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-21-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-21-01-0040.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-21-01-0040.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-01-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-21-02-0040.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-21-02-0040.Discount = "" Then
+						Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-21-02-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-21-02-0040.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-21-02-0040.Discount = "" Then
+						Var return ""
+					Else
+						If $51-21-02-0040.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -626,7 +828,7 @@
 			<Value> $Sum51210100405121020040TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-21-01-0040.Price
@@ -711,13 +913,11 @@
 				Topping "Load" "-"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -736,18 +936,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			
@@ -759,9 +953,9 @@
 		; 51-02-01-0039 51-02-02-0039 51-02-03-0039 
 		<Menu>
 		<State> Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>THAI MILK TEA</LanguageSlot1>
@@ -785,27 +979,99 @@
 		<HotState> $51-02-01-0039.Button </HotState>
 		<IceState> $51-02-02-0039.Button </IceState>
 		<BlendState> $51-02-03-0039.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $51-02-01-0039.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $51-02-01-0039.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $51-02-01-0039.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $51-02-02-0039.Price = -1 Then
+						If $51-02-01-0039.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $51-02-03-0039.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $51-02-01-0039.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $51-02-01-0039.Discount = "" Then
+						Var return ""
+					Else
+						If $51-02-01-0039.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $51-02-02-0039.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-02-02-0039.Discount = "" Then
+						Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-02-02-0039.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-02-02-0039.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-02-02-0039.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-02-02-0039.Discount = "" Then
+						Var return ""
+					Else
+						If $51-02-02-0039.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $51-02-03-0039.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $51-02-03-0039.Discount = "" Then
+						Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $51-02-03-0039.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-02-03-0039.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $51-02-03-0039.Price = -1 Then
+					Var return = ""
+				Else
+					If $51-02-03-0039.Discount = "" Then
+						Var return ""
+					Else
+						If $51-02-03-0039.Discount = > 0 Then
+							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -853,7 +1119,7 @@
 			<Value> $Sum510201003951020200395102030039TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-02-01-0039.Price
@@ -938,13 +1204,11 @@
 				Topping "Load" "51-02-03-0039"
 				EndIf
 			EndIf
-			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml"
 			
 			
 			TabMenuVisibleInst 99
-			DEBUGVAR RedirectToNormalVersion
-			DEBUGVAR ToppingNewUINewSystem
 			If RedirectToNormalVersion = 1 Then
 				Var menu_name_eng_hot = NameLang[0][0]
 				Var menu_desc_eng_hot = DescLang[0][0]
@@ -963,18 +1227,12 @@
 				Var menu_desc_thai_blender = DescLang[2][1]
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
-			Else
 				Var show_eng =  "true"
-			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
 			EndIf
 			
 			

inter/aus/xml/page_topping_select6.lxml

@@ -7,10 +7,23 @@
 <EventOpen>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
+	If RedirectToNormalVersion = 1 Then
+		RootLayoutVisible 3 "hide"
+		;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	Machine WakeUp
+
 	Var UserSelectedSugar = 0
 
 	SAVELOG "Event Open Select 6 AUS"
 
+	If NoWaitMachineEnable = 1 Then
+		Var ConfirmDrinkButtonState = "Enable"
+	Else
+
+		Var ConfirmDrinkButtonState = "Invisible"
+	EndIf
+
 	Var y_topping_bg = 912
 
 	Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1
@@ -50,6 +63,8 @@
 	Var ShowStrawOnly = "Invisible"
 	Var ShowLidOnly = "Invisible"
 
+	Var ShowNormalNextButton = "Enable"
+
 	; On open
 	Var lidAndStrawOldPageIgnore = "true"
 	Var SugarState1 = "Invisible"
@@ -434,14 +449,50 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 	DEBUGVAR Timeout
+	DEBUGVAR MenuReady
+	DEBUGVAR CupRemain
 
+	DEBUGVAR CLOSE_ORDER_NOW
+
+	If CLOSE_ORDER_NOW = "true" Then
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+	If NoWaitMachineEnable = 1 Then
+		DEBUGVAR MachineStage
+		DEBUGVAR ConfirmDrinkButtonState
+		If MachineStage = "close-maintenance" Then
+			Var ConfirmDrinkButtonState = "Enable"
+
+			If stop_now = "true" Then
+					SAVELOG "stop_now is true page_topping_select7.xml"
+					;include="ROOT/taobin_project/inc/return_condition.ev"
+			EndIf
+		Else
+			Var ConfirmDrinkButtonState = "Invisible"
+		EndIf
+
+	EndIf
+
+	If CLOSE_ORDER_NOW = "true" Then
+		SAVELOG "DEACTIVE in page_topping_select6.lxml"
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select6.lxml"
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+
+	DEBUGVAR SelectDrinkType
 
 	Var Timeout = Timeout + 1
 
 	If Timeout > 40 Then
 		Var Timeout = 0
 		If  Seeker = "next" Then
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+			;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
 		Else
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
@@ -469,6 +520,55 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR MenuReason
+	; arm-not-ready
+	; brew-stg
+	; door-cup-alert
+	; stop-now-set
+
+	If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+		Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
+		Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+	Else
+		Var ShowTextSelfTestCountDown = "Please wait a moment"
+	EndIf
+
+	If Seeker = "curr" Then
+		If MenuReason = "arm-not-ready" Then
+
+			SAVELOG "goto mode arm-not-ready"
+			DEBUGVAR DoorCupPosition
+
+			If DoorCupPosition = "bottom" Then
+				Machine RemoveCup
+				Machine DoorLidOpen
+			Else
+				Var TextSelfTestCntColor = "0x513C2F"
+				Var ConfirmDrinkButtonState = "Enable"
+
+				Var ShowTextSelfTestCountDown = "Please take out the glass."
+			EndIf
+		EndIf
+	EndIf
+
+	If MenuReason = "brew-stg" Then
+		Var ConfirmDrinkButtonState = "Enable"
+		If Timeout > 15 Then
+			Var MenuReason = "-"
+			Var Timeout = 0
+			Var ConfirmDrinkButtonState = "Invisible"
+		EndIf
+
+	EndIf
+
+
+	If MenuReason = "-" Then
+
+	Else
+		Var MenuReasonString = MenuReason
+		Var MenuReasonStage = "Enable"
+	EndIf
+
 	Refresh
 	TimerReset
 </EventTimeout>
@@ -661,12 +761,18 @@
 	;Open PreviseXMLFileName2
 	DEBUGVAR OpenFromXML
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/event/tricker.ev"
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
+	DEBUGVAR OpenFromInstMenuTab
+	If OpenFromInstMenuTab > 0 Then
+		DEBUGVAR OpenFromInstMenuTab
+		TabMenuVisibleInst OpenFromInstMenuTab
+	EndIf
+
 	Open OpenFromXML
 
-
-
 </EventClick>
 </Button>
 
@@ -7685,6 +7791,38 @@
 </EventClick>
 </Button>
 
+; next2 button Protect
+<Button>
+<State> ConfirmDrinkButtonState </State>
+<X> 526 </X>
+<Y> 1785 </Y>
+<Filename>  "ROOT/taobin_project/image/topping/topping2/bd_next2.png"</Filename>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+
+<Text>
+	<State> ConfirmDrinkButtonState </State>
+	<X> 0 </X>
+	<Y> 18 </Y>
+	<Align> Center </Align>
+	<Width> 512 </Width>
+	<Font> KanitTTF </Font>
+	<Size> 36 </Size>
+	<Color> TextSelfTestCntColor  </Color>
+	<Value> ShowTextSelfTestCountDown </Value>
+</Text>
+
+<EventClick>
+
+	If Seeker = "curr" Then
+		If MenuReason = "arm-not-ready" Then
+			Machine RemoveCup
+			Machine DoorLidOpen
+		EndIf
+	EndIf
+</EventClick>
+</Button>
+
 <Button>
 <X> 277 </X>
 <Y> 1772 </Y>
@@ -7700,6 +7838,7 @@
 <Button>
 <X> 673 </X>
 <Y> 1785 </Y>
+<State> ShowNormalNextButton </State>
 <Filename> "ROOT/taobin_project/image/topping_inter/bn_next.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_next.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -8421,6 +8560,7 @@
 <Size> 36 </Size>
 <Width> 1080 </Width>
 <Color> 0xFFFFFF </Color>
+<State> ShowNormalNextButton </State>
 <Animation>
 	<Style> "shake-text" </Style>
 	<OnEvent> "OnValueChange" </OnEvent>
@@ -8557,4 +8697,16 @@
 
 ;
 
+<Text>
+<X> 0 </X>
+<Y> 1888 </Y>
+<State> MenuReasonStage </State>
+<Font> KanitTTF </Font>
+<Size> 22 </Size>
+<Width> 1078 </Width>
+<Align> end </Align>
+<Color> 0xFF0000 </Color>
+<Value> MenuReasonString</Value>
+</Text>
+
 </Page>

inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py

@@ -93,38 +93,111 @@
 
       out_xml('\t\t<BlendState> ' + pd_stage3 + ' </BlendState>\n')
 
-      if "show-blend-only" in xml_parameter:
+			if "show-blend-only" in xml_parameter:
-        print("Hot price ignore ")
+				print("Hot price ignore ")
-      else:
+			else:
-        out_xml('\t\t<HotPrice> eval( \n')
+				out_xml('\t\t<HotPrice>\n')
+				out_xml('\t\t\teval(\n')
+				out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
+				out_xml('\t\t\t\t\tVar return = "Free"\n')
+				out_xml('\t\t\t\tElse\n')
+				out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
+				out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+				out_xml('\t\t\t\t\tElse\n')
+				out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
+				out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+				out_xml('\t\t\t\t\t\tElse\n')
+				out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+				out_xml('\t\t\t\t\tEndIf\n')
+				out_xml('\t\t\t\tEndIf\n')
+				out_xml('\t\t\t)\n')
+				out_xml('\t\t</HotPrice>\n')
 
-        out_xml( '\t\tIf $' + pd_code_1 + '.Price = -1 Then\r\n')
+        out_xml('\t\t<HotOriginalPrice>\n')
-        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml('\t\t\teval(\n')
-        out_xml( '\t\tElse\r\n')
+        out_xml('\t\t\t\tVar return = ""\n')
-        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
-        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t\t\t\tVar return = ""\n')
-        out_xml('\t\t) </HotPrice>\n')
+        out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\t\tVar return ""\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</HotOriginalPrice>\n')
 
 
       if "show-blend-only" in xml_parameter:
         print("Cold price ignore ")
       else:
-        out_xml('\t\t<IcePrice> eval( \n')
+        out_xml('\t\t<IcePrice>\n')
-        out_xml( '\t\tIf $' + pd_code_2 + '.Price = -1 Then\r\n')
+        out_xml('\t\t\teval(\n')
-        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml('\t\t\t\tIf $' + pd_code_2 +'.Price = -1 Then\n')
-        out_xml( '\t\tElse\r\n')
+        out_xml('\t\t\t\t\tVar return = "Free"\n')
-        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml('\t\t\t\tElse\n')
-        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
-        out_xml('\t\t) </IcePrice>\n')
+        out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_2 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</IcePrice>\n')
 
+        out_xml('\t\t<IceOriginalPrice>\n')
+        out_xml('\t\t\teval(\n')
+        out_xml('\t\t\t\tVar return = ""\n')
+        out_xml('\t\t\t\tIf $' + pd_code_2 +'.Price = -1 Then\n')
+        out_xml('\t\t\t\t\tVar return = ""\n')
+        out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\t\tVar return ""\n')
+        out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_2 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t)\n')
+        out_xml('\t\t</IceOriginalPrice>\n')
 
-      out_xml('\t\t<BlendPrice> eval( \n')
+      out_xml('\t\t<BlendPrice>\n')
-      out_xml( '\t\tIf $' + pd_code_3 + '.Price = -1 Then\r\n')
+      out_xml('\t\t\teval(\n')
-      out_xml( '\t\t\tVar return = "Free"\r\n')
+      out_xml('\t\t\t\tIf $' + pd_code_3 +'.Price = -1 Then\n')
-      out_xml( '\t\tElse\r\n')
+      out_xml('\t\t\t\t\tVar return = "Free"\n')
-      out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+      out_xml('\t\t\t\tElse\n')
-      out_xml( '\t\tEndIf\r\n')
+      out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
-      out_xml('\t\t) </BlendPrice>\n')
+      out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tIf $' + pd_code_3 + '.Discount = > 0 Then\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t)\n')
+      out_xml('\t\t</BlendPrice>\n')
+
+      out_xml('\t\t<BlendOriginalPrice>\n')
+      out_xml('\t\t\teval(\n')
+      out_xml('\t\t\t\tVar return = ""\n')
+      out_xml('\t\t\t\tIf $' + pd_code_3 +'.Price = -1 Then\n')
+      out_xml('\t\t\t\t\tVar return = ""\n')
+      out_xml('\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
+      out_xml('\t\t\t\t\t\tVar return ""\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tIf $' + pd_code_3 + '.Discount = > 0 Then\n')
+      out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t)\n')
+      out_xml('\t\t</BlendOriginalPrice>\n')
 
 
       out_xml('\t\t<IceProcessingState>\n')
@@ -422,7 +495,7 @@
     out_xml('\t\t\t<Color> 0x322B26 </Color>\n')
     out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
     out_xml('\t\t\t<AutoResizeConfiguration>\n')
-    out_xml('\t\t\t\t<Min> 16 </Min>\n')
+    out_xml('\t\t\t\t<Min> 10 </Min>\n')
     out_xml('\t\t\t\t<Max> 22 </Max>\n')
     out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
     out_xml('\t\t\t</AutoResizeConfiguration>\n')
@@ -441,9 +514,10 @@
     out_xml('\t\t\t<Font> KanitRegularTTF </Font>\n')
     out_xml('\t\t\t<Color> 0x6F5F51 </Color>\n')
     out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
+    out_xml('\t\t\t<ColorDiscount> 0xCC0A14 </ColorDiscount>\n')
     out_xml('\t\t\t<AutoResizeConfiguration>\n')
     out_xml('\t\t\t\t<Min> 4 </Min>\n')
-    out_xml('\t\t\t\t<Max> 20 </Max>\n')
+    out_xml('\t\t\t\t<Max> 14 </Max>\n')
     out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
     out_xml('\t\t\t</AutoResizeConfiguration>\n')
     out_xml('\t\t</MenuPriceTextConfiguration>\n')
@@ -451,6 +525,7 @@
     out_xml('\t\t<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>\n')
     out_xml('\t\t<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>\n')
     out_xml('\t\t<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>\n')
+    out_xml('\t\t<ShowOriginalPrice> "true" </ShowOriginalPrice>\n')
     out_xml('\t</Configuration>\n')
     out_xml('\t<Menus>\n')
     out_xml(';banners\n')

xml/topview2.xml

@@ -243,6 +243,9 @@
 						Var ENABLE_MYANMAR = "Invisible"
 						TRY "ROOT/taobin_project/inter/hkg/xml/multi/control_and_lang_swith.ev"
 					EndIf
+					If CountryName = "Australia" Then
+					    TRY "ROOT/taobin_project/inter/aus/xml/multi/control_and_lang_swith.ev"
+					EndIf
 				Else
 				
 				EndIf