diff --git a/inter/aus/configure.ev b/inter/aus/configure.ev index 25be22a5..07532c6e 100644 --- a/inter/aus/configure.ev +++ b/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 diff --git a/inter/aus/xml/event/script_common_for_open_promotion_xml.ev b/inter/aus/xml/event/script_common_for_open_promotion_xml.ev index cf070aeb..cff8f08f 100644 --- a/inter/aus/xml/event/script_common_for_open_promotion_xml.ev +++ b/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 - OpenInst 2 RecommendPage +If CatalogLayoutV3 = 1 Then + + 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 \ No newline at end of file diff --git a/inter/aus/xml/multi/control_and_lang_swith.lxml b/inter/aus/xml/multi/control_and_lang_swith.ev similarity index 90% rename from inter/aus/xml/multi/control_and_lang_swith.lxml rename to inter/aus/xml/multi/control_and_lang_swith.ev index 036e1abc..1793605c 100644 --- a/inter/aus/xml/multi/control_and_lang_swith.lxml +++ b/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" diff --git a/inter/aus/xml/multi/health.ev b/inter/aus/xml/multi/dessert.ev similarity index 82% rename from inter/aus/xml/multi/health.ev rename to inter/aus/xml/multi/dessert.ev index 92620920..0f32bf3c 100644 --- a/inter/aus/xml/multi/health.ev +++ b/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" diff --git a/inter/aus/xml/multi/energy_drink.ev b/inter/aus/xml/multi/energy_drink.ev new file mode 100644 index 00000000..f485961d --- /dev/null +++ b/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" diff --git a/inter/aus/xml/multi/menu_catalog_default_init.lxml b/inter/aus/xml/multi/menu_catalog_default_init.lxml index 51111d75..fe1d98cb 100644 --- a/inter/aus/xml/multi/menu_catalog_default_init.lxml +++ b/inter/aus/xml/multi/menu_catalog_default_init.lxml @@ -108,18 +108,16 @@ Var Menu7Selected = "Invisible" EndIf - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf + Var Menu22Selected = "Enable" + Var Menu23Selected = "Enable" + Var Menu62Selected = "Enable" - If WinterWarmersCatalogFlag = 1 Then - Var MenuWinterWarmersCatalogState = "Enable" - Else - Var MenuWinterWarmersCatalogState = "Invisible" - EndIf - DEBUGVAR WinterWarmersCatalogFlag - DEBUGVAR MenuWinterWarmersCatalogState + ;If WinterWarmersCatalogFlag = 1 Then + ; Var MenuWinterWarmersCatalogState = "Enable" + ;Else + ; Var MenuWinterWarmersCatalogState = "Invisible" + ;EndIf + ;DEBUGVAR WinterWarmersCatalogFlag + ;DEBUGVAR MenuWinterWarmersCatalogState ; diff --git a/inter/aus/xml/multi/menu_catalog_new.lxml b/inter/aus/xml/multi/menu_catalog_new.lxml index e8248538..b5dbd8c7 100644 --- a/inter/aus/xml/multi/menu_catalog_new.lxml +++ b/inter/aus/xml/multi/menu_catalog_new.lxml @@ -9,135 +9,46 @@ "0xeae6e1" + + InstanceGetString SaveStringInst + DEBUGVAR SaveStringInst + DEBUGVAR show_eng - 1000 - - ;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" + If SaveStringInst = "RefreshNow" Then Refresh EndIf - Var Timeout = Timeout + 1 - TimerReset - + + DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + ;inter-image + Var show_eng = "true" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/page3_2_en/" - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - ;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 + DEBUGVAR DirImageAlter 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 @@ -167,300 +78,17 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf - Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + SAVELOG " Back multi inst" + TabMenuVisibleInst 99 + RootLayoutVisible 13 "hide" + + Var OpenFromMulti = 1 + OpenInst 2 "ROOT/taobin_project/inter/aus/xml/multi/page_catalog.lxml" - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 462 diff --git a/inter/aus/xml/multi/menu_new_layout_gen_v2.py b/inter/aus/xml/multi/menu_new_layout_gen_v2.py deleted file mode 100644 index 0a00258e..00000000 --- a/inter/aus/xml/multi/menu_new_layout_gen_v2.py +++ /dev/null @@ -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( '\r\n') - out_xml('\t 33 \r\n') - out_xml('\t 22 \r\n') - out_xml('\t 225 \r\n') - out_xml('\t 296 \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 Flag( '+ str_con + ') \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\r\n') - - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 22 \r\n') - out_xml( '\t222\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - - out_xml( '\t\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_malay] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_thai] + '\r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 220 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t222\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - #out_xml( '\t showthaiText \r\n') - out_xml( '\t\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_malay] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_thai] + '\r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t Var( DirImage2 + "option_deactive.png" ) \r\n') - out_xml( '\t\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\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "hot_db.png" ) \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t TextPriceMenuHotX \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - - #out_xml( '\t Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) \r\n') - - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + str_hot_product_code + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + str_hot_product_code + '.Price ) \r\n') - out_xml( '\t\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\r\n') - out_xml( '\t 81 \r\n') - out_xml( '\t 264 \r\n') - if pd_code_2 == "51-05-02-0016": - out_xml( '\t Var( DirImage2 + "normal.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') - else: - out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t\r\n') - out_xml( '\t\r\n') - out_xml( '\t 113 \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + str_cold_product_code + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + str_cold_product_code + '.Price ) \r\n') - out_xml( '\t\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\r\n') - out_xml( '\t 146 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t Var( DirImage2 + "blend.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "blend_db.png" ) \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t TextPriceMenuBlendX \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitRegularTTF \r\n') - #out_xml( '\t end \r\n') - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - if "inter" in param: - if "free" in param: - out_xml( '\t " Free" \r\n') - else: - out_xml( '\t StringFmt( $' + str_blend_product_code + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + str_blend_product_code + '.Price ) \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 81 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t \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\r\n') - out_xml( '\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" \r\n') - out_xml( '\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t 49 \r\n') - out_xml( '\t 117 \r\n') - out_xml( '\t \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\r\n') - out_xml( '\t "ROOT/taobin_project/image//img_menu_err2.png" \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 84 \r\n') - out_xml( '\t 266 \r\n') - out_xml( '\t 10 \r\n') - out_xml( '\t OpunMediumTTF \r\n') - out_xml( '\t 0xDE794E \r\n') - out_xml( '\t ice_tab_process_show \r\n') - out_xml( '\t ice_show_open \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t 48 \r\n') - out_xml( '\t 116 \r\n') - out_xml( '\t 32 \r\n') - out_xml( '\t128\r\n') - out_xml( '\t64\r\n') - out_xml( '\t "disable-show" \r\n') - out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t\r\n') - out_xml( '\t\t 000013 \r\n') - out_xml( '\t\r\n') - out_xml( '\t center-vertical-horizontal \r\n') - out_xml( '\t\r\n') - - - out_xml( '\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(' \r\n') - if touch_less_gen == True: - out_xml(' 16 \r\n') - out_xml(' 10 \r\n') - out_xml(' 497 \r\n') - out_xml(' 1080 \r\n') - out_xml(' "auto" \r\n') - out_xml(' "Vertical" \r\n') - out_xml(' 4 \r\n') - out_xml('\r\n') - - pd_code_available = '##-##-##-####' - count = 0 - count_test = 0 - #if touch_less_gen == True: - # out_xml( '\r\n') - # out_xml('\t 33 \r\n') - # out_xml('\t 22 \r\n') - # out_xml('\t 225 \r\n') - # out_xml('\t 296 \r\n') - # out_xml('\t "Enable" \r\n') - # out_xml('\t\r\n') - # out_xml('\t 0 \r\n') - # out_xml('\t 0 \r\n') - # out_xml('\t TouchLessStg \r\n') - # out_xml('\t Var( DirImage + "/touch_less_order.png" )\r\n') - # out_xml('\t Var( DirImage + "/touch_less_order_db.png" )\r\n') - # out_xml('\t\r\n') - # out_xml('\t\r\n') - # out_xml('\t 40 \r\n') - # out_xml('\t 153 \r\n') - # out_xml('\t 150 \r\n') - # out_xml('\t "0xeae6e1" \r\n') - # out_xml('\t "0x513C2F" \r\n') - # out_xml('\t 150 \r\n') - # - # #out_xml('\t TouchLessQrStg \r\n') - # #out_xml('\t "Herr" \r\n') - # out_xml('\t TouchLessQrStg \r\n') - # out_xml('\t testservice \r\n') - # - # out_xml('\t\r\n') - # out_xml('\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('\r\n') - - - out_xml('; Cart\r\n') - out_xml('\r\n') - # if "v2" in param: - - diff --git a/inter/aus/xml/multi/other.ev b/inter/aus/xml/multi/other.ev index 6fc877a5..628f15cf 100644 --- a/inter/aus/xml/multi/other.ev +++ b/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" diff --git a/inter/aus/xml/multi/page_catalog.lxml b/inter/aus/xml/multi/page_catalog.lxml index 2ffc673a..8c0233a1 100644 --- a/inter/aus/xml/multi/page_catalog.lxml +++ b/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 @@ + + 296 + 344 + 42 + "Enable" + + diff --git a/inter/aus/xml/multi/sodaother.ev b/inter/aus/xml/multi/sodaother.ev index 307665de..5029c6e6 100644 --- a/inter/aus/xml/multi/sodaother.ev +++ b/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" diff --git a/inter/aus/xml/multi/tab_menu.lxml b/inter/aus/xml/multi/tab_menu.lxml index 6f870889..62939f45 100644 --- a/inter/aus/xml/multi/tab_menu.lxml +++ b/inter/aus/xml/multi/tab_menu.lxml @@ -5,8 +5,8 @@ ;Var DirImage = "ROOT/taobin_project/image/page2_inter/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_v2_en/" - Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/catalog/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/page3_2_en/" DEBUGVAR DirImageAlter @@ -33,22 +33,6 @@ 1080 102 - - @@ -81,7 +63,7 @@ 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" @@ -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" @@ -109,15 +91,15 @@ "linear" Menu4Selected "No" - Var( DirImageAlter + "/bn_cho_ca2.png") - Var( DirImageAlter + "/bp_cho_ca2.png") + Var( DirImageAUS + "/bn_cho_ca2.png") + Var( DirImageAUS + "/bp_cho_ca2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume 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" @@ -133,41 +115,7 @@ Var NextPage = "-" TabMenuVisibleInst 5 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" - - - - - - - - @@ -176,43 +124,28 @@ "linear" Menu22Selected "No" - Var( DirImageAlter + "/bn_health.png") - Var( DirImageAlter + "/bp_health.png") - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - Var NextPage = "-" - TabMenuVisibleInst 6 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" - - - - + @@ -226,48 +159,10 @@ SoundVolume Var NextPage = "-" - TabMenuVisibleInst 7 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" - - - - - - - - diff --git a/inter/aus/xml/multi/v3/event/dummy_layout_promotion.py b/inter/aus/xml/multi/v3/event/dummy_layout_promotion.py index 026903bd..d04a31ec 100644 --- a/inter/aus/xml/multi/v3/event/dummy_layout_promotion.py +++ b/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" diff --git a/inter/aus/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/aus/xml/multi/v3/event/event_v3/active_promotions.lxml index a95b4b47..fe4b1883 100644 --- a/inter/aus/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/aus/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -77,7 +77,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -96,9 +96,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -106,6 +107,7 @@ 000082 000083 000013 + ShowOriginalPrice @@ -113,9 +115,9 @@ ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,Disable=Invisible,$Sum510101000451010200025101030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -139,27 +141,99 @@ $51-01-01-0004.Button $51-01-02-0002.Button $51-01-03-0002.Button - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0002.Price = -1 Then + Var return = "" + Else + If $51-01-02-0002.Discount = "" Then + Var return "" + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0002.Price = -1 Then + Var return = "" + Else + If $51-01-03-0002.Discount = "" Then + Var return "" + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -207,7 +281,7 @@ $Sum510101000451010200025101030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -292,13 +366,11 @@ Topping "Load" "51-01-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -317,18 +389,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -340,9 +406,9 @@ ; 51-21-01-0004 51-21-02-0002 51-21-03-0002 Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,Disable=Invisible,$Sum512101000451210200025121030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -366,27 +432,99 @@ $51-21-01-0004.Button $51-21-02-0002.Button $51-21-03-0002.Button - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0002.Price = -1 Then + Var return = "" + Else + If $51-21-02-0002.Discount = "" Then + Var return "" + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0002.Price = -1 Then + Var return = "" + Else + If $51-21-03-0002.Discount = "" Then + Var return "" + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -434,7 +572,7 @@ $Sum512101000451210200025121030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -519,13 +657,11 @@ Topping "Load" "51-21-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -544,18 +680,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -567,9 +697,9 @@ ; 51-21-01-0081 51-21-02-0081 51-21-03-0081 Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,Disable=Invisible,$Sum512101008151210200815121030081) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" Coconut Café Latte @@ -593,27 +723,99 @@ $51-21-01-0081.Button $51-21-02-0081.Button $51-21-03-0081.Button - eval( - If $51-21-01-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0081.Price = -1 Then + Var return = "" + Else + If $51-21-01-0081.Discount = "" Then + Var return "" + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0081.Price = -1 Then + Var return = "" + Else + If $51-21-02-0081.Discount = "" Then + Var return "" + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0081.Price = -1 Then + Var return = "" + Else + If $51-21-03-0081.Discount = "" Then + Var return "" + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -661,7 +863,7 @@ $Sum512101008151210200815121030081TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0081.Price @@ -746,13 +948,11 @@ Topping "Load" "51-21-03-0081" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -771,18 +971,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -794,9 +988,9 @@ ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,Disable=Invisible,$Sum510201007151020200715102030071) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" Strawberry\nMatcha Latte @@ -820,27 +1014,99 @@ $51-02-01-0071.Button $51-02-02-0071.Button $51-02-03-0071.Button - eval( - If $51-02-01-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0071.Price = -1 Then + Var return = "" + Else + If $51-02-01-0071.Discount = "" Then + Var return "" + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0071.Price = -1 Then + Var return = "" + Else + If $51-02-02-0071.Discount = "" Then + Var return "" + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0071.Price = -1 Then + Var return = "" + Else + If $51-02-03-0071.Discount = "" Then + Var return "" + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -888,7 +1154,7 @@ $Sum510201007151020200715102030071TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0071.Price @@ -973,13 +1239,11 @@ Topping "Load" "51-02-03-0071" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -998,18 +1262,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1021,9 +1279,9 @@ ; - 51-05-02-0068 - Flag( 51-05-02-0068.Button,Disable=Invisible,$Sum5105020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_pepsi.png" Pepsi Mint @@ -1047,27 +1305,99 @@ "Disable2" $51-05-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0068.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0068.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0068.Price = -1 Then + Var return = "" + Else + If $51-05-02-0068.Discount = "" Then + Var return "" + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1115,7 +1445,7 @@ $Sum5105020068TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1200,13 +1530,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1225,18 +1553,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1248,9 +1570,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,Disable=Invisible,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" Yummy Yuzu\nSparkling @@ -1274,27 +1596,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1342,7 +1736,7 @@ $Sum5105020045TextValue - 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 @@ -1427,13 +1821,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1452,18 +1844,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1475,9 +1861,9 @@ ; - 51-05-02-0035 51-05-03-0035 Flag( 51-05-02-0035.Button,51-05-03-0035.Button,Disable=Invisible,$Sum51050200355105030035) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" Turtle Power\nEnergy Sparkling @@ -1501,27 +1887,99 @@ "Disable2" $51-05-02-0035.Button $51-05-03-0035.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0035.Price = -1 Then + Var return = "" + Else + If $51-05-02-0035.Discount = "" Then + Var return "" + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0035.Price = -1 Then + Var return = "" + Else + If $51-05-03-0035.Discount = "" Then + Var return "" + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1569,7 +2027,7 @@ $Sum51050200355105030035TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1654,13 +2112,11 @@ Topping "Load" "51-05-03-0035" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1679,18 +2135,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1702,9 +2152,9 @@ ; - - 51-03-03-0009 Flag( 51-03-03-0009.Button,Disable=Invisible,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" Oreo Volcano @@ -1728,27 +2178,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1796,7 +2318,7 @@ $Sum5103030009TextValue - 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 @@ -1881,13 +2403,11 @@ Topping "Load" "51-03-03-0009" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1906,18 +2426,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1929,9 +2443,9 @@ ; - 51-05-02-0041 - Flag( 51-05-02-0041.Button,Disable=Invisible,$Sum5105020041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" Straw-Breeze\nSparkling @@ -1955,27 +2469,99 @@ "Disable2" $51-05-02-0041.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0041.Price = -1 Then + Var return = "" + Else + If $51-05-02-0041.Discount = "" Then + Var return "" + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2023,7 +2609,7 @@ $Sum5105020041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2108,13 +2694,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2133,18 +2717,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2156,9 +2734,9 @@ ; - 51-05-02-0010 51-05-03-0010 Flag( 51-05-02-0010.Button,51-05-03-0010.Button,Disable=Invisible,$Sum51050200105105030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" Refreshing\nLimenade @@ -2182,27 +2760,99 @@ "Disable2" $51-05-02-0010.Button $51-05-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2250,7 +2900,7 @@ $Sum51050200105105030010TextValue - 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 @@ -2335,13 +2985,11 @@ Topping "Load" "51-05-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2360,18 +3008,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2383,9 +3025,9 @@ ; 51-02-01-0039 51-02-02-0039 51-02-03-0039 Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,Disable=Invisible,$Sum510201003951020200395102030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" Exceptional Thai\nMilk Tea @@ -2409,27 +3051,99 @@ $51-02-01-0039.Button $51-02-02-0039.Button $51-02-03-0039.Button - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2477,7 +3191,7 @@ $Sum510201003951020200395102030039TextValue - 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 @@ -2562,13 +3276,11 @@ Topping "Load" "51-02-03-0039" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2587,18 +3299,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2610,9 +3316,9 @@ ; 51-02-01-0026 51-02-02-0026 51-02-03-0026 Flag( 51-02-01-0026.Button,51-02-02-0026.Button,51-02-03-0026.Button,Disable=Invisible,$Sum510201002651020200265102030026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" Matcha Latte @@ -2636,27 +3342,99 @@ $51-02-01-0026.Button $51-02-02-0026.Button $51-02-03-0026.Button - eval( - If $51-02-01-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0026.Price = -1 Then + Var return = "" + Else + If $51-02-01-0026.Discount = "" Then + Var return "" + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0026.Price = -1 Then + Var return = "" + Else + If $51-02-02-0026.Discount = "" Then + Var return "" + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0026.Price = -1 Then + Var return = "" + Else + If $51-02-03-0026.Discount = "" Then + Var return "" + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2704,7 +3482,7 @@ $Sum510201002651020200265102030026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0026.Price @@ -2789,13 +3567,11 @@ Topping "Load" "51-02-03-0026" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2814,18 +3590,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2837,9 +3607,9 @@ ; - 51-04-02-0016 - Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" Matcha Protein\nShake @@ -2863,27 +3633,99 @@ "Disable2" $51-04-02-0016.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0016.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0016.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0016.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0016.Price = -1 Then + Var return = "" + Else + If $51-04-02-0016.Discount = "" Then + Var return "" + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2931,7 +3773,7 @@ $Sum5104020016TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3016,13 +3858,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -3041,18 +3881,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/event/event_v3/promotion_template.inc b/inter/aus/xml/multi/v3/event/event_v3/promotion_template.inc index 1082c3ed..22dd5b7e 100644 --- a/inter/aus/xml/multi/v3/event/event_v3/promotion_template.inc +++ b/inter/aus/xml/multi/v3/event/event_v3/promotion_template.inc @@ -1,15 +1,7 @@ #State #Type - - eval( - If show_eng = "true" Then - Var return = "#MediaEng" - Else - Var return = "#MediaThai" - EndIf - ) - + "#MediaEng" #EventClick diff --git a/inter/aus/xml/multi/v3/menu_head.py b/inter/aus/xml/multi/v3/menu_head.py index dfd34582..fa73e442 100644 --- a/inter/aus/xml/multi/v3/menu_head.py +++ b/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_dir2 = 'ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/' - new_default_dir_press = 'ROOT/taobin_project/inter/tha/image/page_drink_press_n/' - new_default_dir_disable = 'ROOT/taobin_project/inter/tha/image/page_drink_disable_n2/' + new_default_dir = 'ROOT/taobin_project/inter/aus/image/page_drink_n/' + new_default_dir2 = 'ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/' + new_default_dir_press = 'ROOT/taobin_project/inter/aus/image/page_drink_press_n/' + new_default_dir_disable = 'ROOT/taobin_project/inter/aus/image/page_drink_disable_n2/' menu_count = 0 diff --git a/inter/aus/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/aus/xml/multi/v3/menu_new_layout_gen_v3.py index fc2c0307..078dff04 100644 --- a/inter/aus/xml/multi/v3/menu_new_layout_gen_v3.py +++ b/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 eval( \n') + out_xml('\t\t\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\n') - out_xml( '\t\tIf $' + pd_code_1 + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return !assigned StringFmt( $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n') - out_xml( '\t\tEndIf\r\n') - out_xml('\t\t) \n') + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tVar return = ""\n') + out_xml('\t\t\t\tIf $' + pd_code_1 +'.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_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\n') if "show-blend-only" in xml_parameter: print("Cold price ignore ") else: - out_xml('\t\t eval( \n') - out_xml( '\t\tIf $' + pd_code_2 + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return !assigned StringFmt( $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n') - out_xml( '\t\tEndIf\r\n') - out_xml('\t\t) \n') + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tIf $' + pd_code_2 +'.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_2 + '.Discount = "" Then\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\n') + + out_xml('\t\t\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\n') - out_xml('\t\t eval( \n') - out_xml( '\t\tIf $' + pd_code_3 + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return !assigned StringFmt( $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n') - out_xml( '\t\tEndIf\r\n') - out_xml('\t\t) \n') + out_xml('\t\t\n') + out_xml('\t\t\teval(\n') + out_xml('\t\t\t\tIf $' + pd_code_3 +'.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_3 + '.Discount = "" Then\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\n') + + out_xml('\t\t\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\n') out_xml('\t\t\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/tha/xml/multi/tab_menu_hide.lxml"\n') + out_xml('\t\t\t;include="ROOT/taobin_project/inter/aus/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\n') out_xml('\t\t\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\n') - out_xml('\t\t\t Flag( '+ ",".join(str_con) + ' ) \n') - out_xml('\t\t\t ' + type + ' \n') - out_xml('\t\t\t\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\n') - out_xml('\t\t\t\n') - out_xml('\t\t\t\t' + event_on_click_script.replace('\\n', '\n').replace('\\t', '\t') + '\n') - out_xml('\t\t\t\n') - out_xml('\t\t\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 0x322B26 \n') out_xml('\t\t\t 0xEAE6E1 \n') out_xml('\t\t\t\n') - out_xml('\t\t\t\t 16 \n') + out_xml('\t\t\t\t 10 \n') out_xml('\t\t\t\t 22 \n') out_xml('\t\t\t\t 1 \n') out_xml('\t\t\t\n') @@ -441,9 +470,10 @@ out_xml('\t\t\t KanitRegularTTF \n') out_xml('\t\t\t 0x6F5F51 \n') out_xml('\t\t\t 0xEAE6E1 \n') + out_xml('\t\t\t 0xCC0A14 \n') out_xml('\t\t\t\n') out_xml('\t\t\t\t 4 \n') - out_xml('\t\t\t\t 20 \n') + out_xml('\t\t\t\t 14 \n') out_xml('\t\t\t\t 1 \n') out_xml('\t\t\t\n') out_xml('\t\t\n') @@ -451,6 +481,7 @@ out_xml('\t\t 000082 \n') out_xml('\t\t 000083 \n') out_xml('\t\t 000013 \n') + out_xml('\t\t "true" \n') out_xml('\t\n') out_xml('\t\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"): - date_time_start = spl[idx_name][idx_date_time_start] - date_time_end = spl[idx_name][idx_date_time_end] - state_var = spl[idx_name][idx_product_var] + [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',') + [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',') + [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',') - type = spl[idx_desc][idx_lang_thai] - eng_media = spl[idx_img][idx_lang_eng] - thai_media = spl[idx_img][idx_lang_thai] - on_click_script = spl[idx_name][idx_lang_thai] + # 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}") - GenBanner(type, thai_media, eng_media, on_click_script, date_time_start, date_time_end, state_var) - else: - [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',') - [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',') - [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',') - - # 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) + 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\n\n') out_xml('\n') diff --git a/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml b/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml index 25beb755..58085e12 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml @@ -58,7 +58,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -77,9 +77,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -87,6 +88,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -94,9 +96,9 @@ ; - 51-04-02-1018 - Flag( 51-04-02-1018.Button,$Sum5104021018) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_original_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_original_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_original_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_original_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_original_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_original_BDMS.png" APP FAST ORIGINAL @@ -120,27 +122,99 @@ "Disable2" $51-04-02-1018.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-1018.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -188,7 +262,7 @@ $Sum5104021018TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-04-02-1019.Button,$Sum5104021019) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_espresso_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_espresso_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_espresso_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_espresso_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_espresso_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_espresso_BDMS.png" APP FAST ESPRESSO @@ -347,27 +413,99 @@ "Disable2" $51-04-02-1019.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-1019.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -415,7 +553,7 @@ $Sum5104021019TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-04-02-1020.Button,$Sum5104021020) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Chocolate_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Chocolate_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Chocolate_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Chocolate_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Chocolate_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Chocolate_BDMS.png" APP FAST \nCHOCOLATE @@ -574,27 +704,99 @@ "Disable2" $51-04-02-1020.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-1020.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -642,7 +844,7 @@ $Sum5104021020TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-04-02-1021.Button,$Sum5104021021) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Thaitea_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Thaitea_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Thaitea_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Thaitea_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Thaitea_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Thaitea_BDMS.png" APP FAST \nTHAI TEA @@ -801,27 +995,99 @@ "Disable2" $51-04-02-1021.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-1021.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -869,7 +1135,7 @@ $Sum5104021021TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-04-02-1022.Button,$Sum5104021022) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha_BDMS.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha_BDMS.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha_BDMS.png" APP FAST \nMATCHA @@ -1028,27 +1286,99 @@ "Disable2" $51-04-02-1022.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-1022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1096,7 +1426,7 @@ $Sum5104021022TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_appfast.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml b/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml index 241c97d8..6232074d 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml @@ -121,7 +121,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -140,9 +140,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -150,6 +151,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -157,9 +159,9 @@ ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -183,27 +185,99 @@ $51-01-01-0004.Button $51-01-02-0002.Button $51-01-03-0002.Button - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0002.Price = -1 Then + Var return = "" + Else + If $51-01-02-0002.Discount = "" Then + Var return "" + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0002.Price = -1 Then + Var return = "" + Else + If $51-01-03-0002.Discount = "" Then + Var return "" + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -251,7 +325,7 @@ $Sum510101000451010200025101030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -336,13 +410,11 @@ Topping "Load" "51-01-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -361,18 +433,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -384,9 +450,9 @@ ; 51-21-01-0004 51-21-02-0002 51-21-03-0002 Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,$Sum512101000451210200025121030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -410,27 +476,99 @@ $51-21-01-0004.Button $51-21-02-0002.Button $51-21-03-0002.Button - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0002.Price = -1 Then + Var return = "" + Else + If $51-21-02-0002.Discount = "" Then + Var return "" + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0002.Price = -1 Then + Var return = "" + Else + If $51-21-03-0002.Discount = "" Then + Var return "" + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -478,7 +616,7 @@ $Sum512101000451210200025121030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -563,13 +701,11 @@ Topping "Load" "51-21-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -588,18 +724,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -611,9 +741,9 @@ ; 51-21-01-0060 51-21-02-0060 51-21-03-0060 Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,$Sum512101006051210200605121030060) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" Vanilla Café Latte @@ -637,27 +767,99 @@ $51-21-01-0060.Button $51-21-02-0060.Button $51-21-03-0060.Button - eval( - If $51-21-01-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0060.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0060.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -705,7 +907,7 @@ $Sum512101006051210200605121030060TextValue - 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 @@ -790,13 +992,11 @@ Topping "Load" "51-21-03-0060" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -815,18 +1015,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -838,9 +1032,9 @@ ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" Caramel Café Latte @@ -864,27 +1058,99 @@ $51-01-01-0007.Button $51-01-02-0004.Button $51-01-03-0004.Button - eval( - If $51-01-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0007.Price = -1 Then + Var return = "" + Else + If $51-01-01-0007.Discount = "" Then + Var return "" + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0004.Price = -1 Then + Var return = "" + Else + If $51-01-02-0004.Discount = "" Then + Var return "" + Else + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0004.Price = -1 Then + Var return = "" + Else + If $51-01-03-0004.Discount = "" Then + Var return "" + Else + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -932,7 +1198,7 @@ $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -1017,13 +1283,11 @@ Topping "Load" "51-01-03-0004" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -1042,18 +1306,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1065,9 +1323,9 @@ ; 51-21-01-0007 51-21-02-0004 51-21-03-0004 Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" Caramel Café Latte @@ -1091,27 +1349,99 @@ $51-21-01-0007.Button $51-21-02-0004.Button $51-21-03-0004.Button - eval( - If $51-21-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0007.Price = -1 Then + Var return = "" + Else + If $51-21-01-0007.Discount = "" Then + Var return "" + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0004.Price = -1 Then + Var return = "" + Else + If $51-21-02-0004.Discount = "" Then + Var return "" + Else + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0004.Price = -1 Then + Var return = "" + Else + If $51-21-03-0004.Discount = "" Then + Var return "" + Else + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1159,7 +1489,7 @@ $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price @@ -1244,13 +1574,11 @@ Topping "Load" "51-21-03-0004" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -1269,18 +1597,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1292,9 +1614,9 @@ ; 51-21-01-0081 51-21-02-0081 51-21-03-0081 Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" Coconut Café Latte @@ -1318,27 +1640,99 @@ $51-21-01-0081.Button $51-21-02-0081.Button $51-21-03-0081.Button - eval( - If $51-21-01-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0081.Price = -1 Then + Var return = "" + Else + If $51-21-01-0081.Discount = "" Then + Var return "" + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0081.Price = -1 Then + Var return = "" + Else + If $51-21-02-0081.Discount = "" Then + Var return "" + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0081.Price = -1 Then + Var return = "" + Else + If $51-21-03-0081.Discount = "" Then + Var return "" + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1386,7 +1780,7 @@ $Sum512101008151210200815121030081TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0081.Price @@ -1471,13 +1865,11 @@ Topping "Load" "51-21-03-0081" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -1496,18 +1888,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1519,9 +1905,9 @@ ; 51-21-01-0079 51-21-02-0079 51-21-03-0079 Flag( 51-21-01-0079.Button,51-21-02-0079.Button,51-21-03-0079.Button,$Sum512101007951210200795121030079) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Vanilla_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Vanilla_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Vanilla_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Vanilla_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Vanilla_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Vanilla_caramel_latte.png" Vanilla Caramel\nCafé Latte @@ -1545,27 +1931,99 @@ $51-21-01-0079.Button $51-21-02-0079.Button $51-21-03-0079.Button - eval( - If $51-21-01-0079.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0079.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0079.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0079.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0079.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0079.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0079.Price = -1 Then + Var return = "" + Else + If $51-21-01-0079.Discount = "" Then + Var return "" + Else + If $51-21-01-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0079.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0079.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0079.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0079.Price = -1 Then + Var return = "" + Else + If $51-21-02-0079.Discount = "" Then + Var return "" + Else + If $51-21-02-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0079.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0079.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0079.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0079.Price = -1 Then + Var return = "" + Else + If $51-21-03-0079.Discount = "" Then + Var return "" + Else + If $51-21-03-0079.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1613,7 +2071,7 @@ $Sum512101007951210200795121030079TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Vanilla_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Vanilla_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0079.Price @@ -1698,13 +2156,11 @@ Topping "Load" "51-21-03-0079" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -1723,18 +2179,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1746,9 +2196,9 @@ ; 51-01-01-0005 51-11-02-0002 51-11-03-0002 Flag( 51-01-01-0005.Button,51-11-02-0002.Button,51-11-03-0002.Button,$Sum510101000551110200025111030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_cappuccino.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_cappuccino.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_cappuccino.png" CAPPUCCINO @@ -1772,27 +2222,99 @@ $51-01-01-0005.Button $51-11-02-0002.Button $51-11-03-0002.Button - eval( - If $51-01-01-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-11-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-11-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0005.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0005.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0005.Price = -1 Then + Var return = "" + Else + If $51-01-01-0005.Discount = "" Then + Var return "" + Else + If $51-01-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-11-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-11-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-11-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-11-02-0002.Price = -1 Then + Var return = "" + Else + If $51-11-02-0002.Discount = "" Then + Var return "" + Else + If $51-11-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-11-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-11-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-11-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-11-03-0002.Price = -1 Then + Var return = "" + Else + If $51-11-03-0002.Discount = "" Then + Var return "" + Else + If $51-11-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1840,7 +2362,7 @@ $Sum510101000551110200025111030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0005.Price @@ -1925,13 +2447,11 @@ Topping "Load" "51-11-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -1950,18 +2470,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1973,9 +2487,9 @@ ; 51-21-01-0005 51-31-02-0002 51-31-03-0002 Flag( 51-21-01-0005.Button,51-31-02-0002.Button,51-31-03-0002.Button,$Sum512101000551310200025131030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_cappuccino.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_cappuccino.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_cappuccino.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_cappuccino.png" CAPPUCCINO @@ -1999,27 +2513,99 @@ $51-21-01-0005.Button $51-31-02-0002.Button $51-31-03-0002.Button - eval( - If $51-21-01-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-31-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-31-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0005.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0005.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0005.Price = -1 Then + Var return = "" + Else + If $51-21-01-0005.Discount = "" Then + Var return "" + Else + If $51-21-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-31-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-31-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-31-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-31-02-0002.Price = -1 Then + Var return = "" + Else + If $51-31-02-0002.Discount = "" Then + Var return "" + Else + If $51-31-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-31-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-31-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-31-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-31-03-0002.Price = -1 Then + Var return = "" + Else + If $51-31-03-0002.Discount = "" Then + Var return "" + Else + If $51-31-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2067,7 +2653,7 @@ $Sum512101000551310200025131030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0005.Price @@ -2152,13 +2738,11 @@ Topping "Load" "51-31-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -2177,18 +2761,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2200,9 +2778,9 @@ ; 51-01-01-0006 51-01-02-0003 51-01-03-0003 Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -2226,27 +2804,99 @@ $51-01-01-0006.Button $51-01-02-0003.Button $51-01-03-0003.Button - eval( - If $51-01-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2294,7 +2944,7 @@ $Sum510101000651010200035101030003TextValue - 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 @@ -2379,13 +3029,11 @@ Topping "Load" "51-01-03-0003" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -2404,18 +3052,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2427,9 +3069,9 @@ ; 51-21-01-0006 51-21-02-0003 51-21-03-0003 Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -2453,27 +3095,99 @@ $51-21-01-0006.Button $51-21-02-0003.Button $51-21-03-0003.Button - eval( - If $51-21-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2521,7 +3235,7 @@ $Sum512101000651210200035121030003TextValue - 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 @@ -2606,13 +3320,11 @@ Topping "Load" "51-21-03-0003" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -2631,18 +3343,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2654,9 +3360,9 @@ ; 51-01-01-0003 51-01-02-0001 - Flag( 51-01-01-0003.Button,51-01-02-0001.Button,$Sum51010100035101020001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no.png" LONG BLACK @@ -2680,27 +3386,99 @@ $51-01-01-0003.Button $51-01-02-0001.Button "Disable2" - eval( - If $51-01-01-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0003.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0003.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0003.Price = -1 Then + Var return = "" + Else + If $51-01-01-0003.Discount = "" Then + Var return "" + Else + If $51-01-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0001.Price = -1 Then + Var return = "" + Else + If $51-01-02-0001.Discount = "" Then + Var return "" + Else + If $51-01-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2748,7 +3526,7 @@ $Sum51010100035101020001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0003.Price @@ -2833,13 +3611,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -2858,18 +3634,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2881,9 +3651,9 @@ ; 51-21-01-0003 51-21-02-0001 - Flag( 51-21-01-0003.Button,51-21-02-0001.Button,$Sum51210100035121020001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no.png" LONG BLACK @@ -2907,27 +3677,99 @@ $51-21-01-0003.Button $51-21-02-0001.Button "Disable2" - eval( - If $51-21-01-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0003.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0003.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0003.Price = -1 Then + Var return = "" + Else + If $51-21-01-0003.Discount = "" Then + Var return "" + Else + If $51-21-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0001.Price = -1 Then + Var return = "" + Else + If $51-21-02-0001.Discount = "" Then + Var return "" + Else + If $51-21-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2975,7 +3817,7 @@ $Sum51210100035121020001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0003.Price @@ -3060,13 +3902,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -3085,18 +3925,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3108,9 +3942,9 @@ ; 51-01-01-0001 - - Flag( 51-01-01-0001.Button,$Sum5101010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_espresso.png" ESPRESSO @@ -3134,27 +3968,99 @@ $51-01-01-0001.Button "Disable2" "Disable2" - eval( - If $51-01-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0001.Price = -1 Then + Var return = "" + Else + If $51-01-01-0001.Discount = "" Then + Var return "" + Else + If $51-01-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3202,7 +4108,7 @@ $Sum5101010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0001.Price @@ -3287,13 +4193,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -3312,18 +4216,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3335,9 +4233,9 @@ ; 51-21-01-0001 - - Flag( 51-21-01-0001.Button,$Sum5121010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_espresso.png" ESPRESSO @@ -3361,27 +4259,99 @@ $51-21-01-0001.Button "Disable2" "Disable2" - eval( - If $51-21-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0001.Price = -1 Then + Var return = "" + Else + If $51-21-01-0001.Discount = "" Then + Var return "" + Else + If $51-21-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3429,7 +4399,7 @@ $Sum5121010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0001.Price @@ -3514,13 +4484,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -3539,18 +4507,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3562,9 +4524,9 @@ ; 51-11-01-0001 - - Flag( 51-11-01-0001.Button,$Sum5111010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_double_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_double_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_double_espresso.png" DOUBLE \nESPRESSO @@ -3588,27 +4550,99 @@ $51-11-01-0001.Button "Disable2" "Disable2" - eval( - If $51-11-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-11-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-11-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-11-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-11-01-0001.Price = -1 Then + Var return = "" + Else + If $51-11-01-0001.Discount = "" Then + Var return "" + Else + If $51-11-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3656,7 +4690,7 @@ $Sum5111010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-11-01-0001.Price @@ -3741,13 +4775,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -3766,18 +4798,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3789,9 +4815,9 @@ ; 51-31-01-0001 - - Flag( 51-31-01-0001.Button,$Sum5131010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_double_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_double_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_double_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_double_espresso.png" DOUBLE \nESPRESSO @@ -3815,27 +4841,99 @@ $51-31-01-0001.Button "Disable2" "Disable2" - eval( - If $51-31-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-31-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-31-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-31-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-31-01-0001.Price = -1 Then + Var return = "" + Else + If $51-31-01-0001.Discount = "" Then + Var return "" + Else + If $51-31-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3883,7 +4981,7 @@ $Sum5131010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-31-01-0001.Price @@ -3968,13 +5066,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -3993,18 +5089,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4016,9 +5106,9 @@ ; 51-01-01-0031 51-01-02-0031 51-01-03-0031 Flag( 51-01-01-0031.Button,51-01-02-0031.Button,51-01-03-0031.Button,$Sum510101003151010200315101030031) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" Matcha\nCafé Latte @@ -4042,27 +5132,99 @@ $51-01-01-0031.Button $51-01-02-0031.Button $51-01-03-0031.Button - eval( - If $51-01-01-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0031.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0031.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0031.Price = -1 Then + Var return = "" + Else + If $51-01-01-0031.Discount = "" Then + Var return "" + Else + If $51-01-01-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0031.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0031.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0031.Price = -1 Then + Var return = "" + Else + If $51-01-02-0031.Discount = "" Then + Var return "" + Else + If $51-01-02-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0031.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0031.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0031.Price = -1 Then + Var return = "" + Else + If $51-01-03-0031.Discount = "" Then + Var return "" + Else + If $51-01-03-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4110,7 +5272,7 @@ $Sum510101003151010200315101030031TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0031.Price @@ -4195,13 +5357,11 @@ Topping "Load" "51-01-03-0031" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -4220,18 +5380,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4243,9 +5397,9 @@ ; 51-21-01-0031 51-21-02-0031 51-21-03-0031 Flag( 51-21-01-0031.Button,51-21-02-0031.Button,51-21-03-0031.Button,$Sum512101003151210200315121030031) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_greenteacoffee_lattle.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_greenteacoffee_lattle.png" Matcha\nCafé Latte @@ -4269,27 +5423,99 @@ $51-21-01-0031.Button $51-21-02-0031.Button $51-21-03-0031.Button - eval( - If $51-21-01-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0031.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0031.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0031.Price = -1 Then + Var return = "" + Else + If $51-21-01-0031.Discount = "" Then + Var return "" + Else + If $51-21-01-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0031.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0031.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0031.Price = -1 Then + Var return = "" + Else + If $51-21-02-0031.Discount = "" Then + Var return "" + Else + If $51-21-02-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0031.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0031.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0031.Price = -1 Then + Var return = "" + Else + If $51-21-03-0031.Discount = "" Then + Var return "" + Else + If $51-21-03-0031.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4337,7 +5563,7 @@ $Sum512101003151210200315121030031TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0031.Price @@ -4422,13 +5648,11 @@ Topping "Load" "51-21-03-0031" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -4447,18 +5671,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4470,9 +5688,9 @@ ; 51-01-01-0055 51-01-02-0055 51-01-03-0055 Flag( 51-01-01-0055.Button,51-01-02-0055.Button,51-01-03-0055.Button,$Sum510101005551010200555101030055) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_coffee_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea_SingPark.png" Thai Tea\nCafé Latte @@ -4496,27 +5714,99 @@ $51-01-01-0055.Button $51-01-02-0055.Button $51-01-03-0055.Button - eval( - If $51-01-01-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0055.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0055.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0055.Price = -1 Then + Var return = "" + Else + If $51-01-01-0055.Discount = "" Then + Var return "" + Else + If $51-01-01-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0055.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0055.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0055.Price = -1 Then + Var return = "" + Else + If $51-01-02-0055.Discount = "" Then + Var return "" + Else + If $51-01-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0055.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0055.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0055.Price = -1 Then + Var return = "" + Else + If $51-01-03-0055.Discount = "" Then + Var return "" + Else + If $51-01-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4564,7 +5854,7 @@ $Sum510101005551010200555101030055TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea_SingPark.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea_SingPark.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0055.Price @@ -4649,13 +5939,11 @@ Topping "Load" "51-01-03-0055" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -4674,18 +5962,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4697,9 +5979,9 @@ ; 51-21-01-0055 51-21-02-0055 51-21-03-0055 Flag( 51-21-01-0055.Button,51-21-02-0055.Button,51-21-03-0055.Button,$Sum512101005551210200555121030055) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_coffee_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_coffee_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_coffee_thai_milk_tea_SingPark.png" Thai Tea\nCafé Latte @@ -4723,27 +6005,99 @@ $51-21-01-0055.Button $51-21-02-0055.Button $51-21-03-0055.Button - eval( - If $51-21-01-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0055.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0055.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0055.Price = -1 Then + Var return = "" + Else + If $51-21-01-0055.Discount = "" Then + Var return "" + Else + If $51-21-01-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0055.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0055.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0055.Price = -1 Then + Var return = "" + Else + If $51-21-02-0055.Discount = "" Then + Var return "" + Else + If $51-21-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0055.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0055.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0055.Price = -1 Then + Var return = "" + Else + If $51-21-03-0055.Discount = "" Then + Var return "" + Else + If $51-21-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4791,7 +6145,7 @@ $Sum512101005551210200555121030055TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea_SingPark.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea_SingPark.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0055.Price @@ -4876,13 +6230,11 @@ Topping "Load" "51-21-03-0055" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -4901,18 +6253,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4924,9 +6270,9 @@ ; 51-01-01-0064 51-01-02-0064 51-01-03-0064 Flag( 51-01-01-0064.Button,51-01-02-0064.Button,51-01-03-0064.Button,$Sum510101006451010200645101030064) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mint_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mint_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mint_mocha.png" MINT MOCHA @@ -4950,27 +6296,99 @@ $51-01-01-0064.Button $51-01-02-0064.Button $51-01-03-0064.Button - eval( - If $51-01-01-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0064.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0064.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0064.Price = -1 Then + Var return = "" + Else + If $51-01-01-0064.Discount = "" Then + Var return "" + Else + If $51-01-01-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0064.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0064.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0064.Price = -1 Then + Var return = "" + Else + If $51-01-02-0064.Discount = "" Then + Var return "" + Else + If $51-01-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0064.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0064.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0064.Price = -1 Then + Var return = "" + Else + If $51-01-03-0064.Discount = "" Then + Var return "" + Else + If $51-01-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5018,7 +6436,7 @@ $Sum510101006451010200645101030064TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_mint_mocha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mint_mocha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0064.Price @@ -5103,13 +6521,11 @@ Topping "Load" "51-01-03-0064" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -5128,18 +6544,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5151,9 +6561,9 @@ ; - 51-11-02-0001 51-11-03-0001 Flag( 51-11-02-0001.Button,51-11-03-0001.Button,$Sum51110200015111030001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_epsresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_epsresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_epsresso.png" Thai ICED\n Espresso @@ -5177,27 +6587,99 @@ "Disable2" $51-11-02-0001.Button $51-11-03-0001.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-11-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-11-03-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-11-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-11-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-11-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-11-02-0001.Price = -1 Then + Var return = "" + Else + If $51-11-02-0001.Discount = "" Then + Var return "" + Else + If $51-11-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-11-03-0001.Price = -1 Then + Var return = "Free" + Else + If $51-11-03-0001.Discount = "" Then + Var return !assigned StringFmt( $51-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-11-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-03-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-11-03-0001.Price = -1 Then + Var return = "" + Else + If $51-11-03-0001.Discount = "" Then + Var return "" + Else + If $51-11-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5245,7 +6727,7 @@ $Sum51110200015111030001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_epsresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_epsresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -5330,13 +6812,11 @@ Topping "Load" "51-11-03-0001" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -5355,18 +6835,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5378,9 +6852,9 @@ ; - 51-31-02-0001 51-31-03-0001 Flag( 51-31-02-0001.Button,51-31-03-0001.Button,$Sum51310200015131030001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_epsresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_epsresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_epsresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_epsresso.png" Thai ICED\n Espresso @@ -5404,27 +6878,99 @@ "Disable2" $51-31-02-0001.Button $51-31-03-0001.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-31-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-31-03-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-31-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-31-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-31-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-31-02-0001.Price = -1 Then + Var return = "" + Else + If $51-31-02-0001.Discount = "" Then + Var return "" + Else + If $51-31-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-31-03-0001.Price = -1 Then + Var return = "Free" + Else + If $51-31-03-0001.Discount = "" Then + Var return !assigned StringFmt( $51-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-31-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-03-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-31-03-0001.Price = -1 Then + Var return = "" + Else + If $51-31-03-0001.Discount = "" Then + Var return "" + Else + If $51-31-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5472,7 +7018,7 @@ $Sum51310200015131030001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_epsresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_epsresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -5557,13 +7103,11 @@ Topping "Load" "51-31-03-0001" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -5582,18 +7126,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5605,9 +7143,9 @@ ; 51-01-01-0017 51-01-02-0017 - Flag( 51-01-01-0017.Button,51-01-02-0017.Button,$Sum51010100175101020017) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" Lychee\nAmericano @@ -5631,27 +7169,99 @@ $51-01-01-0017.Button $51-01-02-0017.Button "Disable2" - eval( - If $51-01-01-0017.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0017.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0017.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0017.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0017.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0017.Price = -1 Then + Var return = "" + Else + If $51-01-01-0017.Discount = "" Then + Var return "" + Else + If $51-01-01-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0017.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0017.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0017.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0017.Price = -1 Then + Var return = "" + Else + If $51-01-02-0017.Discount = "" Then + Var return "" + Else + If $51-01-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5699,7 +7309,7 @@ $Sum51010100175101020017TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0017.Price @@ -5784,13 +7394,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -5809,18 +7417,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5832,9 +7434,9 @@ ; 51-21-01-0017 51-21-02-0017 - Flag( 51-21-01-0017.Button,51-21-02-0017.Button,$Sum51210100175121020017) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_lychee_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_lychee_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_lychee_espresso.png" Lychee\nAmericano @@ -5858,27 +7460,99 @@ $51-21-01-0017.Button $51-21-02-0017.Button "Disable2" - eval( - If $51-21-01-0017.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0017.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0017.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0017.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0017.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0017.Price = -1 Then + Var return = "" + Else + If $51-21-01-0017.Discount = "" Then + Var return "" + Else + If $51-21-01-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0017.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0017.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0017.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0017.Price = -1 Then + Var return = "" + Else + If $51-21-02-0017.Discount = "" Then + Var return "" + Else + If $51-21-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5926,7 +7600,7 @@ $Sum51210100175121020017TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0017.Price @@ -6011,13 +7685,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -6036,18 +7708,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6059,9 +7725,9 @@ ; 51-01-01-0040 51-01-02-0040 - Flag( 51-01-01-0040.Button,51-01-02-0040.Button,$Sum51010100405101020040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" Yuzu\nAmericano @@ -6085,27 +7751,99 @@ $51-01-01-0040.Button $51-01-02-0040.Button "Disable2" - eval( - If $51-01-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6153,7 +7891,7 @@ $Sum51010100405101020040TextValue - 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 @@ -6238,13 +7976,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -6263,18 +7999,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6286,9 +8016,9 @@ ; 51-21-01-0040 51-21-02-0040 - Flag( 51-21-01-0040.Button,51-21-02-0040.Button,$Sum51210100405121020040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" Yuzu\nAmericano @@ -6312,27 +8042,99 @@ $51-21-01-0040.Button $51-21-02-0040.Button "Disable2" - eval( - If $51-21-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6380,7 +8182,7 @@ $Sum51210100405121020040TextValue - 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 @@ -6465,13 +8267,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -6490,18 +8290,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6513,9 +8307,9 @@ ; - 51-01-02-0068 - Flag( 51-01-02-0068.Button,$Sum5101020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" Coconut Americano @@ -6539,27 +8333,99 @@ "Disable2" $51-01-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6607,7 +8473,7 @@ $Sum5101020068TextValue - 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 @@ -6692,13 +8558,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -6717,18 +8581,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6740,9 +8598,9 @@ ; - 51-21-02-0068 - Flag( 51-21-02-0068.Button,$Sum5121020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" Coconut Americano @@ -6766,27 +8624,99 @@ "Disable2" $51-21-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6834,7 +8764,7 @@ $Sum5121020068TextValue - 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 @@ -6919,13 +8849,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -6944,18 +8872,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6967,9 +8889,9 @@ ; - 51-01-02-0041 - Flag( 51-01-02-0041.Button,$Sum5101020041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_americano_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_americano_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_americano_soda.png" Sparkling\nAmericano @@ -6993,27 +8915,99 @@ "Disable2" $51-01-02-0041.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-01-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0041.Price = -1 Then + Var return = "" + Else + If $51-01-02-0041.Discount = "" Then + Var return "" + Else + If $51-01-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7061,7 +9055,7 @@ $Sum5101020041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_americano_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_americano_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -7146,13 +9140,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -7171,18 +9163,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -7194,9 +9180,9 @@ ; - 51-21-02-0041 - Flag( 51-21-02-0041.Button,$Sum5121020041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_americano_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_americano_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_americano_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_americano_soda.png" Sparkling\nAmericano @@ -7220,27 +9206,99 @@ "Disable2" $51-21-02-0041.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-21-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0041.Price = -1 Then + Var return = "" + Else + If $51-21-02-0041.Discount = "" Then + Var return "" + Else + If $51-21-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7288,7 +9346,7 @@ $Sum5121020041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_americano_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_americano_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -7373,13 +9431,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_coffee.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] @@ -7398,18 +9454,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml b/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml index 9a16c2f6..1e1a9759 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml @@ -101,7 +101,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -120,9 +120,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -130,6 +131,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -137,9 +139,9 @@ ; - - 51-03-03-0009 Flag( 51-03-03-0009.Button,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" Oreo Volcano @@ -163,27 +165,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -231,7 +305,7 @@ $Sum5103030009TextValue - 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 @@ -316,13 +390,11 @@ Topping "Load" "51-03-03-0009" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -341,18 +413,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -364,9 +430,9 @@ ; - - 51-03-03-0034 Flag( 51-03-03-0034.Button,$Sum5103030034) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Oreo_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Oreo_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Oreo_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Oreo_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Oreo_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Oreo_smoothie.png" Mint\nOreo Volcano @@ -390,27 +456,99 @@ "Disable2" "Disable2" $51-03-03-0034.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0034.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0034.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0034.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0034.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0034.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0034.Price = -1 Then + Var return = "" + Else + If $51-03-03-0034.Discount = "" Then + Var return "" + Else + If $51-03-03-0034.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -458,7 +596,7 @@ $Sum5103030034TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Oreo_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Oreo_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -543,13 +681,11 @@ Topping "Load" "51-03-03-0034" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -568,18 +704,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -591,9 +721,9 @@ ; - - 51-03-03-0027 Flag( 51-03-03-0027.Button,$Sum5103030027) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Strawberry_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Strawberry_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Strawberry_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Strawberry_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Strawberry_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Strawberry_smoothie_oreo.png" Strawberry\nOreo Volcano @@ -617,27 +747,99 @@ "Disable2" "Disable2" $51-03-03-0027.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0027.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0027.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0027.Price = -1 Then + Var return = "" + Else + If $51-03-03-0027.Discount = "" Then + Var return "" + Else + If $51-03-03-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -685,7 +887,7 @@ $Sum5103030027TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Strawberry_smoothie_oreo.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Strawberry_smoothie_oreo.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -770,13 +972,11 @@ Topping "Load" "51-03-03-0027" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -795,18 +995,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -818,9 +1012,9 @@ ; - - 51-03-03-0010 Flag( 51-03-03-0010.Button,$Sum5103030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" Black Forest @@ -844,27 +1038,99 @@ "Disable2" "Disable2" $51-03-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0010.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0010.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0010.Price = -1 Then + Var return = "" + Else + If $51-03-03-0010.Discount = "" Then + Var return "" + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -912,7 +1178,7 @@ $Sum5103030010TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -997,13 +1263,11 @@ Topping "Load" "51-03-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -1022,18 +1286,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1045,9 +1303,9 @@ ; - - 51-03-03-0051 Flag( 51-03-03-0051.Button,$Sum5103030051) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" Cheesecake @@ -1071,27 +1329,99 @@ "Disable2" "Disable2" $51-03-03-0051.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0051.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0051.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0051.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0051.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0051.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0051.Price = -1 Then + Var return = "" + Else + If $51-03-03-0051.Discount = "" Then + Var return "" + Else + If $51-03-03-0051.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1139,7 +1469,7 @@ $Sum5103030051TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1224,13 +1554,11 @@ Topping "Load" "51-03-03-0051" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -1249,18 +1577,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1272,9 +1594,9 @@ ; - - 51-03-03-0052 Flag( 51-03-03-0052.Button,$Sum5103030052) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" Strawberry\nCheesecake @@ -1298,27 +1620,99 @@ "Disable2" "Disable2" $51-03-03-0052.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0052.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0052.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0052.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0052.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0052.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0052.Price = -1 Then + Var return = "" + Else + If $51-03-03-0052.Discount = "" Then + Var return "" + Else + If $51-03-03-0052.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1366,7 +1760,7 @@ $Sum5103030052TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1451,13 +1845,11 @@ Topping "Load" "51-03-03-0052" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -1476,18 +1868,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1499,9 +1885,9 @@ ; - - 51-03-03-0053 Flag( 51-03-03-0053.Button,$Sum5103030053) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" Lychee Cheesecake @@ -1525,27 +1911,99 @@ "Disable2" "Disable2" $51-03-03-0053.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0053.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0053.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0053.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0053.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0053.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0053.Price = -1 Then + Var return = "" + Else + If $51-03-03-0053.Discount = "" Then + Var return "" + Else + If $51-03-03-0053.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1593,7 +2051,7 @@ $Sum5103030053TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1678,13 +2136,11 @@ Topping "Load" "51-03-03-0053" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -1703,18 +2159,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1726,9 +2176,9 @@ ; - - 51-03-03-0055 Flag( 51-03-03-0055.Button,$Sum5103030055) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" Mint Cheesecake @@ -1752,27 +2202,99 @@ "Disable2" "Disable2" $51-03-03-0055.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0055.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0055.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0055.Price = -1 Then + Var return = "" + Else + If $51-03-03-0055.Discount = "" Then + Var return "" + Else + If $51-03-03-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1820,7 +2342,7 @@ $Sum5103030055TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1905,13 +2427,11 @@ Topping "Load" "51-03-03-0055" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -1930,18 +2450,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1953,9 +2467,9 @@ ; - - 51-03-03-0056 Flag( 51-03-03-0056.Button,$Sum5103030056) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" Melon Cheesecake @@ -1979,27 +2493,99 @@ "Disable2" "Disable2" $51-03-03-0056.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0056.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0056.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0056.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0056.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0056.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0056.Price = -1 Then + Var return = "" + Else + If $51-03-03-0056.Discount = "" Then + Var return "" + Else + If $51-03-03-0056.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2047,7 +2633,7 @@ $Sum5103030056TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2132,13 +2718,11 @@ Topping "Load" "51-03-03-0056" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -2157,18 +2741,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2180,9 +2758,9 @@ ; - - 51-03-03-0045 Flag( 51-03-03-0045.Button,$Sum5103030045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_caramel_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_caramel_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_caramel_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_caramel_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_caramel_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_caramel_Biscoff.png" Caramel Biscoff\nVolcano @@ -2206,27 +2784,99 @@ "Disable2" "Disable2" $51-03-03-0045.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0045.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0045.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0045.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0045.Price = -1 Then + Var return = "" + Else + If $51-03-03-0045.Discount = "" Then + Var return "" + Else + If $51-03-03-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2274,7 +2924,7 @@ $Sum5103030045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_caramel_Biscoff.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_caramel_Biscoff.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2359,13 +3009,11 @@ Topping "Load" "51-03-03-0045" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -2384,18 +3032,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2407,9 +3049,9 @@ ; - - 51-03-03-0046 Flag( 51-03-03-0046.Button,$Sum5103030046) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Milk_Straw_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Milk_Straw_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Milk_Straw_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Milk_Straw_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Milk_Straw_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Milk_Straw_Biscoff.png" Strawberry Biscoff\nVolcano @@ -2433,27 +3075,99 @@ "Disable2" "Disable2" $51-03-03-0046.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0046.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0046.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0046.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0046.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0046.Price = -1 Then + Var return = "" + Else + If $51-03-03-0046.Discount = "" Then + Var return "" + Else + If $51-03-03-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2501,7 +3215,7 @@ $Sum5103030046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Milk_Straw_Biscoff.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Milk_Straw_Biscoff.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2586,13 +3300,11 @@ Topping "Load" "51-03-03-0046" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -2611,18 +3323,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2634,9 +3340,9 @@ ; - - 51-03-03-0047 Flag( 51-03-03-0047.Button,$Sum5103030047) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Milk_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Milk_Biscoff.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Milk_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Milk_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Milk_Biscoff.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Milk_Biscoff.png" Mint\nBiscoff Volcano @@ -2660,27 +3366,99 @@ "Disable2" "Disable2" $51-03-03-0047.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0047.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0047.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0047.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0047.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0047.Price = -1 Then + Var return = "" + Else + If $51-03-03-0047.Discount = "" Then + Var return "" + Else + If $51-03-03-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2728,7 +3506,7 @@ $Sum5103030047TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Milk_Biscoff.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Milk_Biscoff.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2813,13 +3591,11 @@ Topping "Load" "51-03-03-0047" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_dessert.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] @@ -2838,18 +3614,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml b/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml new file mode 100644 index 00000000..b53afe46 --- /dev/null +++ b/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml @@ -0,0 +1,2472 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 7 Then + Var SlientRefreshIndex = 8 + EndIf + + Var EnergyDrinkRefreshTimeOut = 0 + + + + + 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 + + + 1000 + + ;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 + + + +;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new.lxml" + + + 0 + 497 + 1080 + 1423 + + + KanitMediumTTF + 0x322B26 + 0xEAE6E1 + + 10 + 22 + 1 + + + + KanitMediumTTF + 0x322B26 + 0xEAE6E1 + + 10 + 14 + 1 + + + + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + 0xCC0A14 + + 4 + 14 + 1 + + + 000081 + 000082 + 000083 + 000013 + ShowOriginalPrice + + +;banners + ; ==================> Len = 3 + ; - 51-05-02-0035 51-05-03-0035 + + Flag( 51-05-02-0035.Button,51-05-03-0035.Button,$Sum51050200355105030035) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" + + + Turtle Power\nEnergy Sparkling + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Soda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-0035.Button + $51-05-03-0035.Button + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0035.Price = -1 Then + Var return = "" + Else + If $51-05-02-0035.Discount = "" Then + Var return "" + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0035.Price = -1 Then + Var return = "" + Else + If $51-05-03-0035.Discount = "" Then + Var return "" + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum51050200355105030035TextID + $Sum51050200355105030035TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-0035.Price + Var PriceD3 = $51-05-03-0035.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-0035" + Var PD_CODE3 = "51-05-03-0035" + ; begin lang + Var aliasName[0] = "Turtle Power\nEnergy Sparkling" + Var aliasDesc[0] = "Energy drink, Soda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK SODA" + Var NameLang[1][1] = "เต่าทรงพลังโซดา" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "SODA TAO POWER" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Soda, Ice" + Var DescLang[1][1] = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Minuman Bervitamin, Soda, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "TAO POWER DRINK SODA" + Var NameLang[2][1] = "เต่าทรงพลังโซดาปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SODA TAO POWER" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Energy drink, Soda, Ice" + Var DescLang[2][1] = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Minuman Bertenaga, Soda, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-0035.Button + Var PD_STAGE_3 = $51-05-03-0035.Button + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-0035" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "51-05-03-0035" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9990 - + + Flag( 51-05-02-9990.Button,$Sum5105029990) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Yuzu_soda.png" + + + Yuzu Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Yuzu Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9990.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9990.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9990.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9990.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9990.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9990.Price = -1 Then + Var return = "" + Else + If $51-05-02-9990.Discount = "" Then + Var return "" + Else + If $51-05-02-9990.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029990TextID + $Sum5105029990TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Yuzu_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9990.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9990" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Yuzu Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Yuzu Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Yuzu Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Yuzu Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9990.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9990" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9991 - + + Flag( 51-05-02-9991.Button,$Sum5105029991) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Strawberry_soda.png" + + + Strawberry Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Strawberry Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9991.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9991.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9991.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9991.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9991.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9991.Price = -1 Then + Var return = "" + Else + If $51-05-02-9991.Discount = "" Then + Var return "" + Else + If $51-05-02-9991.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029991TextID + $Sum5105029991TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Strawberry_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9991.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9991" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Strawberry Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Strawberry Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Strawberry Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Strawberry Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9991.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9991" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9992 - + + Flag( 51-05-02-9992.Button,$Sum5105029992) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Coconut_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Coconut_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Coconut_soda.png" + + + Coconut Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Coconut Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9992.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9992.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9992.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9992.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9992.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9992.Price = -1 Then + Var return = "" + Else + If $51-05-02-9992.Discount = "" Then + Var return "" + Else + If $51-05-02-9992.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029992TextID + $Sum5105029992TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Coconut_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9992.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9992" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Coconut Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Coconut Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Coconut Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Coconut Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9992.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9992" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9993 - + + Flag( 51-05-02-9993.Button,$Sum5105029993) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Mint_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Mint_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Mint_soda.png" + + + Mint Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Mint Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9993.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9993.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9993.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9993.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9993.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9993.Price = -1 Then + Var return = "" + Else + If $51-05-02-9993.Discount = "" Then + Var return "" + Else + If $51-05-02-9993.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029993TextID + $Sum5105029993TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Mint_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9993.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9993" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Mint Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Mint Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Mint Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Mint Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9993.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9993" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9994 - + + Flag( 51-05-02-9994.Button,$Sum5105029994) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Vanilla_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Vanilla_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Vanilla_soda.png" + + + Vanilla Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Vanilla Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9994.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9994.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9994.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9994.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9994.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9994.Price = -1 Then + Var return = "" + Else + If $51-05-02-9994.Discount = "" Then + Var return "" + Else + If $51-05-02-9994.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029994TextID + $Sum5105029994TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Vanilla_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9994.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9994" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Vanilla Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Vanilla Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Vanilla Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Vanilla Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9994.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9994" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9995 - + + Flag( 51-05-02-9995.Button,$Sum5105029995) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Caramel_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Caramel_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Caramel_soda.png" + + + Caramel Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Caramel Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9995.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9995.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9995.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9995.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9995.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9995.Price = -1 Then + Var return = "" + Else + If $51-05-02-9995.Discount = "" Then + Var return "" + Else + If $51-05-02-9995.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029995TextID + $Sum5105029995TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Caramel_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9995.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9995" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Caramel Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Caramel Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Caramel Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Caramel Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9995.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9995" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + ; ==================> Len = 3 + ; - 51-05-02-9996 - + + Flag( 51-05-02-9996.Button,$Sum5105029996) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_Lychee_soda.png" + + + Lychee Turtle\nPower Energy + เต่าทรงพลังโซดา + - + - + + + + + + + Energy drink, Lychee Syrup,\nSoda, Ice + เครื่องดื่มเต่าทรงพลัง โซดา + - + - + + + + + "Disable2" + $51-05-02-9996.Button + "Disable2" + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-9996.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-9996.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-9996.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9996.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-9996.Price = -1 Then + Var return = "" + Else + If $51-05-02-9996.Discount = "" Then + Var return "" + Else + If $51-05-02-9996.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum5105029996TextID + $Sum5105029996TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Lychee_soda.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-9996.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-9996" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Lychee Turtle\nPower Energy" + Var aliasDesc[0] = "Energy drink, Lychee Syrup,\nSoda, Ice" + Var aliasName[1] = "เต่าทรงพลังโซดา" + Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Lychee Turtle Power Energy" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Energy drink, Lychee Syrup, Soda, Ice" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-9996.Button + Var PD_STAGE_3 = "Disable2" + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-05-02-9996" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "-" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + + + + + + + + diff --git a/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.skt b/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.skt new file mode 100644 index 00000000..dd43b176 --- /dev/null +++ b/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.skt @@ -0,0 +1,101 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + DEBUGVAR SlientRefreshIndex + + If SlientRefreshIndex = 7 Then + Var SlientRefreshIndex = 8 + EndIf + + Var EnergyDrinkRefreshTimeOut = 0 + + + + + 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 + + + 1000 + + ;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 + + + +;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new.lxml" + + + + + diff --git a/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml b/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml index 8e697caf..fcacaa94 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml @@ -92,7 +92,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -111,9 +111,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -121,6 +122,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -128,9 +130,9 @@ ; 51-03-01-0005 51-03-02-0005 51-03-03-0005 Flag( 51-03-01-0005.Button,51-03-02-0005.Button,51-03-03-0005.Button,$Sum510301000551030200055103030005) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.png" MILK @@ -154,27 +156,99 @@ $51-03-01-0005.Button $51-03-02-0005.Button $51-03-03-0005.Button - eval( - If $51-03-01-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0005.Price = -1 Then + Var return = "" + Else + If $51-03-01-0005.Discount = "" Then + Var return "" + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0005.Price = -1 Then + Var return = "" + Else + If $51-03-02-0005.Discount = "" Then + Var return "" + Else + If $51-03-02-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0005.Price = -1 Then + Var return = "" + Else + If $51-03-03-0005.Discount = "" Then + Var return "" + Else + If $51-03-03-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -222,7 +296,7 @@ $Sum510301000551030200055103030005TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0005.Price @@ -307,13 +381,11 @@ Topping "Load" "51-03-03-0005" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -332,18 +404,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -355,9 +421,9 @@ ; 51-03-01-0001 51-03-02-0001 51-03-03-0001 Flag( 51-03-01-0001.Button,51-03-02-0001.Button,51-03-03-0001.Button,$Sum510301000151030200015103030001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_caramel.png" CARAMEL MILK @@ -381,27 +447,99 @@ $51-03-01-0001.Button $51-03-02-0001.Button $51-03-03-0001.Button - eval( - If $51-03-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0001.Price = -1 Then + Var return = "" + Else + If $51-03-01-0001.Discount = "" Then + Var return "" + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0001.Price = -1 Then + Var return = "" + Else + If $51-03-02-0001.Discount = "" Then + Var return "" + Else + If $51-03-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0001.Price = -1 Then + Var return = "" + Else + If $51-03-03-0001.Discount = "" Then + Var return "" + Else + If $51-03-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -449,7 +587,7 @@ $Sum510301000151030200015103030001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_caramel.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_caramel.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0001.Price @@ -534,13 +672,11 @@ Topping "Load" "51-03-03-0001" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -559,18 +695,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -582,9 +712,9 @@ ; 51-03-01-0003 51-03-02-0003 51-03-03-0003 Flag( 51-03-01-0003.Button,51-03-02-0003.Button,51-03-03-0003.Button,$Sum510301000351030200035103030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Black_Sugar_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Black_Sugar_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Black_Sugar_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Black_Sugar_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Black_Sugar_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Black_Sugar_Milk.png" BROWN SUGAR \nMILK @@ -608,27 +738,99 @@ $51-03-01-0003.Button $51-03-02-0003.Button $51-03-03-0003.Button - eval( - If $51-03-01-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0003.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0003.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0003.Price = -1 Then + Var return = "" + Else + If $51-03-01-0003.Discount = "" Then + Var return "" + Else + If $51-03-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0003.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0003.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0003.Price = -1 Then + Var return = "" + Else + If $51-03-02-0003.Discount = "" Then + Var return "" + Else + If $51-03-02-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0003.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0003.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0003.Price = -1 Then + Var return = "" + Else + If $51-03-03-0003.Discount = "" Then + Var return "" + Else + If $51-03-03-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -676,7 +878,7 @@ $Sum510301000351030200035103030003TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Black_Sugar_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Black_Sugar_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0003.Price @@ -761,13 +963,11 @@ Topping "Load" "51-03-03-0003" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -786,18 +986,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -809,9 +1003,9 @@ ; - 51-03-02-0006 51-03-03-0006 Flag( 51-03-02-0006.Button,51-03-03-0006.Button,$Sum51030200065103030006) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_pink_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_pink_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_pink_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_pink_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_pink_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_pink_milk.png" PINK MILK @@ -835,27 +1029,99 @@ "Disable2" $51-03-02-0006.Button $51-03-03-0006.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0006.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0006.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0006.Price = -1 Then + Var return = "" + Else + If $51-03-02-0006.Discount = "" Then + Var return "" + Else + If $51-03-02-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0006.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0006.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0006.Price = -1 Then + Var return = "" + Else + If $51-03-03-0006.Discount = "" Then + Var return "" + Else + If $51-03-03-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -903,7 +1169,7 @@ $Sum51030200065103030006TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_pink_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_pink_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -988,13 +1254,11 @@ Topping "Load" "51-03-03-0006" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -1013,18 +1277,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1036,9 +1294,9 @@ ; 51-03-01-0002 51-03-02-0002 51-03-03-0002 Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa.png" CHOCOLATE @@ -1062,27 +1320,99 @@ $51-03-01-0002.Button $51-03-02-0002.Button $51-03-03-0002.Button - eval( - If $51-03-01-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0002.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0002.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0002.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1130,7 +1460,7 @@ $Sum510301000251030200025103030002TextValue - 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 @@ -1215,13 +1545,11 @@ Topping "Load" "51-03-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -1240,18 +1568,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1263,9 +1585,9 @@ ; 51-03-01-0022 51-03-02-0022 51-03-03-0022 Flag( 51-03-01-0022.Button,51-03-02-0022.Button,51-03-03-0022.Button,$Sum510301002251030200225103030022) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Melon_smoothie.png" MELON MILK @@ -1289,27 +1611,99 @@ $51-03-01-0022.Button $51-03-02-0022.Button $51-03-03-0022.Button - eval( - If $51-03-01-0022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0022.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0022.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0022.Price = -1 Then + Var return = "" + Else + If $51-03-01-0022.Discount = "" Then + Var return "" + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0022.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0022.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0022.Price = -1 Then + Var return = "" + Else + If $51-03-02-0022.Discount = "" Then + Var return "" + Else + If $51-03-02-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0022.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0022.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0022.Price = -1 Then + Var return = "" + Else + If $51-03-03-0022.Discount = "" Then + Var return "" + Else + If $51-03-03-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1357,7 +1751,7 @@ $Sum510301002251030200225103030022TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0022.Price @@ -1442,13 +1836,11 @@ Topping "Load" "51-03-03-0022" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -1467,18 +1859,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1490,9 +1876,9 @@ ; - - 51-03-03-0010 Flag( 51-03-03-0010.Button,$Sum5103030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" STRAWBERRY CHOC\nMILK @@ -1516,27 +1902,99 @@ "Disable2" "Disable2" $51-03-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0010.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0010.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0010.Price = -1 Then + Var return = "" + Else + If $51-03-03-0010.Discount = "" Then + Var return "" + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1584,7 +2042,7 @@ $Sum5103030010TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1669,13 +2127,11 @@ Topping "Load" "51-03-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -1694,18 +2150,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1717,9 +2167,9 @@ ; - - 51-03-03-0020 Flag( 51-03-03-0020.Button,$Sum5103030020) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_ovaltine.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_ovaltine.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_ovaltine.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_ovaltine.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_ovaltine.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_ovaltine.png" OVALTINE SMOOTHIE \nVOLCANO @@ -1743,27 +2193,99 @@ "Disable2" "Disable2" $51-03-03-0020.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0020.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0020.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0020.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0020.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0020.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0020.Price = -1 Then + Var return = "" + Else + If $51-03-03-0020.Discount = "" Then + Var return "" + Else + If $51-03-03-0020.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1811,7 +2333,7 @@ $Sum5103030020TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_smoothie_ovaltine.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_smoothie_ovaltine.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1896,13 +2418,11 @@ Topping "Load" "51-03-03-0020" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -1921,18 +2441,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1944,9 +2458,9 @@ ; - - 51-03-03-0021 Flag( 51-03-03-0021.Button,$Sum5103030021) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Ovalcocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Ovalcocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Ovalcocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Ovalcocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Ovalcocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Ovalcocoa_smoothie.png" COCOA OVALTINE \nVOLCANO @@ -1970,27 +2484,99 @@ "Disable2" "Disable2" $51-03-03-0021.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0021.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0021.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0021.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0021.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0021.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0021.Price = -1 Then + Var return = "" + Else + If $51-03-03-0021.Discount = "" Then + Var return "" + Else + If $51-03-03-0021.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2038,7 +2624,7 @@ $Sum5103030021TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Ovalcocoa_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Ovalcocoa_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2123,13 +2709,11 @@ Topping "Load" "51-03-03-0021" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -2148,18 +2732,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2171,9 +2749,9 @@ ; - 51-05-02-0041 51-05-03-0041 Flag( 51-05-02-0041.Button,51-05-03-0041.Button,$Sum51050200415105030041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" SPARKLING STRAWBERRY @@ -2197,27 +2775,99 @@ "Disable2" $51-05-02-0041.Button $51-05-03-0041.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0041.Price = -1 Then + Var return = "" + Else + If $51-05-02-0041.Discount = "" Then + Var return "" + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0041.Price = -1 Then + Var return = "" + Else + If $51-05-03-0041.Discount = "" Then + Var return "" + Else + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2265,7 +2915,7 @@ $Sum51050200415105030041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2350,13 +3000,11 @@ Topping "Load" "51-05-03-0041" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -2375,18 +3023,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2398,9 +3040,9 @@ ; - 51-05-02-0008 51-05-03-0008 Flag( 51-05-02-0008.Button,51-05-03-0008.Button,$Sum51050200085105030008) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_sala_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_sala_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_sala_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_sala_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_sala_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_sala_soda.png" SALAK SODA @@ -2424,27 +3066,99 @@ "Disable2" $51-05-02-0008.Button $51-05-03-0008.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0008.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0008.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0008.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0008.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0008.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0008.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0008.Price = -1 Then + Var return = "" + Else + If $51-05-02-0008.Discount = "" Then + Var return "" + Else + If $51-05-02-0008.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0008.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0008.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0008.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0008.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0008.Price = -1 Then + Var return = "" + Else + If $51-05-03-0008.Discount = "" Then + Var return "" + Else + If $51-05-03-0008.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2492,7 +3206,7 @@ $Sum51050200085105030008TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_sala_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_sala_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2577,13 +3291,11 @@ Topping "Load" "51-05-03-0008" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -2602,18 +3314,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2625,9 +3331,9 @@ ; - 51-05-02-0044 - Flag( 51-05-02-0044.Button,$Sum5105020044) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_melon_soda.png" SPARKLING MELON @@ -2651,27 +3357,99 @@ "Disable2" $51-05-02-0044.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0044.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2719,7 +3497,7 @@ $Sum5105020044TextValue - 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 @@ -2804,13 +3582,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -2829,18 +3605,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2852,9 +3622,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" SPARKLING YUZU @@ -2878,27 +3648,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2946,7 +3788,7 @@ $Sum5105020045TextValue - 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 @@ -3031,13 +3873,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -3056,18 +3896,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3079,9 +3913,9 @@ ; - - 51-03-03-0009 Flag( 51-03-03-0009.Button,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" OREO VOLCANO @@ -3105,27 +3939,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3173,7 +4079,7 @@ $Sum5103030009TextValue - 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 @@ -3258,13 +4164,11 @@ Topping "Load" "51-03-03-0009" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -3283,18 +4187,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3306,9 +4204,9 @@ ; 51-03-01-0002 - - Flag( 51-03-01-0002.Button,$Sum5103010002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa.png" CHOCOLATE @@ -3332,27 +4230,99 @@ $51-03-01-0002.Button "Disable2" "Disable2" - eval( - If $51-03-01-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0002.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0002.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0002.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3400,7 +4370,7 @@ $Sum5103010002TextValue - 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 @@ -3485,13 +4455,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -3510,18 +4478,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3533,9 +4495,9 @@ ; 51-03-01-0001 - - Flag( 51-03-01-0001.Button,$Sum5103010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_caramel.png" CARAMEL MILK @@ -3559,27 +4521,99 @@ $51-03-01-0001.Button "Disable2" "Disable2" - eval( - If $51-03-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0001.Price = -1 Then + Var return = "" + Else + If $51-03-01-0001.Discount = "" Then + Var return "" + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3627,7 +4661,7 @@ $Sum5103010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_caramel.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_caramel.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0001.Price @@ -3712,13 +4746,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -3737,18 +4769,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3760,9 +4786,9 @@ ; 51-01-01-0003 - - Flag( 51-01-01-0003.Button,$Sum5101010003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no.png" LONG BLACK @@ -3786,27 +4812,99 @@ $51-01-01-0003.Button "Disable2" "Disable2" - eval( - If $51-01-01-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0003.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0003.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0003.Price = -1 Then + Var return = "" + Else + If $51-01-01-0003.Discount = "" Then + Var return "" + Else + If $51-01-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3854,7 +4952,7 @@ $Sum5101010003TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0003.Price @@ -3939,13 +5037,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -3964,18 +5060,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3987,9 +5077,9 @@ ; 51-21-01-0003 - - Flag( 51-21-01-0003.Button,$Sum5121010003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no.png" LONG BLACK @@ -4013,27 +5103,99 @@ $51-21-01-0003.Button "Disable2" "Disable2" - eval( - If $51-21-01-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0003.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0003.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0003.Price = -1 Then + Var return = "" + Else + If $51-21-01-0003.Discount = "" Then + Var return "" + Else + If $51-21-01-0003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4081,7 +5243,7 @@ $Sum5121010003TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0003.Price @@ -4166,13 +5328,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -4191,18 +5351,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4214,9 +5368,9 @@ ; 51-01-01-0004 - - Flag( 51-01-01-0004.Button,$Sum5101010004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -4240,27 +5394,99 @@ $51-01-01-0004.Button "Disable2" "Disable2" - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4308,7 +5534,7 @@ $Sum5101010004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -4393,13 +5619,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -4418,18 +5642,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4441,9 +5659,9 @@ ; 51-21-01-0004 - - Flag( 51-21-01-0004.Button,$Sum5121010004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -4467,27 +5685,99 @@ $51-21-01-0004.Button "Disable2" "Disable2" - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4535,7 +5825,7 @@ $Sum5121010004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -4620,13 +5910,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -4645,18 +5933,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4668,9 +5950,9 @@ ; 51-01-01-0006 - - Flag( 51-01-01-0006.Button,$Sum5101010006) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -4694,27 +5976,99 @@ $51-01-01-0006.Button "Disable2" "Disable2" - eval( - If $51-01-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4762,7 +6116,7 @@ $Sum5101010006TextValue - 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 @@ -4847,13 +6201,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -4872,18 +6224,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4895,9 +6241,9 @@ ; 51-21-01-0006 - - Flag( 51-21-01-0006.Button,$Sum5121010006) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -4921,27 +6267,99 @@ $51-21-01-0006.Button "Disable2" "Disable2" - eval( - If $51-21-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4989,7 +6407,7 @@ $Sum5121010006TextValue - 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 @@ -5074,13 +6492,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -5099,18 +6515,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5122,9 +6532,9 @@ ; 51-01-01-0064 - - Flag( 51-01-01-0064.Button,$Sum5101010064) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mint_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mint_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mint_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mint_mocha.png" MINT MOCHA @@ -5148,27 +6558,99 @@ $51-01-01-0064.Button "Disable2" "Disable2" - eval( - If $51-01-01-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0064.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0064.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0064.Price = -1 Then + Var return = "" + Else + If $51-01-01-0064.Discount = "" Then + Var return "" + Else + If $51-01-01-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5216,7 +6698,7 @@ $Sum5101010064TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_mint_mocha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mint_mocha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0064.Price @@ -5301,13 +6783,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -5326,18 +6806,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5349,9 +6823,9 @@ ; 51-01-01-0007 - - Flag( 51-01-01-0007.Button,$Sum5101010007) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" CARAMEL LATTE @@ -5375,27 +6849,99 @@ $51-01-01-0007.Button "Disable2" "Disable2" - eval( - If $51-01-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0007.Price = -1 Then + Var return = "" + Else + If $51-01-01-0007.Discount = "" Then + Var return "" + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5443,7 +6989,7 @@ $Sum5101010007TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -5528,13 +7074,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -5553,18 +7097,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5576,9 +7114,9 @@ ; 51-21-01-0007 - - Flag( 51-21-01-0007.Button,$Sum5121010007) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" CARAMEL LATTE @@ -5602,27 +7140,99 @@ $51-21-01-0007.Button "Disable2" "Disable2" - eval( - If $51-21-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0007.Price = -1 Then + Var return = "" + Else + If $51-21-01-0007.Discount = "" Then + Var return "" + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5670,7 +7280,7 @@ $Sum5121010007TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price @@ -5755,13 +7365,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -5780,18 +7388,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5803,9 +7405,9 @@ ; 51-01-01-0040 - - Flag( 51-01-01-0040.Button,$Sum5101010040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" YUZU ESPRESSO @@ -5829,27 +7431,99 @@ $51-01-01-0040.Button "Disable2" "Disable2" - eval( - If $51-01-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5897,7 +7571,7 @@ $Sum5101010040TextValue - 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 @@ -5982,13 +7656,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -6007,18 +7679,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6030,9 +7696,9 @@ ; 51-21-01-0040 - - Flag( 51-21-01-0040.Button,$Sum5121010040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" YUZU ESPRESSO @@ -6056,27 +7722,99 @@ $51-21-01-0040.Button "Disable2" "Disable2" - eval( - If $51-21-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6124,7 +7862,7 @@ $Sum5121010040TextValue - 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 @@ -6209,13 +7947,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -6234,18 +7970,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6257,9 +7987,9 @@ ; 51-03-01-0024 - - Flag( 51-03-01-0024.Button,$Sum5103010024) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_ChocoBanana_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_ChocoBanana_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_ChocoBanana_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_ChocoBanana_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_ChocoBanana_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_ChocoBanana_milk.png" CHOC TOKYO\nBANANA MILK @@ -6283,27 +8013,99 @@ $51-03-01-0024.Button "Disable2" "Disable2" - eval( - If $51-03-01-0024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0024.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0024.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0024.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0024.Price = -1 Then + Var return = "" + Else + If $51-03-01-0024.Discount = "" Then + Var return "" + Else + If $51-03-01-0024.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6351,7 +8153,7 @@ $Sum5103010024TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0024.Price @@ -6436,13 +8238,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -6461,18 +8261,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6484,9 +8278,9 @@ ; 51-03-01-0035 - - Flag( 51-03-01-0035.Button,$Sum5103010035) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Cocoa.png" CHOC MINT @@ -6510,27 +8304,99 @@ $51-03-01-0035.Button "Disable2" "Disable2" - eval( - If $51-03-01-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0035.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0035.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0035.Price = -1 Then + Var return = "" + Else + If $51-03-01-0035.Discount = "" Then + Var return "" + Else + If $51-03-01-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6578,7 +8444,7 @@ $Sum5103010035TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Cocoa.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Cocoa.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0035.Price @@ -6663,13 +8529,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -6688,18 +8552,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6711,9 +8569,9 @@ ; 51-03-01-0040 - - Flag( 51-03-01-0040.Button,$Sum5103010040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Vanilla_caramel_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Vanilla_caramel_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Vanilla_caramel_Milk.png" VANILLA CARAMEL\nMILK @@ -6737,27 +8595,99 @@ $51-03-01-0040.Button "Disable2" "Disable2" - eval( - If $51-03-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0040.Price = -1 Then + Var return = "" + Else + If $51-03-01-0040.Discount = "" Then + Var return "" + Else + If $51-03-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -6805,7 +8735,7 @@ $Sum5103010040TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Vanilla_caramel_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Vanilla_caramel_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0040.Price @@ -6890,13 +8820,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -6915,18 +8843,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -6938,9 +8860,9 @@ ; 51-02-01-0024 - - Flag( 51-02-01-0024.Button,$Sum5102010024) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_thai_milk_tea_tacc.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_thai_milk_tea_tacc.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_thai_milk_tea_tacc.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_thai_milk_tea_tacc.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_thai_milk_tea_tacc.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_thai_milk_tea_tacc.png" THAI MILK TEA @@ -6964,27 +8886,99 @@ $51-02-01-0024.Button "Disable2" "Disable2" - eval( - If $51-02-01-0024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0024.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0024.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0024.Price = -1 Then + Var return = "" + Else + If $51-02-01-0024.Discount = "" Then + Var return "" + Else + If $51-02-01-0024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7032,7 +9026,7 @@ $Sum5102010024TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_tacc.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_tacc.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0024.Price @@ -7117,13 +9111,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -7142,18 +9134,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -7165,9 +9151,9 @@ ; 51-02-01-0039 - - Flag( 51-02-01-0039.Button,$Sum5102010039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" THAI MILK TEA @@ -7191,27 +9177,99 @@ $51-02-01-0039.Button "Disable2" "Disable2" - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7259,7 +9317,7 @@ $Sum5102010039TextValue - 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 @@ -7344,13 +9402,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -7369,18 +9425,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -7392,9 +9442,9 @@ ; 51-02-01-0004 - - Flag( 51-02-01-0004.Button,$Sum5102010004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea.png" MATCHA LATTE @@ -7418,27 +9468,99 @@ $51-02-01-0004.Button "Disable2" "Disable2" - eval( - If $51-02-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0004.Price = -1 Then + Var return = "" + Else + If $51-02-01-0004.Discount = "" Then + Var return "" + Else + If $51-02-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7486,7 +9608,7 @@ $Sum5102010004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0004.Price @@ -7571,13 +9693,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -7596,18 +9716,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -7619,9 +9733,9 @@ ; 51-02-01-0026 - - Flag( 51-02-01-0026.Button,$Sum5102010026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" MATCHA LATTE @@ -7645,27 +9759,99 @@ $51-02-01-0026.Button "Disable2" "Disable2" - eval( - If $51-02-01-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0026.Price = -1 Then + Var return = "" + Else + If $51-02-01-0026.Discount = "" Then + Var return "" + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7713,7 +9899,7 @@ $Sum5102010026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0026.Price @@ -7798,13 +9984,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -7823,18 +10007,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -7846,9 +10024,9 @@ ; 51-05-01-0001 - - Flag( 51-05-01-0001.Button,$Sum5105010001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade.png" LIMENADE @@ -7872,27 +10050,99 @@ $51-05-01-0001.Button "Disable2" "Disable2" - eval( - If $51-05-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-05-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-05-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-01-0001.Price = -1 Then + Var return = "" + Else + If $51-05-01-0001.Discount = "" Then + Var return "" + Else + If $51-05-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -7940,7 +10190,7 @@ $Sum5105010001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_lemonade.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-05-01-0001.Price @@ -8025,13 +10275,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -8050,18 +10298,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -8073,9 +10315,9 @@ ; 51-03-01-0005 - - Flag( 51-03-01-0005.Button,$Sum5103010005) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.png" MILK @@ -8099,27 +10341,99 @@ $51-03-01-0005.Button "Disable2" "Disable2" - eval( - If $51-03-01-0005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0005.Price = -1 Then + Var return = "" + Else + If $51-03-01-0005.Discount = "" Then + Var return "" + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -8167,7 +10481,7 @@ $Sum5103010005TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0005.Price @@ -8252,13 +10566,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -8277,18 +10589,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -8300,9 +10606,9 @@ ; 51-03-01-0022 - - Flag( 51-03-01-0022.Button,$Sum5103010022) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Melon_smoothie.png" MELON MILK @@ -8326,27 +10632,99 @@ $51-03-01-0022.Button "Disable2" "Disable2" - eval( - If $51-03-01-0022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0022.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0022.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0022.Price = -1 Then + Var return = "" + Else + If $51-03-01-0022.Discount = "" Then + Var return "" + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -8394,7 +10772,7 @@ $Sum5103010022TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0022.Price @@ -8479,13 +10857,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -8504,18 +10880,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -8527,9 +10897,9 @@ ; 51-02-01-1026 - - Flag( 51-02-01-1026.Button,$Sum5102011026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_latte_Healthy.png" MATCHA LATTE @@ -8553,27 +10923,99 @@ $51-02-01-1026.Button "Disable2" "Disable2" - eval( - If $51-02-01-1026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1026.Price = -1 Then + Var return = "" + Else + If $51-02-01-1026.Discount = "" Then + Var return "" + Else + If $51-02-01-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -8621,7 +11063,7 @@ $Sum5102011026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_latte_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_latte_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1026.Price @@ -8706,13 +11148,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_forkid.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] @@ -8731,18 +11171,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_health.lxml b/inter/aus/xml/multi/v3/page_catalog_group_health.lxml index 0ce77c44..438edacc 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_health.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_health.lxml @@ -101,7 +101,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -120,9 +120,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -130,6 +131,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -137,9 +139,9 @@ ; 51-01-01-1003 51-01-02-1001 - Flag( 51-01-01-1003.Button,51-01-02-1001.Button,$Sum51010110035101021001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no_Healthy.png" LONG BLACK @@ -163,27 +165,99 @@ $51-01-01-1003.Button $51-01-02-1001.Button "Disable2" - eval( - If $51-01-01-1003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-1001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-1003.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-1003.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-1003.Price = -1 Then + Var return = "" + Else + If $51-01-01-1003.Discount = "" Then + Var return "" + Else + If $51-01-01-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-1001.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-1001.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-1001.Price = -1 Then + Var return = "" + Else + If $51-01-02-1001.Discount = "" Then + Var return "" + Else + If $51-01-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -231,7 +305,7 @@ $Sum51010110035101021001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-1003.Price @@ -316,13 +390,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -341,18 +413,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -364,9 +430,9 @@ ; 51-21-01-1003 51-21-02-1001 - Flag( 51-21-01-1003.Button,51-21-02-1001.Button,$Sum51210110035121021001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_america_no_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_america_no_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_america_no_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_america_no_Healthy.png" LONG BLACK @@ -390,27 +456,99 @@ $51-21-01-1003.Button $51-21-02-1001.Button "Disable2" - eval( - If $51-21-01-1003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-1001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-1003.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-1003.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-1003.Price = -1 Then + Var return = "" + Else + If $51-21-01-1003.Discount = "" Then + Var return "" + Else + If $51-21-01-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-1001.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-1001.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-1001.Price = -1 Then + Var return = "" + Else + If $51-21-02-1001.Discount = "" Then + Var return "" + Else + If $51-21-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -458,7 +596,7 @@ $Sum51210110035121021001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-1003.Price @@ -543,13 +681,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -568,18 +704,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -591,9 +721,9 @@ ; 51-01-01-1004 51-01-02-1002 - Flag( 51-01-01-1004.Button,51-01-02-1002.Button,$Sum51010110045101021002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_Healthy.png" LATTE @@ -617,27 +747,99 @@ $51-01-01-1004.Button $51-01-02-1002.Button "Disable2" - eval( - If $51-01-01-1004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-1002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-1004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-1004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-1004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-1004.Price = -1 Then + Var return = "" + Else + If $51-01-01-1004.Discount = "" Then + Var return "" + Else + If $51-01-01-1004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-1002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-1002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-1002.Price = -1 Then + Var return = "" + Else + If $51-01-02-1002.Discount = "" Then + Var return "" + Else + If $51-01-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -685,7 +887,7 @@ $Sum51010110045101021002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-1004.Price @@ -770,13 +972,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -795,18 +995,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -818,9 +1012,9 @@ ; 51-21-01-1004 51-21-02-1002 - Flag( 51-21-01-1004.Button,51-21-02-1002.Button,$Sum51210110045121021002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_Healthy.png" LATTE @@ -844,27 +1038,99 @@ $51-21-01-1004.Button $51-21-02-1002.Button "Disable2" - eval( - If $51-21-01-1004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-1002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-1004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-1004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-1004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-1004.Price = -1 Then + Var return = "" + Else + If $51-21-01-1004.Discount = "" Then + Var return "" + Else + If $51-21-01-1004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-1002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-1002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-1002.Price = -1 Then + Var return = "" + Else + If $51-21-02-1002.Discount = "" Then + Var return "" + Else + If $51-21-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -912,7 +1178,7 @@ $Sum51210110045121021002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-1004.Price @@ -997,13 +1263,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -1022,18 +1286,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1045,9 +1303,9 @@ ; 51-01-01-1006 51-01-02-1003 - Flag( 51-01-01-1006.Button,51-01-02-1003.Button,$Sum51010110065101021003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Mocha_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_Mocha_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_Mocha_Healthy.png" MOCHA @@ -1071,27 +1329,99 @@ $51-01-01-1006.Button $51-01-02-1003.Button "Disable2" - eval( - If $51-01-01-1006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-1003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-1006.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-1006.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-1006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-1006.Price = -1 Then + Var return = "" + Else + If $51-01-01-1006.Discount = "" Then + Var return "" + Else + If $51-01-01-1006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-1003.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-1003.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-1003.Price = -1 Then + Var return = "" + Else + If $51-01-02-1003.Discount = "" Then + Var return "" + Else + If $51-01-02-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1139,7 +1469,7 @@ $Sum51010110065101021003TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-1006.Price @@ -1224,13 +1554,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -1249,18 +1577,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1272,9 +1594,9 @@ ; 51-21-01-1006 51-21-02-1003 - Flag( 51-21-01-1006.Button,51-21-02-1003.Button,$Sum51210110065121021003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Mocha_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_Mocha_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_Mocha_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_Mocha_Healthy.png" MOCHA @@ -1298,27 +1620,99 @@ $51-21-01-1006.Button $51-21-02-1003.Button "Disable2" - eval( - If $51-21-01-1006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-1003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-1006.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-1006.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-1006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-1006.Price = -1 Then + Var return = "" + Else + If $51-21-01-1006.Discount = "" Then + Var return "" + Else + If $51-21-01-1006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-1003.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-1003.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1003.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-1003.Price = -1 Then + Var return = "" + Else + If $51-21-02-1003.Discount = "" Then + Var return "" + Else + If $51-21-02-1003.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1366,7 +1760,7 @@ $Sum51210110065121021003TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-1006.Price @@ -1451,13 +1845,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -1476,18 +1868,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1499,9 +1885,9 @@ ; 51-01-01-1099 51-01-02-1099 - Flag( 51-01-01-1099.Button,51-01-02-1099.Button,$Sum51010110995101021099) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Cappu_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_Cappu_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_Cappu_Healthy.png" CAPPUCCINO @@ -1525,27 +1911,99 @@ $51-01-01-1099.Button $51-01-02-1099.Button "Disable2" - eval( - If $51-01-01-1099.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-1099.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-1099.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-1099.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1099.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-1099.Price = -1 Then + Var return = "" + Else + If $51-01-01-1099.Discount = "" Then + Var return "" + Else + If $51-01-01-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-1099.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-1099.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1099.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-1099.Price = -1 Then + Var return = "" + Else + If $51-01-02-1099.Discount = "" Then + Var return "" + Else + If $51-01-02-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1593,7 +2051,7 @@ $Sum51010110995101021099TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-1099.Price @@ -1678,13 +2136,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -1703,18 +2159,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1726,9 +2176,9 @@ ; 51-21-01-1099 51-21-02-1099 - Flag( 51-21-01-1099.Button,51-21-02-1099.Button,$Sum51210110995121021099) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Cappu_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_Cappu_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_Cappu_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_Cappu_Healthy.png" CAPPUCCINO @@ -1752,27 +2202,99 @@ $51-21-01-1099.Button $51-21-02-1099.Button "Disable2" - eval( - If $51-21-01-1099.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-1099.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-1099.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-1099.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1099.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-1099.Price = -1 Then + Var return = "" + Else + If $51-21-01-1099.Discount = "" Then + Var return "" + Else + If $51-21-01-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-1099.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-1099.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1099.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-1099.Price = -1 Then + Var return = "" + Else + If $51-21-02-1099.Discount = "" Then + Var return "" + Else + If $51-21-02-1099.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1820,7 +2342,7 @@ $Sum51210110995121021099TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-1099.Price @@ -1905,13 +2427,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -1930,18 +2450,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1953,9 +2467,9 @@ ; 51-02-01-1024 51-02-02-1024 - Flag( 51-02-01-1024.Button,51-02-02-1024.Button,$Sum51020110245102021024) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_thai_milk_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_thai_milk_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_thai_milk_tea_Healthy.png" THAI MILK TEA @@ -1979,27 +2493,99 @@ $51-02-01-1024.Button $51-02-02-1024.Button "Disable2" - eval( - If $51-02-01-1024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1024.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1024.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1024.Price = -1 Then + Var return = "" + Else + If $51-02-01-1024.Discount = "" Then + Var return "" + Else + If $51-02-01-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1024.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1024.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1024.Price = -1 Then + Var return = "" + Else + If $51-02-02-1024.Discount = "" Then + Var return "" + Else + If $51-02-02-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2047,7 +2633,7 @@ $Sum51020110245102021024TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1024.Price @@ -2132,13 +2718,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -2157,18 +2741,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2180,9 +2758,9 @@ ; 51-02-01-1024 51-02-02-1024 - Flag( 51-02-01-1024.Button,51-02-02-1024.Button,$Sum51020110245102021024) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_thai_milk_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_thai_milk_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_thai_milk_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_thai_milk_tea_Healthy.png" THAI MILK TEA @@ -2206,27 +2784,99 @@ $51-02-01-1024.Button $51-02-02-1024.Button "Disable2" - eval( - If $51-02-01-1024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1024.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1024.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1024.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1024.Price = -1 Then + Var return = "" + Else + If $51-02-01-1024.Discount = "" Then + Var return "" + Else + If $51-02-01-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1024.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1024.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1024.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1024.Price = -1 Then + Var return = "" + Else + If $51-02-02-1024.Discount = "" Then + Var return "" + Else + If $51-02-02-1024.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2274,7 +2924,7 @@ $Sum51020110245102021024TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1024.Price @@ -2359,13 +3009,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -2384,18 +3032,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2407,9 +3049,9 @@ ; 51-02-01-1025 51-02-02-1025 - Flag( 51-02-01-1025.Button,51-02-02-1025.Button,$Sum51020110255102021025) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_taiwan_milk_tea_Jason_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_taiwan_milk_tea_Jason_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_taiwan_milk_tea_Jason_Healthy.png" MILK TEA @@ -2433,27 +3075,99 @@ $51-02-01-1025.Button $51-02-02-1025.Button "Disable2" - eval( - If $51-02-01-1025.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1025.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1025.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1025.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1025.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1025.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1025.Price = -1 Then + Var return = "" + Else + If $51-02-01-1025.Discount = "" Then + Var return "" + Else + If $51-02-01-1025.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1025.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1025.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1025.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1025.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1025.Price = -1 Then + Var return = "" + Else + If $51-02-02-1025.Discount = "" Then + Var return "" + Else + If $51-02-02-1025.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2501,7 +3215,7 @@ $Sum51020110255102021025TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea_Jason_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea_Jason_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1025.Price @@ -2586,13 +3300,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -2611,18 +3323,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2634,9 +3340,9 @@ ; 51-02-01-1026 51-02-02-1026 - Flag( 51-02-01-1026.Button,51-02-02-1026.Button,$Sum51020110265102021026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_latte_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_latte_Healthy.png" MATCHA LATTE @@ -2660,27 +3366,99 @@ $51-02-01-1026.Button $51-02-02-1026.Button "Disable2" - eval( - If $51-02-01-1026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1026.Price = -1 Then + Var return = "" + Else + If $51-02-01-1026.Discount = "" Then + Var return "" + Else + If $51-02-01-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1026.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1026.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1026.Price = -1 Then + Var return = "" + Else + If $51-02-02-1026.Discount = "" Then + Var return "" + Else + If $51-02-02-1026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2728,7 +3506,7 @@ $Sum51020110265102021026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_latte_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_latte_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1026.Price @@ -2813,13 +3591,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -2838,18 +3614,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2861,9 +3631,9 @@ ; 51-02-01-1029 51-02-02-1029 - Flag( 51-02-01-1029.Button,51-02-02-1029.Button,$Sum51020110295102021029) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_blacktea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_blacktea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_blacktea.png" THAI TEA @@ -2887,27 +3657,99 @@ $51-02-01-1029.Button $51-02-02-1029.Button "Disable2" - eval( - If $51-02-01-1029.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1029.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1029.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1029.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1029.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1029.Price = -1 Then + Var return = "" + Else + If $51-02-01-1029.Discount = "" Then + Var return "" + Else + If $51-02-01-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1029.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1029.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1029.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1029.Price = -1 Then + Var return = "" + Else + If $51-02-02-1029.Discount = "" Then + Var return "" + Else + If $51-02-02-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2955,7 +3797,7 @@ $Sum51020110295102021029TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_blacktea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_blacktea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1029.Price @@ -3040,13 +3882,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -3065,18 +3905,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3088,9 +3922,9 @@ ; 51-02-01-1027 51-02-02-1027 - Flag( 51-02-01-1027.Button,51-02-02-1027.Button,$Sum51020110275102021027) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_tea_Healthy.png" MATCHA TEA @@ -3114,27 +3948,99 @@ $51-02-01-1027.Button $51-02-02-1027.Button "Disable2" - eval( - If $51-02-01-1027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1027.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1027.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1027.Price = -1 Then + Var return = "" + Else + If $51-02-01-1027.Discount = "" Then + Var return "" + Else + If $51-02-01-1027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1027.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1027.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1027.Price = -1 Then + Var return = "" + Else + If $51-02-02-1027.Discount = "" Then + Var return "" + Else + If $51-02-02-1027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3182,7 +4088,7 @@ $Sum51020110275102021027TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1027.Price @@ -3267,13 +4173,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -3292,18 +4196,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3315,9 +4213,9 @@ ; 51-02-01-1029 51-02-02-1029 - Flag( 51-02-01-1029.Button,51-02-02-1029.Button,$Sum51020110295102021029) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_blacktea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_blacktea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_blacktea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_blacktea.png" THAI TEA @@ -3341,27 +4239,99 @@ $51-02-01-1029.Button $51-02-02-1029.Button "Disable2" - eval( - If $51-02-01-1029.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1029.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1029.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1029.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1029.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1029.Price = -1 Then + Var return = "" + Else + If $51-02-01-1029.Discount = "" Then + Var return "" + Else + If $51-02-01-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1029.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1029.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1029.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1029.Price = -1 Then + Var return = "" + Else + If $51-02-02-1029.Discount = "" Then + Var return "" + Else + If $51-02-02-1029.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3409,7 +4379,7 @@ $Sum51020110295102021029TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_blacktea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_blacktea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1029.Price @@ -3494,13 +4464,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -3519,18 +4487,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3542,9 +4504,9 @@ ; 51-02-01-1030 51-02-02-1030 - Flag( 51-02-01-1030.Button,51-02-02-1030.Button,$Sum51020110305102021030) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_limeblack tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_limeblack tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_limeblack tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_limeblack tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_limeblack tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_limeblack tea_Healthy.png" THAI TEA \nLIMENADE @@ -3568,27 +4530,99 @@ $51-02-01-1030.Button $51-02-02-1030.Button "Disable2" - eval( - If $51-02-01-1030.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1030.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1030.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1030.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1030.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1030.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1030.Price = -1 Then + Var return = "" + Else + If $51-02-01-1030.Discount = "" Then + Var return "" + Else + If $51-02-01-1030.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1030.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1030.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1030.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1030.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1030.Price = -1 Then + Var return = "" + Else + If $51-02-02-1030.Discount = "" Then + Var return "" + Else + If $51-02-02-1030.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3636,7 +4670,7 @@ $Sum51020110305102021030TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_limeblack tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_limeblack tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1030.Price @@ -3721,13 +4755,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -3746,18 +4778,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3769,9 +4795,9 @@ ; 51-02-01-1031 51-02-02-1031 - Flag( 51-02-01-1031.Button,51-02-02-1031.Button,$Sum51020110315102021031) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_oolong_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_oolong_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_oolong_tea_Healthy.png" BLACK TEA @@ -3795,27 +4821,99 @@ $51-02-01-1031.Button $51-02-02-1031.Button "Disable2" - eval( - If $51-02-01-1031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1031.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1031.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1031.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1031.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1031.Price = -1 Then + Var return = "" + Else + If $51-02-01-1031.Discount = "" Then + Var return "" + Else + If $51-02-01-1031.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1031.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1031.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1031.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1031.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1031.Price = -1 Then + Var return = "" + Else + If $51-02-02-1031.Discount = "" Then + Var return "" + Else + If $51-02-02-1031.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3863,7 +4961,7 @@ $Sum51020110315102021031TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_oolong_tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_oolong_tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1031.Price @@ -3948,13 +5046,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -3973,18 +5069,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3996,9 +5086,9 @@ ; 51-02-01-1032 51-02-02-1032 - Flag( 51-02-01-1032.Button,51-02-02-1032.Button,$Sum51020110325102021032) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_lime_Oolong_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_lime_Oolong_tea_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_lime_Oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_lime_Oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_lime_Oolong_tea_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_lime_Oolong_tea_Healthy.png" TAIWANESE \nLBLACK TEA @@ -4022,27 +5112,99 @@ $51-02-01-1032.Button $51-02-02-1032.Button "Disable2" - eval( - If $51-02-01-1032.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1032.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1032.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1032.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1032.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1032.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1032.Price = -1 Then + Var return = "" + Else + If $51-02-01-1032.Discount = "" Then + Var return "" + Else + If $51-02-01-1032.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1032.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1032.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1032.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1032.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1032.Price = -1 Then + Var return = "" + Else + If $51-02-02-1032.Discount = "" Then + Var return "" + Else + If $51-02-02-1032.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4090,7 +5252,7 @@ $Sum51020110325102021032TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1032.Price @@ -4175,13 +5337,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -4200,18 +5360,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4223,9 +5377,9 @@ ; 51-02-01-1037 51-02-02-1037 - Flag( 51-02-01-1037.Button,51-02-02-1037.Button,$Sum51020110375102021037) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_hojicha_milk_tea_sing_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_hojicha_milk_tea_sing_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_hojicha_milk_tea_sing_Healthy.png" HOJICHA LATTE @@ -4249,27 +5403,99 @@ $51-02-01-1037.Button $51-02-02-1037.Button "Disable2" - eval( - If $51-02-01-1037.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1037.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1037.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1037.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1037.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1037.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1037.Price = -1 Then + Var return = "" + Else + If $51-02-01-1037.Discount = "" Then + Var return "" + Else + If $51-02-01-1037.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1037.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1037.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1037.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1037.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1037.Price = -1 Then + Var return = "" + Else + If $51-02-02-1037.Discount = "" Then + Var return "" + Else + If $51-02-02-1037.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4317,7 +5543,7 @@ $Sum51020110375102021037TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_hojicha_milk_tea_sing_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_hojicha_milk_tea_sing_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1037.Price @@ -4402,13 +5628,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -4427,18 +5651,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4450,9 +5668,9 @@ ; 51-03-01-1002 51-03-02-1002 - Flag( 51-03-01-1002.Button,51-03-02-1002.Button,$Sum51030110025103021002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa_Healthy.png" CHOCOLATE @@ -4476,27 +5694,99 @@ $51-03-01-1002.Button $51-03-02-1002.Button "Disable2" - eval( - If $51-03-01-1002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-1002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-1002.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-1002.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-1002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-1002.Price = -1 Then + Var return = "" + Else + If $51-03-01-1002.Discount = "" Then + Var return "" + Else + If $51-03-01-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-1002.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-1002.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-1002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-1002.Price = -1 Then + Var return = "" + Else + If $51-03-02-1002.Discount = "" Then + Var return "" + Else + If $51-03-02-1002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4544,7 +5834,7 @@ $Sum51030110025103021002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_cocoa_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_cocoa_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-1002.Price @@ -4629,13 +5919,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -4654,18 +5942,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4677,9 +5959,9 @@ ; 51-03-01-1005 51-03-02-1005 - Flag( 51-03-01-1005.Button,51-03-02-1005.Button,$Sum51030110055103021005) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_milk_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_milk_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_milk_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk_Healthy.png" MILK @@ -4703,27 +5985,99 @@ $51-03-01-1005.Button $51-03-02-1005.Button "Disable2" - eval( - If $51-03-01-1005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-1005.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-1005.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-1005.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-1005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-1005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-1005.Price = -1 Then + Var return = "" + Else + If $51-03-01-1005.Discount = "" Then + Var return "" + Else + If $51-03-01-1005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-1005.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-1005.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-1005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-1005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-1005.Price = -1 Then + Var return = "" + Else + If $51-03-02-1005.Discount = "" Then + Var return "" + Else + If $51-03-02-1005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4771,7 +6125,7 @@ $Sum51030110055103021005TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_milk_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-1005.Price @@ -4856,13 +6210,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -4881,18 +6233,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -4904,9 +6250,9 @@ ; 51-02-01-1038 51-02-02-1038 - Flag( 51-02-01-1038.Button,51-02-02-1038.Button,$Sum51020110385102021038) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" THAI MILK TEA @@ -4930,27 +6276,99 @@ $51-02-01-1038.Button $51-02-02-1038.Button "Disable2" - eval( - If $51-02-01-1038.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1038.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1038.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1038.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1038.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1038.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1038.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1038.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1038.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1038.Price = -1 Then + Var return = "" + Else + If $51-02-01-1038.Discount = "" Then + Var return "" + Else + If $51-02-01-1038.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1038.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1038.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1038.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1038.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1038.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1038.Price = -1 Then + Var return = "" + Else + If $51-02-02-1038.Discount = "" Then + Var return "" + Else + If $51-02-02-1038.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -4998,7 +6416,7 @@ $Sum51020110385102021038TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1038.Price @@ -5083,13 +6501,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -5108,18 +6524,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5131,9 +6541,9 @@ ; 51-02-01-1039 51-02-02-1039 - Flag( 51-02-01-1039.Button,51-02-02-1039.Button,$Sum51020110395102021039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_black_tea_SingPark_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_black_tea_SingPark_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_black_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_black_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_black_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_black_tea_SingPark_Healthy.png" BLACK TEA @@ -5157,27 +6567,99 @@ $51-02-01-1039.Button $51-02-02-1039.Button "Disable2" - eval( - If $51-02-01-1039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1039.Price = -1 Then + Var return = "" + Else + If $51-02-01-1039.Discount = "" Then + Var return "" + Else + If $51-02-01-1039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1039.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1039.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1039.Price = -1 Then + Var return = "" + Else + If $51-02-02-1039.Discount = "" Then + Var return "" + Else + If $51-02-02-1039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5225,7 +6707,7 @@ $Sum51020110395102021039TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_thai_black_tea_SingPark_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_black_tea_SingPark_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1039.Price @@ -5310,13 +6792,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -5335,18 +6815,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5358,9 +6832,9 @@ ; 51-02-01-1040 51-02-02-1040 - Flag( 51-02-01-1040.Button,51-02-02-1040.Button,$Sum51020110405102021040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_limeblack_tea_SingPark_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_limeblack_tea_SingPark_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_limeblack_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_limeblack_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_limeblack_tea_SingPark_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_limeblack_tea_SingPark_Healthy.png" LIME BLACK TEA @@ -5384,27 +6858,99 @@ $51-02-01-1040.Button $51-02-02-1040.Button "Disable2" - eval( - If $51-02-01-1040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-1040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-1040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-1040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-1040.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-1040.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-1040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-1040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-1040.Price = -1 Then + Var return = "" + Else + If $51-02-01-1040.Discount = "" Then + Var return "" + Else + If $51-02-01-1040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-1040.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-1040.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-1040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-1040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-1040.Price = -1 Then + Var return = "" + Else + If $51-02-02-1040.Discount = "" Then + Var return "" + Else + If $51-02-02-1040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5452,7 +6998,7 @@ $Sum51020110405102021040TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_limeblack_tea_SingPark_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_limeblack_tea_SingPark_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-1040.Price @@ -5537,13 +7083,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -5562,18 +7106,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5585,9 +7123,9 @@ ; 51-05-01-1001 51-05-02-1001 - Flag( 51-05-01-1001.Button,51-05-02-1001.Button,$Sum51050110015105021001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_limande_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_limande_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_limande_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_limande_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_limande_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_limande_Healthy.png" THAI LIME TEA @@ -5611,27 +7149,99 @@ $51-05-01-1001.Button $51-05-02-1001.Button "Disable2" - eval( - If $51-05-01-1001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-1001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-05-01-1001.Price = -1 Then + Var return = "Free" + Else + If $51-05-01-1001.Discount = "" Then + Var return !assigned StringFmt( $51-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-01-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-01-1001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-01-1001.Price = -1 Then + Var return = "" + Else + If $51-05-01-1001.Discount = "" Then + Var return "" + Else + If $51-05-01-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-02-1001.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-1001.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-1001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-1001.Price = -1 Then + Var return = "" + Else + If $51-05-02-1001.Discount = "" Then + Var return "" + Else + If $51-05-02-1001.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5679,7 +7289,7 @@ $Sum51050110015105021001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_limande_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_limande_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-05-01-1001.Price @@ -5764,13 +7374,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -5789,18 +7397,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -5812,9 +7414,9 @@ ; - 51-05-02-1010 - Flag( 51-05-02-1010.Button,$Sum5105021010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda_Healthy.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda_Healthy.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda_Healthy.png" ICED LIMENADE \nSODA @@ -5838,27 +7440,99 @@ "Disable2" $51-05-02-1010.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-1010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-1010.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-1010.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-1010.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-1010.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-1010.Price = -1 Then + Var return = "" + Else + If $51-05-02-1010.Discount = "" Then + Var return "" + Else + If $51-05-02-1010.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -5906,7 +7580,7 @@ $Sum5105021010TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda_Healthy.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda_Healthy.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -5991,13 +7665,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_health.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] @@ -6016,18 +7688,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml b/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml index f37d3bcd..3ace2734 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml @@ -88,7 +88,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -107,9 +107,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -117,16 +118,308 @@ 000082 000083 000013 + ShowOriginalPrice ;banners + ; ==================> Len = 3 + ; 51-03-01-0005 51-03-02-0005 51-03-03-0005 + + Flag( 51-03-01-0005.Button,51-03-02-0005.Button,51-03-03-0005.Button,$Sum510301000551030200055103030005) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.png" + + + MILK + นม + - + - + + + + + + + Milk + นม + - + - + + + + + $51-03-01-0005.Button + $51-03-02-0005.Button + $51-03-03-0005.Button + + eval( + If $51-03-01-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0005.Price = -1 Then + Var return = "" + Else + If $51-03-01-0005.Discount = "" Then + Var return "" + Else + If $51-03-01-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0005.Price = -1 Then + Var return = "" + Else + If $51-03-02-0005.Discount = "" Then + Var return "" + Else + If $51-03-02-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0005.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0005.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0005.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0005.Price = -1 Then + Var return = "" + Else + If $51-03-03-0005.Discount = "" Then + Var return "" + Else + If $51-03-03-0005.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum510301000551030200055103030005TextID + $Sum510301000551030200055103030005TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-03-01-0005.Price + Var PriceD2 = $51-03-02-0005.Price + Var PriceD3 = $51-03-03-0005.Price + Var PD_CODE1 = "51-03-01-0005" + Var PD_CODE2 = "51-03-02-0005" + Var PD_CODE3 = "51-03-03-0005" + ; begin lang + Var aliasName[0] = "MILK" + Var aliasDesc[0] = "Milk" + Var aliasName[1] = "นม" + Var aliasDesc[1] = "นม" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "" + Var aliasDesc[4] = "" + Var aliasName[5] = "" + Var aliasDesc[5] = "" + Var NameLang[0][0] = "WARM MILK" + Var NameLang[0][1] = "นมร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "SUSU SUAM" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Milk" + Var DescLang[0][1] = "นม" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Susu" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "MILK WITH Iced" + Var NameLang[1][1] = "นมเย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "SUSU AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Milk, Ice" + Var DescLang[1][1] = "นม และน้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Susu, Ice" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "MILK SMOOTHIE" + Var NameLang[2][1] = "นมปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE SUSU" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Milk, Ice" + Var DescLang[2][1] = "นม และน้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Susu, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-03-01-0005.Button + Var PD_STAGE_2 = $51-03-02-0005.Button + Var PD_STAGE_3 = $51-03-03-0005.Button + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "51-03-02-0005" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-03-01-0005" + Else + Topping "Load" "51-03-03-0005" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml" + + + TabMenuVisibleInst 99 + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var show_eng = "true" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" + EndIf + + + + + + ; ==================> Len = 3 ; 51-03-01-0002 51-03-02-0002 51-03-03-0002 Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa.png" Chocolate Milk @@ -150,27 +443,99 @@ $51-03-01-0002.Button $51-03-02-0002.Button $51-03-03-0002.Button - eval( - If $51-03-01-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0002.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0002.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0002.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -218,7 +583,7 @@ $Sum510301000251030200025103030002TextValue - 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 @@ -303,13 +668,11 @@ Topping "Load" "51-03-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -328,18 +691,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -351,9 +708,9 @@ ; - - 51-03-03-0011 Flag( 51-03-03-0011.Button,$Sum5103030011) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberrymilk_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberrymilk_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberrymilk_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberrymilk_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberrymilk_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberrymilk_smoothie.png" Strawberry Milk @@ -377,27 +734,99 @@ "Disable2" "Disable2" $51-03-03-0011.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0011.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0011.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0011.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0011.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0011.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0011.Price = -1 Then + Var return = "" + Else + If $51-03-03-0011.Discount = "" Then + Var return "" + Else + If $51-03-03-0011.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -445,7 +874,7 @@ $Sum5103030011TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -530,13 +959,11 @@ Topping "Load" "51-03-03-0011" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -555,18 +982,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -578,9 +999,9 @@ ; 51-03-01-0039 51-03-02-0039 51-03-03-0039 Flag( 51-03-01-0039.Button,51-03-02-0039.Button,51-03-03-0039.Button,$Sum510301003951030200395103030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_milk_Vanilla.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_milk_Vanilla.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_milk_Vanilla.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_milk_Vanilla.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_milk_Vanilla.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_milk_Vanilla.png" Vanilla Milk @@ -604,27 +1025,99 @@ $51-03-01-0039.Button $51-03-02-0039.Button $51-03-03-0039.Button - eval( - If $51-03-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0039.Price = -1 Then + Var return = "" + Else + If $51-03-01-0039.Discount = "" Then + Var return "" + Else + If $51-03-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0039.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0039.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0039.Price = -1 Then + Var return = "" + Else + If $51-03-02-0039.Discount = "" Then + Var return "" + Else + If $51-03-02-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0039.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0039.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0039.Price = -1 Then + Var return = "" + Else + If $51-03-03-0039.Discount = "" Then + Var return "" + Else + If $51-03-03-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -672,7 +1165,7 @@ $Sum510301003951030200395103030039TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_milk_Vanilla.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_milk_Vanilla.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0039.Price @@ -757,13 +1250,11 @@ Topping "Load" "51-03-03-0039" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -782,18 +1273,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -805,9 +1290,9 @@ ; 51-03-01-0022 - - Flag( 51-03-01-0022.Button,$Sum5103010022) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Melon_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Melon_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Melon_smoothie.png" Melon Milk @@ -831,27 +1316,99 @@ $51-03-01-0022.Button "Disable2" "Disable2" - eval( - If $51-03-01-0022.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0022.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0022.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0022.Price = -1 Then + Var return = "" + Else + If $51-03-01-0022.Discount = "" Then + Var return "" + Else + If $51-03-01-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -899,7 +1456,7 @@ $Sum5103010022TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Melon_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0022.Price @@ -984,13 +1541,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -1009,18 +1564,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1032,9 +1581,9 @@ ; 51-03-01-0036 51-03-02-0036 51-03-03-0036 Flag( 51-03-01-0036.Button,51-03-02-0036.Button,51-03-03-0036.Button,$Sum510301003651030200365103030036) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Milk.png" MINT MILK @@ -1058,27 +1607,99 @@ $51-03-01-0036.Button $51-03-02-0036.Button $51-03-03-0036.Button - eval( - If $51-03-01-0036.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0036.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0036.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0036.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0036.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0036.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0036.Price = -1 Then + Var return = "" + Else + If $51-03-01-0036.Discount = "" Then + Var return "" + Else + If $51-03-01-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0036.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0036.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0036.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0036.Price = -1 Then + Var return = "" + Else + If $51-03-02-0036.Discount = "" Then + Var return "" + Else + If $51-03-02-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0036.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0036.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0036.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0036.Price = -1 Then + Var return = "" + Else + If $51-03-03-0036.Discount = "" Then + Var return "" + Else + If $51-03-03-0036.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1126,7 +1747,7 @@ $Sum510301003651030200365103030036TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0036.Price @@ -1211,13 +1832,11 @@ Topping "Load" "51-03-03-0036" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -1236,18 +1855,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1259,9 +1872,9 @@ ; - 51-03-02-0058 51-03-03-0058 Flag( 51-03-02-0058.Button,51-03-03-0058.Button,$Sum51030200585103030058) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_MILK.png" Coconut Milk @@ -1285,27 +1898,99 @@ "Disable2" $51-03-02-0058.Button $51-03-03-0058.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0058.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0058.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0058.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0058.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0058.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0058.Price = -1 Then + Var return = "" + Else + If $51-03-02-0058.Discount = "" Then + Var return "" + Else + If $51-03-02-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0058.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0058.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0058.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0058.Price = -1 Then + Var return = "" + Else + If $51-03-03-0058.Discount = "" Then + Var return "" + Else + If $51-03-03-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1353,7 +2038,7 @@ $Sum51030200585103030058TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_MILK.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_MILK.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1438,13 +2123,11 @@ Topping "Load" "51-03-03-0058" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -1463,18 +2146,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1486,9 +2163,9 @@ ; 51-03-01-0001 51-03-02-0001 51-03-03-0001 Flag( 51-03-01-0001.Button,51-03-02-0001.Button,51-03-03-0001.Button,$Sum510301000151030200015103030001) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_caramel.png" Caramel Milk @@ -1512,27 +2189,99 @@ $51-03-01-0001.Button $51-03-02-0001.Button $51-03-03-0001.Button - eval( - If $51-03-01-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0001.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0001.Price = -1 Then + Var return = "" + Else + If $51-03-01-0001.Discount = "" Then + Var return "" + Else + If $51-03-01-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0001.Price = -1 Then + Var return = "" + Else + If $51-03-02-0001.Discount = "" Then + Var return "" + Else + If $51-03-02-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0001.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0001.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0001.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0001.Price = -1 Then + Var return = "" + Else + If $51-03-03-0001.Discount = "" Then + Var return "" + Else + If $51-03-03-0001.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1580,7 +2329,7 @@ $Sum510301000151030200015103030001TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_caramel.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_caramel.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0001.Price @@ -1665,13 +2414,11 @@ Topping "Load" "51-03-03-0001" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -1690,18 +2437,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1713,9 +2454,9 @@ ; 51-03-01-0041 51-03-02-0041 51-03-03-0041 Flag( 51-03-01-0041.Button,51-03-02-0041.Button,51-03-03-0041.Button,$Sum510301004151030200415103030041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Vanilla_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Vanilla_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Vanilla_cocoa.png" Vanilla Chocolate @@ -1739,27 +2480,99 @@ $51-03-01-0041.Button $51-03-02-0041.Button $51-03-03-0041.Button - eval( - If $51-03-01-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0041.Price = -1 Then + Var return = "" + Else + If $51-03-01-0041.Discount = "" Then + Var return "" + Else + If $51-03-01-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0041.Price = -1 Then + Var return = "" + Else + If $51-03-02-0041.Discount = "" Then + Var return "" + Else + If $51-03-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0041.Price = -1 Then + Var return = "" + Else + If $51-03-03-0041.Discount = "" Then + Var return "" + Else + If $51-03-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1807,7 +2620,7 @@ $Sum510301004151030200415103030041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Vanilla_cocoa.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Vanilla_cocoa.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0041.Price @@ -1892,13 +2705,11 @@ Topping "Load" "51-03-03-0041" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -1917,18 +2728,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1940,9 +2745,9 @@ ; 51-03-01-0004 51-03-02-0004 51-03-03-0004 Flag( 51-03-01-0004.Button,51-03-02-0004.Button,51-03-03-0004.Button,$Sum510301000451030200045103030004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_caramel_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_caramel_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_caramel_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_caramel_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_caramel_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_caramel_cocoa.png" Caramel\nChocolate Milk @@ -1966,27 +2771,99 @@ $51-03-01-0004.Button $51-03-02-0004.Button $51-03-03-0004.Button - eval( - If $51-03-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0004.Price = -1 Then + Var return = "" + Else + If $51-03-01-0004.Discount = "" Then + Var return "" + Else + If $51-03-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0004.Price = -1 Then + Var return = "" + Else + If $51-03-02-0004.Discount = "" Then + Var return "" + Else + If $51-03-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0004.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0004.Price = -1 Then + Var return = "" + Else + If $51-03-03-0004.Discount = "" Then + Var return "" + Else + If $51-03-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2034,7 +2911,7 @@ $Sum510301000451030200045103030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_caramel_cocoa.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_caramel_cocoa.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0004.Price @@ -2119,13 +2996,11 @@ Topping "Load" "51-03-03-0004" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -2144,18 +3019,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2167,9 +3036,9 @@ ; 51-03-01-0040 51-03-02-0040 51-03-03-0040 Flag( 51-03-01-0040.Button,51-03-02-0040.Button,51-03-03-0040.Button,$Sum510301004051030200405103030040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Vanilla_caramel_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Vanilla_caramel_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Vanilla_caramel_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Vanilla_caramel_Milk.png" Vanilla Caramel\nMilk @@ -2193,27 +3062,99 @@ $51-03-01-0040.Button $51-03-02-0040.Button $51-03-03-0040.Button - eval( - If $51-03-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0040.Price = -1 Then + Var return = "" + Else + If $51-03-01-0040.Discount = "" Then + Var return "" + Else + If $51-03-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0040.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0040.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0040.Price = -1 Then + Var return = "" + Else + If $51-03-02-0040.Discount = "" Then + Var return "" + Else + If $51-03-02-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0040.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0040.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0040.Price = -1 Then + Var return = "" + Else + If $51-03-03-0040.Discount = "" Then + Var return "" + Else + If $51-03-03-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2261,7 +3202,7 @@ $Sum510301004051030200405103030040TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Vanilla_caramel_Milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Vanilla_caramel_Milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0040.Price @@ -2346,13 +3287,11 @@ Topping "Load" "51-03-03-0040" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -2371,18 +3310,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2394,9 +3327,9 @@ ; 51-03-01-0041 51-03-02-0041 51-03-03-0041 Flag( 51-03-01-0041.Button,51-03-02-0041.Button,51-03-03-0041.Button,$Sum510301004151030200415103030041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Vanilla_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Vanilla_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Vanilla_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Vanilla_cocoa.png" Vanilla Cocoa @@ -2420,27 +3353,99 @@ $51-03-01-0041.Button $51-03-02-0041.Button $51-03-03-0041.Button - eval( - If $51-03-01-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0041.Price = -1 Then + Var return = "" + Else + If $51-03-01-0041.Discount = "" Then + Var return "" + Else + If $51-03-01-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0041.Price = -1 Then + Var return = "" + Else + If $51-03-02-0041.Discount = "" Then + Var return "" + Else + If $51-03-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0041.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0041.Price = -1 Then + Var return = "" + Else + If $51-03-03-0041.Discount = "" Then + Var return "" + Else + If $51-03-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2488,7 +3493,7 @@ $Sum510301004151030200415103030041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Vanilla_cocoa.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Vanilla_cocoa.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0041.Price @@ -2573,13 +3578,11 @@ Topping "Load" "51-03-03-0041" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -2598,18 +3601,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2621,9 +3618,9 @@ ; - - 51-03-03-0010 Flag( 51-03-03-0010.Button,$Sum5103030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberrycocoa_smoothie.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberrycocoa_smoothie.png" Strawberry\nChocolate Milk @@ -2647,27 +3644,99 @@ "Disable2" "Disable2" $51-03-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-03-0010.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0010.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0010.Price = -1 Then + Var return = "" + Else + If $51-03-03-0010.Discount = "" Then + Var return "" + Else + If $51-03-03-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2715,7 +3784,7 @@ $Sum5103030010TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2800,13 +3869,11 @@ Topping "Load" "51-03-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -2825,18 +3892,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2848,9 +3909,9 @@ ; - 51-03-02-0059 51-03-03-0059 Flag( 51-03-02-0059.Button,51-03-03-0059.Button,$Sum51030200595103030059) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_CHOCOLATE_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_CHOCOLATE_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_CHOCOLATE_MILK.png" Coconut\nChocolate Milk @@ -2874,27 +3935,99 @@ "Disable2" $51-03-02-0059.Button $51-03-03-0059.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0059.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0059.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0059.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0059.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0059.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0059.Price = -1 Then + Var return = "" + Else + If $51-03-02-0059.Discount = "" Then + Var return "" + Else + If $51-03-02-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0059.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0059.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0059.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0059.Price = -1 Then + Var return = "" + Else + If $51-03-03-0059.Discount = "" Then + Var return "" + Else + If $51-03-03-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2942,7 +4075,7 @@ $Sum51030200595103030059TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_CHOCOLATE_MILK.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_CHOCOLATE_MILK.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3027,13 +4160,11 @@ Topping "Load" "51-03-03-0059" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -3052,18 +4183,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3075,9 +4200,9 @@ ; 51-03-01-0025 51-03-02-0025 51-03-03-0025 Flag( 51-03-01-0025.Button,51-03-02-0025.Button,51-03-03-0025.Button,$Sum510301002551030200255103030025) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_ChocoYuzu_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_ChocoYuzu_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_ChocoYuzu_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_ChocoYuzu_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_ChocoYuzu_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_ChocoYuzu_milk.png" Chocolate Yuzu @@ -3101,27 +4226,99 @@ $51-03-01-0025.Button $51-03-02-0025.Button $51-03-03-0025.Button - eval( - If $51-03-01-0025.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0025.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0025.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0025.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0025.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0025.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0025.Price = -1 Then + Var return = "" + Else + If $51-03-01-0025.Discount = "" Then + Var return "" + Else + If $51-03-01-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-02-0025.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0025.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0025.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0025.Price = -1 Then + Var return = "" + Else + If $51-03-02-0025.Discount = "" Then + Var return "" + Else + If $51-03-02-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0025.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0025.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0025.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0025.Price = -1 Then + Var return = "" + Else + If $51-03-03-0025.Discount = "" Then + Var return "" + Else + If $51-03-03-0025.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3169,7 +4366,7 @@ $Sum510301002551030200255103030025TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_ChocoYuzu_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_ChocoYuzu_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-03-01-0025.Price @@ -3254,13 +4451,11 @@ Topping "Load" "51-03-03-0025" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -3279,18 +4474,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3302,9 +4491,9 @@ ; - 51-03-02-0037 51-03-03-0037 Flag( 51-03-02-0037.Button,51-03-03-0037.Button,$Sum51030200375103030037) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Milk_Straw.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Milk_Straw.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Milk_Straw.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Milk_Straw.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Milk_Straw.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Milk_Straw.png" Strawberry and Mint\nMilk @@ -3328,27 +4517,99 @@ "Disable2" $51-03-02-0037.Button $51-03-03-0037.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0037.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0037.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0037.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0037.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0037.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0037.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0037.Price = -1 Then + Var return = "" + Else + If $51-03-02-0037.Discount = "" Then + Var return "" + Else + If $51-03-02-0037.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0037.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0037.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0037.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0037.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0037.Price = -1 Then + Var return = "" + Else + If $51-03-03-0037.Discount = "" Then + Var return "" + Else + If $51-03-03-0037.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3396,7 +4657,7 @@ $Sum51030200375103030037TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Milk_Straw.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Milk_Straw.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3481,13 +4742,11 @@ Topping "Load" "51-03-03-0037" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.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] @@ -3506,18 +4765,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_other.lxml b/inter/aus/xml/multi/v3/page_catalog_group_other.lxml index 4157bf3e..231b64db 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_other.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_other.lxml @@ -10,8 +10,8 @@ DEBUGVAR SlientRefreshIndex - If SlientRefreshIndex = 7 Then - Var SlientRefreshIndex = 8 + If SlientRefreshIndex = 8 Then + Var SlientRefreshIndex = 9 EndIf Var OtherRefreshTimeOut = 1 @@ -100,7 +100,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -119,9 +119,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -129,6 +130,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -136,9 +138,9 @@ ; - 51-05-02-0035 51-05-03-0035 Flag( 51-05-02-0035.Button,51-05-03-0035.Button,$Sum51050200355105030035) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" Turtle Power\nEnergy Sparkling @@ -162,27 +164,99 @@ "Disable2" $51-05-02-0035.Button $51-05-03-0035.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0035.Price = -1 Then + Var return = "" + Else + If $51-05-02-0035.Discount = "" Then + Var return "" + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0035.Price = -1 Then + Var return = "" + Else + If $51-05-03-0035.Discount = "" Then + Var return "" + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -230,7 +304,7 @@ $Sum51050200355105030035TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -315,13 +389,11 @@ Topping "Load" "51-05-03-0035" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -340,18 +412,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -363,9 +429,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" Sprakling Yuzu @@ -389,27 +455,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -457,7 +595,7 @@ $Sum5105020045TextValue - 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 @@ -542,13 +680,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -567,18 +703,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -590,9 +720,9 @@ ; - 51-05-02-0033 51-05-03-0033 Flag( 51-05-02-0033.Button,51-05-03-0033.Button,$Sum51050200335105030033) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Lychee_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Lychee_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" Sparkling Lychee @@ -616,27 +746,99 @@ "Disable2" $51-05-02-0033.Button $51-05-03-0033.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0033.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0033.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -684,7 +886,7 @@ $Sum51050200335105030033TextValue - 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 @@ -769,13 +971,11 @@ Topping "Load" "51-05-03-0033" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -794,18 +994,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -817,9 +1011,9 @@ ; - 51-05-02-0010 51-05-03-0010 Flag( 51-05-02-0010.Button,51-05-03-0010.Button,$Sum51050200105105030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" Sparkling\nLimenade @@ -843,27 +1037,99 @@ "Disable2" $51-05-02-0010.Button $51-05-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -911,7 +1177,7 @@ $Sum51050200105105030010TextValue - 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 @@ -996,13 +1262,11 @@ Topping "Load" "51-05-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -1021,18 +1285,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1044,9 +1302,9 @@ ; - 51-05-02-0041 51-05-03-0041 Flag( 51-05-02-0041.Button,51-05-03-0041.Button,$Sum51050200415105030041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" Sparkling\nStrawberry @@ -1070,27 +1328,99 @@ "Disable2" $51-05-02-0041.Button $51-05-03-0041.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0041.Price = -1 Then + Var return = "" + Else + If $51-05-02-0041.Discount = "" Then + Var return "" + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0041.Price = -1 Then + Var return = "" + Else + If $51-05-03-0041.Discount = "" Then + Var return "" + Else + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1138,7 +1468,7 @@ $Sum51050200415105030041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1223,13 +1553,11 @@ Topping "Load" "51-05-03-0041" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -1248,18 +1576,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1271,9 +1593,9 @@ ; - 51-05-02-0044 - Flag( 51-05-02-0044.Button,$Sum5105020044) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_melon_soda.png" Sparkling Melon @@ -1297,27 +1619,99 @@ "Disable2" $51-05-02-0044.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0044.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1365,7 +1759,7 @@ $Sum5105020044TextValue - 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 @@ -1450,13 +1844,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -1475,18 +1867,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1498,9 +1884,9 @@ ; - 51-05-02-0090 - Flag( 51-05-02-0090.Button,$Sum5105020090) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_SODA.png" Coconut Sparkling @@ -1524,27 +1910,99 @@ "Disable2" $51-05-02-0090.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0090.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0090.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0090.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0090.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0090.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0090.Price = -1 Then + Var return = "" + Else + If $51-05-02-0090.Discount = "" Then + Var return "" + Else + If $51-05-02-0090.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1592,7 +2050,7 @@ $Sum5105020090TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_SODA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_SODA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1677,13 +2135,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -1702,18 +2158,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1725,9 +2175,9 @@ ; - 51-05-02-0064 - Flag( 51-05-02-0064.Button,$Sum5105020064) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Yuzu_Soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Yuzu_Soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Yuzu_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Yuzu_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Yuzu_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Yuzu_Soda.png" Yuzu and Mint\nSparkling @@ -1751,27 +2201,99 @@ "Disable2" $51-05-02-0064.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0064.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0064.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0064.Price = -1 Then + Var return = "" + Else + If $51-05-02-0064.Discount = "" Then + Var return "" + Else + If $51-05-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1819,7 +2341,7 @@ $Sum5105020064TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Yuzu_Soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Yuzu_Soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1904,13 +2426,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -1929,18 +2449,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1952,9 +2466,9 @@ ; - 51-05-02-0062 51-05-03-0062 Flag( 51-05-02-0062.Button,51-05-03-0062.Button,$Sum51050200625105030062) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_Black.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_Black.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_pepsi_Black.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_pepsi_Black.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" Pepsi Max @@ -1978,27 +2492,99 @@ "Disable2" $51-05-02-0062.Button $51-05-03-0062.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0062.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0062.Price = -1 Then + Var return = "" + Else + If $51-05-02-0062.Discount = "" Then + Var return "" + Else + If $51-05-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0062.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0062.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0062.Price = -1 Then + Var return = "" + Else + If $51-05-03-0062.Discount = "" Then + Var return "" + Else + If $51-05-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2046,7 +2632,7 @@ $Sum51050200625105030062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_Black.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_pepsi_Black.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2131,13 +2717,11 @@ Topping "Load" "51-05-03-0062" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -2156,18 +2740,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2179,9 +2757,9 @@ ; - 51-05-02-0068 - Flag( 51-05-02-0068.Button,$Sum5105020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_pepsi.png" Pepsi Max Mint @@ -2205,27 +2783,99 @@ "Disable2" $51-05-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0068.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0068.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0068.Price = -1 Then + Var return = "" + Else + If $51-05-02-0068.Discount = "" Then + Var return "" + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2273,7 +2923,7 @@ $Sum5105020068TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2358,13 +3008,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -2383,18 +3031,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2406,9 +3048,9 @@ ; - 51-05-02-0075 51-05-03-0075 Flag( 51-05-02-0075.Button,51-05-03-0075.Button,$Sum51050200755105030075) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_Melon.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_Melon.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_pepsi_Melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_pepsi_Melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" Pepsi Max Melon @@ -2432,27 +3074,99 @@ "Disable2" $51-05-02-0075.Button $51-05-03-0075.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0075.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0075.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0075.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0075.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0075.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0075.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0075.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0075.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0075.Price = -1 Then + Var return = "" + Else + If $51-05-02-0075.Discount = "" Then + Var return "" + Else + If $51-05-02-0075.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0075.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0075.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0075.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0075.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0075.Price = -1 Then + Var return = "" + Else + If $51-05-03-0075.Discount = "" Then + Var return "" + Else + If $51-05-03-0075.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2500,7 +3214,7 @@ $Sum51050200755105030075TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2585,13 +3299,11 @@ Topping "Load" "51-05-03-0075" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -2610,18 +3322,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2633,9 +3339,9 @@ ; - 51-05-02-0076 - Flag( 51-05-02-0076.Button,$Sum5105020076) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_yuzu.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_pepsi_yuzu.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" Pepsi Max Yuzu @@ -2659,27 +3365,99 @@ "Disable2" $51-05-02-0076.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0076.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0076.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0076.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0076.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0076.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0076.Price = -1 Then + Var return = "" + Else + If $51-05-02-0076.Discount = "" Then + Var return "" + Else + If $51-05-02-0076.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2727,7 +3505,7 @@ $Sum5105020076TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2812,13 +3590,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -2837,18 +3613,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2860,9 +3630,9 @@ ; - 51-05-02-0117 - Flag( 51-05-02-0117.Button,$Sum5105020117) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" Coconut Pepsi\nMax @@ -2886,27 +3656,99 @@ "Disable2" $51-05-02-0117.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0117.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0117.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0117.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0117.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0117.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0117.Price = -1 Then + Var return = "" + Else + If $51-05-02-0117.Discount = "" Then + Var return "" + Else + If $51-05-02-0117.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2954,7 +3796,7 @@ $Sum5105020117TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3039,13 +3881,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -3064,18 +3904,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3087,9 +3921,9 @@ ; - 51-05-02-0014 - Flag( 51-05-02-0014.Button,$Sum5105020014) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_soda.png" Sparkling Water @@ -3113,27 +3947,99 @@ "Disable2" $51-05-02-0014.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0014.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0014.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0014.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0014.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0014.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0014.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0014.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0014.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0014.Price = -1 Then + Var return = "" + Else + If $51-05-02-0014.Discount = "" Then + Var return "" + Else + If $51-05-02-0014.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0014.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3181,7 +4087,7 @@ $Sum5105020014TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3266,13 +4172,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -3291,18 +4195,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3314,9 +4212,9 @@ ; - 51-05-02-0015 - Flag( 51-05-02-0015.Button,$Sum5105020015) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_soda.png" Iced Sparkling Water @@ -3340,27 +4238,99 @@ "Disable2" $51-05-02-0015.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0015.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0015.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0015.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0015.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0015.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0015.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0015.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0015.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0015.Price = -1 Then + Var return = "" + Else + If $51-05-02-0015.Discount = "" Then + Var return "" + Else + If $51-05-02-0015.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0015.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3408,7 +4378,7 @@ $Sum5105020015TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3493,13 +4463,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -3518,18 +4486,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3541,9 +4503,9 @@ ; - 51-05-02-0017 - Flag( 51-05-02-0017.Button,$Sum5105020017) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced.png" Ice @@ -3567,27 +4529,99 @@ "Disable2" $51-05-02-0017.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0017.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0017.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0017.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0017.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0017.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0017.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0017.Price = -1 Then + Var return = "" + Else + If $51-05-02-0017.Discount = "" Then + Var return "" + Else + If $51-05-02-0017.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3635,7 +4669,7 @@ $Sum5105020017TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3720,13 +4754,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_other.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] @@ -3745,18 +4777,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_other.skt b/inter/aus/xml/multi/v3/page_catalog_group_other.skt index 2505c27b..eceba719 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_other.skt +++ b/inter/aus/xml/multi/v3/page_catalog_group_other.skt @@ -13,8 +13,8 @@ DEBUGVAR SlientRefreshIndex - If SlientRefreshIndex = 7 Then - Var SlientRefreshIndex = 8 + If SlientRefreshIndex = 8 Then + Var SlientRefreshIndex = 9 EndIf Var OtherRefreshTimeOut = 1 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml index af92cca7..74a248fd 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; 51-01-01-0006 51-01-02-0003 51-01-03-0003 Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -104,27 +106,99 @@ $51-01-01-0006.Button $51-01-02-0003.Button $51-01-03-0003.Button - eval( - If $51-01-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum510101000651010200035101030003TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -331,27 +397,99 @@ $51-21-01-0006.Button $51-21-02-0003.Button $51-21-03-0003.Button - eval( - If $51-21-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum512101000651210200035121030003TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-05-02-0010.Button,51-05-03-0010.Button,$Sum51050200105105030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" SPARKLING\nLIMENADE @@ -558,27 +688,99 @@ "Disable2" $51-05-02-0010.Button $51-05-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum51050200105105030010TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_cocoa.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_cocoa.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_cocoa.png" CHOCOLATE @@ -785,27 +979,99 @@ $51-03-01-0002.Button $51-03-02-0002.Button $51-03-03-0002.Button - eval( - If $51-03-01-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-03-01-0002.Price = -1 Then + Var return = "Free" + Else + If $51-03-01-0002.Discount = "" Then + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-01-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-01-0002.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum510301000251030200025103030002TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_autumn_breeze.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml index 6bfc8fef..c283c54d 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; - 51-05-02-0044 - Flag( 51-05-02-0044.Button,$Sum5105020044) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_melon_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_melon_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_melon_soda.png" SPARKLING MELON @@ -104,27 +106,99 @@ "Disable2" $51-05-02-0044.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0044.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum5105020044TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-01-02-0068.Button,$Sum5101020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" COCONUT\nAMERICANO @@ -331,27 +397,99 @@ "Disable2" $51-01-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum5101020068TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-21-02-0068.Button,$Sum5121020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" COCONUT\nAMERICANO @@ -558,27 +688,99 @@ "Disable2" $51-21-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum5121020068TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-05-02-0063.Button,$Sum5105020063) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Strawberry_Soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Strawberry_Soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Strawberry_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Strawberry_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Strawberry_Soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Strawberry_Soda.png" STRAWBERRY & MINT\nSPARKLING @@ -785,27 +979,99 @@ "Disable2" $51-05-02-0063.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0063.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum5105020063TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_happy_easter.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.lxml index 0f49d77a..940a752b 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; 51-01-01-0006 51-01-02-0003 51-01-03-0003 Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -104,27 +106,99 @@ $51-01-01-0006.Button $51-01-02-0003.Button $51-01-03-0003.Button - eval( - If $51-01-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum510101000651010200035101030003TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" MOCHA @@ -331,27 +397,99 @@ $51-21-01-0006.Button $51-21-02-0003.Button $51-21-03-0003.Button - eval( - If $51-21-01-0006.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0003.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0006.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0006.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0006.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0006.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum512101000651210200035121030003TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-01-01-0004 51-01-02-0002 51-01-03-0002 Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -558,27 +688,99 @@ $51-01-01-0004.Button $51-01-02-0002.Button $51-01-03-0002.Button - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0002.Price = -1 Then + Var return = "" + Else + If $51-01-02-0002.Discount = "" Then + Var return "" + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0002.Price = -1 Then + Var return = "" + Else + If $51-01-03-0002.Discount = "" Then + Var return "" + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum510101000451010200025101030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -711,13 +913,11 @@ Topping "Load" "51-01-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-21-01-0004 51-21-02-0002 51-21-03-0002 Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,$Sum512101000451210200025121030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -785,27 +979,99 @@ $51-21-01-0004.Button $51-21-02-0002.Button $51-21-03-0002.Button - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0002.Price = -1 Then + Var return = "" + Else + If $51-21-02-0002.Discount = "" Then + Var return "" + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0002.Price = -1 Then + Var return = "" + Else + If $51-21-03-0002.Discount = "" Then + Var return "" + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum512101000451210200025121030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -938,13 +1204,11 @@ Topping "Load" "51-21-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -986,9 +1244,9 @@ ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" CARAMEL LATTE @@ -1012,27 +1270,99 @@ $51-01-01-0007.Button $51-01-02-0004.Button $51-01-03-0004.Button - eval( - If $51-01-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0007.Price = -1 Then + Var return = "" + Else + If $51-01-01-0007.Discount = "" Then + Var return "" + Else + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0004.Price = -1 Then + Var return = "" + Else + If $51-01-02-0004.Discount = "" Then + Var return "" + Else + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0004.Price = -1 Then + Var return = "" + Else + If $51-01-03-0004.Discount = "" Then + Var return "" + Else + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1080,7 +1410,7 @@ $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -1165,13 +1495,11 @@ Topping "Load" "51-01-03-0004" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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] @@ -1190,18 +1518,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1213,9 +1535,9 @@ ; 51-21-01-0007 51-21-02-0004 51-21-03-0004 Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_caramel_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" CARAMEL LATTE @@ -1239,27 +1561,99 @@ $51-21-01-0007.Button $51-21-02-0004.Button $51-21-03-0004.Button - eval( - If $51-21-01-0007.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0007.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0007.Price = -1 Then + Var return = "" + Else + If $51-21-01-0007.Discount = "" Then + Var return "" + Else + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0004.Price = -1 Then + Var return = "" + Else + If $51-21-02-0004.Discount = "" Then + Var return "" + Else + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0004.Price = -1 Then + Var return = "" + Else + If $51-21-03-0004.Discount = "" Then + Var return "" + Else + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1307,7 +1701,7 @@ $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price @@ -1392,13 +1786,11 @@ Topping "Load" "51-21-03-0004" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_st_patrick.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.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] @@ -1417,18 +1809,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml index 17b45dbf..3d36d553 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; - 51-05-02-0033 51-05-03-0033 Flag( 51-05-02-0033.Button,51-05-03-0033.Button,$Sum51050200335105030033) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Lychee_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Lychee_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Lychee_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Lychee_soda.png" Sparkling Lychee @@ -104,27 +106,99 @@ "Disable2" $51-05-02-0033.Button $51-05-03-0033.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0033.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0033.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum51050200335105030033TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,$Sum512101006051210200605121030060) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png" Vanilla Café Latte @@ -331,27 +397,99 @@ $51-21-01-0060.Button $51-21-02-0060.Button $51-21-03-0060.Button - eval( - If $51-21-01-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0060.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0060.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum512101006051210200605121030060TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-03-03-0009.Button,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" Oreo Volcano @@ -558,27 +688,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum5103030009TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_taste_the_journey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml index 96a13c61..d10c2f18 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" SPARKLING YUZU @@ -104,27 +106,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum5105020045TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-01-01-0040.Button,51-01-02-0040.Button,$Sum51010100405101020040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" YUZU ESPRESSO @@ -331,27 +397,99 @@ $51-01-01-0040.Button $51-01-02-0040.Button "Disable2" - eval( - If $51-01-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum51010100405101020040TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 - Flag( 51-21-01-0040.Button,51-21-02-0040.Button,$Sum51210100405121020040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Yuzu_americano.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" YUZU ESPRESSO @@ -558,27 +688,99 @@ $51-21-01-0040.Button $51-21-02-0040.Button "Disable2" - eval( - If $51-21-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0040.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum51210100405121020040TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" THAI MILK TEA @@ -785,27 +979,99 @@ $51-02-01-0039.Button $51-02-02-0039.Button $51-02-03-0039.Button - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum510201003951020200395102030039TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_pro_valentine.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.lxml b/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.lxml index 1352db93..ae71f940 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; - 51-01-02-0068 - Flag( 51-01-02-0068.Button,$Sum5101020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" COCONUT\nAMERICANO @@ -104,27 +106,99 @@ "Disable2" $51-01-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum5101020068TextValue - 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 @@ -257,13 +331,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-02-0068 - Flag( 51-21-02-0068.Button,$Sum5121020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" COCONUT\nAMERICANO @@ -331,27 +397,99 @@ "Disable2" $51-21-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum5121020068TextValue - 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" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-02-0058 51-03-03-0058 Flag( 51-03-02-0058.Button,51-03-03-0058.Button,$Sum51030200585103030058) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_MILK.png" COCONUT MILK @@ -558,27 +688,99 @@ "Disable2" $51-03-02-0058.Button $51-03-03-0058.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0058.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0058.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0058.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0058.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0058.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0058.Price = -1 Then + Var return = "" + Else + If $51-03-02-0058.Discount = "" Then + Var return "" + Else + If $51-03-02-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0058.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0058.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0058.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0058.Price = -1 Then + Var return = "" + Else + If $51-03-03-0058.Discount = "" Then + Var return "" + Else + If $51-03-03-0058.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum51030200585103030058TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_MILK.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_MILK.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -711,13 +913,11 @@ Topping "Load" "51-03-03-0058" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-02-0059 51-03-03-0059 Flag( 51-03-02-0059.Button,51-03-03-0059.Button,$Sum51030200595103030059) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_CHOCOLATE_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_CHOCOLATE_MILK.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_CHOCOLATE_MILK.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_CHOCOLATE_MILK.png" COCONUT CHOCO\nMILK @@ -785,27 +979,99 @@ "Disable2" $51-03-02-0059.Button $51-03-03-0059.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-02-0059.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0059.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-03-02-0059.Price = -1 Then + Var return = "Free" + Else + If $51-03-02-0059.Discount = "" Then + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-02-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0059.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-02-0059.Price = -1 Then + Var return = "" + Else + If $51-03-02-0059.Discount = "" Then + Var return "" + Else + If $51-03-02-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-03-03-0059.Price = -1 Then + Var return = "Free" + Else + If $51-03-03-0059.Discount = "" Then + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-03-03-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0059.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-03-03-0059.Price = -1 Then + Var return = "" + Else + If $51-03-03-0059.Discount = "" Then + Var return "" + Else + If $51-03-03-0059.Discount = > 0 Then + Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum51030200595103030059TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_CHOCOLATE_MILK.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_CHOCOLATE_MILK.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -938,13 +1204,11 @@ Topping "Load" "51-03-03-0059" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -986,9 +1244,9 @@ ; 51-02-01-0060 51-02-02-0060 51-02-03-0060 Flag( 51-02-01-0060.Button,51-02-02-0060.Button,51-02-03-0060.Button,$Sum510201006051020200605102030060) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_COCONUT_MATCHA_LATTE.png" COCONUT MATCHA\nLATTE @@ -1012,27 +1270,99 @@ $51-02-01-0060.Button $51-02-02-0060.Button $51-02-03-0060.Button - eval( - If $51-02-01-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0060.Price = -1 Then + Var return = "" + Else + If $51-02-01-0060.Discount = "" Then + Var return "" + Else + If $51-02-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0060.Price = -1 Then + Var return = "" + Else + If $51-02-02-0060.Discount = "" Then + Var return "" + Else + If $51-02-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0060.Price = -1 Then + Var return = "" + Else + If $51-02-03-0060.Discount = "" Then + Var return "" + Else + If $51-02-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1080,7 +1410,7 @@ $Sum510201006051020200605102030060TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_COCONUT_MATCHA_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_COCONUT_MATCHA_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0060.Price @@ -1165,13 +1495,11 @@ Topping "Load" "51-02-03-0060" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -1190,18 +1518,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1213,9 +1535,9 @@ ; 51-02-01-0061 51-02-02-0061 51-02-03-0061 Flag( 51-02-01-0061.Button,51-02-02-0061.Button,51-02-03-0061.Button,$Sum510201006151020200615102030061) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_MATCHA_LATTE.png" COCONUT MATCHA @@ -1239,27 +1561,99 @@ $51-02-01-0061.Button $51-02-02-0061.Button $51-02-03-0061.Button - eval( - If $51-02-01-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0061.Price = -1 Then + Var return = "" + Else + If $51-02-01-0061.Discount = "" Then + Var return "" + Else + If $51-02-01-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0061.Price = -1 Then + Var return = "" + Else + If $51-02-02-0061.Discount = "" Then + Var return "" + Else + If $51-02-02-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0061.Price = -1 Then + Var return = "" + Else + If $51-02-03-0061.Discount = "" Then + Var return "" + Else + If $51-02-03-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1307,7 +1701,7 @@ $Sum510201006151020200615102030061TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_MATCHA_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_MATCHA_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0061.Price @@ -1392,13 +1786,11 @@ Topping "Load" "51-02-03-0061" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -1417,18 +1809,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1440,9 +1826,9 @@ ; - 51-02-02-0062 51-02-03-0062 Flag( 51-02-02-0062.Button,51-02-03-0062.Button,$Sum51020200625102030062) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_THAI_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_THAI_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_MILK_TEA.png" COCONUT THAI\nMILK TEA @@ -1466,27 +1852,99 @@ "Disable2" $51-02-02-0062.Button $51-02-03-0062.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0062.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0062.Price = -1 Then + Var return = "" + Else + If $51-02-02-0062.Discount = "" Then + Var return "" + Else + If $51-02-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0062.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0062.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0062.Price = -1 Then + Var return = "" + Else + If $51-02-03-0062.Discount = "" Then + Var return "" + Else + If $51-02-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1534,7 +1992,7 @@ $Sum51020200625102030062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_MILK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_MILK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1619,13 +2077,11 @@ Topping "Load" "51-02-03-0062" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -1644,18 +2100,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1667,9 +2117,9 @@ ; - 51-02-02-0063 51-02-03-0063 Flag( 51-02-02-0063.Button,51-02-03-0063.Button,$Sum51020200635102030063) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_THAI_BLACK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_THAI_BLACK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" COCONUT THAI\nBLACK TEA @@ -1693,27 +2143,99 @@ "Disable2" $51-02-02-0063.Button $51-02-03-0063.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0063.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0063.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0063.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0063.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0063.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0063.Price = -1 Then + Var return = "" + Else + If $51-02-02-0063.Discount = "" Then + Var return "" + Else + If $51-02-02-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0063.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0063.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0063.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0063.Price = -1 Then + Var return = "" + Else + If $51-02-03-0063.Discount = "" Then + Var return "" + Else + If $51-02-03-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1761,7 +2283,7 @@ $Sum51020200635102030063TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_BLACK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_BLACK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1846,13 +2368,11 @@ Topping "Load" "51-02-03-0063" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -1871,18 +2391,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1894,9 +2408,9 @@ ; - 51-02-02-0064 51-02-03-0064 Flag( 51-02-02-0064.Button,51-02-03-0064.Button,$Sum51020200645102030064) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_JASMINE_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_JASMINE_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_JASMINE_MILK_TEA.png" COCONUT JASMINE\nMILK TEA @@ -1920,27 +2434,99 @@ "Disable2" $51-02-02-0064.Button $51-02-03-0064.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0064.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0064.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0064.Price = -1 Then + Var return = "" + Else + If $51-02-02-0064.Discount = "" Then + Var return "" + Else + If $51-02-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0064.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0064.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0064.Price = -1 Then + Var return = "" + Else + If $51-02-03-0064.Discount = "" Then + Var return "" + Else + If $51-02-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1988,7 +2574,7 @@ $Sum51020200645102030064TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_JASMINE_MILK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_JASMINE_MILK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2073,13 +2659,11 @@ Topping "Load" "51-02-03-0064" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -2098,18 +2682,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2121,9 +2699,9 @@ ; - 51-02-02-0065 51-02-03-0065 Flag( 51-02-02-0065.Button,51-02-03-0065.Button,$Sum51020200655102030065) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_COCONUT_JASMINE_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_COCONUT_JASMINE_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_COCONUT_JASMINE_TEA.png" COCONUT JASMINE\nTEA @@ -2147,27 +2725,99 @@ "Disable2" $51-02-02-0065.Button $51-02-03-0065.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0065.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0065.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0065.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0065.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0065.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0065.Price = -1 Then + Var return = "" + Else + If $51-02-02-0065.Discount = "" Then + Var return "" + Else + If $51-02-02-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0065.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0065.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0065.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0065.Price = -1 Then + Var return = "" + Else + If $51-02-03-0065.Discount = "" Then + Var return "" + Else + If $51-02-03-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2215,7 +2865,7 @@ $Sum51020200655102030065TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_COCONUT_JASMINE_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_COCONUT_JASMINE_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2300,13 +2950,11 @@ Topping "Load" "51-02-03-0065" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -2325,18 +2973,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2348,9 +2990,9 @@ ; - - 51-05-03-0092 Flag( 51-05-03-0092.Button,$Sum5105030092) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_SMOOTHIE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_SMOOTHIE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_SMOOTHIE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_SMOOTHIE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_SMOOTHIE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_SMOOTHIE.png" COCONUT SMOOTHIE @@ -2374,27 +3016,99 @@ "Disable2" "Disable2" $51-05-03-0092.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0092.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-03-0092.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0092.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0092.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0092.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0092.Price = -1 Then + Var return = "" + Else + If $51-05-03-0092.Discount = "" Then + Var return "" + Else + If $51-05-03-0092.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2442,7 +3156,7 @@ $Sum5105030092TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_SMOOTHIE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_SMOOTHIE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2527,13 +3241,11 @@ Topping "Load" "51-05-03-0092" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -2552,18 +3264,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2575,9 +3281,9 @@ ; - 51-05-02-0090 - Flag( 51-05-02-0090.Button,$Sum5105020090) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_SODA.png" COCONUT SODA @@ -2601,27 +3307,99 @@ "Disable2" $51-05-02-0090.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0090.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0090.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0090.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0090.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0090.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0090.Price = -1 Then + Var return = "" + Else + If $51-05-02-0090.Discount = "" Then + Var return "" + Else + If $51-05-02-0090.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2669,7 +3447,7 @@ $Sum5105020090TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_SODA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_SODA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2754,13 +3532,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -2779,18 +3555,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2802,9 +3572,9 @@ ; - 51-05-02-0091 51-05-02-0091 Flag( 51-05-02-0091.Button,51-05-02-0091.Button,$Sum51050200915105020091) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" COCONUT PEPSI @@ -2828,27 +3598,99 @@ "Disable2" $51-05-02-0091.Button $51-05-02-0091.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0091.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0091.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0091.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0091.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0091.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0091.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0091.Price = -1 Then + Var return = "" + Else + If $51-05-02-0091.Discount = "" Then + Var return "" + Else + If $51-05-02-0091.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-02-0091.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0091.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0091.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0091.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0091.Price = -1 Then + Var return = "" + Else + If $51-05-02-0091.Discount = "" Then + Var return "" + Else + If $51-05-02-0091.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2896,7 +3738,7 @@ $Sum51050200915105020091TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2981,13 +3823,11 @@ Topping "Load" "51-05-02-0091" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -3006,18 +3846,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3029,9 +3863,9 @@ ; - 51-05-02-0117 - Flag( 51-05-02-0117.Button,$Sum5105020117) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_PEPSI.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_PEPSI.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" COCONUT PEPSI\nMAX @@ -3055,27 +3889,99 @@ "Disable2" $51-05-02-0117.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0117.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0117.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0117.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0117.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0117.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0117.Price = -1 Then + Var return = "" + Else + If $51-05-02-0117.Discount = "" Then + Var return "" + Else + If $51-05-02-0117.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3123,7 +4029,7 @@ $Sum5105020117TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3208,13 +4114,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -3233,18 +4137,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3256,9 +4154,9 @@ ; - 51-05-02-0093 - Flag( 51-05-02-0093.Button,$Sum5105020093) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_LYCHEE_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_LYCHEE_SODA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_LYCHEE_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LYCHEE_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LYCHEE_SODA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LYCHEE_SODA.png" COCONUT LYCHEE\nSODA @@ -3282,27 +4180,99 @@ "Disable2" $51-05-02-0093.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0093.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0093.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0093.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0093.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0093.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0093.Price = -1 Then + Var return = "" + Else + If $51-05-02-0093.Discount = "" Then + Var return "" + Else + If $51-05-02-0093.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3350,7 +4320,7 @@ $Sum5105020093TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_LYCHEE_SODA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LYCHEE_SODA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3435,13 +4405,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_promotion_coconut.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.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] @@ -3460,18 +4428,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml b/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml index 59b221b8..9a77e632 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml @@ -77,7 +77,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -96,9 +96,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -106,6 +107,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -113,9 +115,9 @@ ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,Disable=Invisible,$Sum510101000451010200025101030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -139,27 +141,99 @@ $51-01-01-0004.Button $51-01-02-0002.Button $51-01-03-0002.Button - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0002.Price = -1 Then + Var return = "" + Else + If $51-01-02-0002.Discount = "" Then + Var return "" + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0002.Price = -1 Then + Var return = "" + Else + If $51-01-03-0002.Discount = "" Then + Var return "" + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -207,7 +281,7 @@ $Sum510101000451010200025101030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -292,13 +366,11 @@ Topping "Load" "51-01-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -317,18 +389,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -340,9 +406,9 @@ ; 51-21-01-0004 51-21-02-0002 51-21-03-0002 Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,Disable=Invisible,$Sum512101000451210200025121030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -366,27 +432,99 @@ $51-21-01-0004.Button $51-21-02-0002.Button $51-21-03-0002.Button - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0002.Price = -1 Then + Var return = "" + Else + If $51-21-02-0002.Discount = "" Then + Var return "" + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0002.Price = -1 Then + Var return = "" + Else + If $51-21-03-0002.Discount = "" Then + Var return "" + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -434,7 +572,7 @@ $Sum512101000451210200025121030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -519,13 +657,11 @@ Topping "Load" "51-21-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -544,18 +680,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -567,9 +697,9 @@ ; 51-21-01-0081 51-21-02-0081 51-21-03-0081 Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,Disable=Invisible,$Sum512101008151210200815121030081) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" Coconut Café Latte @@ -593,27 +723,99 @@ $51-21-01-0081.Button $51-21-02-0081.Button $51-21-03-0081.Button - eval( - If $51-21-01-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0081.Price = -1 Then + Var return = "" + Else + If $51-21-01-0081.Discount = "" Then + Var return "" + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0081.Price = -1 Then + Var return = "" + Else + If $51-21-02-0081.Discount = "" Then + Var return "" + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0081.Price = -1 Then + Var return = "" + Else + If $51-21-03-0081.Discount = "" Then + Var return "" + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -661,7 +863,7 @@ $Sum512101008151210200815121030081TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0081.Price @@ -746,13 +948,11 @@ Topping "Load" "51-21-03-0081" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -771,18 +971,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -794,9 +988,9 @@ ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,Disable=Invisible,$Sum510201007151020200715102030071) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" Strawberry\nMatcha Latte @@ -820,27 +1014,99 @@ $51-02-01-0071.Button $51-02-02-0071.Button $51-02-03-0071.Button - eval( - If $51-02-01-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0071.Price = -1 Then + Var return = "" + Else + If $51-02-01-0071.Discount = "" Then + Var return "" + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0071.Price = -1 Then + Var return = "" + Else + If $51-02-02-0071.Discount = "" Then + Var return "" + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0071.Price = -1 Then + Var return = "" + Else + If $51-02-03-0071.Discount = "" Then + Var return "" + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -888,7 +1154,7 @@ $Sum510201007151020200715102030071TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0071.Price @@ -973,13 +1239,11 @@ Topping "Load" "51-02-03-0071" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -998,18 +1262,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1021,9 +1279,9 @@ ; - 51-05-02-0068 - Flag( 51-05-02-0068.Button,Disable=Invisible,$Sum5105020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_pepsi.png" Pepsi Mint @@ -1047,27 +1305,99 @@ "Disable2" $51-05-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0068.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0068.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0068.Price = -1 Then + Var return = "" + Else + If $51-05-02-0068.Discount = "" Then + Var return "" + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1115,7 +1445,7 @@ $Sum5105020068TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1200,13 +1530,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1225,18 +1553,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1248,9 +1570,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,Disable=Invisible,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" Yummy Yuzu\nSparkling @@ -1274,27 +1596,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1342,7 +1736,7 @@ $Sum5105020045TextValue - 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 @@ -1427,13 +1821,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1452,18 +1844,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1475,9 +1861,9 @@ ; - 51-05-02-0035 51-05-03-0035 Flag( 51-05-02-0035.Button,51-05-03-0035.Button,Disable=Invisible,$Sum51050200355105030035) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" Turtle Power\nEnergy Sparkling @@ -1501,27 +1887,99 @@ "Disable2" $51-05-02-0035.Button $51-05-03-0035.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0035.Price = -1 Then + Var return = "" + Else + If $51-05-02-0035.Discount = "" Then + Var return "" + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0035.Price = -1 Then + Var return = "" + Else + If $51-05-03-0035.Discount = "" Then + Var return "" + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1569,7 +2027,7 @@ $Sum51050200355105030035TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1654,13 +2112,11 @@ Topping "Load" "51-05-03-0035" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1679,18 +2135,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1702,9 +2152,9 @@ ; - - 51-03-03-0009 Flag( 51-03-03-0009.Button,Disable=Invisible,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" Oreo Volcano @@ -1728,27 +2178,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1796,7 +2318,7 @@ $Sum5103030009TextValue - 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 @@ -1881,13 +2403,11 @@ Topping "Load" "51-03-03-0009" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -1906,18 +2426,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1929,9 +2443,9 @@ ; - 51-05-02-0041 - Flag( 51-05-02-0041.Button,Disable=Invisible,$Sum5105020041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" Straw-Breeze\nSparkling @@ -1955,27 +2469,99 @@ "Disable2" $51-05-02-0041.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0041.Price = -1 Then + Var return = "" + Else + If $51-05-02-0041.Discount = "" Then + Var return "" + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2023,7 +2609,7 @@ $Sum5105020041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2108,13 +2694,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2133,18 +2717,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2156,9 +2734,9 @@ ; - 51-05-02-0010 51-05-03-0010 Flag( 51-05-02-0010.Button,51-05-03-0010.Button,Disable=Invisible,$Sum51050200105105030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" Refreshing\nLimenade @@ -2182,27 +2760,99 @@ "Disable2" $51-05-02-0010.Button $51-05-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2250,7 +2900,7 @@ $Sum51050200105105030010TextValue - 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 @@ -2335,13 +2985,11 @@ Topping "Load" "51-05-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2360,18 +3008,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2383,9 +3025,9 @@ ; 51-02-01-0039 51-02-02-0039 51-02-03-0039 Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,Disable=Invisible,$Sum510201003951020200395102030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" Exceptional Thai\nMilk Tea @@ -2409,27 +3051,99 @@ $51-02-01-0039.Button $51-02-02-0039.Button $51-02-03-0039.Button - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2477,7 +3191,7 @@ $Sum510201003951020200395102030039TextValue - 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 @@ -2562,13 +3276,11 @@ Topping "Load" "51-02-03-0039" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2587,18 +3299,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2610,9 +3316,9 @@ ; 51-02-01-0026 51-02-02-0026 51-02-03-0026 Flag( 51-02-01-0026.Button,51-02-02-0026.Button,51-02-03-0026.Button,Disable=Invisible,$Sum510201002651020200265102030026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" Matcha Latte @@ -2636,27 +3342,99 @@ $51-02-01-0026.Button $51-02-02-0026.Button $51-02-03-0026.Button - eval( - If $51-02-01-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0026.Price = -1 Then + Var return = "" + Else + If $51-02-01-0026.Discount = "" Then + Var return "" + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0026.Price = -1 Then + Var return = "" + Else + If $51-02-02-0026.Discount = "" Then + Var return "" + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0026.Price = -1 Then + Var return = "" + Else + If $51-02-03-0026.Discount = "" Then + Var return "" + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2704,7 +3482,7 @@ $Sum510201002651020200265102030026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0026.Price @@ -2789,13 +3567,11 @@ Topping "Load" "51-02-03-0026" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -2814,18 +3590,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2837,9 +3607,9 @@ ; - 51-04-02-0016 - Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" Matcha Protein\nShake @@ -2863,27 +3633,99 @@ "Disable2" $51-04-02-0016.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0016.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0016.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0016.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0016.Price = -1 Then + Var return = "" + Else + If $51-04-02-0016.Discount = "" Then + Var return "" + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2931,7 +3773,7 @@ $Sum5104020016TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3016,13 +3858,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend.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] @@ -3041,18 +3881,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml b/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml index cd7b2337..9b97bce6 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml @@ -42,7 +42,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -61,9 +61,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -71,6 +72,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -78,9 +80,9 @@ ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -104,27 +106,99 @@ $51-01-01-0004.Button $51-01-02-0002.Button $51-01-03-0002.Button - eval( - If $51-01-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-01-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-01-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-01-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-01-0004.Price = -1 Then + Var return = "" + Else + If $51-01-01-0004.Discount = "" Then + Var return "" + Else + If $51-01-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-02-0002.Price = -1 Then + Var return = "" + Else + If $51-01-02-0002.Discount = "" Then + Var return "" + Else + If $51-01-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-01-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-01-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-01-03-0002.Price = -1 Then + Var return = "" + Else + If $51-01-03-0002.Discount = "" Then + Var return "" + Else + If $51-01-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -172,7 +246,7 @@ $Sum510101000451010200025101030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0004.Price @@ -257,13 +331,11 @@ Topping "Load" "51-01-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-0004 51-21-02-0002 51-21-03-0002 Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,$Sum512101000451210200025121030002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" LATTE @@ -331,27 +397,99 @@ $51-21-01-0004.Button $51-21-02-0002.Button $51-21-03-0002.Button - eval( - If $51-21-01-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0004.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0004.Price = -1 Then + Var return = "" + Else + If $51-21-01-0004.Discount = "" Then + Var return "" + Else + If $51-21-01-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0002.Price = -1 Then + Var return = "" + Else + If $51-21-02-0002.Discount = "" Then + Var return "" + Else + If $51-21-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0002.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0002.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0002.Price = -1 Then + Var return = "" + Else + If $51-21-03-0002.Discount = "" Then + Var return "" + Else + If $51-21-03-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -399,7 +537,7 @@ $Sum512101000451210200025121030002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0004.Price @@ -484,13 +622,11 @@ Topping "Load" "51-21-03-0002" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-0081 51-21-02-0081 51-21-03-0081 Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" Coconut Café Latte @@ -558,27 +688,99 @@ $51-21-01-0081.Button $51-21-02-0081.Button $51-21-03-0081.Button - eval( - If $51-21-01-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-02-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-21-03-0081.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-21-01-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-01-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-01-0081.Price = -1 Then + Var return = "" + Else + If $51-21-01-0081.Discount = "" Then + Var return "" + Else + If $51-21-01-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-02-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-02-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-02-0081.Price = -1 Then + Var return = "" + Else + If $51-21-02-0081.Discount = "" Then + Var return "" + Else + If $51-21-02-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-21-03-0081.Price = -1 Then + Var return = "Free" + Else + If $51-21-03-0081.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-21-03-0081.Price = -1 Then + Var return = "" + Else + If $51-21-03-0081.Discount = "" Then + Var return "" + Else + If $51-21-03-0081.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -626,7 +828,7 @@ $Sum512101008151210200815121030081TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0081.Price @@ -711,13 +913,11 @@ Topping "Load" "51-21-03-0081" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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-0071 51-02-02-0071 51-02-03-0071 Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,$Sum510201007151020200715102030071) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" Strawberry\nMatcha Latte @@ -785,27 +979,99 @@ $51-02-01-0071.Button $51-02-02-0071.Button $51-02-03-0071.Button - eval( - If $51-02-01-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0071.Price = -1 Then + Var return = "" + Else + If $51-02-01-0071.Discount = "" Then + Var return "" + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0071.Price = -1 Then + Var return = "" + Else + If $51-02-02-0071.Discount = "" Then + Var return "" + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0071.Price = -1 Then + Var return = "" + Else + If $51-02-03-0071.Discount = "" Then + Var return "" + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -853,7 +1119,7 @@ $Sum510201007151020200715102030071TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0071.Price @@ -938,13 +1204,11 @@ Topping "Load" "51-02-03-0071" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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 DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -986,9 +1244,9 @@ ; - 51-05-02-0068 - Flag( 51-05-02-0068.Button,$Sum5105020068) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_pepsi.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_pepsi.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_pepsi.png" Pepsi Mint @@ -1012,27 +1270,99 @@ "Disable2" $51-05-02-0068.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0068.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0068.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0068.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0068.Price = -1 Then + Var return = "" + Else + If $51-05-02-0068.Discount = "" Then + Var return "" + Else + If $51-05-02-0068.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1080,7 +1410,7 @@ $Sum5105020068TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1165,13 +1495,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -1190,18 +1518,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1213,9 +1535,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_yuzu_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" Yummy Yuzu\nSparkling @@ -1239,27 +1561,99 @@ "Disable2" $51-05-02-0045.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1307,7 +1701,7 @@ $Sum5105020045TextValue - 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 @@ -1392,13 +1786,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -1417,18 +1809,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1440,9 +1826,9 @@ ; - 51-05-02-0035 51-05-03-0035 Flag( 51-05-02-0035.Button,51-05-03-0035.Button,$Sum51050200355105030035) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_energy_drink_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_energy_drink_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_energy_drink_soda.png" Turtle Power\nEnergy Sparkling @@ -1466,27 +1852,99 @@ "Disable2" $51-05-02-0035.Button $51-05-03-0035.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0035.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0035.Price = -1 Then + Var return = "" + Else + If $51-05-02-0035.Discount = "" Then + Var return "" + Else + If $51-05-02-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-05-03-0035.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0035.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0035.Price = -1 Then + Var return = "" + Else + If $51-05-03-0035.Discount = "" Then + Var return "" + Else + If $51-05-03-0035.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1534,7 +1992,7 @@ $Sum51050200355105030035TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1619,13 +2077,11 @@ Topping "Load" "51-05-03-0035" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -1644,18 +2100,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1667,9 +2117,9 @@ ; - - 51-03-03-0009 Flag( 51-03-03-0009.Button,$Sum5103030009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_smoothie_oreo.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_smoothie_oreo.png" Oreo Volcano @@ -1693,27 +2143,99 @@ "Disable2" "Disable2" $51-03-03-0009.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-03-03-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1761,7 +2283,7 @@ $Sum5103030009TextValue - 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 @@ -1846,13 +2368,11 @@ Topping "Load" "51-03-03-0009" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -1871,18 +2391,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1894,9 +2408,9 @@ ; - 51-05-02-0041 - Flag( 51-05-02-0041.Button,$Sum5105020041) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_strawberry_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_strawberry_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_strawberry_soda.png" Straw-Breeze\nSparkling @@ -1920,27 +2434,99 @@ "Disable2" $51-05-02-0041.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0041.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-05-02-0041.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0041.Price = -1 Then + Var return = "" + Else + If $51-05-02-0041.Discount = "" Then + Var return "" + Else + If $51-05-02-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1988,7 +2574,7 @@ $Sum5105020041TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2073,13 +2659,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -2098,18 +2682,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2121,9 +2699,9 @@ ; - 51-05-02-0010 51-05-03-0010 Flag( 51-05-02-0010.Button,51-05-03-0010.Button,$Sum51050200105105030010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_lemonade_soda.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_lemonade_soda.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" Refreshing\nLimenade @@ -2147,27 +2725,99 @@ "Disable2" $51-05-02-0010.Button $51-05-03-0010.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-05-03-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2215,7 +2865,7 @@ $Sum51050200105105030010TextValue - 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 @@ -2300,13 +2950,11 @@ Topping "Load" "51-05-03-0010" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -2325,18 +2973,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2348,9 +2990,9 @@ ; 51-02-01-0039 51-02-02-0039 51-02-03-0039 Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" Exceptional Thai\nMilk Tea @@ -2374,27 +3016,99 @@ $51-02-01-0039.Button $51-02-02-0039.Button $51-02-03-0039.Button - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2442,7 +3156,7 @@ $Sum510201003951020200395102030039TextValue - 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 @@ -2527,13 +3241,11 @@ Topping "Load" "51-02-03-0039" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -2552,18 +3264,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2575,9 +3281,9 @@ ; 51-02-01-0026 51-02-02-0026 51-02-03-0026 Flag( 51-02-01-0026.Button,51-02-02-0026.Button,51-02-03-0026.Button,$Sum510201002651020200265102030026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" Matcha Latte @@ -2601,27 +3307,99 @@ $51-02-01-0026.Button $51-02-02-0026.Button $51-02-03-0026.Button - eval( - If $51-02-01-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0026.Price = -1 Then + Var return = "" + Else + If $51-02-01-0026.Discount = "" Then + Var return "" + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0026.Price = -1 Then + Var return = "" + Else + If $51-02-02-0026.Discount = "" Then + Var return "" + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0026.Price = -1 Then + Var return = "" + Else + If $51-02-03-0026.Discount = "" Then + Var return "" + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2669,7 +3447,7 @@ $Sum510201002651020200265102030026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0026.Price @@ -2754,13 +3532,11 @@ Topping "Load" "51-02-03-0026" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -2779,18 +3555,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2802,9 +3572,9 @@ ; - 51-04-02-0016 - Flag( 51-04-02-0016.Button,$Sum5104020016) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" Matcha Protein\nShake @@ -2828,27 +3598,99 @@ "Disable2" $51-04-02-0016.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0016.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0016.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0016.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0016.Price = -1 Then + Var return = "" + Else + If $51-04-02-0016.Discount = "" Then + Var return "" + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2896,7 +3738,7 @@ $Sum5104020016TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2981,13 +3823,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend_multi_pro.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_recommend_multi_pro.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] @@ -3006,18 +3846,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml b/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml index c42c251a..b66e2eb9 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml @@ -143,7 +143,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -162,9 +162,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -172,6 +173,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -179,9 +181,9 @@ ; 51-02-01-0026 51-02-02-0026 51-02-03-0026 Flag( 51-02-01-0026.Button,51-02-02-0026.Button,51-02-03-0026.Button,$Sum510201002651020200265102030026) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" Matcha Latte @@ -205,27 +207,99 @@ $51-02-01-0026.Button $51-02-02-0026.Button $51-02-03-0026.Button - eval( - If $51-02-01-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0026.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0026.Price = -1 Then + Var return = "" + Else + If $51-02-01-0026.Discount = "" Then + Var return "" + Else + If $51-02-01-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0026.Price = -1 Then + Var return = "" + Else + If $51-02-02-0026.Discount = "" Then + Var return "" + Else + If $51-02-02-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0026.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0026.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0026.Price = -1 Then + Var return = "" + Else + If $51-02-03-0026.Discount = "" Then + Var return "" + Else + If $51-02-03-0026.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -273,7 +347,7 @@ $Sum510201002651020200265102030026TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0026.Price @@ -358,13 +432,11 @@ Topping "Load" "51-02-03-0026" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -383,18 +455,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -406,9 +472,9 @@ ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,$Sum510201007151020200715102030071) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Strawberry_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Strawberry_Matcha_Latte.png" Strawberry\nMatcha Latte @@ -432,27 +498,99 @@ $51-02-01-0071.Button $51-02-02-0071.Button $51-02-03-0071.Button - eval( - If $51-02-01-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0071.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0071.Price = -1 Then + Var return = "" + Else + If $51-02-01-0071.Discount = "" Then + Var return "" + Else + If $51-02-01-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0071.Price = -1 Then + Var return = "" + Else + If $51-02-02-0071.Discount = "" Then + Var return "" + Else + If $51-02-02-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0071.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0071.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0071.Price = -1 Then + Var return = "" + Else + If $51-02-03-0071.Discount = "" Then + Var return "" + Else + If $51-02-03-0071.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -500,7 +638,7 @@ $Sum510201007151020200715102030071TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0071.Price @@ -585,13 +723,11 @@ Topping "Load" "51-02-03-0071" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -610,18 +746,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -633,9 +763,9 @@ ; 51-02-01-0027 51-02-02-0027 51-02-03-0027 Flag( 51-02-01-0027.Button,51-02-02-0027.Button,51-02-03-0027.Button,$Sum510201002751020200275102030027) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_tea_sing.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_matcha_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_matcha_tea_sing.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_matcha_tea_sing.png" Matcha Tea @@ -659,27 +789,99 @@ $51-02-01-0027.Button $51-02-02-0027.Button $51-02-03-0027.Button - eval( - If $51-02-01-0027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0027.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0027.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0027.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0027.Price = -1 Then + Var return = "" + Else + If $51-02-01-0027.Discount = "" Then + Var return "" + Else + If $51-02-01-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0027.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0027.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0027.Price = -1 Then + Var return = "" + Else + If $51-02-02-0027.Discount = "" Then + Var return "" + Else + If $51-02-02-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0027.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0027.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0027.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0027.Price = -1 Then + Var return = "" + Else + If $51-02-03-0027.Discount = "" Then + Var return "" + Else + If $51-02-03-0027.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -727,7 +929,7 @@ $Sum510201002751020200275102030027TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_sing.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_sing.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0027.Price @@ -812,13 +1014,11 @@ Topping "Load" "51-02-03-0027" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -837,18 +1037,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -860,9 +1054,9 @@ ; 51-02-01-0028 51-02-02-0028 51-02-03-0028 Flag( 51-02-01-0028.Button,51-02-02-0028.Button,51-02-03-0028.Button,$Sum510201002851020200285102030028) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_lime_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_lime_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_lime_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_lime_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_lime_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_lime_Matcha.png" Matcha\nLimenade @@ -886,27 +1080,99 @@ $51-02-01-0028.Button $51-02-02-0028.Button $51-02-03-0028.Button - eval( - If $51-02-01-0028.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0028.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0028.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0028.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0028.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0028.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0028.Price = -1 Then + Var return = "" + Else + If $51-02-01-0028.Discount = "" Then + Var return "" + Else + If $51-02-01-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0028.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0028.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0028.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0028.Price = -1 Then + Var return = "" + Else + If $51-02-02-0028.Discount = "" Then + Var return "" + Else + If $51-02-02-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0028.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0028.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0028.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0028.Price = -1 Then + Var return = "" + Else + If $51-02-03-0028.Discount = "" Then + Var return "" + Else + If $51-02-03-0028.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -954,7 +1220,7 @@ $Sum510201002851020200285102030028TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0028.Price @@ -1039,13 +1305,11 @@ Topping "Load" "51-02-03-0028" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -1064,18 +1328,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1087,9 +1345,9 @@ ; 51-02-01-0060 51-02-02-0060 51-02-03-0060 Flag( 51-02-01-0060.Button,51-02-02-0060.Button,51-02-03-0060.Button,$Sum510201006051020200605102030060) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_COCONUT_MATCHA_LATTE.png" Coconut Matcha\nLatte @@ -1113,27 +1371,99 @@ $51-02-01-0060.Button $51-02-02-0060.Button $51-02-03-0060.Button - eval( - If $51-02-01-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0060.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0060.Price = -1 Then + Var return = "" + Else + If $51-02-01-0060.Discount = "" Then + Var return "" + Else + If $51-02-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0060.Price = -1 Then + Var return = "" + Else + If $51-02-02-0060.Discount = "" Then + Var return "" + Else + If $51-02-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0060.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0060.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0060.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0060.Price = -1 Then + Var return = "" + Else + If $51-02-03-0060.Discount = "" Then + Var return "" + Else + If $51-02-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1181,7 +1511,7 @@ $Sum510201006051020200605102030060TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_COCONUT_MATCHA_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_COCONUT_MATCHA_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0060.Price @@ -1266,13 +1596,11 @@ Topping "Load" "51-02-03-0060" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -1291,18 +1619,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1314,9 +1636,9 @@ ; 51-02-01-0061 51-02-02-0061 51-02-03-0061 Flag( 51-02-01-0061.Button,51-02-02-0061.Button,51-02-03-0061.Button,$Sum510201006151020200615102030061) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_MATCHA_LATTE.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_MATCHA_LATTE.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_MATCHA_LATTE.png" Coconut Matcha @@ -1340,27 +1662,99 @@ $51-02-01-0061.Button $51-02-02-0061.Button $51-02-03-0061.Button - eval( - If $51-02-01-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0061.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0061.Price = -1 Then + Var return = "" + Else + If $51-02-01-0061.Discount = "" Then + Var return "" + Else + If $51-02-01-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0061.Price = -1 Then + Var return = "" + Else + If $51-02-02-0061.Discount = "" Then + Var return "" + Else + If $51-02-02-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0061.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0061.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0061.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0061.Price = -1 Then + Var return = "" + Else + If $51-02-03-0061.Discount = "" Then + Var return "" + Else + If $51-02-03-0061.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1408,7 +1802,7 @@ $Sum510201006151020200615102030061TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_MATCHA_LATTE.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_MATCHA_LATTE.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0061.Price @@ -1493,13 +1887,11 @@ Topping "Load" "51-02-03-0061" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -1518,18 +1910,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1541,9 +1927,9 @@ ; 51-02-01-0039 51-02-02-0039 51-02-03-0039 Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" Thai Milk Tea @@ -1567,27 +1953,99 @@ $51-02-01-0039.Button $51-02-02-0039.Button $51-02-03-0039.Button - eval( - If $51-02-01-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0039.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0039.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0039.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0039.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0039.Price = -1 Then + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1635,7 +2093,7 @@ $Sum510201003951020200395102030039TextValue - 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 @@ -1720,13 +2178,11 @@ Topping "Load" "51-02-03-0039" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -1745,18 +2201,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1768,9 +2218,9 @@ ; 51-02-01-0047 51-02-02-0047 - Flag( 51-02-01-0047.Button,51-02-02-0047.Button,$Sum51020100475102020047) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_black_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_black_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_black_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_black_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_black_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_black_tea_SingPark.png" Thai Black Tea @@ -1794,27 +2244,99 @@ $51-02-01-0047.Button $51-02-02-0047.Button "Disable2" - eval( - If $51-02-01-0047.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0047.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0047.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0047.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0047.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0047.Price = -1 Then + Var return = "" + Else + If $51-02-01-0047.Discount = "" Then + Var return "" + Else + If $51-02-01-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0047.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0047.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0047.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0047.Price = -1 Then + Var return = "" + Else + If $51-02-02-0047.Discount = "" Then + Var return "" + Else + If $51-02-02-0047.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1862,7 +2384,7 @@ $Sum51020100475102020047TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_thai_black_tea_SingPark.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_black_tea_SingPark.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0047.Price @@ -1947,13 +2469,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -1972,18 +2492,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1995,9 +2509,9 @@ ; 51-02-01-0040 51-02-02-0040 51-02-03-0040 Flag( 51-02-01-0040.Button,51-02-02-0040.Button,51-02-03-0040.Button,$Sum510201004051020200405102030040) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_limeblack_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_limeblack_tea_SingPark.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_limeblack_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_limeblack_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_limeblack_tea_SingPark.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_limeblack_tea_SingPark.png" Thai Lime Tea @@ -2021,27 +2535,99 @@ $51-02-01-0040.Button $51-02-02-0040.Button $51-02-03-0040.Button - eval( - If $51-02-01-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0040.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0040.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0040.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0040.Price = -1 Then + Var return = "" + Else + If $51-02-01-0040.Discount = "" Then + Var return "" + Else + If $51-02-01-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0040.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0040.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0040.Price = -1 Then + Var return = "" + Else + If $51-02-02-0040.Discount = "" Then + Var return "" + Else + If $51-02-02-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0040.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0040.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0040.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0040.Price = -1 Then + Var return = "" + Else + If $51-02-03-0040.Discount = "" Then + Var return "" + Else + If $51-02-03-0040.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2089,7 +2675,7 @@ $Sum510201004051020200405102030040TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_limeblack_tea_SingPark.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_limeblack_tea_SingPark.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0040.Price @@ -2174,13 +2760,11 @@ Topping "Load" "51-02-03-0040" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -2199,18 +2783,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2222,9 +2800,9 @@ ; - 51-02-02-0062 51-02-03-0062 Flag( 51-02-02-0062.Button,51-02-03-0062.Button,$Sum51020200625102030062) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_THAI_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_THAI_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_THAI_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_MILK_TEA.png" Coconut Thai Tea @@ -2248,27 +2826,99 @@ "Disable2" $51-02-02-0062.Button $51-02-03-0062.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0062.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0062.Price = -1 Then + Var return = "" + Else + If $51-02-02-0062.Discount = "" Then + Var return "" + Else + If $51-02-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0062.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0062.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0062.Price = -1 Then + Var return = "" + Else + If $51-02-03-0062.Discount = "" Then + Var return "" + Else + If $51-02-03-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2316,7 +2966,7 @@ $Sum51020200625102030062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_MILK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_MILK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2401,13 +3051,11 @@ Topping "Load" "51-02-03-0062" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -2426,18 +3074,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2449,9 +3091,9 @@ ; - 51-02-02-0063 51-02-03-0063 Flag( 51-02-02-0063.Button,51-02-03-0063.Button,$Sum51020200635102030063) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_THAI_BLACK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_THAI_BLACK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_THAI_BLACK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" Coconut Thai Black Tea @@ -2475,27 +3117,99 @@ "Disable2" $51-02-02-0063.Button $51-02-03-0063.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0063.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0063.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0063.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0063.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0063.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0063.Price = -1 Then + Var return = "" + Else + If $51-02-02-0063.Discount = "" Then + Var return "" + Else + If $51-02-02-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0063.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0063.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0063.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0063.Price = -1 Then + Var return = "" + Else + If $51-02-03-0063.Discount = "" Then + Var return "" + Else + If $51-02-03-0063.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2543,7 +3257,7 @@ $Sum51020200635102030063TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_BLACK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_THAI_BLACK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2628,13 +3342,11 @@ Topping "Load" "51-02-03-0063" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -2653,18 +3365,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2676,9 +3382,9 @@ ; 51-02-01-0046 51-02-02-0046 - Flag( 51-02-01-0046.Button,51-02-02-0046.Button,$Sum51020100465102020046) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_jasmine_milk_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_jasmine_milk_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_jasmine_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea.png" Jasmine Milk Tea @@ -2702,27 +3408,99 @@ $51-02-01-0046.Button $51-02-02-0046.Button "Disable2" - eval( - If $51-02-01-0046.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0046.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0046.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0046.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0046.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0046.Price = -1 Then + Var return = "" + Else + If $51-02-01-0046.Discount = "" Then + Var return "" + Else + If $51-02-01-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0046.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0046.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0046.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0046.Price = -1 Then + Var return = "" + Else + If $51-02-02-0046.Discount = "" Then + Var return "" + Else + If $51-02-02-0046.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2770,7 +3548,7 @@ $Sum51020100465102020046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0046.Price @@ -2855,13 +3633,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -2880,18 +3656,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2903,9 +3673,9 @@ ; 51-02-01-0045 51-02-02-0045 - Flag( 51-02-01-0045.Button,51-02-02-0045.Button,$Sum51020100455102020045) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_jasmine_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_jasmine_tea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_jasmine_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_tea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_tea.png" Jasmine Tea @@ -2929,27 +3699,99 @@ $51-02-01-0045.Button $51-02-02-0045.Button "Disable2" - eval( - If $51-02-01-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0045.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0045.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0045.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0045.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0045.Price = -1 Then + Var return = "" + Else + If $51-02-01-0045.Discount = "" Then + Var return "" + Else + If $51-02-01-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0045.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0045.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0045.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0045.Price = -1 Then + Var return = "" + Else + If $51-02-02-0045.Discount = "" Then + Var return "" + Else + If $51-02-02-0045.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2997,7 +3839,7 @@ $Sum51020100455102020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_jasmine_tea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_tea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0045.Price @@ -3082,13 +3924,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -3107,18 +3947,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3130,9 +3964,9 @@ ; - 51-02-02-0064 51-02-03-0064 Flag( 51-02-02-0064.Button,51-02-03-0064.Button,$Sum51020200645102030064) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_COCONUT_JASMINE_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_COCONUT_JASMINE_MILK_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_JASMINE_MILK_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_JASMINE_MILK_TEA.png" Coconut Jasmine\n Milk Tea @@ -3156,27 +3990,99 @@ "Disable2" $51-02-02-0064.Button $51-02-03-0064.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0064.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0064.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0064.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0064.Price = -1 Then + Var return = "" + Else + If $51-02-02-0064.Discount = "" Then + Var return "" + Else + If $51-02-02-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0064.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0064.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0064.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0064.Price = -1 Then + Var return = "" + Else + If $51-02-03-0064.Discount = "" Then + Var return "" + Else + If $51-02-03-0064.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3224,7 +4130,7 @@ $Sum51020200645102030064TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_COCONUT_JASMINE_MILK_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_JASMINE_MILK_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3309,13 +4215,11 @@ Topping "Load" "51-02-03-0064" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -3334,18 +4238,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3357,9 +4255,9 @@ ; - 51-02-02-0065 51-02-03-0065 Flag( 51-02-02-0065.Button,51-02-03-0065.Button,$Sum51020200655102030065) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_COCONUT_JASMINE_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_COCONUT_JASMINE_TEA.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_COCONUT_JASMINE_TEA.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_COCONUT_JASMINE_TEA.png" Coconut Jasmine\nTea @@ -3383,27 +4281,99 @@ "Disable2" $51-02-02-0065.Button $51-02-03-0065.Button - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0065.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0065.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-02-02-0065.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0065.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0065.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0065.Price = -1 Then + Var return = "" + Else + If $51-02-02-0065.Discount = "" Then + Var return "" + Else + If $51-02-02-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0065.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0065.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0065.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0065.Price = -1 Then + Var return = "" + Else + If $51-02-03-0065.Discount = "" Then + Var return "" + Else + If $51-02-03-0065.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3451,7 +4421,7 @@ $Sum51020200655102030065TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_COCONUT_JASMINE_TEA.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_COCONUT_JASMINE_TEA.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3536,13 +4506,11 @@ Topping "Load" "51-02-03-0065" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -3561,18 +4529,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -3584,9 +4546,9 @@ ; 51-02-01-0050 51-02-02-0050 51-02-03-0050 Flag( 51-02-01-0050.Button,51-02-02-0050.Button,51-02-03-0050.Button,$Sum510201005051020200505102030050) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Mint_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Mint_Matcha_Latte.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Mint_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Mint_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Mint_Matcha_Latte.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Mint_Matcha_Latte.png" MINT MATCHA LATTE @@ -3610,27 +4572,99 @@ $51-02-01-0050.Button $51-02-02-0050.Button $51-02-03-0050.Button - eval( - If $51-02-01-0050.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-02-0050.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-02-03-0050.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + eval( + If $51-02-01-0050.Price = -1 Then + Var return = "Free" + Else + If $51-02-01-0050.Discount = "" Then + Var return !assigned StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-01-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0050.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-01-0050.Price = -1 Then + Var return = "" + Else + If $51-02-01-0050.Discount = "" Then + Var return "" + Else + If $51-02-01-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-02-0050.Price = -1 Then + Var return = "Free" + Else + If $51-02-02-0050.Discount = "" Then + Var return !assigned StringFmt( $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-02-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0050.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-02-0050.Price = -1 Then + Var return = "" + Else + If $51-02-02-0050.Discount = "" Then + Var return "" + Else + If $51-02-02-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + If $51-02-03-0050.Price = -1 Then + Var return = "Free" + Else + If $51-02-03-0050.Discount = "" Then + Var return !assigned StringFmt( $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-02-03-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0050.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-02-03-0050.Price = -1 Then + Var return = "" + Else + If $51-02-03-0050.Discount = "" Then + Var return "" + Else + If $51-02-03-0050.Discount = > 0 Then + Var return !assigned StringFmt( $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -3678,7 +4712,7 @@ $Sum510201005051020200505102030050TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Mint_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_Matcha_Latte.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0050.Price @@ -3763,13 +4797,11 @@ Topping "Load" "51-02-03-0050" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_tea.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] @@ -3788,18 +4820,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml b/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml index c8decb56..da18da3d 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml @@ -84,7 +84,7 @@ 0x322B26 0xEAE6E1 - 16 + 10 22 1 @@ -103,9 +103,10 @@ KanitRegularTTF 0x6F5F51 0xEAE6E1 + 0xCC0A14 4 - 20 + 14 1 @@ -113,6 +114,7 @@ 000082 000083 000013 + ShowOriginalPrice ;banners @@ -120,9 +122,9 @@ ; - 51-04-02-0011 - Flag( 51-04-02-0011.Button,$Sum5104020011) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_isolated.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_isolated.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_isolated.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_isolated.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_isolated.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_isolated.png" Plain Protein @@ -146,27 +148,99 @@ "Disable2" $51-04-02-0011.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0011.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0011.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0011.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0011.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0011.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0011.Price = -1 Then + Var return = "" + Else + If $51-04-02-0011.Discount = "" Then + Var return "" + Else + If $51-04-02-0011.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -214,7 +288,7 @@ $Sum5104020011TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_isolated.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_isolated.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -299,13 +373,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -324,18 +396,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -347,9 +413,9 @@ ; - 51-04-02-0016 - Flag( 51-04-02-0016.Button,$Sum5104020016) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Matcha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" Matcha Shake @@ -373,27 +439,99 @@ "Disable2" $51-04-02-0016.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0016.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0016.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0016.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0016.Price = -1 Then + Var return = "" + Else + If $51-04-02-0016.Discount = "" Then + Var return "" + Else + If $51-04-02-0016.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -441,7 +579,7 @@ $Sum5104020016TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -526,13 +664,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -551,18 +687,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -574,9 +704,9 @@ ; - 51-04-02-0002 - Flag( 51-04-02-0002.Button,$Sum5104020002) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Chocolate.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Chocolate.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Chocolate.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Chocolate.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Chocolate.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Chocolate.png" Chocolate Shake @@ -600,27 +730,99 @@ "Disable2" $51-04-02-0002.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0002.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0002.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0002.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0002.Price = -1 Then + Var return = "" + Else + If $51-04-02-0002.Discount = "" Then + Var return "" + Else + If $51-04-02-0002.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -668,7 +870,7 @@ $Sum5104020002TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -753,13 +955,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -778,18 +978,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -801,9 +995,9 @@ ; - 51-04-02-0009 - Flag( 51-04-02-0009.Button,$Sum5104020009) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_caramel.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_caramel.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_caramel.png" Caramel Shake @@ -827,27 +1021,99 @@ "Disable2" $51-04-02-0009.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0009.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0009.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0009.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0009.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0009.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0009.Price = -1 Then + Var return = "" + Else + If $51-04-02-0009.Discount = "" Then + Var return "" + Else + If $51-04-02-0009.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -895,7 +1161,7 @@ $Sum5104020009TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_caramel.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_caramel.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -980,13 +1246,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -1005,18 +1269,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1028,9 +1286,9 @@ ; - 51-04-02-0062 - Flag( 51-04-02-0062.Button,$Sum5104020062) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Mocha.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Mocha.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Mocha.png" Mocha Shake @@ -1054,27 +1312,99 @@ "Disable2" $51-04-02-0062.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0062.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0062.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0062.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0062.Price = -1 Then + Var return = "" + Else + If $51-04-02-0062.Discount = "" Then + Var return "" + Else + If $51-04-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1122,7 +1452,7 @@ $Sum5104020062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Mocha.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Mocha.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1207,13 +1537,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -1232,18 +1560,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1255,9 +1577,9 @@ ; - 51-04-02-0004 - Flag( 51-04-02-0004.Button,$Sum5104020004) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_espresso.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_espresso.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_espresso.png" Espresso Shake @@ -1281,27 +1603,99 @@ "Disable2" $51-04-02-0004.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0004.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0004.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0004.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0004.Price = -1 Then + Var return = "" + Else + If $51-04-02-0004.Discount = "" Then + Var return "" + Else + If $51-04-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1349,7 +1743,7 @@ $Sum5104020004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_espresso.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_espresso.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1434,13 +1828,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -1459,18 +1851,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1482,9 +1868,9 @@ ; - 51-04-02-0013 - Flag( 51-04-02-0013.Button,$Sum5104020013) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Strawberry.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Strawberry.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Strawberry.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Strawberry.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Strawberry.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Strawberry.png" Strawberry Shake @@ -1508,27 +1894,99 @@ "Disable2" $51-04-02-0013.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0013.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0013.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0013.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0013.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0013.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0013.Price = -1 Then + Var return = "" + Else + If $51-04-02-0013.Discount = "" Then + Var return "" + Else + If $51-04-02-0013.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1576,7 +2034,7 @@ $Sum5104020013TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1661,13 +2119,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -1686,18 +2142,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1709,9 +2159,9 @@ ; - 51-04-02-0018 - Flag( 51-04-02-0018.Button,$Sum5104020018) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_melon.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_melon.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_melon.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_melon.png" Melon Shake @@ -1735,27 +2185,99 @@ "Disable2" $51-04-02-0018.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0018.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0018.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0018.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0018.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0018.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0018.Price = -1 Then + Var return = "" + Else + If $51-04-02-0018.Discount = "" Then + Var return "" + Else + If $51-04-02-0018.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -1803,7 +2325,7 @@ $Sum5104020018TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_melon.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_melon.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1888,13 +2410,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -1913,18 +2433,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -1936,9 +2450,9 @@ ; - 51-04-02-0055 - Flag( 51-04-02-0055.Button,$Sum5104020055) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_Thaitea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_Thaitea.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_Thaitea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Thaitea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Thaitea.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Thaitea.png" Thai Tea Shake @@ -1962,27 +2476,99 @@ "Disable2" $51-04-02-0055.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0055.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0055.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0055.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0055.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0055.Price = -1 Then + Var return = "" + Else + If $51-04-02-0055.Discount = "" Then + Var return "" + Else + If $51-04-02-0055.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2030,7 +2616,7 @@ $Sum5104020055TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2115,13 +2701,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -2140,18 +2724,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 @@ -2163,9 +2741,9 @@ ; - 51-04-02-0010 - Flag( 51-04-02-0010.Button,$Sum5104020010) - "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_protein_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_protein_milk.png" - "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_protein_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_milk.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_milk.png" Milk Shake @@ -2189,27 +2767,99 @@ "Disable2" $51-04-02-0010.Button "Disable2" - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $51-04-02-0010.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) - eval( - If $##-##-##-####.Price = -1 Then - Var return = "Free" - Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) - EndIf - ) + + 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 + ) + + + 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 + ) + + + eval( + If $51-04-02-0010.Price = -1 Then + Var return = "Free" + Else + If $51-04-02-0010.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-04-02-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0010.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-04-02-0010.Price = -1 Then + Var return = "" + Else + If $51-04-02-0010.Discount = "" Then + Var return "" + Else + If $51-04-02-0010.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + ) + + + 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 + ) + + + 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 + ) + eval( If ICE_PROCESS_STATUS = 2 Then @@ -2257,7 +2907,7 @@ $Sum5104020010TextValue - Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_protein_milk.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_milk.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -2342,13 +2992,11 @@ Topping "Load" "-" EndIf EndIf - ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" - Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" + ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_whey.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] @@ -2367,18 +3015,12 @@ Var menu_desc_thai_blender = DescLang[2][1] DEBUGVAR menu_name_thai_cold DEBUGVAR menu_desc_thai_cold - Var NameDrink = aliasName[0] - Var DrinkDescription = aliasDesc[0] - Var NameDrinkTH = aliasName[1] - Var DrinkDescriptionTH = aliasDesc[1] - If LanguageShow = "THAI" Then - Var show_eng = "false" - Else + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] Var show_eng = "true" - EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml" 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 diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 4e73be21..9daa314f 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -7,10 +7,23 @@ 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 @@ 1000 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 @@ -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 - - @@ -7685,6 +7791,38 @@ +; next2 button Protect + +