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 fe4b1883..b2bf829a 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 @@ -107,52 +107,62 @@ 000082 000083 000013 - ShowOriginalPrice + "true" + + HugInACupProState + IMAGE + "ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png" + + TabMenuVisibleInst 99 +OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml" + + ; ==================> Len = 3 - ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 + ; 51-21-01-0060 51-21-02-0060 51-21-03-0060 - Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,Disable=Invisible,$Sum510101000451010200025101030002) - "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" + Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,Disable=Invisible,$Sum512101006051210200605121030060) + "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" - LATTE - ลาเต้ - - - - + Vanilla Café Latte + + + - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - + Coffee, Vanilla, Milk + + + - $51-01-01-0004.Button - $51-01-02-0002.Button - $51-01-03-0002.Button + $51-21-01-0060.Button + $51-21-02-0060.Button + $51-21-03-0060.Button eval( - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.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) + If $51-21-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -160,30 +170,32 @@ eval( Var return = "" - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.Price = -1 Then Var return = "" Else - If $51-01-01-0004.Discount = "" Then + If $51-21-01-0060.Discount = "" Then Var return "" Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.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) + If $51-21-02-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -191,30 +203,32 @@ eval( Var return = "" - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.Price = -1 Then Var return = "" Else - If $51-01-02-0002.Discount = "" Then + If $51-21-02-0060.Discount = "" Then Var return "" Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.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) + If $51-21-03-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -222,14 +236,15 @@ eval( Var return = "" - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.Price = -1 Then Var return = "" Else - If $51-01-03-0002.Discount = "" Then + If $51-21-03-0060.Discount = "" Then Var return "" Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -252,97 +267,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510101000451010200025101030002TextID - $Sum510101000451010200025101030002TextValue + $Sum512101006051210200605121030060TextID + $Sum512101006051210200605121030060TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.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-01-01-0004.Price - Var PriceD2 = $51-01-02-0002.Price - Var PriceD3 = $51-01-03-0002.Price - Var PD_CODE1 = "51-01-01-0004" - Var PD_CODE2 = "51-01-02-0002" - Var PD_CODE3 = "51-01-03-0002" + Var PriceD1 = $51-21-01-0060.Price + Var PriceD2 = $51-21-02-0060.Price + Var PriceD3 = $51-21-03-0060.Price + Var PD_CODE1 = "51-21-01-0060" + Var PD_CODE2 = "51-21-02-0060" + Var PD_CODE3 = "51-21-03-0060" ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed milk" - Var aliasName[1] = "ลาเต้" - Var aliasDesc[1] = "กาแฟ นม และ ฟองนม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Vanilla Café Latte" + Var aliasDesc[0] = "Coffee, Vanilla, 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" + Var NameLang[0][0] = "Hot VANILLA latte" + Var NameLang[0][1] = "กาแฟลาเต้วานิลาร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" + Var NameLang[0][4] = "" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" + Var DescLang[0][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup" + Var DescLang[0][1] = "กาแฟ นม และน้ำเชื่อมวานิลา" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" + Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" + Var NameLang[1][0] = "Iced VANILLA latte" + Var NameLang[1][1] = "กาแฟลาเต้วานิลาเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[1][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[1][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" + Var NameLang[2][0] = "VANILLA latte frappe" + Var NameLang[2][1] = "กาแฟลาเต้วานิลาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[2][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[2][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-01-01-0004.Button - Var PD_STAGE_2 = $51-01-02-0002.Button - Var PD_STAGE_3 = $51-01-03-0002.Button + Var PD_STAGE_1 = $51-21-01-0060.Button + Var PD_STAGE_2 = $51-21-02-0060.Button + Var PD_STAGE_3 = $51-21-03-0060.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -358,303 +373,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-01-02-0002" + Topping "Load" "51-21-02-0060" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-01-01-0004" + Topping "Load" "51-21-01-0060" Else - Topping "Load" "51-01-03-0002" - 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_recommend.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-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/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 - ลาเต้ - - - - - - - - - - - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - - - - - - $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 - 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 - 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" - - - $Sum512101000451210200025121030002TextID - $Sum512101000451210200025121030002TextValue - - - 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 - Var PriceD2 = $51-21-02-0002.Price - Var PriceD3 = $51-21-03-0002.Price - Var PD_CODE1 = "51-21-01-0004" - Var PD_CODE2 = "51-21-02-0002" - Var PD_CODE3 = "51-21-03-0002" - ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" - Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" - Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" - Var NameLang[2][2] = "" - Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" - Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[2][2] = "" - Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[2][5] = "" - ; end lang - Var PD_STAGE_1 = $51-21-01-0004.Button - Var PD_STAGE_2 = $51-21-02-0002.Button - Var PD_STAGE_3 = $51-21-03-0002.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-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-21-01-0004" - Else - Topping "Load" "51-21-03-0002" + Topping "Load" "51-21-03-0060" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -735,6 +459,7 @@ 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 EndIf ) @@ -750,6 +475,7 @@ Else If $51-21-01-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -766,6 +492,7 @@ 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 EndIf ) @@ -781,6 +508,7 @@ Else If $51-21-02-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -797,6 +525,7 @@ 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 EndIf ) @@ -812,6 +541,7 @@ Else If $51-21-03-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -985,47 +715,48 @@ ; ==================> Len = 3 - ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 + ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 - Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,Disable=Invisible,$Sum510201007151020200715102030071) - "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" + Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,Disable=Invisible,$Sum510101000751010200045101030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Strawberry\nMatcha Latte - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Matcha, Milk, Strawberry Syrup - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - $51-02-01-0071.Button - $51-02-02-0071.Button - $51-02-03-0071.Button + $51-01-01-0007.Button + $51-01-02-0004.Button + $51-01-03-0004.Button eval( - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.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) + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1033,30 +764,32 @@ eval( Var return = "" - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.Price = -1 Then Var return = "" Else - If $51-02-01-0071.Discount = "" Then + If $51-01-01-0007.Discount = "" Then Var return "" Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.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) + If $51-01-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1064,30 +797,32 @@ eval( Var return = "" - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.Price = -1 Then Var return = "" Else - If $51-02-02-0071.Discount = "" Then + If $51-01-02-0004.Discount = "" Then Var return "" Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.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) + If $51-01-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1095,14 +830,15 @@ eval( Var return = "" - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.Price = -1 Then Var return = "" Else - If $51-02-03-0071.Discount = "" Then + If $51-01-03-0004.Discount = "" Then Var return "" Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1125,97 +861,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510201007151020200715102030071TextID - $Sum510201007151020200715102030071TextValue + $Sum510101000751010200045101030004TextID + $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $51-02-01-0071.Price - Var PriceD2 = $51-02-02-0071.Price - Var PriceD3 = $51-02-03-0071.Price - Var PD_CODE1 = "51-02-01-0071" - Var PD_CODE2 = "51-02-02-0071" - Var PD_CODE3 = "51-02-03-0071" + Var PriceD1 = $51-01-01-0007.Price + Var PriceD2 = $51-01-02-0004.Price + Var PriceD3 = $51-01-03-0004.Price + Var PD_CODE1 = "51-01-01-0007" + Var PD_CODE2 = "51-01-02-0004" + Var PD_CODE3 = "51-01-03-0004" ; begin lang - Var aliasName[0] = "Strawberry\nMatcha Latte" - Var aliasDesc[0] = "Matcha, Milk, Strawberry Syrup" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "HOT STRAWBERRY MATCHA LATTE" - Var NameLang[0][1] = "" + Var NameLang[0][0] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Strawberry, Matcha, Milk" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced STRAWBERRY MATCHA LATTE" - Var NameLang[1][1] = "-" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "Iced CARAMELCAFÉ LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Matcha, Milk, Strawberry Syrup" - Var DescLang[1][1] = "-" - Var DescLang[1][2] = "-" - Var DescLang[1][3] = "-" - Var DescLang[1][4] = "-" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "FRAPPE STRAWBERRY MATCHA LATTE" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Strawberry, Matcha, Milk" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-02-01-0071.Button - Var PD_STAGE_2 = $51-02-02-0071.Button - Var PD_STAGE_3 = $51-02-03-0071.Button + Var PD_STAGE_1 = $51-01-01-0007.Button + Var PD_STAGE_2 = $51-01-02-0004.Button + Var PD_STAGE_3 = $51-01-03-0004.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -1231,12 +967,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-02-02-0071" + Topping "Load" "51-01-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-02-01-0071" + Topping "Load" "51-01-01-0007" Else - Topping "Load" "51-02-03-0071" + Topping "Load" "51-01-03-0004" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -1276,47 +1012,48 @@ ; ==================> Len = 3 - ; - 51-05-02-0068 - + ; 51-21-01-0007 51-21-02-0004 51-21-03-0004 - Flag( 51-05-02-0068.Button,Disable=Invisible,$Sum5105020068) - "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" + Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,Disable=Invisible,$Sum512101000751210200045121030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Pepsi Mint - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Pepsi, Mint Syrup& Ice - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - "Disable2" - $51-05-02-0068.Button - "Disable2" + $51-21-01-0007.Button + $51-21-02-0004.Button + $51-21-03-0004.Button eval( - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1324,30 +1061,32 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-01-0007.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.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) + If $51-21-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + 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-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1355,30 +1094,32 @@ eval( Var return = "" - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.Price = -1 Then Var return = "" Else - If $51-05-02-0068.Discount = "" Then + If $51-21-02-0004.Discount = "" Then Var return "" Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1386,14 +1127,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-03-0004.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1416,53 +1158,350 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020068TextID - $Sum5105020068TextValue + $Sum512101000751210200045121030004TextID + $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-21-01-0007.Price + Var PriceD2 = $51-21-02-0004.Price + Var PriceD3 = $51-21-03-0004.Price + Var PD_CODE1 = "51-21-01-0007" + Var PD_CODE2 = "51-21-02-0004" + Var PD_CODE3 = "51-21-03-0004" + ; begin lang + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced CARAMEL COFFEE LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-21-01-0007.Button + Var PD_STAGE_2 = $51-21-02-0004.Button + Var PD_STAGE_3 = $51-21-03-0004.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-21-02-0004" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-21-01-0007" + Else + Topping "Load" "51-21-03-0004" + 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_recommend.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-0117 - + + Flag( 51-05-02-0117.Button,Disable=Invisible,$Sum5105020117) + "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 + เมล่อนโซดา + - + - + + + + + + + Coconut Syrup, Pepsi max and Soda + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0117.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020117TextID + $Sum5105020117TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0068.Price + Var PriceD2 = $51-05-02-0117.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0068" + Var PD_CODE2 = "51-05-02-0117" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Pepsi Mint" - Var aliasDesc[0] = "Pepsi, Mint Syrup& Ice" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Coconut Pepsi\nMax" + Var aliasDesc[0] = "Coconut Syrup, Pepsi max and Soda" + Var aliasName[1] = "เมล่อนโซดา" + Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" Var aliasName[5] = "" @@ -1479,14 +1518,14 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "PEPSI MINT" - Var NameLang[1][1] = "เป๊ปซี่มินต์" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "ICED COCONUT PEPSI MAX" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Pepsi max, Mint Syrup& Ice" - Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมมิ้นท์ และโซดา" + Var DescLang[1][0] = "Coconut Syrup, Pepsi max and Soda" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -1505,7 +1544,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0068.Button + Var PD_STAGE_2 = $51-05-02-0117.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -1522,7 +1561,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0068" + Topping "Load" "51-05-02-0117" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1570,12 +1609,12 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,Disable=Invisible,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" - Yummy Yuzu\nSparkling + Sparkling Yuzu ยูซุโซดา - - @@ -1608,6 +1647,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1623,6 +1663,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1639,6 +1680,7 @@ 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 EndIf ) @@ -1654,6 +1696,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1670,6 +1713,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1685,6 +1729,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1736,7 +1781,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1746,7 +1791,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Yummy Yuzu\nSparkling" + Var aliasName[0] = "Sparkling Yuzu" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -1899,6 +1944,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1914,6 +1960,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1930,6 +1977,7 @@ 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 EndIf ) @@ -1945,6 +1993,7 @@ Else If $51-05-02-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1961,6 +2010,7 @@ 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 EndIf ) @@ -1976,6 +2026,7 @@ Else If $51-05-03-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2190,6 +2241,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2205,6 +2257,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2221,6 +2274,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2236,6 +2290,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2252,6 +2307,7 @@ 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 EndIf ) @@ -2267,6 +2323,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2440,15 +2497,15 @@ ; ==================> Len = 3 - ; - 51-05-02-0041 - + ; - 51-05-02-0041 51-05-03-0041 - Flag( 51-05-02-0041.Button,Disable=Invisible,$Sum5105020041) + Flag( 51-05-02-0041.Button,51-05-03-0041.Button,Disable=Invisible,$Sum51050200415105030041) "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 + Sparkling\nStrawberry สตอเบอร์รี่โซดา - - @@ -2468,7 +2525,7 @@ "Disable2" $51-05-02-0041.Button - "Disable2" + $51-05-03-0041.Button eval( If $##-##-##-####.Price = -1 Then @@ -2481,6 +2538,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2496,6 +2554,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2512,6 +2571,7 @@ 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 EndIf ) @@ -2527,22 +2587,24 @@ Else If $51-05-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2550,14 +2612,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-05-03-0041.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2580,33 +2643,33 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020041TextID - $Sum5105020041TextValue + $Sum51050200415105030041TextID + $Sum51050200415105030041TextValue Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" @@ -2614,12 +2677,12 @@ Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price Var PriceD2 = $51-05-02-0041.Price - Var PriceD3 = $##-##-##-####.Price + Var PriceD3 = $51-05-03-0041.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "51-05-02-0041" - Var PD_CODE3 = "##-##-##-####" + Var PD_CODE3 = "51-05-03-0041" ; begin lang - Var aliasName[0] = "Straw-Breeze\nSparkling" + Var aliasName[0] = "Sparkling\nStrawberry" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -2655,22 +2718,22 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "SPARKLING STRAWBERRY SMOOTHIE" + Var NameLang[2][1] = "สตอเบอร์รี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE SODA STRAWBERI" Var NameLang[2][5] = "" - Var DescLang[2][0] = "" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Strawberry Syrup, Soda, Ice" + Var DescLang[2][1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = $51-05-02-0041.Button - Var PD_STAGE_3 = "Disable2" + Var PD_STAGE_3 = $51-05-03-0041.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2691,7 +2754,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "51-05-03-0041" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -2731,36 +2794,102 @@ ; ==================> Len = 3 - ; - 51-05-02-0010 51-05-03-0010 + ; 51-02-01-0046 51-02-02-0046 - - Flag( 51-05-02-0010.Button,51-05-03-0010.Button,Disable=Invisible,$Sum51050200105105030010) - "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" + Flag( 51-02-01-0046.Button,51-02-02-0046.Button,Disable=Invisible,$Sum51020100465102020046) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" - Refreshing\nLimenade - น้ำมะนาวโซดา + Jasmine Milk Tea + ชามะลิลาเต้ - - - + - - Limenade, Sugar, Soda & Ice - มะนาว โซดา + Jasmine & Milk + ชามะลิ และนม - - - + - - "Disable2" - $51-05-02-0010.Button - $51-05-03-0010.Button + $51-02-01-0046.Button + $51-02-02-0046.Button + "Disable2" + 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 + 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 + 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 + 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 + EndIf + ) + + eval( If $##-##-##-####.Price = -1 Then Var return = "Free" @@ -2772,11 +2901,12 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) - - + + eval( Var return = "" If $##-##-##-####.Price = -1 Then @@ -2787,68 +2917,7 @@ 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 EndIf ) @@ -2871,97 +2940,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum51050200105105030010TextID - $Sum51050200105105030010TextValue + $Sum51020100465102020046TextID + $Sum51020100465102020046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0010.Price - Var PriceD3 = $51-05-03-0010.Price - Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0010" - Var PD_CODE3 = "51-05-03-0010" + Var PriceD1 = $51-02-01-0046.Price + Var PriceD2 = $51-02-02-0046.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "51-02-01-0046" + Var PD_CODE2 = "51-02-02-0046" + Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Refreshing\nLimenade" - Var aliasDesc[0] = "Limenade, Sugar, Soda & Ice" - Var aliasName[1] = "น้ำมะนาวโซดา" - Var aliasDesc[1] = "มะนาว โซดา" + Var aliasName[0] = "Jasmine Milk Tea" + Var aliasDesc[0] = "Jasmine & 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] = "" - Var NameLang[0][1] = "" + Var aliasName[5] = "-" + Var aliasDesc[5] = "-" + Var NameLang[0][0] = "Hot JASMINE MILK TEA" + Var NameLang[0][1] = "ชามะลิลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "TEH SUSU JASMIN PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Jasmine & Milk" + Var DescLang[0][1] = "ชามะลิ และนม" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Teh Jasmin, Susu" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced SPARKLING LIMENADE" - Var NameLang[1][1] = "น้ำมะนาวโซดา" + Var NameLang[1][0] = "Iced JASMINE MILK TEA" + Var NameLang[1][1] = "ชามะลิลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SODA LIMAU AIS" + Var NameLang[1][4] = "TEH SUSU JASMIN AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[1][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Jasmine, Milk, Iced" + Var DescLang[1][1] = "ชามะลิ นม และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Limau, Gula, Soda, Ais" + Var DescLang[1][4] = "Teh Jasmin, Susu, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "SPARKLING LIMENADE SMOOTHIE" - Var NameLang[2][1] = "น้ำมะนาวโซดาปั่น" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE SODA LIMAU" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[2][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Limau, Gula, Soda, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0010.Button - Var PD_STAGE_3 = $51-05-03-0010.Button + Var PD_STAGE_1 = $51-02-01-0046.Button + Var PD_STAGE_2 = $51-02-02-0046.Button + Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2977,12 +3046,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0010" + Topping "Load" "51-02-02-0046" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "51-02-01-0046" Else - Topping "Load" "51-05-03-0010" + Topping "Load" "-" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -3030,7 +3099,7 @@ "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" - Exceptional Thai\nMilk Tea + Thai Milk Tea ชานมไทย - - @@ -3063,6 +3132,7 @@ 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 EndIf ) @@ -3078,6 +3148,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3094,6 +3165,7 @@ 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 EndIf ) @@ -3109,6 +3181,7 @@ Else If $51-02-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3125,6 +3198,7 @@ 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 EndIf ) @@ -3140,6 +3214,7 @@ Else If $51-02-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3201,7 +3276,7 @@ Var PD_CODE2 = "51-02-02-0039" Var PD_CODE3 = "51-02-03-0039" ; begin lang - Var aliasName[0] = "Exceptional Thai\nMilk Tea" + Var aliasName[0] = "Thai Milk Tea" Var aliasDesc[0] = "Thai tea, Sugar, milk" Var aliasName[1] = "ชานมไทย" Var aliasDesc[1] = "ชาไทย และ นม" @@ -3354,6 +3429,7 @@ 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 EndIf ) @@ -3369,6 +3445,7 @@ Else If $51-02-01-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3385,6 +3462,7 @@ 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 EndIf ) @@ -3400,6 +3478,7 @@ Else If $51-02-02-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3416,6 +3495,7 @@ 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 EndIf ) @@ -3431,6 +3511,7 @@ Else If $51-02-03-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3604,34 +3685,34 @@ ; ==================> Len = 3 - ; - 51-04-02-0016 - + ; - 51-04-02-0062 - - Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) - "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" + Flag( 51-04-02-0062.Button,Disable=Invisible,$Sum5104020062) + "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" - Matcha Protein\nShake - มัทฉะโปรตีน - - - - + Mocha Shake + + + - Whey protein,\nMatcha, & Milk - เวย์โปรตีน ชาเชียว นม - - - - + Whey protein, Espresso\n& Milk, Chocolate + + + "Disable2" - $51-04-02-0016.Button + $51-04-02-0062.Button "Disable2" eval( @@ -3645,6 +3726,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3660,22 +3742,24 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.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) + If $51-04-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + 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-0016.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3683,14 +3767,15 @@ eval( Var return = "" - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.Price = -1 Then Var return = "" Else - If $51-04-02-0016.Discount = "" Then + If $51-04-02-0062.Discount = "" Then Var return "" Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + If $51-04-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3707,6 +3792,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3722,6 +3808,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3744,53 +3831,53 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5104020016TextID - $Sum5104020016TextValue + $Sum5104020062TextID + $Sum5104020062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.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 - Var PriceD2 = $51-04-02-0016.Price + Var PriceD2 = $51-04-02-0062.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-04-02-0016" + Var PD_CODE2 = "51-04-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Matcha Protein\nShake" - Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk" - Var aliasName[1] = "มัทฉะโปรตีน" - Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Mocha Shake" + Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate" + 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] = "" @@ -3807,17 +3894,17 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "MATCHA SHAKE" - Var NameLang[1][1] = "มัทฉะโปรตีน" + Var NameLang[1][0] = "CAFE MOCHA PROTEIN" + Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SHAKE MATCHA" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Whey protein,Matcha, and Milk" - Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม" + Var DescLang[1][0] = "Coffee, Chocolate, Whey" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Protein Whey, Matcha, Susu" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "" Var NameLang[2][1] = "" @@ -3833,7 +3920,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-04-02-0016.Button + Var PD_STAGE_2 = $51-04-02-0062.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -3850,7 +3937,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-04-02-0016" + Topping "Load" "51-04-02-0062" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" 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 078dff04..e56ec7ea 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 @@ -108,6 +108,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\n') @@ -124,6 +125,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\n') @@ -145,6 +147,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\n') @@ -161,6 +164,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\n') @@ -179,6 +183,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\n') @@ -195,6 +200,7 @@ 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\t\tEndIf\n') out_xml('\t\t\t\t\tEndIf\n') out_xml('\t\t\t\tEndIf\n') out_xml('\t\t\t)\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 58085e12..f8775242 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml @@ -88,7 +88,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -134,6 +134,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +150,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -165,6 +167,7 @@ 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 EndIf ) @@ -180,6 +183,7 @@ Else If $51-04-02-1018.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -196,6 +200,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -211,6 +216,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -425,6 +431,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +447,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -456,6 +464,7 @@ 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 EndIf ) @@ -471,6 +480,7 @@ Else If $51-04-02-1019.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -487,6 +497,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -502,6 +513,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -716,6 +728,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +744,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -747,6 +761,7 @@ 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 EndIf ) @@ -762,6 +777,7 @@ Else If $51-04-02-1020.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -778,6 +794,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -793,6 +810,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1007,6 +1025,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1041,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1038,6 +1058,7 @@ 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 EndIf ) @@ -1053,6 +1074,7 @@ Else If $51-04-02-1021.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1069,6 +1091,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1084,6 +1107,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1298,6 +1322,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1313,6 +1338,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1329,6 +1355,7 @@ 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 EndIf ) @@ -1344,6 +1371,7 @@ Else If $51-04-02-1022.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1360,6 +1388,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1375,6 +1404,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 6232074d..db078786 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_coffee.lxml @@ -151,7 +151,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -197,6 +197,7 @@ 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 EndIf ) @@ -212,6 +213,7 @@ Else If $51-01-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -228,6 +230,7 @@ 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 EndIf ) @@ -243,6 +246,7 @@ Else If $51-01-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -259,6 +263,7 @@ 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 EndIf ) @@ -274,6 +279,7 @@ Else If $51-01-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -488,6 +494,7 @@ 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 EndIf ) @@ -503,6 +510,7 @@ Else If $51-21-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -519,6 +527,7 @@ 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 EndIf ) @@ -534,6 +543,7 @@ Else If $51-21-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -550,6 +560,7 @@ 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 EndIf ) @@ -565,6 +576,7 @@ Else If $51-21-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -779,6 +791,7 @@ 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 EndIf ) @@ -794,6 +807,7 @@ Else If $51-21-01-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -810,6 +824,7 @@ 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 EndIf ) @@ -825,6 +840,7 @@ Else If $51-21-02-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -841,6 +857,7 @@ 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 EndIf ) @@ -856,6 +873,7 @@ Else If $51-21-03-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1032,9 +1050,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/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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" Caramel Café Latte @@ -1070,6 +1088,7 @@ 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 EndIf ) @@ -1085,6 +1104,7 @@ Else If $51-01-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1101,6 +1121,7 @@ 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 EndIf ) @@ -1116,6 +1137,7 @@ Else If $51-01-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1132,6 +1154,7 @@ 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 EndIf ) @@ -1147,6 +1170,7 @@ Else If $51-01-03-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1198,7 +1222,7 @@ $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -1323,9 +1347,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/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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" Caramel Café Latte @@ -1361,6 +1385,7 @@ 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 EndIf ) @@ -1376,6 +1401,7 @@ Else If $51-21-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1392,6 +1418,7 @@ 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 EndIf ) @@ -1407,6 +1434,7 @@ Else If $51-21-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1423,6 +1451,7 @@ 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 EndIf ) @@ -1438,6 +1467,7 @@ Else If $51-21-03-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1489,7 +1519,7 @@ $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price @@ -1652,6 +1682,7 @@ 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 EndIf ) @@ -1667,6 +1698,7 @@ Else If $51-21-01-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1683,6 +1715,7 @@ 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 EndIf ) @@ -1698,6 +1731,7 @@ Else If $51-21-02-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1714,6 +1748,7 @@ 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 EndIf ) @@ -1729,6 +1764,7 @@ Else If $51-21-03-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1943,6 +1979,7 @@ 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 EndIf ) @@ -1958,6 +1995,7 @@ Else If $51-21-01-0079.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1974,6 +2012,7 @@ 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 EndIf ) @@ -1989,6 +2028,7 @@ Else If $51-21-02-0079.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2005,6 +2045,7 @@ 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 EndIf ) @@ -2020,6 +2061,7 @@ Else If $51-21-03-0079.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0079.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2234,6 +2276,7 @@ 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 EndIf ) @@ -2249,6 +2292,7 @@ Else If $51-01-01-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2265,6 +2309,7 @@ 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 EndIf ) @@ -2280,6 +2325,7 @@ Else If $51-11-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2296,6 +2342,7 @@ 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 EndIf ) @@ -2311,6 +2358,7 @@ Else If $51-11-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2525,6 +2573,7 @@ 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 EndIf ) @@ -2540,6 +2589,7 @@ Else If $51-21-01-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2556,6 +2606,7 @@ 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 EndIf ) @@ -2571,6 +2622,7 @@ Else If $51-31-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2587,6 +2639,7 @@ 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 EndIf ) @@ -2602,6 +2655,7 @@ Else If $51-31-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2816,6 +2870,7 @@ 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 EndIf ) @@ -2831,6 +2886,7 @@ Else If $51-01-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2847,6 +2903,7 @@ 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 EndIf ) @@ -2862,6 +2919,7 @@ Else If $51-01-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2878,6 +2936,7 @@ 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 EndIf ) @@ -2893,6 +2952,7 @@ Else If $51-01-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3107,6 +3167,7 @@ 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 EndIf ) @@ -3122,6 +3183,7 @@ Else If $51-21-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3138,6 +3200,7 @@ 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 EndIf ) @@ -3153,6 +3216,7 @@ Else If $51-21-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3169,6 +3233,7 @@ 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 EndIf ) @@ -3184,6 +3249,7 @@ Else If $51-21-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3398,6 +3464,7 @@ 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 EndIf ) @@ -3413,6 +3480,7 @@ Else If $51-01-01-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3429,6 +3497,7 @@ 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 EndIf ) @@ -3444,6 +3513,7 @@ Else If $51-01-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3460,6 +3530,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3475,6 +3546,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3689,6 +3761,7 @@ 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 EndIf ) @@ -3704,6 +3777,7 @@ Else If $51-21-01-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3720,6 +3794,7 @@ 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 EndIf ) @@ -3735,6 +3810,7 @@ Else If $51-21-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3751,6 +3827,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3766,6 +3843,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3980,6 +4058,7 @@ 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 EndIf ) @@ -3995,6 +4074,7 @@ Else If $51-01-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4011,6 +4091,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4026,6 +4107,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4042,6 +4124,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4057,6 +4140,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4271,6 +4355,7 @@ 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 EndIf ) @@ -4286,6 +4371,7 @@ Else If $51-21-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4302,6 +4388,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4317,6 +4404,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4333,6 +4421,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4348,6 +4437,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4562,6 +4652,7 @@ 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 EndIf ) @@ -4577,6 +4668,7 @@ Else If $51-11-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4593,6 +4685,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4608,6 +4701,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4624,6 +4718,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4639,6 +4734,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4853,6 +4949,7 @@ 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 EndIf ) @@ -4868,6 +4965,7 @@ Else If $51-31-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4884,6 +4982,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4899,6 +4998,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4915,6 +5015,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4930,6 +5031,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5144,6 +5246,7 @@ 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 EndIf ) @@ -5159,6 +5262,7 @@ Else If $51-01-01-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5175,6 +5279,7 @@ 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 EndIf ) @@ -5190,6 +5295,7 @@ Else If $51-01-02-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5206,6 +5312,7 @@ 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 EndIf ) @@ -5221,6 +5328,7 @@ Else If $51-01-03-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5435,6 +5543,7 @@ 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 EndIf ) @@ -5450,6 +5559,7 @@ Else If $51-21-01-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5466,6 +5576,7 @@ 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 EndIf ) @@ -5481,6 +5592,7 @@ Else If $51-21-02-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5497,6 +5609,7 @@ 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 EndIf ) @@ -5512,6 +5625,7 @@ Else If $51-21-03-0031.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5726,6 +5840,7 @@ 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 EndIf ) @@ -5741,6 +5856,7 @@ Else If $51-01-01-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5757,6 +5873,7 @@ 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 EndIf ) @@ -5772,6 +5889,7 @@ Else If $51-01-02-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5788,6 +5906,7 @@ 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 EndIf ) @@ -5803,6 +5922,7 @@ Else If $51-01-03-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6017,6 +6137,7 @@ 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 EndIf ) @@ -6032,6 +6153,7 @@ Else If $51-21-01-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6048,6 +6170,7 @@ 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 EndIf ) @@ -6063,6 +6186,7 @@ Else If $51-21-02-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6079,6 +6203,7 @@ 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 EndIf ) @@ -6094,6 +6219,7 @@ Else If $51-21-03-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6308,6 +6434,7 @@ 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 EndIf ) @@ -6323,6 +6450,7 @@ Else If $51-01-01-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6339,6 +6467,7 @@ 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 EndIf ) @@ -6354,6 +6483,7 @@ Else If $51-01-02-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6370,6 +6500,7 @@ 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 EndIf ) @@ -6385,6 +6516,7 @@ Else If $51-01-03-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6599,6 +6731,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6614,6 +6747,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6630,6 +6764,7 @@ 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 EndIf ) @@ -6645,6 +6780,7 @@ Else If $51-11-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6661,6 +6797,7 @@ 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 EndIf ) @@ -6676,6 +6813,7 @@ Else If $51-11-03-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6890,6 +7028,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6905,6 +7044,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6921,6 +7061,7 @@ 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 EndIf ) @@ -6936,6 +7077,7 @@ Else If $51-31-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6952,6 +7094,7 @@ 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 EndIf ) @@ -6967,6 +7110,7 @@ Else If $51-31-03-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7181,6 +7325,7 @@ 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 EndIf ) @@ -7196,6 +7341,7 @@ Else If $51-01-01-0017.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7212,6 +7358,7 @@ 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 EndIf ) @@ -7227,6 +7374,7 @@ Else If $51-01-02-0017.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7243,6 +7391,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7258,6 +7407,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7472,6 +7622,7 @@ 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 EndIf ) @@ -7487,6 +7638,7 @@ Else If $51-21-01-0017.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7503,6 +7655,7 @@ 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 EndIf ) @@ -7518,6 +7671,7 @@ Else If $51-21-02-0017.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7534,6 +7688,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7549,6 +7704,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7763,6 +7919,7 @@ 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 EndIf ) @@ -7778,6 +7935,7 @@ Else If $51-01-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7794,6 +7952,7 @@ 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 EndIf ) @@ -7809,6 +7968,7 @@ Else If $51-01-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7825,6 +7985,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7840,6 +8001,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8054,6 +8216,7 @@ 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 EndIf ) @@ -8069,6 +8232,7 @@ Else If $51-21-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8085,6 +8249,7 @@ 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 EndIf ) @@ -8100,6 +8265,7 @@ Else If $51-21-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8116,6 +8282,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8131,6 +8298,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8345,6 +8513,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8360,6 +8529,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8376,6 +8546,7 @@ 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 EndIf ) @@ -8391,6 +8562,7 @@ Else If $51-01-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8407,6 +8579,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8422,6 +8595,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8636,6 +8810,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8651,6 +8826,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8667,6 +8843,7 @@ 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 EndIf ) @@ -8682,6 +8859,7 @@ Else If $51-21-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8698,6 +8876,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8713,6 +8892,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8927,6 +9107,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8942,6 +9123,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8958,6 +9140,7 @@ 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 EndIf ) @@ -8973,6 +9156,7 @@ Else If $51-01-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8989,6 +9173,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9004,6 +9189,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9218,6 +9404,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9233,6 +9420,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9249,6 +9437,7 @@ 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 EndIf ) @@ -9264,6 +9453,7 @@ Else If $51-21-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9280,6 +9470,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9295,6 +9486,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 1e1a9759..9e44e91e 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml @@ -131,7 +131,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -177,6 +177,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -192,6 +193,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -208,6 +210,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -223,6 +226,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -239,6 +243,7 @@ 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 EndIf ) @@ -254,6 +259,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -468,6 +474,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -483,6 +490,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -499,6 +507,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -514,6 +523,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -530,6 +540,7 @@ 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 EndIf ) @@ -545,6 +556,7 @@ Else If $51-03-03-0034.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -759,6 +771,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -774,6 +787,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -790,6 +804,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -805,6 +820,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -821,6 +837,7 @@ 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 EndIf ) @@ -836,6 +853,7 @@ Else If $51-03-03-0027.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1050,6 +1068,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1065,6 +1084,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1081,6 +1101,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1096,6 +1117,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1112,6 +1134,7 @@ 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 EndIf ) @@ -1127,6 +1150,7 @@ Else If $51-03-03-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1341,6 +1365,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1356,6 +1381,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1372,6 +1398,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1387,6 +1414,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1403,6 +1431,7 @@ 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 EndIf ) @@ -1418,6 +1447,7 @@ Else If $51-03-03-0051.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1632,6 +1662,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1647,6 +1678,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1663,6 +1695,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1678,6 +1711,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1694,6 +1728,7 @@ 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 EndIf ) @@ -1709,6 +1744,7 @@ Else If $51-03-03-0052.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1923,6 +1959,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1938,6 +1975,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1954,6 +1992,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1969,6 +2008,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1985,6 +2025,7 @@ 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 EndIf ) @@ -2000,6 +2041,7 @@ Else If $51-03-03-0053.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2214,6 +2256,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2229,6 +2272,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2245,6 +2289,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2260,6 +2305,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2276,6 +2322,7 @@ 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 EndIf ) @@ -2291,6 +2338,7 @@ Else If $51-03-03-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2505,6 +2553,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2520,6 +2569,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2536,6 +2586,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2551,6 +2602,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2567,6 +2619,7 @@ 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 EndIf ) @@ -2582,6 +2635,7 @@ Else If $51-03-03-0056.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2796,6 +2850,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2811,6 +2866,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2827,6 +2883,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2842,6 +2899,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2858,6 +2916,7 @@ 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 EndIf ) @@ -2873,6 +2932,7 @@ Else If $51-03-03-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3087,6 +3147,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3102,6 +3163,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3118,6 +3180,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3133,6 +3196,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3149,6 +3213,7 @@ 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 EndIf ) @@ -3164,6 +3229,7 @@ Else If $51-03-03-0046.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3378,6 +3444,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3393,6 +3460,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3409,6 +3477,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3424,6 +3493,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3440,6 +3510,7 @@ 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 EndIf ) @@ -3455,6 +3526,7 @@ Else If $51-03-03-0047.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 index b53afe46..39d8f568 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml @@ -131,7 +131,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -177,6 +177,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -192,6 +193,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -208,6 +210,7 @@ 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 EndIf ) @@ -223,6 +226,7 @@ Else If $51-05-02-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -239,6 +243,7 @@ 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 EndIf ) @@ -254,6 +259,7 @@ Else If $51-05-03-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -468,6 +474,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -483,6 +490,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -499,6 +507,7 @@ 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 EndIf ) @@ -514,6 +523,7 @@ Else If $51-05-02-9990.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -530,6 +540,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -545,6 +556,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -759,6 +771,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -774,6 +787,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -790,6 +804,7 @@ 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 EndIf ) @@ -805,6 +820,7 @@ Else If $51-05-02-9991.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -821,6 +837,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -836,6 +853,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1050,6 +1068,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1065,6 +1084,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1081,6 +1101,7 @@ 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 EndIf ) @@ -1096,6 +1117,7 @@ Else If $51-05-02-9992.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1112,6 +1134,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1127,6 +1150,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1341,6 +1365,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1356,6 +1381,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1372,6 +1398,7 @@ 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 EndIf ) @@ -1387,6 +1414,7 @@ Else If $51-05-02-9993.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1403,6 +1431,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1418,6 +1447,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1632,6 +1662,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1647,6 +1678,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1663,6 +1695,7 @@ 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 EndIf ) @@ -1678,6 +1711,7 @@ Else If $51-05-02-9994.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1694,6 +1728,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1709,6 +1744,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1923,6 +1959,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1938,6 +1975,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1954,6 +1992,7 @@ 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 EndIf ) @@ -1969,6 +2008,7 @@ Else If $51-05-02-9995.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1985,6 +2025,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2000,6 +2041,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2214,6 +2256,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2229,6 +2272,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2245,6 +2289,7 @@ 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 EndIf ) @@ -2260,6 +2305,7 @@ Else If $51-05-02-9996.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2276,6 +2322,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2291,6 +2338,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) 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 fcacaa94..76ba4929 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_forkid.lxml @@ -122,7 +122,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -168,6 +168,7 @@ 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 EndIf ) @@ -183,6 +184,7 @@ Else If $51-03-01-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -199,6 +201,7 @@ 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 EndIf ) @@ -214,6 +217,7 @@ Else If $51-03-02-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -230,6 +234,7 @@ 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 EndIf ) @@ -245,6 +250,7 @@ Else If $51-03-03-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -459,6 +465,7 @@ 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 EndIf ) @@ -474,6 +481,7 @@ Else If $51-03-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -490,6 +498,7 @@ 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 EndIf ) @@ -505,6 +514,7 @@ Else If $51-03-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -521,6 +531,7 @@ 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 EndIf ) @@ -536,6 +547,7 @@ Else If $51-03-03-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -750,6 +762,7 @@ 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 EndIf ) @@ -765,6 +778,7 @@ Else If $51-03-01-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -781,6 +795,7 @@ 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 EndIf ) @@ -796,6 +811,7 @@ Else If $51-03-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -812,6 +828,7 @@ 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 EndIf ) @@ -827,6 +844,7 @@ Else If $51-03-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1041,6 +1059,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1056,6 +1075,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1072,6 +1092,7 @@ 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 EndIf ) @@ -1087,6 +1108,7 @@ Else If $51-03-02-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1103,6 +1125,7 @@ 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 EndIf ) @@ -1118,6 +1141,7 @@ Else If $51-03-03-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1332,6 +1356,7 @@ 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 EndIf ) @@ -1347,6 +1372,7 @@ Else If $51-03-01-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1363,6 +1389,7 @@ 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 EndIf ) @@ -1378,6 +1405,7 @@ Else If $51-03-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1394,6 +1422,7 @@ 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 EndIf ) @@ -1409,6 +1438,7 @@ Else If $51-03-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1623,6 +1653,7 @@ 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 EndIf ) @@ -1638,6 +1669,7 @@ Else If $51-03-01-0022.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1654,6 +1686,7 @@ 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 EndIf ) @@ -1669,6 +1702,7 @@ Else If $51-03-02-0022.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1685,6 +1719,7 @@ 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 EndIf ) @@ -1700,6 +1735,7 @@ Else If $51-03-03-0022.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1914,6 +1950,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1929,6 +1966,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1945,6 +1983,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1960,6 +1999,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1976,6 +2016,7 @@ 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 EndIf ) @@ -1991,6 +2032,7 @@ Else If $51-03-03-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2205,6 +2247,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2220,6 +2263,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2236,6 +2280,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2251,6 +2296,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2267,6 +2313,7 @@ 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 EndIf ) @@ -2282,6 +2329,7 @@ Else If $51-03-03-0020.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2496,6 +2544,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2511,6 +2560,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2527,6 +2577,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2542,6 +2593,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2558,6 +2610,7 @@ 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 EndIf ) @@ -2573,6 +2626,7 @@ Else If $51-03-03-0021.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2787,6 +2841,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2802,6 +2857,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2818,6 +2874,7 @@ 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 EndIf ) @@ -2833,6 +2890,7 @@ Else If $51-05-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2849,6 +2907,7 @@ 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 EndIf ) @@ -2864,6 +2923,7 @@ Else If $51-05-03-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3078,6 +3138,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3093,6 +3154,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3109,6 +3171,7 @@ 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 EndIf ) @@ -3124,6 +3187,7 @@ Else If $51-05-02-0008.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3140,6 +3204,7 @@ 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 EndIf ) @@ -3155,6 +3220,7 @@ Else If $51-05-03-0008.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3369,6 +3435,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3384,6 +3451,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3400,6 +3468,7 @@ 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 EndIf ) @@ -3415,6 +3484,7 @@ Else If $51-05-02-0044.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3431,6 +3501,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3446,6 +3517,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3622,9 +3694,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" SPARKLING YUZU @@ -3660,6 +3732,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3675,6 +3748,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3691,6 +3765,7 @@ 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 EndIf ) @@ -3706,6 +3781,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3722,6 +3798,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3737,6 +3814,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3788,7 +3866,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -3951,6 +4029,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3966,6 +4045,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3982,6 +4062,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3997,6 +4078,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4013,6 +4095,7 @@ 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 EndIf ) @@ -4028,6 +4111,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4242,6 +4326,7 @@ 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 EndIf ) @@ -4257,6 +4342,7 @@ Else If $51-03-01-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4273,6 +4359,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4288,6 +4375,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4304,6 +4392,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4319,6 +4408,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4533,6 +4623,7 @@ 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 EndIf ) @@ -4548,6 +4639,7 @@ Else If $51-03-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4564,6 +4656,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4579,6 +4672,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4595,6 +4689,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4610,6 +4705,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4824,6 +4920,7 @@ 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 EndIf ) @@ -4839,6 +4936,7 @@ Else If $51-01-01-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4855,6 +4953,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4870,6 +4969,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4886,6 +4986,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4901,6 +5002,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5115,6 +5217,7 @@ 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 EndIf ) @@ -5130,6 +5233,7 @@ Else If $51-21-01-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5146,6 +5250,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5161,6 +5266,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5177,6 +5283,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5192,6 +5299,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5406,6 +5514,7 @@ 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 EndIf ) @@ -5421,6 +5530,7 @@ Else If $51-01-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5437,6 +5547,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5452,6 +5563,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5468,6 +5580,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5483,6 +5596,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5697,6 +5811,7 @@ 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 EndIf ) @@ -5712,6 +5827,7 @@ Else If $51-21-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5728,6 +5844,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5743,6 +5860,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5759,6 +5877,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5774,6 +5893,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5988,6 +6108,7 @@ 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 EndIf ) @@ -6003,6 +6124,7 @@ Else If $51-01-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6019,6 +6141,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6034,6 +6157,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6050,6 +6174,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6065,6 +6190,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6279,6 +6405,7 @@ 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 EndIf ) @@ -6294,6 +6421,7 @@ Else If $51-21-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6310,6 +6438,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6325,6 +6454,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6341,6 +6471,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6356,6 +6487,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6570,6 +6702,7 @@ 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 EndIf ) @@ -6585,6 +6718,7 @@ Else If $51-01-01-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6601,6 +6735,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6616,6 +6751,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6632,6 +6768,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6647,6 +6784,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6823,9 +6961,9 @@ ; 51-01-01-0007 - - Flag( 51-01-01-0007.Button,$Sum5101010007) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" CARAMEL LATTE @@ -6861,6 +6999,7 @@ 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 EndIf ) @@ -6876,6 +7015,7 @@ Else If $51-01-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6892,6 +7032,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6907,6 +7048,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6923,6 +7065,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6938,6 +7081,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6989,7 +7133,7 @@ $Sum5101010007TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -7114,9 +7258,9 @@ ; 51-21-01-0007 - - Flag( 51-21-01-0007.Button,$Sum5121010007) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" CARAMEL LATTE @@ -7152,6 +7296,7 @@ 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 EndIf ) @@ -7167,6 +7312,7 @@ Else If $51-21-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7183,6 +7329,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7198,6 +7345,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7214,6 +7362,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7229,6 +7378,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7280,7 +7430,7 @@ $Sum5121010007TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price @@ -7443,6 +7593,7 @@ 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 EndIf ) @@ -7458,6 +7609,7 @@ Else If $51-01-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7474,6 +7626,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7489,6 +7642,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7505,6 +7659,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7520,6 +7675,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7734,6 +7890,7 @@ 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 EndIf ) @@ -7749,6 +7906,7 @@ Else If $51-21-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7765,6 +7923,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7780,6 +7939,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7796,6 +7956,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7811,6 +7972,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8025,6 +8187,7 @@ 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 EndIf ) @@ -8040,6 +8203,7 @@ Else If $51-03-01-0024.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8056,6 +8220,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8071,6 +8236,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8087,6 +8253,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8102,6 +8269,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8316,6 +8484,7 @@ 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 EndIf ) @@ -8331,6 +8500,7 @@ Else If $51-03-01-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8347,6 +8517,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8362,6 +8533,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8378,6 +8550,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8393,6 +8566,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8607,6 +8781,7 @@ 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 EndIf ) @@ -8622,6 +8797,7 @@ Else If $51-03-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8638,6 +8814,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8653,6 +8830,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8669,6 +8847,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8684,6 +8863,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8898,6 +9078,7 @@ 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 EndIf ) @@ -8913,6 +9094,7 @@ Else If $51-02-01-0024.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8929,6 +9111,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8944,6 +9127,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8960,6 +9144,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -8975,6 +9160,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9189,6 +9375,7 @@ 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 EndIf ) @@ -9204,6 +9391,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9220,6 +9408,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9235,6 +9424,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9251,6 +9441,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9266,6 +9457,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9480,6 +9672,7 @@ 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 EndIf ) @@ -9495,6 +9688,7 @@ Else If $51-02-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9511,6 +9705,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9526,6 +9721,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9542,6 +9738,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9557,6 +9754,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9771,6 +9969,7 @@ 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 EndIf ) @@ -9786,6 +9985,7 @@ Else If $51-02-01-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9802,6 +10002,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9817,6 +10018,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9833,6 +10035,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -9848,6 +10051,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10062,6 +10266,7 @@ 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 EndIf ) @@ -10077,6 +10282,7 @@ Else If $51-05-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10093,6 +10299,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10108,6 +10315,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10124,6 +10332,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10139,6 +10348,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10353,6 +10563,7 @@ 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 EndIf ) @@ -10368,6 +10579,7 @@ Else If $51-03-01-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10384,6 +10596,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10399,6 +10612,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10415,6 +10629,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10430,6 +10645,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10644,6 +10860,7 @@ 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 EndIf ) @@ -10659,6 +10876,7 @@ Else If $51-03-01-0022.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10675,6 +10893,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10690,6 +10909,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10706,6 +10926,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10721,6 +10942,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10935,6 +11157,7 @@ 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 EndIf ) @@ -10950,6 +11173,7 @@ Else If $51-02-01-1026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10966,6 +11190,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10981,6 +11206,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -10997,6 +11223,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -11012,6 +11239,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 438edacc..53b55b0e 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_health.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_health.lxml @@ -131,7 +131,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -177,6 +177,7 @@ 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 EndIf ) @@ -192,6 +193,7 @@ Else If $51-01-01-1003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -208,6 +210,7 @@ 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 EndIf ) @@ -223,6 +226,7 @@ Else If $51-01-02-1001.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -239,6 +243,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -254,6 +259,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -468,6 +474,7 @@ 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 EndIf ) @@ -483,6 +490,7 @@ Else If $51-21-01-1003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -499,6 +507,7 @@ 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 EndIf ) @@ -514,6 +523,7 @@ Else If $51-21-02-1001.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -530,6 +540,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -545,6 +556,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -759,6 +771,7 @@ 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 EndIf ) @@ -774,6 +787,7 @@ Else If $51-01-01-1004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -790,6 +804,7 @@ 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 EndIf ) @@ -805,6 +820,7 @@ Else If $51-01-02-1002.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -821,6 +837,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -836,6 +853,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1050,6 +1068,7 @@ 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 EndIf ) @@ -1065,6 +1084,7 @@ Else If $51-21-01-1004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1081,6 +1101,7 @@ 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 EndIf ) @@ -1096,6 +1117,7 @@ Else If $51-21-02-1002.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1112,6 +1134,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1127,6 +1150,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1341,6 +1365,7 @@ 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 EndIf ) @@ -1356,6 +1381,7 @@ Else If $51-01-01-1006.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1372,6 +1398,7 @@ 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 EndIf ) @@ -1387,6 +1414,7 @@ Else If $51-01-02-1003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1403,6 +1431,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1418,6 +1447,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1632,6 +1662,7 @@ 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 EndIf ) @@ -1647,6 +1678,7 @@ Else If $51-21-01-1006.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1663,6 +1695,7 @@ 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 EndIf ) @@ -1678,6 +1711,7 @@ Else If $51-21-02-1003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1694,6 +1728,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1709,6 +1744,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1923,6 +1959,7 @@ 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 EndIf ) @@ -1938,6 +1975,7 @@ Else If $51-01-01-1099.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1954,6 +1992,7 @@ 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 EndIf ) @@ -1969,6 +2008,7 @@ Else If $51-01-02-1099.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1985,6 +2025,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2000,6 +2041,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2214,6 +2256,7 @@ 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 EndIf ) @@ -2229,6 +2272,7 @@ Else If $51-21-01-1099.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2245,6 +2289,7 @@ 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 EndIf ) @@ -2260,6 +2305,7 @@ Else If $51-21-02-1099.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2276,6 +2322,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2291,6 +2338,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2505,6 +2553,7 @@ 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 EndIf ) @@ -2520,6 +2569,7 @@ Else If $51-02-01-1024.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2536,6 +2586,7 @@ 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 EndIf ) @@ -2551,6 +2602,7 @@ Else If $51-02-02-1024.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2567,6 +2619,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2582,6 +2635,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2796,6 +2850,7 @@ 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 EndIf ) @@ -2811,6 +2866,7 @@ Else If $51-02-01-1024.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2827,6 +2883,7 @@ 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 EndIf ) @@ -2842,6 +2899,7 @@ Else If $51-02-02-1024.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2858,6 +2916,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2873,6 +2932,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3087,6 +3147,7 @@ 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 EndIf ) @@ -3102,6 +3163,7 @@ Else If $51-02-01-1025.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3118,6 +3180,7 @@ 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 EndIf ) @@ -3133,6 +3196,7 @@ Else If $51-02-02-1025.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3149,6 +3213,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3164,6 +3229,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3378,6 +3444,7 @@ 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 EndIf ) @@ -3393,6 +3460,7 @@ Else If $51-02-01-1026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3409,6 +3477,7 @@ 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 EndIf ) @@ -3424,6 +3493,7 @@ Else If $51-02-02-1026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3440,6 +3510,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3455,6 +3526,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3669,6 +3741,7 @@ 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 EndIf ) @@ -3684,6 +3757,7 @@ Else If $51-02-01-1029.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3700,6 +3774,7 @@ 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 EndIf ) @@ -3715,6 +3790,7 @@ Else If $51-02-02-1029.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3731,6 +3807,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3746,6 +3823,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3960,6 +4038,7 @@ 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 EndIf ) @@ -3975,6 +4054,7 @@ Else If $51-02-01-1027.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3991,6 +4071,7 @@ 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 EndIf ) @@ -4006,6 +4087,7 @@ Else If $51-02-02-1027.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4022,6 +4104,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4037,6 +4120,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4251,6 +4335,7 @@ 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 EndIf ) @@ -4266,6 +4351,7 @@ Else If $51-02-01-1029.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4282,6 +4368,7 @@ 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 EndIf ) @@ -4297,6 +4384,7 @@ Else If $51-02-02-1029.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4313,6 +4401,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4328,6 +4417,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4542,6 +4632,7 @@ 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 EndIf ) @@ -4557,6 +4648,7 @@ Else If $51-02-01-1030.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4573,6 +4665,7 @@ 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 EndIf ) @@ -4588,6 +4681,7 @@ Else If $51-02-02-1030.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4604,6 +4698,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4619,6 +4714,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4833,6 +4929,7 @@ 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 EndIf ) @@ -4848,6 +4945,7 @@ Else If $51-02-01-1031.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4864,6 +4962,7 @@ 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 EndIf ) @@ -4879,6 +4978,7 @@ Else If $51-02-02-1031.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4895,6 +4995,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4910,6 +5011,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5124,6 +5226,7 @@ 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 EndIf ) @@ -5139,6 +5242,7 @@ Else If $51-02-01-1032.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5155,6 +5259,7 @@ 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 EndIf ) @@ -5170,6 +5275,7 @@ Else If $51-02-02-1032.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5186,6 +5292,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5201,6 +5308,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5415,6 +5523,7 @@ 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 EndIf ) @@ -5430,6 +5539,7 @@ Else If $51-02-01-1037.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5446,6 +5556,7 @@ 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 EndIf ) @@ -5461,6 +5572,7 @@ Else If $51-02-02-1037.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5477,6 +5589,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5492,6 +5605,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5706,6 +5820,7 @@ 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 EndIf ) @@ -5721,6 +5836,7 @@ Else If $51-03-01-1002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5737,6 +5853,7 @@ 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 EndIf ) @@ -5752,6 +5869,7 @@ Else If $51-03-02-1002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5768,6 +5886,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5783,6 +5902,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -5997,6 +6117,7 @@ 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 EndIf ) @@ -6012,6 +6133,7 @@ Else If $51-03-01-1005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6028,6 +6150,7 @@ 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 EndIf ) @@ -6043,6 +6166,7 @@ Else If $51-03-02-1005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6059,6 +6183,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6074,6 +6199,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6288,6 +6414,7 @@ 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 EndIf ) @@ -6303,6 +6430,7 @@ Else If $51-02-01-1038.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6319,6 +6447,7 @@ 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 EndIf ) @@ -6334,6 +6463,7 @@ Else If $51-02-02-1038.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1038.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6350,6 +6480,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6365,6 +6496,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6579,6 +6711,7 @@ 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 EndIf ) @@ -6594,6 +6727,7 @@ Else If $51-02-01-1039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6610,6 +6744,7 @@ 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 EndIf ) @@ -6625,6 +6760,7 @@ Else If $51-02-02-1039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6641,6 +6777,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6656,6 +6793,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6870,6 +7008,7 @@ 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 EndIf ) @@ -6885,6 +7024,7 @@ Else If $51-02-01-1040.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6901,6 +7041,7 @@ 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 EndIf ) @@ -6916,6 +7057,7 @@ Else If $51-02-02-1040.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-1040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6932,6 +7074,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -6947,6 +7090,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7161,6 +7305,7 @@ 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 EndIf ) @@ -7176,6 +7321,7 @@ Else If $51-05-01-1001.Discount = > 0 Then Var return !assigned StringFmt( $51-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7192,6 +7338,7 @@ 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 EndIf ) @@ -7207,6 +7354,7 @@ Else If $51-05-02-1001.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7223,6 +7371,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7238,6 +7387,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7452,6 +7602,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7467,6 +7618,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7483,6 +7635,7 @@ 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 EndIf ) @@ -7498,6 +7651,7 @@ Else If $51-05-02-1010.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7514,6 +7668,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -7529,6 +7684,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 3ace2734..93b29302 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml @@ -118,7 +118,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -164,6 +164,7 @@ 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 EndIf ) @@ -179,6 +180,7 @@ Else If $51-03-01-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -195,6 +197,7 @@ 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 EndIf ) @@ -210,6 +213,7 @@ Else If $51-03-02-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -226,6 +230,7 @@ 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 EndIf ) @@ -241,6 +246,7 @@ Else If $51-03-03-0005.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -455,6 +461,7 @@ 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 EndIf ) @@ -470,6 +477,7 @@ Else If $51-03-01-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -486,6 +494,7 @@ 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 EndIf ) @@ -501,6 +510,7 @@ Else If $51-03-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -517,6 +527,7 @@ 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 EndIf ) @@ -532,6 +543,7 @@ Else If $51-03-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -746,6 +758,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -761,6 +774,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -777,6 +791,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -792,6 +807,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -808,6 +824,7 @@ 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 EndIf ) @@ -823,6 +840,7 @@ Else If $51-03-03-0011.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1037,6 +1055,7 @@ 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 EndIf ) @@ -1052,6 +1071,7 @@ Else If $51-03-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1068,6 +1088,7 @@ 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 EndIf ) @@ -1083,6 +1104,7 @@ Else If $51-03-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1099,6 +1121,7 @@ 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 EndIf ) @@ -1114,6 +1137,7 @@ Else If $51-03-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1328,6 +1352,7 @@ 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 EndIf ) @@ -1343,6 +1368,7 @@ Else If $51-03-01-0022.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1359,6 +1385,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1374,6 +1401,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1390,6 +1418,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1405,6 +1434,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1619,6 +1649,7 @@ 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 EndIf ) @@ -1634,6 +1665,7 @@ Else If $51-03-01-0036.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1650,6 +1682,7 @@ 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 EndIf ) @@ -1665,6 +1698,7 @@ Else If $51-03-02-0036.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1681,6 +1715,7 @@ 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 EndIf ) @@ -1696,6 +1731,7 @@ Else If $51-03-03-0036.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1910,6 +1946,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1925,6 +1962,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1941,6 +1979,7 @@ 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 EndIf ) @@ -1956,6 +1995,7 @@ Else If $51-03-02-0058.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1972,6 +2012,7 @@ 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 EndIf ) @@ -1987,6 +2028,7 @@ Else If $51-03-03-0058.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2201,6 +2243,7 @@ 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 EndIf ) @@ -2216,6 +2259,7 @@ Else If $51-03-01-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2232,6 +2276,7 @@ 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 EndIf ) @@ -2247,6 +2292,7 @@ Else If $51-03-02-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2263,6 +2309,7 @@ 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 EndIf ) @@ -2278,6 +2325,7 @@ Else If $51-03-03-0001.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2492,6 +2540,7 @@ 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 EndIf ) @@ -2507,6 +2556,7 @@ Else If $51-03-01-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2523,6 +2573,7 @@ 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 EndIf ) @@ -2538,6 +2589,7 @@ Else If $51-03-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2554,6 +2606,7 @@ 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 EndIf ) @@ -2569,6 +2622,7 @@ Else If $51-03-03-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2783,6 +2837,7 @@ 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 EndIf ) @@ -2798,6 +2853,7 @@ Else If $51-03-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2814,6 +2870,7 @@ 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 EndIf ) @@ -2829,6 +2886,7 @@ Else If $51-03-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2845,6 +2903,7 @@ 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 EndIf ) @@ -2860,6 +2919,7 @@ Else If $51-03-03-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3074,6 +3134,7 @@ 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 EndIf ) @@ -3089,6 +3150,7 @@ Else If $51-03-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3105,6 +3167,7 @@ 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 EndIf ) @@ -3120,6 +3183,7 @@ Else If $51-03-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3136,6 +3200,7 @@ 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 EndIf ) @@ -3151,6 +3216,7 @@ Else If $51-03-03-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3320,297 +3386,6 @@ - - - - ; ==================> Len = 3 - ; 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/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 - - - - - - - - - - Milk,Vanilla syrup, - - - - - - - - $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 - 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 - 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" - - - $Sum510301004151030200415103030041TextID - $Sum510301004151030200415103030041TextValue - - - 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 - Var PriceD2 = $51-03-02-0041.Price - Var PriceD3 = $51-03-03-0041.Price - Var PD_CODE1 = "51-03-01-0041" - Var PD_CODE2 = "51-03-02-0041" - Var PD_CODE3 = "51-03-03-0041" - ; begin lang - Var aliasName[0] = "Vanilla Cocoa" - Var aliasDesc[0] = "Milk,Vanilla syrup," - 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] = "Hot VANILLA cocoa" - Var NameLang[0][1] = "นมวานิลาร้อน" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "" - Var NameLang[0][5] = "" - Var DescLang[0][0] = "Milk,Vanilla syrup," - Var DescLang[0][1] = " นม น้ำเชื่อมวานิลา" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "" - Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced VANILLA cocoa" - Var NameLang[1][1] = "นมวานิลาเย็น" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "" - Var NameLang[1][5] = "" - Var DescLang[1][0] = "Milk,Vanilla syrup," - Var DescLang[1][1] = " นม น้ำเชื่อมวานิลา" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "" - Var DescLang[1][5] = "" - Var NameLang[2][0] = "VANILLA cocoa frappe" - Var NameLang[2][1] = "นมวานิลาปั่น" - Var NameLang[2][2] = "" - Var NameLang[2][3] = "" - Var NameLang[2][4] = "" - Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk,Vanilla syrup," - 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 = $51-03-01-0041.Button - Var PD_STAGE_2 = $51-03-02-0041.Button - Var PD_STAGE_3 = $51-03-03-0041.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-0041" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-03-01-0041" - Else - Topping "Load" "51-03-03-0041" - 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 - - - @@ -3656,6 +3431,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3671,6 +3447,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3687,6 +3464,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3702,6 +3480,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3718,6 +3497,7 @@ 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 EndIf ) @@ -3733,6 +3513,7 @@ Else If $51-03-03-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3947,6 +3728,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3962,6 +3744,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3978,6 +3761,7 @@ 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 EndIf ) @@ -3993,6 +3777,7 @@ Else If $51-03-02-0059.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4009,6 +3794,7 @@ 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 EndIf ) @@ -4024,6 +3810,7 @@ Else If $51-03-03-0059.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4238,6 +4025,7 @@ 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 EndIf ) @@ -4253,6 +4041,7 @@ Else If $51-03-01-0025.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4269,6 +4058,7 @@ 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 EndIf ) @@ -4284,6 +4074,7 @@ Else If $51-03-02-0025.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4300,6 +4091,7 @@ 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 EndIf ) @@ -4315,6 +4107,7 @@ Else If $51-03-03-0025.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4529,6 +4322,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4544,6 +4338,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4560,6 +4355,7 @@ 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 EndIf ) @@ -4575,6 +4371,7 @@ Else If $51-03-02-0037.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4591,6 +4388,7 @@ 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 EndIf ) @@ -4606,6 +4404,7 @@ Else If $51-03-03-0037.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 231b64db..7550e33a 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_other.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_other.lxml @@ -130,7 +130,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -176,6 +176,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -191,6 +192,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -207,6 +209,7 @@ 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 EndIf ) @@ -222,6 +225,7 @@ Else If $51-05-02-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -238,6 +242,7 @@ 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 EndIf ) @@ -253,6 +258,7 @@ Else If $51-05-03-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -429,12 +435,12 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" - Sprakling Yuzu + Sparkling Yuzu ยูซุโซดา - - @@ -467,6 +473,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -482,6 +489,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -498,6 +506,7 @@ 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 EndIf ) @@ -513,6 +522,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -529,6 +539,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -544,6 +555,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -595,7 +607,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -605,7 +617,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Sprakling Yuzu" + Var aliasName[0] = "Sparkling Yuzu" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -758,6 +770,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -773,6 +786,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -789,6 +803,7 @@ 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 EndIf ) @@ -804,6 +819,7 @@ Else If $51-05-02-0033.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -820,6 +836,7 @@ 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 EndIf ) @@ -835,6 +852,7 @@ Else If $51-05-03-0033.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1049,6 +1067,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1064,6 +1083,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1080,6 +1100,7 @@ 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 EndIf ) @@ -1095,6 +1116,7 @@ Else If $51-05-02-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1111,6 +1133,7 @@ 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 EndIf ) @@ -1126,6 +1149,7 @@ Else If $51-05-03-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1340,6 +1364,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1355,6 +1380,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1371,6 +1397,7 @@ 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 EndIf ) @@ -1386,6 +1413,7 @@ Else If $51-05-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1402,6 +1430,7 @@ 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 EndIf ) @@ -1417,6 +1446,7 @@ Else If $51-05-03-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1631,6 +1661,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1646,6 +1677,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1662,6 +1694,7 @@ 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 EndIf ) @@ -1677,6 +1710,7 @@ Else If $51-05-02-0044.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1693,6 +1727,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1708,6 +1743,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1889,7 +1925,7 @@ "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_SODA.png" - Coconut Sparkling + Sparkling Coconut เมล่อนโซดา - - @@ -1922,6 +1958,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1937,6 +1974,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1953,6 +1991,7 @@ 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 EndIf ) @@ -1968,6 +2007,7 @@ Else If $51-05-02-0090.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1984,6 +2024,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1999,6 +2040,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2060,7 +2102,7 @@ Var PD_CODE2 = "51-05-02-0090" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Coconut Sparkling" + Var aliasName[0] = "Sparkling Coconut" Var aliasDesc[0] = "Coconut Syrup and Soda" Var aliasName[1] = "เมล่อนโซดา" Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" @@ -2084,7 +2126,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "COCONUT SODA" + Var NameLang[1][0] = "SPARKLING COCONUT" Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -2168,6 +2210,897 @@ + + + + ; ==================> Len = 3 + ; - 51-05-02-0093 - + + Flag( 51-05-02-0093.Button,$Sum5105020093) + "ROOT/taobin_project/inter/aus/image/page_drink_n//" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//" + + + Sparkling Coconut\nLychee + เมล่อนโซดา + - + - + + + + + + + Coconut Syrup, Lychee Syrup and Soda + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0093.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020093TextID + $Sum5105020093TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-0093.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-0093" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Sparkling Coconut\nLychee" + Var aliasDesc[0] = "Coconut Syrup, Lychee Syrup and Soda" + Var aliasName[1] = "เมล่อนโซดา" + Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" + 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 LYCHEE SODA" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Coconut Syrup, Lychee Syrup and Soda" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][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-0093.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-0093" + 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_other.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-0022 51-05-03-0022 + + Flag( 51-05-02-0022.Button,51-05-03-0022.Button,$Sum51050200225105030022) + "ROOT/taobin_project/inter/aus/image/page_drink_n//" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//" + + + Sparkling Lychee\nLimenade + เมล่อนโซดา + - + - + + + + + + + Lynchee Syrup, Limenade, Soda, Ice + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0022.Button + $51-05-03-0022.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + If $51-05-02-0022.Price = -1 Then + Var return = "Free" + Else + If $51-05-02-0022.Discount = "" Then + Var return !assigned StringFmt( $51-05-02-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-02-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-02-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-02-0022.Price = -1 Then + Var return = "" + Else + If $51-05-02-0022.Discount = "" Then + Var return "" + Else + If $51-05-02-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-02-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + If $51-05-03-0022.Price = -1 Then + Var return = "Free" + Else + If $51-05-03-0022.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0022.Price , DisplayFormat, PreScaleConvertShow) + Else + If $51-05-03-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0022.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $51-05-03-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $51-05-03-0022.Price = -1 Then + Var return = "" + Else + If $51-05-03-0022.Discount = "" Then + Var return "" + Else + If $51-05-03-0022.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0022.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum51050200225105030022TextID + $Sum51050200225105030022TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-0022.Price + Var PriceD3 = $51-05-03-0022.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-0022" + Var PD_CODE3 = "51-05-03-0022" + ; begin lang + Var aliasName[0] = "Sparkling Lychee\nLimenade" + Var aliasDesc[0] = "Lynchee Syrup, Limenade, Soda, Ice" + Var aliasName[1] = "เมล่อนโซดา" + Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" + 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] = "Iced Sparkling Lynchee Limenade" + Var NameLang[1][1] = "ลิ้นจี่มะนาวโซดาเย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "SODA LAICI LIMAU" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Lynchee Syrup, Limenade, Soda, Ice" + Var DescLang[1][1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Sirap Strawberry, Limau, Soda, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "Sparkling Lychee Limenade Frappe" + Var NameLang[2][1] = "ลิ้นจี่มะนาวโซดาปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE SODA LAICI LIMAU" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Lynchee Syrup, Limenade, Soda, Ice" + Var DescLang[2][1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Sirap Strawberi, Limau, Soda, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $51-05-02-0022.Button + Var PD_STAGE_3 = $51-05-03-0022.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-0022" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "-" + Else + Topping "Load" "51-05-03-0022" + 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_other.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-0063 - + + Flag( 51-05-02-0063.Button,$Sum5105020063) + "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" + + + Sparkling Strawberry\nand Mint + + + + + + + + + + Mint Syrup, Strawberry Syrup, Lime, Soda & Ice + + + + + + + + "Disable2" + $51-05-02-0063.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020063TextID + $Sum5105020063TextValue + + + 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 + Var PriceD2 = $51-05-02-0063.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-0063" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Sparkling Strawberry\nand Mint" + Var aliasDesc[0] = "Mint Syrup, Strawberry Syrup, Lime, 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] = "Sparkling Strawberry and Mint" + Var NameLang[1][1] = "สตรอเบอร์รี่มินต์โซดา" + Var NameLang[1][2] = "-" + Var NameLang[1][3] = "-" + Var NameLang[1][4] = "-" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Mint Syrup, Strawberry Syrup, Lime, 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-0063.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-0063" + 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_other.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 + + + @@ -2213,6 +3146,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2228,6 +3162,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2244,6 +3179,7 @@ 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 EndIf ) @@ -2259,6 +3195,7 @@ Else If $51-05-02-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2275,6 +3212,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2290,6 +3228,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2504,6 +3443,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2519,6 +3459,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2535,6 +3476,7 @@ 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 EndIf ) @@ -2550,6 +3492,7 @@ Else If $51-05-02-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2566,6 +3509,7 @@ 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 EndIf ) @@ -2581,6 +3525,7 @@ Else If $51-05-03-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2795,6 +3740,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2810,6 +3756,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2826,6 +3773,7 @@ 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 EndIf ) @@ -2841,6 +3789,7 @@ Else If $51-05-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2857,6 +3806,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2872,6 +3822,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3086,6 +4037,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3101,6 +4053,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3117,6 +4070,7 @@ 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 EndIf ) @@ -3132,6 +4086,7 @@ Else If $51-05-02-0075.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3148,6 +4103,7 @@ 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 EndIf ) @@ -3163,6 +4119,7 @@ Else If $51-05-03-0075.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3377,6 +4334,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3392,6 +4350,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3408,6 +4367,7 @@ 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 EndIf ) @@ -3423,6 +4383,7 @@ Else If $51-05-02-0076.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3439,6 +4400,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3454,6 +4416,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3668,6 +4631,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3683,6 +4647,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3699,6 +4664,7 @@ 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 EndIf ) @@ -3714,6 +4680,7 @@ Else If $51-05-02-0117.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3730,6 +4697,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3745,6 +4713,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3959,6 +4928,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3974,6 +4944,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3990,6 +4961,7 @@ 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 EndIf ) @@ -4005,6 +4977,7 @@ Else If $51-05-02-0014.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0014.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4021,6 +4994,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4036,6 +5010,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4250,6 +5225,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4265,6 +5241,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4281,6 +5258,7 @@ 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 EndIf ) @@ -4296,6 +5274,7 @@ Else If $51-05-02-0015.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0015.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4312,6 +5291,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4327,6 +5307,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4541,6 +5522,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4556,6 +5538,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4572,6 +5555,7 @@ 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 EndIf ) @@ -4587,6 +5571,7 @@ Else If $51-05-02-0017.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0017.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4603,6 +5588,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4618,6 +5604,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) 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 74a248fd..a93b9f9e 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -118,6 +118,7 @@ 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 EndIf ) @@ -133,6 +134,7 @@ Else If $51-01-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-01-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ 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 EndIf ) @@ -195,6 +200,7 @@ Else If $51-01-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -409,6 +415,7 @@ 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 EndIf ) @@ -424,6 +431,7 @@ Else If $51-21-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-21-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ 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 EndIf ) @@ -486,6 +497,7 @@ Else If $51-21-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -715,6 +728,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ 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 EndIf ) @@ -746,6 +761,7 @@ Else If $51-05-02-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ 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 EndIf ) @@ -777,6 +794,7 @@ Else If $51-05-03-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -991,6 +1009,7 @@ 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 EndIf ) @@ -1006,6 +1025,7 @@ Else If $51-03-01-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1042,7 @@ 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 EndIf ) @@ -1037,6 +1058,7 @@ Else If $51-03-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1053,6 +1075,7 @@ 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 EndIf ) @@ -1068,6 +1091,7 @@ Else If $51-03-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 c283c54d..1ccb566b 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -118,6 +118,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -133,6 +134,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-05-02-0044.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -195,6 +200,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -409,6 +415,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -424,6 +431,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-01-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -486,6 +497,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -715,6 +728,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ 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 EndIf ) @@ -746,6 +761,7 @@ Else If $51-21-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -777,6 +794,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -991,6 +1009,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1006,6 +1025,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1042,7 @@ 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 EndIf ) @@ -1037,6 +1058,7 @@ Else If $51-05-02-0063.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1053,6 +1075,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1068,6 +1091,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1153,7 +1177,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "STRAWBERRY & MINT SPARKLING" + Var NameLang[1][0] = "Sparkling Strawberry and Mint" Var NameLang[1][1] = "สตรอเบอร์รี่มินต์โซดา" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" diff --git a/inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.lxml b/inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.lxml new file mode 100644 index 00000000..efdfc6ff --- /dev/null +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.lxml @@ -0,0 +1,1274 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_default_init.lxml" + + + Var Timeout = 0 + + + ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new_menu.lxml" + SetInstanceIgnoreTouch + + + 1000 + + + ;include="ROOT/taobin_project/inter/aus/xml/multi/ForProGroup.inc" + + + 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 + "true" + + +;banners + ; ==================> Len = 3 + ; 51-02-01-0046 51-02-02-0046 - + + Flag( 51-02-01-0046.Button,51-02-02-0046.Button,$Sum51020100465102020046) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" + + + Jasmine Milk Tea + ชามะลิลาเต้ + - + - + + - + + + + + Jasmine & Milk + ชามะลิ และนม + - + - + + - + + + $51-02-01-0046.Button + $51-02-02-0046.Button + "Disable2" + + 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 + 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 + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum51020100465102020046TextID + $Sum51020100465102020046TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-02-01-0046.Price + Var PriceD2 = $51-02-02-0046.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "51-02-01-0046" + Var PD_CODE2 = "51-02-02-0046" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Jasmine Milk Tea" + Var aliasDesc[0] = "Jasmine & 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] = "Hot JASMINE MILK TEA" + Var NameLang[0][1] = "ชามะลิลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "TEH SUSU JASMIN PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Jasmine & Milk" + Var DescLang[0][1] = "ชามะลิ และนม" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Teh Jasmin, Susu" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced JASMINE MILK TEA" + Var NameLang[1][1] = "ชามะลิลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "TEH SUSU JASMIN AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Jasmine, Milk, Iced" + Var DescLang[1][1] = "ชามะลิ นม และน้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Teh Jasmin, Susu, Ais" + 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 = $51-02-01-0046.Button + Var PD_STAGE_2 = $51-02-02-0046.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-02-02-0046" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-02-01-0046" + 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_pro_hug_in_a_cup.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-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/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" + + + Caramel Café Latte + คาราเมลลาเต้ + - + - + + + + + + + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - + + + + + $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 + 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 + 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 + 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 + 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 + 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 + 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 + 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" + + + $Sum510101000751010200045101030004TextID + $Sum510101000751010200045101030004TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-01-01-0007.Price + Var PriceD2 = $51-01-02-0004.Price + Var PriceD3 = $51-01-03-0004.Price + Var PD_CODE1 = "51-01-01-0007" + Var PD_CODE2 = "51-01-02-0004" + Var PD_CODE3 = "51-01-03-0004" + ; begin lang + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced CARAMELCAFÉ LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-01-01-0007.Button + Var PD_STAGE_2 = $51-01-02-0004.Button + Var PD_STAGE_3 = $51-01-03-0004.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-01-02-0004" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-01-01-0007" + Else + Topping "Load" "51-01-03-0004" + 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_pro_hug_in_a_cup.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-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/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" + + + Caramel Café Latte + คาราเมลลาเต้ + - + - + + + + + + + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - + + + + + $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 + 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 + 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 + 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 + 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 + 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 + 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 + 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" + + + $Sum512101000751210200045121030004TextID + $Sum512101000751210200045121030004TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-21-01-0007.Price + Var PriceD2 = $51-21-02-0004.Price + Var PriceD3 = $51-21-03-0004.Price + Var PD_CODE1 = "51-21-01-0007" + Var PD_CODE2 = "51-21-02-0004" + Var PD_CODE3 = "51-21-03-0004" + ; begin lang + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced CARAMEL COFFEE LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-21-01-0007.Button + Var PD_STAGE_2 = $51-21-02-0004.Button + Var PD_STAGE_3 = $51-21-03-0004.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-21-02-0004" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-21-01-0007" + Else + Topping "Load" "51-21-03-0004" + 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_pro_hug_in_a_cup.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-0045 - + + Flag( 51-05-02-0045.Button,$Sum5105020045) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" + + + Sparkling Yuzu + ยูซุโซดา + - + - + + + + + + + Yuzu Syrup, Soda, Ice + น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0045.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020045TextID + $Sum5105020045TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $##-##-##-####.Price + Var PriceD2 = $51-05-02-0045.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "51-05-02-0045" + Var PD_CODE3 = "##-##-##-####" + ; begin lang + Var aliasName[0] = "Sparkling Yuzu" + Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" + Var aliasName[1] = "ยูซุโซดา" + Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" + 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] = "SPARKLING YUZU" + Var NameLang[1][1] = "ยูซุโซดา" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "SODA YUZU" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Yuzu Syrup, Soda, Ice" + Var DescLang[1][1] = "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Sirap Yuzu, Soda, Ais" + 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-0045.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-0045" + 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_pro_hug_in_a_cup.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_pro_hug_in_a_cup.skt b/inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.skt new file mode 100644 index 00000000..2096aa7e --- /dev/null +++ b/inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.skt @@ -0,0 +1,42 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_default_init.lxml" + + + Var Timeout = 0 + + + ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new_menu.lxml" + SetInstanceIgnoreTouch + + + 1000 + + + ;include="ROOT/taobin_project/inter/aus/xml/multi/ForProGroup.inc" + + + TimerReset + + +;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new.lxml" + + + + + + + + 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 940a752b..4c210d58 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -118,6 +118,7 @@ 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 EndIf ) @@ -133,6 +134,7 @@ Else If $51-01-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-01-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ 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 EndIf ) @@ -195,6 +200,7 @@ Else If $51-01-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -409,6 +415,7 @@ 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 EndIf ) @@ -424,6 +431,7 @@ Else If $51-21-01-0006.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-21-02-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ 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 EndIf ) @@ -486,6 +497,7 @@ Else If $51-21-03-0003.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ 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 EndIf ) @@ -715,6 +728,7 @@ Else If $51-01-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ 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 EndIf ) @@ -746,6 +761,7 @@ Else If $51-01-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ 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 EndIf ) @@ -777,6 +794,7 @@ Else If $51-01-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -991,6 +1009,7 @@ 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 EndIf ) @@ -1006,6 +1025,7 @@ Else If $51-21-01-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1042,7 @@ 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 EndIf ) @@ -1037,6 +1058,7 @@ Else If $51-21-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1053,6 +1075,7 @@ 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 EndIf ) @@ -1068,6 +1091,7 @@ Else If $51-21-03-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1244,9 +1268,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/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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" CARAMEL LATTE @@ -1282,6 +1306,7 @@ 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 EndIf ) @@ -1297,6 +1322,7 @@ Else If $51-01-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1313,6 +1339,7 @@ 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 EndIf ) @@ -1328,6 +1355,7 @@ Else If $51-01-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1344,6 +1372,7 @@ 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 EndIf ) @@ -1359,6 +1388,7 @@ Else If $51-01-03-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1410,7 +1440,7 @@ $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-01-01-0007.Price @@ -1535,9 +1565,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/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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" CARAMEL LATTE @@ -1573,6 +1603,7 @@ 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 EndIf ) @@ -1588,6 +1619,7 @@ Else If $51-21-01-0007.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1604,6 +1636,7 @@ 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 EndIf ) @@ -1619,6 +1652,7 @@ Else If $51-21-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1635,6 +1669,7 @@ 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 EndIf ) @@ -1650,6 +1685,7 @@ Else If $51-21-03-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1701,7 +1737,7 @@ $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-21-01-0007.Price 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 3d36d553..dba46f05 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -118,6 +118,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -133,6 +134,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-05-02-0033.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ 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 EndIf ) @@ -195,6 +200,7 @@ Else If $51-05-03-0033.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -409,6 +415,7 @@ 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 EndIf ) @@ -424,6 +431,7 @@ Else If $51-21-01-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-21-02-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ 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 EndIf ) @@ -486,6 +497,7 @@ Else If $51-21-03-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -715,6 +728,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -746,6 +761,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ 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 EndIf ) @@ -777,6 +794,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 d10c2f18..6f2df5d1 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -80,9 +80,9 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" SPARKLING YUZU @@ -118,6 +118,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -133,6 +134,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -195,6 +200,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -246,7 +252,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -409,6 +415,7 @@ 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 EndIf ) @@ -424,6 +431,7 @@ Else If $51-01-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-01-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -486,6 +497,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ 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 EndIf ) @@ -715,6 +728,7 @@ Else If $51-21-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ 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 EndIf ) @@ -746,6 +761,7 @@ Else If $51-21-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -777,6 +794,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -991,6 +1009,7 @@ 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 EndIf ) @@ -1006,6 +1025,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1042,7 @@ 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 EndIf ) @@ -1037,6 +1058,7 @@ Else If $51-02-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1053,6 +1075,7 @@ 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 EndIf ) @@ -1068,6 +1091,7 @@ Else If $51-02-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 ae71f940..ab258e02 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 @@ -72,7 +72,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -118,6 +118,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -133,6 +134,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -149,6 +151,7 @@ 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 EndIf ) @@ -164,6 +167,7 @@ Else If $51-01-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -180,6 +184,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -195,6 +200,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -409,6 +415,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -424,6 +431,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -440,6 +448,7 @@ 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 EndIf ) @@ -455,6 +464,7 @@ Else If $51-21-02-0068.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -471,6 +481,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -486,6 +497,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -700,6 +712,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -715,6 +728,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +745,7 @@ 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 EndIf ) @@ -746,6 +761,7 @@ Else If $51-03-02-0058.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +778,7 @@ 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 EndIf ) @@ -777,6 +794,7 @@ Else If $51-03-03-0058.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -991,6 +1009,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1006,6 +1025,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1022,6 +1042,7 @@ 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 EndIf ) @@ -1037,6 +1058,7 @@ Else If $51-03-02-0059.Discount = > 0 Then Var return !assigned StringFmt( $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1053,6 +1075,7 @@ 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 EndIf ) @@ -1068,6 +1091,7 @@ Else If $51-03-03-0059.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1282,6 +1306,7 @@ 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 EndIf ) @@ -1297,6 +1322,7 @@ Else If $51-02-01-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1313,6 +1339,7 @@ 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 EndIf ) @@ -1328,6 +1355,7 @@ Else If $51-02-02-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1344,6 +1372,7 @@ 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 EndIf ) @@ -1359,6 +1388,7 @@ Else If $51-02-03-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1573,6 +1603,7 @@ 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 EndIf ) @@ -1588,6 +1619,7 @@ Else If $51-02-01-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1604,6 +1636,7 @@ 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 EndIf ) @@ -1619,6 +1652,7 @@ Else If $51-02-02-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1635,6 +1669,7 @@ 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 EndIf ) @@ -1650,6 +1685,7 @@ Else If $51-02-03-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1864,6 +1900,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1879,6 +1916,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1895,6 +1933,7 @@ 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 EndIf ) @@ -1910,6 +1949,7 @@ Else If $51-02-02-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1926,6 +1966,7 @@ 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 EndIf ) @@ -1941,6 +1982,7 @@ Else If $51-02-03-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2155,6 +2197,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2170,6 +2213,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2186,6 +2230,7 @@ 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 EndIf ) @@ -2201,6 +2246,7 @@ Else If $51-02-02-0063.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2217,6 +2263,7 @@ 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 EndIf ) @@ -2232,6 +2279,7 @@ Else If $51-02-03-0063.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2446,6 +2494,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2461,6 +2510,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2477,6 +2527,7 @@ 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 EndIf ) @@ -2492,6 +2543,7 @@ Else If $51-02-02-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2508,6 +2560,7 @@ 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 EndIf ) @@ -2523,6 +2576,7 @@ Else If $51-02-03-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2737,6 +2791,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2752,6 +2807,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2768,6 +2824,7 @@ 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 EndIf ) @@ -2783,6 +2840,7 @@ Else If $51-02-02-0065.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2799,6 +2857,7 @@ 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 EndIf ) @@ -2814,6 +2873,7 @@ Else If $51-02-03-0065.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3028,6 +3088,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3043,6 +3104,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3059,6 +3121,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3074,6 +3137,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3090,6 +3154,7 @@ 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 EndIf ) @@ -3105,6 +3170,7 @@ Else If $51-05-03-0092.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3319,6 +3385,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3334,6 +3401,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3350,6 +3418,7 @@ 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 EndIf ) @@ -3365,6 +3434,7 @@ Else If $51-05-02-0090.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3381,6 +3451,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3396,6 +3467,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3481,7 +3553,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "COCONUT SODA" + Var NameLang[1][0] = "SPARKLING COCONUT" Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3610,6 +3682,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3625,6 +3698,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3641,6 +3715,7 @@ 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 EndIf ) @@ -3656,6 +3731,7 @@ Else If $51-05-02-0091.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3672,6 +3748,7 @@ 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 EndIf ) @@ -3687,6 +3764,7 @@ Else If $51-05-02-0091.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3901,6 +3979,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3916,6 +3995,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3932,6 +4012,7 @@ 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 EndIf ) @@ -3947,6 +4028,7 @@ Else If $51-05-02-0117.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3963,6 +4045,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3978,6 +4061,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4192,6 +4276,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4207,6 +4292,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4223,6 +4309,7 @@ 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 EndIf ) @@ -4238,6 +4325,7 @@ Else If $51-05-02-0093.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4254,6 +4342,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4269,6 +4358,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 9a77e632..bd08a40e 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_recommend.lxml @@ -107,52 +107,53 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners ; ==================> Len = 3 - ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 + ; 51-21-01-0060 51-21-02-0060 51-21-03-0060 - Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,Disable=Invisible,$Sum510101000451010200025101030002) - "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" + Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,Disable=Invisible,$Sum512101006051210200605121030060) + "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" - LATTE - ลาเต้ - - - - + Vanilla Café Latte + + + - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - + Coffee, Vanilla, Milk + + + - $51-01-01-0004.Button - $51-01-02-0002.Button - $51-01-03-0002.Button + $51-21-01-0060.Button + $51-21-02-0060.Button + $51-21-03-0060.Button eval( - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.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) + If $51-21-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -160,30 +161,32 @@ eval( Var return = "" - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.Price = -1 Then Var return = "" Else - If $51-01-01-0004.Discount = "" Then + If $51-21-01-0060.Discount = "" Then Var return "" Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.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) + If $51-21-02-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -191,30 +194,32 @@ eval( Var return = "" - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.Price = -1 Then Var return = "" Else - If $51-01-02-0002.Discount = "" Then + If $51-21-02-0060.Discount = "" Then Var return "" Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.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) + If $51-21-03-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -222,14 +227,15 @@ eval( Var return = "" - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.Price = -1 Then Var return = "" Else - If $51-01-03-0002.Discount = "" Then + If $51-21-03-0060.Discount = "" Then Var return "" Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -252,97 +258,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510101000451010200025101030002TextID - $Sum510101000451010200025101030002TextValue + $Sum512101006051210200605121030060TextID + $Sum512101006051210200605121030060TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.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-01-01-0004.Price - Var PriceD2 = $51-01-02-0002.Price - Var PriceD3 = $51-01-03-0002.Price - Var PD_CODE1 = "51-01-01-0004" - Var PD_CODE2 = "51-01-02-0002" - Var PD_CODE3 = "51-01-03-0002" + Var PriceD1 = $51-21-01-0060.Price + Var PriceD2 = $51-21-02-0060.Price + Var PriceD3 = $51-21-03-0060.Price + Var PD_CODE1 = "51-21-01-0060" + Var PD_CODE2 = "51-21-02-0060" + Var PD_CODE3 = "51-21-03-0060" ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed milk" - Var aliasName[1] = "ลาเต้" - Var aliasDesc[1] = "กาแฟ นม และ ฟองนม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Vanilla Café Latte" + Var aliasDesc[0] = "Coffee, Vanilla, 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" + Var NameLang[0][0] = "Hot VANILLA latte" + Var NameLang[0][1] = "กาแฟลาเต้วานิลาร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" + Var NameLang[0][4] = "" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" + Var DescLang[0][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup" + Var DescLang[0][1] = "กาแฟ นม และน้ำเชื่อมวานิลา" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" + Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" + Var NameLang[1][0] = "Iced VANILLA latte" + Var NameLang[1][1] = "กาแฟลาเต้วานิลาเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[1][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[1][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" + Var NameLang[2][0] = "VANILLA latte frappe" + Var NameLang[2][1] = "กาแฟลาเต้วานิลาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[2][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[2][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-01-01-0004.Button - Var PD_STAGE_2 = $51-01-02-0002.Button - Var PD_STAGE_3 = $51-01-03-0002.Button + Var PD_STAGE_1 = $51-21-01-0060.Button + Var PD_STAGE_2 = $51-21-02-0060.Button + Var PD_STAGE_3 = $51-21-03-0060.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -358,303 +364,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-01-02-0002" + Topping "Load" "51-21-02-0060" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-01-01-0004" + Topping "Load" "51-21-01-0060" Else - Topping "Load" "51-01-03-0002" - 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_recommend.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-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/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 - ลาเต้ - - - - - - - - - - - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - - - - - - $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 - 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 - 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" - - - $Sum512101000451210200025121030002TextID - $Sum512101000451210200025121030002TextValue - - - 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 - Var PriceD2 = $51-21-02-0002.Price - Var PriceD3 = $51-21-03-0002.Price - Var PD_CODE1 = "51-21-01-0004" - Var PD_CODE2 = "51-21-02-0002" - Var PD_CODE3 = "51-21-03-0002" - ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" - Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" - Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" - Var NameLang[2][2] = "" - Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" - Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[2][2] = "" - Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[2][5] = "" - ; end lang - Var PD_STAGE_1 = $51-21-01-0004.Button - Var PD_STAGE_2 = $51-21-02-0002.Button - Var PD_STAGE_3 = $51-21-03-0002.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-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-21-01-0004" - Else - Topping "Load" "51-21-03-0002" + Topping "Load" "51-21-03-0060" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -735,6 +450,7 @@ 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 EndIf ) @@ -750,6 +466,7 @@ Else If $51-21-01-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -766,6 +483,7 @@ 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 EndIf ) @@ -781,6 +499,7 @@ Else If $51-21-02-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -797,6 +516,7 @@ 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 EndIf ) @@ -812,6 +532,7 @@ Else If $51-21-03-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -985,47 +706,48 @@ ; ==================> Len = 3 - ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 + ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 - Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,Disable=Invisible,$Sum510201007151020200715102030071) - "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" + Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,Disable=Invisible,$Sum510101000751010200045101030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Strawberry\nMatcha Latte - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Matcha, Milk, Strawberry Syrup - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - $51-02-01-0071.Button - $51-02-02-0071.Button - $51-02-03-0071.Button + $51-01-01-0007.Button + $51-01-02-0004.Button + $51-01-03-0004.Button eval( - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.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) + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1033,30 +755,32 @@ eval( Var return = "" - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.Price = -1 Then Var return = "" Else - If $51-02-01-0071.Discount = "" Then + If $51-01-01-0007.Discount = "" Then Var return "" Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.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) + If $51-01-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1064,30 +788,32 @@ eval( Var return = "" - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.Price = -1 Then Var return = "" Else - If $51-02-02-0071.Discount = "" Then + If $51-01-02-0004.Discount = "" Then Var return "" Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.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) + If $51-01-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1095,14 +821,15 @@ eval( Var return = "" - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.Price = -1 Then Var return = "" Else - If $51-02-03-0071.Discount = "" Then + If $51-01-03-0004.Discount = "" Then Var return "" Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1125,97 +852,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510201007151020200715102030071TextID - $Sum510201007151020200715102030071TextValue + $Sum510101000751010200045101030004TextID + $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $51-02-01-0071.Price - Var PriceD2 = $51-02-02-0071.Price - Var PriceD3 = $51-02-03-0071.Price - Var PD_CODE1 = "51-02-01-0071" - Var PD_CODE2 = "51-02-02-0071" - Var PD_CODE3 = "51-02-03-0071" + Var PriceD1 = $51-01-01-0007.Price + Var PriceD2 = $51-01-02-0004.Price + Var PriceD3 = $51-01-03-0004.Price + Var PD_CODE1 = "51-01-01-0007" + Var PD_CODE2 = "51-01-02-0004" + Var PD_CODE3 = "51-01-03-0004" ; begin lang - Var aliasName[0] = "Strawberry\nMatcha Latte" - Var aliasDesc[0] = "Matcha, Milk, Strawberry Syrup" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "HOT STRAWBERRY MATCHA LATTE" - Var NameLang[0][1] = "" + Var NameLang[0][0] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Strawberry, Matcha, Milk" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced STRAWBERRY MATCHA LATTE" - Var NameLang[1][1] = "-" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "Iced CARAMELCAFÉ LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Matcha, Milk, Strawberry Syrup" - Var DescLang[1][1] = "-" - Var DescLang[1][2] = "-" - Var DescLang[1][3] = "-" - Var DescLang[1][4] = "-" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "FRAPPE STRAWBERRY MATCHA LATTE" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Strawberry, Matcha, Milk" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-02-01-0071.Button - Var PD_STAGE_2 = $51-02-02-0071.Button - Var PD_STAGE_3 = $51-02-03-0071.Button + Var PD_STAGE_1 = $51-01-01-0007.Button + Var PD_STAGE_2 = $51-01-02-0004.Button + Var PD_STAGE_3 = $51-01-03-0004.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -1231,12 +958,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-02-02-0071" + Topping "Load" "51-01-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-02-01-0071" + Topping "Load" "51-01-01-0007" Else - Topping "Load" "51-02-03-0071" + Topping "Load" "51-01-03-0004" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -1276,47 +1003,48 @@ ; ==================> Len = 3 - ; - 51-05-02-0068 - + ; 51-21-01-0007 51-21-02-0004 51-21-03-0004 - Flag( 51-05-02-0068.Button,Disable=Invisible,$Sum5105020068) - "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" + Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,Disable=Invisible,$Sum512101000751210200045121030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Pepsi Mint - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Pepsi, Mint Syrup& Ice - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - "Disable2" - $51-05-02-0068.Button - "Disable2" + $51-21-01-0007.Button + $51-21-02-0004.Button + $51-21-03-0004.Button eval( - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1324,30 +1052,32 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-01-0007.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.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) + If $51-21-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + 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-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1355,30 +1085,32 @@ eval( Var return = "" - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.Price = -1 Then Var return = "" Else - If $51-05-02-0068.Discount = "" Then + If $51-21-02-0004.Discount = "" Then Var return "" Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1386,14 +1118,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-03-0004.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1416,53 +1149,350 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020068TextID - $Sum5105020068TextValue + $Sum512101000751210200045121030004TextID + $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-21-01-0007.Price + Var PriceD2 = $51-21-02-0004.Price + Var PriceD3 = $51-21-03-0004.Price + Var PD_CODE1 = "51-21-01-0007" + Var PD_CODE2 = "51-21-02-0004" + Var PD_CODE3 = "51-21-03-0004" + ; begin lang + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced CARAMEL COFFEE LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-21-01-0007.Button + Var PD_STAGE_2 = $51-21-02-0004.Button + Var PD_STAGE_3 = $51-21-03-0004.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-21-02-0004" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-21-01-0007" + Else + Topping "Load" "51-21-03-0004" + 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_recommend.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-0117 - + + Flag( 51-05-02-0117.Button,Disable=Invisible,$Sum5105020117) + "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 + เมล่อนโซดา + - + - + + + + + + + Coconut Syrup, Pepsi max and Soda + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0117.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020117TextID + $Sum5105020117TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0068.Price + Var PriceD2 = $51-05-02-0117.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0068" + Var PD_CODE2 = "51-05-02-0117" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Pepsi Mint" - Var aliasDesc[0] = "Pepsi, Mint Syrup& Ice" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Coconut Pepsi\nMax" + Var aliasDesc[0] = "Coconut Syrup, Pepsi max and Soda" + Var aliasName[1] = "เมล่อนโซดา" + Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" Var aliasName[5] = "" @@ -1479,14 +1509,14 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "PEPSI MINT" - Var NameLang[1][1] = "เป๊ปซี่มินต์" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "ICED COCONUT PEPSI MAX" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Pepsi max, Mint Syrup& Ice" - Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมมิ้นท์ และโซดา" + Var DescLang[1][0] = "Coconut Syrup, Pepsi max and Soda" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -1505,7 +1535,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0068.Button + Var PD_STAGE_2 = $51-05-02-0117.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -1522,7 +1552,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0068" + Topping "Load" "51-05-02-0117" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1570,12 +1600,12 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,Disable=Invisible,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" - Yummy Yuzu\nSparkling + Sparkling Yuzu ยูซุโซดา - - @@ -1608,6 +1638,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1623,6 +1654,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1639,6 +1671,7 @@ 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 EndIf ) @@ -1654,6 +1687,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1670,6 +1704,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1685,6 +1720,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1736,7 +1772,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1746,7 +1782,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Yummy Yuzu\nSparkling" + Var aliasName[0] = "Sparkling Yuzu" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -1899,6 +1935,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1914,6 +1951,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1930,6 +1968,7 @@ 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 EndIf ) @@ -1945,6 +1984,7 @@ Else If $51-05-02-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1961,6 +2001,7 @@ 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 EndIf ) @@ -1976,6 +2017,7 @@ Else If $51-05-03-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2190,6 +2232,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2205,6 +2248,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2221,6 +2265,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2236,6 +2281,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2252,6 +2298,7 @@ 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 EndIf ) @@ -2267,6 +2314,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2440,15 +2488,15 @@ ; ==================> Len = 3 - ; - 51-05-02-0041 - + ; - 51-05-02-0041 51-05-03-0041 - Flag( 51-05-02-0041.Button,Disable=Invisible,$Sum5105020041) + Flag( 51-05-02-0041.Button,51-05-03-0041.Button,Disable=Invisible,$Sum51050200415105030041) "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 + Sparkling\nStrawberry สตอเบอร์รี่โซดา - - @@ -2468,7 +2516,7 @@ "Disable2" $51-05-02-0041.Button - "Disable2" + $51-05-03-0041.Button eval( If $##-##-##-####.Price = -1 Then @@ -2481,6 +2529,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2496,6 +2545,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2512,6 +2562,7 @@ 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 EndIf ) @@ -2527,22 +2578,24 @@ Else If $51-05-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2550,14 +2603,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-05-03-0041.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2580,33 +2634,33 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020041TextID - $Sum5105020041TextValue + $Sum51050200415105030041TextID + $Sum51050200415105030041TextValue Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" @@ -2614,12 +2668,12 @@ Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price Var PriceD2 = $51-05-02-0041.Price - Var PriceD3 = $##-##-##-####.Price + Var PriceD3 = $51-05-03-0041.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "51-05-02-0041" - Var PD_CODE3 = "##-##-##-####" + Var PD_CODE3 = "51-05-03-0041" ; begin lang - Var aliasName[0] = "Straw-Breeze\nSparkling" + Var aliasName[0] = "Sparkling\nStrawberry" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -2655,22 +2709,22 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "SPARKLING STRAWBERRY SMOOTHIE" + Var NameLang[2][1] = "สตอเบอร์รี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE SODA STRAWBERI" Var NameLang[2][5] = "" - Var DescLang[2][0] = "" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Strawberry Syrup, Soda, Ice" + Var DescLang[2][1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = $51-05-02-0041.Button - Var PD_STAGE_3 = "Disable2" + Var PD_STAGE_3 = $51-05-03-0041.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2691,7 +2745,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "51-05-03-0041" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -2731,36 +2785,102 @@ ; ==================> Len = 3 - ; - 51-05-02-0010 51-05-03-0010 + ; 51-02-01-0046 51-02-02-0046 - - Flag( 51-05-02-0010.Button,51-05-03-0010.Button,Disable=Invisible,$Sum51050200105105030010) - "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" + Flag( 51-02-01-0046.Button,51-02-02-0046.Button,Disable=Invisible,$Sum51020100465102020046) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" - Refreshing\nLimenade - น้ำมะนาวโซดา + Jasmine Milk Tea + ชามะลิลาเต้ - - - + - - Limenade, Sugar, Soda & Ice - มะนาว โซดา + Jasmine & Milk + ชามะลิ และนม - - - + - - "Disable2" - $51-05-02-0010.Button - $51-05-03-0010.Button + $51-02-01-0046.Button + $51-02-02-0046.Button + "Disable2" + 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 + 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 + 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 + 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 + EndIf + ) + + eval( If $##-##-##-####.Price = -1 Then Var return = "Free" @@ -2772,11 +2892,12 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) - - + + eval( Var return = "" If $##-##-##-####.Price = -1 Then @@ -2787,68 +2908,7 @@ 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 EndIf ) @@ -2871,97 +2931,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum51050200105105030010TextID - $Sum51050200105105030010TextValue + $Sum51020100465102020046TextID + $Sum51020100465102020046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0010.Price - Var PriceD3 = $51-05-03-0010.Price - Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0010" - Var PD_CODE3 = "51-05-03-0010" + Var PriceD1 = $51-02-01-0046.Price + Var PriceD2 = $51-02-02-0046.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "51-02-01-0046" + Var PD_CODE2 = "51-02-02-0046" + Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Refreshing\nLimenade" - Var aliasDesc[0] = "Limenade, Sugar, Soda & Ice" - Var aliasName[1] = "น้ำมะนาวโซดา" - Var aliasDesc[1] = "มะนาว โซดา" + Var aliasName[0] = "Jasmine Milk Tea" + Var aliasDesc[0] = "Jasmine & 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] = "" - Var NameLang[0][1] = "" + Var aliasName[5] = "-" + Var aliasDesc[5] = "-" + Var NameLang[0][0] = "Hot JASMINE MILK TEA" + Var NameLang[0][1] = "ชามะลิลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "TEH SUSU JASMIN PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Jasmine & Milk" + Var DescLang[0][1] = "ชามะลิ และนม" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Teh Jasmin, Susu" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced SPARKLING LIMENADE" - Var NameLang[1][1] = "น้ำมะนาวโซดา" + Var NameLang[1][0] = "Iced JASMINE MILK TEA" + Var NameLang[1][1] = "ชามะลิลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SODA LIMAU AIS" + Var NameLang[1][4] = "TEH SUSU JASMIN AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[1][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Jasmine, Milk, Iced" + Var DescLang[1][1] = "ชามะลิ นม และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Limau, Gula, Soda, Ais" + Var DescLang[1][4] = "Teh Jasmin, Susu, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "SPARKLING LIMENADE SMOOTHIE" - Var NameLang[2][1] = "น้ำมะนาวโซดาปั่น" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE SODA LIMAU" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[2][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Limau, Gula, Soda, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0010.Button - Var PD_STAGE_3 = $51-05-03-0010.Button + Var PD_STAGE_1 = $51-02-01-0046.Button + Var PD_STAGE_2 = $51-02-02-0046.Button + Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2977,12 +3037,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0010" + Topping "Load" "51-02-02-0046" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "51-02-01-0046" Else - Topping "Load" "51-05-03-0010" + Topping "Load" "-" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -3030,7 +3090,7 @@ "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" - Exceptional Thai\nMilk Tea + Thai Milk Tea ชานมไทย - - @@ -3063,6 +3123,7 @@ 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 EndIf ) @@ -3078,6 +3139,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3094,6 +3156,7 @@ 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 EndIf ) @@ -3109,6 +3172,7 @@ Else If $51-02-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3125,6 +3189,7 @@ 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 EndIf ) @@ -3140,6 +3205,7 @@ Else If $51-02-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3201,7 +3267,7 @@ Var PD_CODE2 = "51-02-02-0039" Var PD_CODE3 = "51-02-03-0039" ; begin lang - Var aliasName[0] = "Exceptional Thai\nMilk Tea" + Var aliasName[0] = "Thai Milk Tea" Var aliasDesc[0] = "Thai tea, Sugar, milk" Var aliasName[1] = "ชานมไทย" Var aliasDesc[1] = "ชาไทย และ นม" @@ -3354,6 +3420,7 @@ 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 EndIf ) @@ -3369,6 +3436,7 @@ Else If $51-02-01-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3385,6 +3453,7 @@ 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 EndIf ) @@ -3400,6 +3469,7 @@ Else If $51-02-02-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3416,6 +3486,7 @@ 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 EndIf ) @@ -3431,6 +3502,7 @@ Else If $51-02-03-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3604,34 +3676,34 @@ ; ==================> Len = 3 - ; - 51-04-02-0016 - + ; - 51-04-02-0062 - - Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) - "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" + Flag( 51-04-02-0062.Button,Disable=Invisible,$Sum5104020062) + "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" - Matcha Protein\nShake - มัทฉะโปรตีน - - - - + Mocha Shake + + + - Whey protein,\nMatcha, & Milk - เวย์โปรตีน ชาเชียว นม - - - - + Whey protein, Espresso\n& Milk, Chocolate + + + "Disable2" - $51-04-02-0016.Button + $51-04-02-0062.Button "Disable2" eval( @@ -3645,6 +3717,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3660,22 +3733,24 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.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) + If $51-04-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + 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-0016.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3683,14 +3758,15 @@ eval( Var return = "" - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.Price = -1 Then Var return = "" Else - If $51-04-02-0016.Discount = "" Then + If $51-04-02-0062.Discount = "" Then Var return "" Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + If $51-04-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3707,6 +3783,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3722,6 +3799,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3744,53 +3822,53 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5104020016TextID - $Sum5104020016TextValue + $Sum5104020062TextID + $Sum5104020062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.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 - Var PriceD2 = $51-04-02-0016.Price + Var PriceD2 = $51-04-02-0062.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-04-02-0016" + Var PD_CODE2 = "51-04-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Matcha Protein\nShake" - Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk" - Var aliasName[1] = "มัทฉะโปรตีน" - Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Mocha Shake" + Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate" + 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] = "" @@ -3807,17 +3885,17 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "MATCHA SHAKE" - Var NameLang[1][1] = "มัทฉะโปรตีน" + Var NameLang[1][0] = "CAFE MOCHA PROTEIN" + Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SHAKE MATCHA" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Whey protein,Matcha, and Milk" - Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม" + Var DescLang[1][0] = "Coffee, Chocolate, Whey" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Protein Whey, Matcha, Susu" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "" Var NameLang[2][1] = "" @@ -3833,7 +3911,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-04-02-0016.Button + Var PD_STAGE_2 = $51-04-02-0062.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -3850,7 +3928,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-04-02-0016" + Topping "Load" "51-04-02-0062" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" 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 9b97bce6..f696b927 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 @@ -72,52 +72,53 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners ; ==================> Len = 3 - ; 51-01-01-0004 51-01-02-0002 51-01-03-0002 + ; 51-21-01-0060 51-21-02-0060 51-21-03-0060 - Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) - "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" + Flag( 51-21-01-0060.Button,51-21-02-0060.Button,51-21-03-0060.Button,$Sum512101006051210200605121030060) + "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" - LATTE - ลาเต้ - - - - + Vanilla Café Latte + + + - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - + Coffee, Vanilla, Milk + + + - $51-01-01-0004.Button - $51-01-02-0002.Button - $51-01-03-0002.Button + $51-21-01-0060.Button + $51-21-02-0060.Button + $51-21-03-0060.Button eval( - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.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) + If $51-21-01-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -125,30 +126,32 @@ eval( Var return = "" - If $51-01-01-0004.Price = -1 Then + If $51-21-01-0060.Price = -1 Then Var return = "" Else - If $51-01-01-0004.Discount = "" Then + If $51-21-01-0060.Discount = "" Then Var return "" Else - If $51-01-01-0004.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.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) + If $51-21-02-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -156,30 +159,32 @@ eval( Var return = "" - If $51-01-02-0002.Price = -1 Then + If $51-21-02-0060.Price = -1 Then Var return = "" Else - If $51-01-02-0002.Discount = "" Then + If $51-21-02-0060.Discount = "" Then Var return "" Else - If $51-01-02-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.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) + If $51-21-03-0060.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow) + 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-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -187,14 +192,15 @@ eval( Var return = "" - If $51-01-03-0002.Price = -1 Then + If $51-21-03-0060.Price = -1 Then Var return = "" Else - If $51-01-03-0002.Discount = "" Then + If $51-21-03-0060.Discount = "" Then Var return "" Else - If $51-01-03-0002.Discount = > 0 Then - Var return !assigned StringFmt( $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0060.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -217,97 +223,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510101000451010200025101030002TextID - $Sum510101000451010200025101030002TextValue + $Sum512101006051210200605121030060TextID + $Sum512101006051210200605121030060TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.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-01-01-0004.Price - Var PriceD2 = $51-01-02-0002.Price - Var PriceD3 = $51-01-03-0002.Price - Var PD_CODE1 = "51-01-01-0004" - Var PD_CODE2 = "51-01-02-0002" - Var PD_CODE3 = "51-01-03-0002" + Var PriceD1 = $51-21-01-0060.Price + Var PriceD2 = $51-21-02-0060.Price + Var PriceD3 = $51-21-03-0060.Price + Var PD_CODE1 = "51-21-01-0060" + Var PD_CODE2 = "51-21-02-0060" + Var PD_CODE3 = "51-21-03-0060" ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed milk" - Var aliasName[1] = "ลาเต้" - Var aliasDesc[1] = "กาแฟ นม และ ฟองนม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Vanilla Café Latte" + Var aliasDesc[0] = "Coffee, Vanilla, 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" + Var NameLang[0][0] = "Hot VANILLA latte" + Var NameLang[0][1] = "กาแฟลาเต้วานิลาร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" + Var NameLang[0][4] = "" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" + Var DescLang[0][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup" + Var DescLang[0][1] = "กาแฟ นม และน้ำเชื่อมวานิลา" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" + Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" + Var NameLang[1][0] = "Iced VANILLA latte" + Var NameLang[1][1] = "กาแฟลาเต้วานิลาเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[1][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[1][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" + Var NameLang[2][0] = "VANILLA latte frappe" + Var NameLang[2][1] = "กาแฟลาเต้วานิลาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" + Var DescLang[2][0] = "Espresso, Milk,Foamed milk ,Vanilla Syrup, Iced" + Var DescLang[2][1] = "กาแฟ นม และน้ำเชื่อมวานิลา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-01-01-0004.Button - Var PD_STAGE_2 = $51-01-02-0002.Button - Var PD_STAGE_3 = $51-01-03-0002.Button + Var PD_STAGE_1 = $51-21-01-0060.Button + Var PD_STAGE_2 = $51-21-02-0060.Button + Var PD_STAGE_3 = $51-21-03-0060.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -323,303 +329,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-01-02-0002" + Topping "Load" "51-21-02-0060" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-01-01-0004" + Topping "Load" "51-21-01-0060" Else - Topping "Load" "51-01-03-0002" - 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_recommend_multi_pro.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-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/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 - ลาเต้ - - - - - - - - - - - Espresso, Milk, Foamed milk - กาแฟ นม และ ฟองนม - - - - - - - - - $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 - 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 - 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" - - - $Sum512101000451210200025121030002TextID - $Sum512101000451210200025121030002TextValue - - - 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 - Var PriceD2 = $51-21-02-0002.Price - Var PriceD3 = $51-21-03-0002.Price - Var PD_CODE1 = "51-21-01-0004" - Var PD_CODE2 = "51-21-02-0002" - Var PD_CODE3 = "51-21-03-0002" - ; begin lang - Var aliasName[0] = "LATTE" - Var aliasDesc[0] = "Espresso, Milk, Foamed 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] = "Hot LATTE" - Var NameLang[0][1] = "ลาเต้ร้อน" - Var NameLang[0][2] = "" - Var NameLang[0][3] = "" - Var NameLang[0][4] = "KAFÉ LATTE PANAS" - Var NameLang[0][5] = "" - Var DescLang[0][0] = "Espresso, Milk,Foamed milk" - Var DescLang[0][1] = "กาแฟ นม และ นม" - Var DescLang[0][2] = "" - Var DescLang[0][3] = "" - Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced LATTE" - Var NameLang[1][1] = "ลาเต้เย็น" - Var NameLang[1][2] = "" - Var NameLang[1][3] = "" - Var NameLang[1][4] = "KAFÉ LATTE AIS" - Var NameLang[1][5] = "" - Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[1][2] = "" - Var DescLang[1][3] = "" - Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[1][5] = "" - Var NameLang[2][0] = "LATTE SMOOTHIE" - Var NameLang[2][1] = "ลาเต้ปั่น" - Var NameLang[2][2] = "" - Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE KAFÉ LATTE" - Var NameLang[2][5] = "" - Var DescLang[2][0] = "Espresso,Milk, Sugar, Ice" - Var DescLang[2][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง" - Var DescLang[2][2] = "" - Var DescLang[2][3] = "" - Var DescLang[2][4] = "Espresso, Susu, Gula, Ais" - Var DescLang[2][5] = "" - ; end lang - Var PD_STAGE_1 = $51-21-01-0004.Button - Var PD_STAGE_2 = $51-21-02-0002.Button - Var PD_STAGE_3 = $51-21-03-0002.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-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-21-01-0004" - Else - Topping "Load" "51-21-03-0002" + Topping "Load" "51-21-03-0060" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -700,6 +415,7 @@ 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 EndIf ) @@ -715,6 +431,7 @@ Else If $51-21-01-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -731,6 +448,7 @@ 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 EndIf ) @@ -746,6 +464,7 @@ Else If $51-21-02-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -762,6 +481,7 @@ 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 EndIf ) @@ -777,6 +497,7 @@ Else If $51-21-03-0081.Discount = > 0 Then Var return !assigned StringFmt( $51-21-03-0081.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -950,47 +671,48 @@ ; ==================> Len = 3 - ; 51-02-01-0071 51-02-02-0071 51-02-03-0071 + ; 51-01-01-0007 51-01-02-0004 51-01-03-0004 - Flag( 51-02-01-0071.Button,51-02-02-0071.Button,51-02-03-0071.Button,$Sum510201007151020200715102030071) - "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" + Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Strawberry\nMatcha Latte - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Matcha, Milk, Strawberry Syrup - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - $51-02-01-0071.Button - $51-02-02-0071.Button - $51-02-03-0071.Button + $51-01-01-0007.Button + $51-01-02-0004.Button + $51-01-03-0004.Button eval( - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.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) + If $51-01-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -998,30 +720,32 @@ eval( Var return = "" - If $51-02-01-0071.Price = -1 Then + If $51-01-01-0007.Price = -1 Then Var return = "" Else - If $51-02-01-0071.Discount = "" Then + If $51-01-01-0007.Discount = "" Then Var return "" Else - If $51-02-01-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.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) + If $51-01-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1029,30 +753,32 @@ eval( Var return = "" - If $51-02-02-0071.Price = -1 Then + If $51-01-02-0004.Price = -1 Then Var return = "" Else - If $51-02-02-0071.Discount = "" Then + If $51-01-02-0004.Discount = "" Then Var return "" Else - If $51-02-02-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.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) + If $51-01-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow) + 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-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1060,14 +786,15 @@ eval( Var return = "" - If $51-02-03-0071.Price = -1 Then + If $51-01-03-0004.Price = -1 Then Var return = "" Else - If $51-02-03-0071.Discount = "" Then + If $51-01-03-0004.Discount = "" Then Var return "" Else - If $51-02-03-0071.Discount = > 0 Then - Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + If $51-01-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1090,97 +817,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum510201007151020200715102030071TextID - $Sum510201007151020200715102030071TextValue + $Sum510101000751010200045101030004TextID + $Sum510101000751010200045101030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Strawberry_Matcha_Latte.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $51-02-01-0071.Price - Var PriceD2 = $51-02-02-0071.Price - Var PriceD3 = $51-02-03-0071.Price - Var PD_CODE1 = "51-02-01-0071" - Var PD_CODE2 = "51-02-02-0071" - Var PD_CODE3 = "51-02-03-0071" + Var PriceD1 = $51-01-01-0007.Price + Var PriceD2 = $51-01-02-0004.Price + Var PriceD3 = $51-01-03-0004.Price + Var PD_CODE1 = "51-01-01-0007" + Var PD_CODE2 = "51-01-02-0004" + Var PD_CODE3 = "51-01-03-0004" ; begin lang - Var aliasName[0] = "Strawberry\nMatcha Latte" - Var aliasDesc[0] = "Matcha, Milk, Strawberry Syrup" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "HOT STRAWBERRY MATCHA LATTE" - Var NameLang[0][1] = "" + Var NameLang[0][0] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "Strawberry, Matcha, Milk" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced STRAWBERRY MATCHA LATTE" - Var NameLang[1][1] = "-" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "Iced CARAMELCAFÉ LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Matcha, Milk, Strawberry Syrup" - Var DescLang[1][1] = "-" - Var DescLang[1][2] = "-" - Var DescLang[1][3] = "-" - Var DescLang[1][4] = "-" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "FRAPPE STRAWBERRY MATCHA LATTE" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Strawberry, Matcha, Milk" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = $51-02-01-0071.Button - Var PD_STAGE_2 = $51-02-02-0071.Button - Var PD_STAGE_3 = $51-02-03-0071.Button + Var PD_STAGE_1 = $51-01-01-0007.Button + Var PD_STAGE_2 = $51-01-02-0004.Button + Var PD_STAGE_3 = $51-01-03-0004.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -1196,12 +923,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-02-02-0071" + Topping "Load" "51-01-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "51-02-01-0071" + Topping "Load" "51-01-01-0007" Else - Topping "Load" "51-02-03-0071" + Topping "Load" "51-01-03-0004" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -1241,47 +968,48 @@ ; ==================> Len = 3 - ; - 51-05-02-0068 - + ; 51-21-01-0007 51-21-02-0004 51-21-03-0004 - Flag( 51-05-02-0068.Button,$Sum5105020068) - "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" + Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" - Pepsi Mint - - - + Caramel Café Latte + คาราเมลลาเต้ + - + - - Pepsi, Mint Syrup& Ice - - - + Espresso, Milk,\nCaramel Syrup + กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล + - + - - "Disable2" - $51-05-02-0068.Button - "Disable2" + $51-21-01-0007.Button + $51-21-02-0004.Button + $51-21-03-0004.Button eval( - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = "" Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1289,30 +1017,32 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-01-0007.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-01-0007.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-01-0007.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.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) + If $51-21-02-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Discount , DisplayFormat, PreScaleConvertShow) + 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-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1320,30 +1050,32 @@ eval( Var return = "" - If $51-05-02-0068.Price = -1 Then + If $51-21-02-0004.Price = -1 Then Var return = "" Else - If $51-05-02-0068.Discount = "" Then + If $51-21-02-0004.Discount = "" Then Var return "" Else - If $51-05-02-0068.Discount = > 0 Then - Var return !assigned StringFmt( $51-05-02-0068.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-02-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = "" Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1351,14 +1083,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-21-03-0004.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-21-03-0004.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-21-03-0004.Discount = > 0 Then + Var return !assigned StringFmt( $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1381,53 +1114,350 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020068TextID - $Sum5105020068TextValue + $Sum512101000751210200045121030004TextID + $Sum512101000751210200045121030004TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $51-21-01-0007.Price + Var PriceD2 = $51-21-02-0004.Price + Var PriceD3 = $51-21-03-0004.Price + Var PD_CODE1 = "51-21-01-0007" + Var PD_CODE2 = "51-21-02-0004" + Var PD_CODE3 = "51-21-03-0004" + ; begin lang + Var aliasName[0] = "Caramel Café Latte" + Var aliasDesc[0] = "Espresso, Milk,\nCaramel Syrup" + Var aliasName[1] = "คาราเมลลาเต้" + Var aliasDesc[1] = "กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล" + 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] = "Hot CARAMEL LATTE" + Var NameLang[0][1] = "คาราเมลลาเต้ร้อน" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "LATTE KARAMEL PANAS" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "Espresso, Milk,Caramel Syrup" + Var DescLang[0][1] = "กาแฟ นม และ นมน้ำเชื่อมคาราเมล" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "Iced CARAMEL COFFEE LATTE" + Var NameLang[1][1] = "คาราเมลลาเต้เย็น" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "KAFÉ LATTE KARAMEL AIS" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[1][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "CARAMEL LATTE SMOOTHIE" + Var NameLang[2][1] = "คาราเมลลาเต้ปั่น" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "SMOOTHIE LATTE KARAMEL" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "Espresso, Milk,Caramel Syrup, Ice" + Var DescLang[2][1] = "กาแฟ นม น้ำเชื่อมคาราเมล นม และ น้ำแข็ง" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "Espresso, Susu, Sirap Karamel, Ais" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $51-21-01-0007.Button + Var PD_STAGE_2 = $51-21-02-0004.Button + Var PD_STAGE_3 = $51-21-03-0004.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-21-02-0004" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "51-21-01-0007" + Else + Topping "Load" "51-21-03-0004" + 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_recommend_multi_pro.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-0117 - + + Flag( 51-05-02-0117.Button,$Sum5105020117) + "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 + เมล่อนโซดา + - + - + + + + + + + Coconut Syrup, Pepsi max and Soda + น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง + - + - + + + + + "Disable2" + $51-05-02-0117.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 + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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 + 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 + EndIf + ) + + + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + If $##-##-##-####.Discount = "" Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + EndIf + EndIf + ) + + + eval( + Var return = "" + If $##-##-##-####.Price = -1 Then + Var return = "" + Else + If $##-##-##-####.Discount = "" Then + Var return "" + Else + If $##-##-##-####.Discount = > 0 Then + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + 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" + + + $Sum5105020117TextID + $Sum5105020117TextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0068.Price + Var PriceD2 = $51-05-02-0117.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0068" + Var PD_CODE2 = "51-05-02-0117" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Pepsi Mint" - Var aliasDesc[0] = "Pepsi, Mint Syrup& Ice" - Var aliasName[1] = "" - Var aliasDesc[1] = "" - Var aliasName[2] = "" - Var aliasDesc[2] = "" - Var aliasName[3] = "" - Var aliasDesc[3] = "" + Var aliasName[0] = "Coconut Pepsi\nMax" + Var aliasDesc[0] = "Coconut Syrup, Pepsi max and Soda" + Var aliasName[1] = "เมล่อนโซดา" + Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" Var aliasName[5] = "" @@ -1444,14 +1474,14 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "PEPSI MINT" - Var NameLang[1][1] = "เป๊ปซี่มินต์" - Var NameLang[1][2] = "-" - Var NameLang[1][3] = "-" - Var NameLang[1][4] = "-" + Var NameLang[1][0] = "ICED COCONUT PEPSI MAX" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Pepsi max, Mint Syrup& Ice" - Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมมิ้นท์ และโซดา" + Var DescLang[1][0] = "Coconut Syrup, Pepsi max and Soda" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" @@ -1470,7 +1500,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0068.Button + Var PD_STAGE_2 = $51-05-02-0117.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -1487,7 +1517,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0068" + Topping "Load" "51-05-02-0117" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1535,12 +1565,12 @@ ; - 51-05-02-0045 - Flag( 51-05-02-0045.Button,$Sum5105020045) - "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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" - Yummy Yuzu\nSparkling + Sparkling Yuzu ยูซุโซดา - - @@ -1573,6 +1603,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1588,6 +1619,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1604,6 +1636,7 @@ 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 EndIf ) @@ -1619,6 +1652,7 @@ Else If $51-05-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1635,6 +1669,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1650,6 +1685,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1701,7 +1737,7 @@ $Sum5105020045TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price @@ -1711,7 +1747,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Yummy Yuzu\nSparkling" + Var aliasName[0] = "Sparkling Yuzu" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -1864,6 +1900,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1879,6 +1916,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1895,6 +1933,7 @@ 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 EndIf ) @@ -1910,6 +1949,7 @@ Else If $51-05-02-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1926,6 +1966,7 @@ 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 EndIf ) @@ -1941,6 +1982,7 @@ Else If $51-05-03-0035.Discount = > 0 Then Var return !assigned StringFmt( $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2155,6 +2197,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2170,6 +2213,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2186,6 +2230,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2201,6 +2246,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2217,6 +2263,7 @@ 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 EndIf ) @@ -2232,6 +2279,7 @@ Else If $51-03-03-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2405,15 +2453,15 @@ ; ==================> Len = 3 - ; - 51-05-02-0041 - + ; - 51-05-02-0041 51-05-03-0041 - Flag( 51-05-02-0041.Button,$Sum5105020041) + Flag( 51-05-02-0041.Button,51-05-03-0041.Button,$Sum51050200415105030041) "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 + Sparkling\nStrawberry สตอเบอร์รี่โซดา - - @@ -2433,7 +2481,7 @@ "Disable2" $51-05-02-0041.Button - "Disable2" + $51-05-03-0041.Button eval( If $##-##-##-####.Price = -1 Then @@ -2446,6 +2494,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2461,6 +2510,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2477,6 +2527,7 @@ 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 EndIf ) @@ -2492,22 +2543,24 @@ Else If $51-05-02-0041.Discount = > 0 Then Var return !assigned StringFmt( $51-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "Free" Else - If $##-##-##-####.Discount = "" Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = "" Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Discount , DisplayFormat, PreScaleConvertShow) Else - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2515,14 +2568,15 @@ eval( Var return = "" - If $##-##-##-####.Price = -1 Then + If $51-05-03-0041.Price = -1 Then Var return = "" Else - If $##-##-##-####.Discount = "" Then + If $51-05-03-0041.Discount = "" Then Var return "" Else - If $##-##-##-####.Discount = > 0 Then - Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + If $51-05-03-0041.Discount = > 0 Then + Var return !assigned StringFmt( $51-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2545,33 +2599,33 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5105020041TextID - $Sum5105020041TextValue + $Sum51050200415105030041TextID + $Sum51050200415105030041TextValue Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png" @@ -2579,12 +2633,12 @@ Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price Var PriceD2 = $51-05-02-0041.Price - Var PriceD3 = $##-##-##-####.Price + Var PriceD3 = $51-05-03-0041.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "51-05-02-0041" - Var PD_CODE3 = "##-##-##-####" + Var PD_CODE3 = "51-05-03-0041" ; begin lang - Var aliasName[0] = "Straw-Breeze\nSparkling" + Var aliasName[0] = "Sparkling\nStrawberry" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -2620,22 +2674,22 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "" - Var NameLang[2][1] = "" + Var NameLang[2][0] = "SPARKLING STRAWBERRY SMOOTHIE" + Var NameLang[2][1] = "สตอเบอร์รี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "" + Var NameLang[2][4] = "SMOOTHIE SODA STRAWBERI" Var NameLang[2][5] = "" - Var DescLang[2][0] = "" - Var DescLang[2][1] = "" + Var DescLang[2][0] = "Strawberry Syrup, Soda, Ice" + Var DescLang[2][1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา และน้ำแข็ง" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "" + Var DescLang[2][4] = "Sirap Strawberi, Soda, Ais" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = $51-05-02-0041.Button - Var PD_STAGE_3 = "Disable2" + Var PD_STAGE_3 = $51-05-03-0041.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2656,7 +2710,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "51-05-03-0041" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -2696,36 +2750,102 @@ ; ==================> Len = 3 - ; - 51-05-02-0010 51-05-03-0010 + ; 51-02-01-0046 51-02-02-0046 - - Flag( 51-05-02-0010.Button,51-05-03-0010.Button,$Sum51050200105105030010) - "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" + Flag( 51-02-01-0046.Button,51-02-02-0046.Button,$Sum51020100465102020046) + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" - Refreshing\nLimenade - น้ำมะนาวโซดา + Jasmine Milk Tea + ชามะลิลาเต้ - - - + - - Limenade, Sugar, Soda & Ice - มะนาว โซดา + Jasmine & Milk + ชามะลิ และนม - - - + - - "Disable2" - $51-05-02-0010.Button - $51-05-03-0010.Button + $51-02-01-0046.Button + $51-02-02-0046.Button + "Disable2" + 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 + 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 + 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 + 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 + EndIf + ) + + eval( If $##-##-##-####.Price = -1 Then Var return = "Free" @@ -2737,11 +2857,12 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) - - + + eval( Var return = "" If $##-##-##-####.Price = -1 Then @@ -2752,68 +2873,7 @@ 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 EndIf ) @@ -2836,97 +2896,97 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum51050200105105030010TextID - $Sum51050200105105030010TextValue + $Sum51020100465102020046TextID + $Sum51020100465102020046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png" + Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = $##-##-##-####.Price - Var PriceD2 = $51-05-02-0010.Price - Var PriceD3 = $51-05-03-0010.Price - Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-05-02-0010" - Var PD_CODE3 = "51-05-03-0010" + Var PriceD1 = $51-02-01-0046.Price + Var PriceD2 = $51-02-02-0046.Price + Var PriceD3 = $##-##-##-####.Price + Var PD_CODE1 = "51-02-01-0046" + Var PD_CODE2 = "51-02-02-0046" + Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Refreshing\nLimenade" - Var aliasDesc[0] = "Limenade, Sugar, Soda & Ice" - Var aliasName[1] = "น้ำมะนาวโซดา" - Var aliasDesc[1] = "มะนาว โซดา" + Var aliasName[0] = "Jasmine Milk Tea" + Var aliasDesc[0] = "Jasmine & 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] = "" - Var NameLang[0][1] = "" + Var aliasName[5] = "-" + Var aliasDesc[5] = "-" + Var NameLang[0][0] = "Hot JASMINE MILK TEA" + Var NameLang[0][1] = "ชามะลิลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" - Var NameLang[0][4] = "" + Var NameLang[0][4] = "TEH SUSU JASMIN PANAS" Var NameLang[0][5] = "" - Var DescLang[0][0] = "" - Var DescLang[0][1] = "" + Var DescLang[0][0] = "Jasmine & Milk" + Var DescLang[0][1] = "ชามะลิ และนม" Var DescLang[0][2] = "" Var DescLang[0][3] = "" - Var DescLang[0][4] = "" + Var DescLang[0][4] = "Teh Jasmin, Susu" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced SPARKLING LIMENADE" - Var NameLang[1][1] = "น้ำมะนาวโซดา" + Var NameLang[1][0] = "Iced JASMINE MILK TEA" + Var NameLang[1][1] = "ชามะลิลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SODA LIMAU AIS" + Var NameLang[1][4] = "TEH SUSU JASMIN AIS" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[1][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[1][0] = "Jasmine, Milk, Iced" + Var DescLang[1][1] = "ชามะลิ นม และน้ำแข็ง" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Limau, Gula, Soda, Ais" + Var DescLang[1][4] = "Teh Jasmin, Susu, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "SPARKLING LIMENADE SMOOTHIE" - Var NameLang[2][1] = "น้ำมะนาวโซดาปั่น" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" - Var NameLang[2][4] = "SMOOTHIE SODA LIMAU" + Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Limenade, Sugar, Soda, Ice" - Var DescLang[2][1] = "มะนาว โซดา และน้ำแข็ง" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" Var DescLang[2][2] = "" Var DescLang[2][3] = "" - Var DescLang[2][4] = "Limau, Gula, Soda, Ais" + Var DescLang[2][4] = "" Var DescLang[2][5] = "" ; end lang - Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-05-02-0010.Button - Var PD_STAGE_3 = $51-05-03-0010.Button + Var PD_STAGE_1 = $51-02-01-0046.Button + Var PD_STAGE_2 = $51-02-02-0046.Button + Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -2942,12 +3002,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-05-02-0010" + Topping "Load" "51-02-02-0046" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "51-02-01-0046" Else - Topping "Load" "51-05-03-0010" + Topping "Load" "-" EndIf EndIf ;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml" @@ -2995,7 +3055,7 @@ "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" - Exceptional Thai\nMilk Tea + Thai Milk Tea ชานมไทย - - @@ -3028,6 +3088,7 @@ 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 EndIf ) @@ -3043,6 +3104,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3059,6 +3121,7 @@ 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 EndIf ) @@ -3074,6 +3137,7 @@ Else If $51-02-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3090,6 +3154,7 @@ 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 EndIf ) @@ -3105,6 +3170,7 @@ Else If $51-02-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3166,7 +3232,7 @@ Var PD_CODE2 = "51-02-02-0039" Var PD_CODE3 = "51-02-03-0039" ; begin lang - Var aliasName[0] = "Exceptional Thai\nMilk Tea" + Var aliasName[0] = "Thai Milk Tea" Var aliasDesc[0] = "Thai tea, Sugar, milk" Var aliasName[1] = "ชานมไทย" Var aliasDesc[1] = "ชาไทย และ นม" @@ -3319,6 +3385,7 @@ 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 EndIf ) @@ -3334,6 +3401,7 @@ Else If $51-02-01-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3350,6 +3418,7 @@ 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 EndIf ) @@ -3365,6 +3434,7 @@ Else If $51-02-02-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3381,6 +3451,7 @@ 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 EndIf ) @@ -3396,6 +3467,7 @@ Else If $51-02-03-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3569,34 +3641,34 @@ ; ==================> Len = 3 - ; - 51-04-02-0016 - + ; - 51-04-02-0062 - - Flag( 51-04-02-0016.Button,$Sum5104020016) - "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" + Flag( 51-04-02-0062.Button,$Sum5104020062) + "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" - Matcha Protein\nShake - มัทฉะโปรตีน - - - - + Mocha Shake + + + - Whey protein,\nMatcha, & Milk - เวย์โปรตีน ชาเชียว นม - - - - + Whey protein, Espresso\n& Milk, Chocolate + + + "Disable2" - $51-04-02-0016.Button + $51-04-02-0062.Button "Disable2" eval( @@ -3610,6 +3682,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3625,22 +3698,24 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) eval( - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.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) + If $51-04-02-0062.Discount = "" Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow) + 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-0016.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3648,14 +3723,15 @@ eval( Var return = "" - If $51-04-02-0016.Price = -1 Then + If $51-04-02-0062.Price = -1 Then Var return = "" Else - If $51-04-02-0016.Discount = "" Then + If $51-04-02-0062.Discount = "" Then Var return "" Else - If $51-04-02-0016.Discount = > 0 Then - Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + If $51-04-02-0062.Discount = > 0 Then + Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3672,6 +3748,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3687,6 +3764,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3709,53 +3787,53 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum5104020016TextID - $Sum5104020016TextValue + $Sum5104020062TextID + $Sum5104020062TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.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 - Var PriceD2 = $51-04-02-0016.Price + Var PriceD2 = $51-04-02-0062.Price Var PriceD3 = $##-##-##-####.Price Var PD_CODE1 = "##-##-##-####" - Var PD_CODE2 = "51-04-02-0016" + Var PD_CODE2 = "51-04-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Matcha Protein\nShake" - Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk" - Var aliasName[1] = "มัทฉะโปรตีน" - Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม" - Var aliasName[2] = "-" - Var aliasDesc[2] = "-" - Var aliasName[3] = "-" - Var aliasDesc[3] = "-" + Var aliasName[0] = "Mocha Shake" + Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate" + 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] = "" @@ -3772,17 +3850,17 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "MATCHA SHAKE" - Var NameLang[1][1] = "มัทฉะโปรตีน" + Var NameLang[1][0] = "CAFE MOCHA PROTEIN" + Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" - Var NameLang[1][4] = "SHAKE MATCHA" + Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Whey protein,Matcha, and Milk" - Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม" + Var DescLang[1][0] = "Coffee, Chocolate, Whey" + Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Protein Whey, Matcha, Susu" + Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "" Var NameLang[2][1] = "" @@ -3798,7 +3876,7 @@ Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" - Var PD_STAGE_2 = $51-04-02-0016.Button + Var PD_STAGE_2 = $51-04-02-0062.Button Var PD_STAGE_3 = "Disable2" Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 @@ -3815,7 +3893,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "51-04-02-0016" + Topping "Load" "51-04-02-0062" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" 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 b66e2eb9..a27c349f 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_tea.lxml @@ -173,7 +173,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -219,6 +219,7 @@ 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 EndIf ) @@ -234,6 +235,7 @@ Else If $51-02-01-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -250,6 +252,7 @@ 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 EndIf ) @@ -265,6 +268,7 @@ Else If $51-02-02-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -281,6 +285,7 @@ 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 EndIf ) @@ -296,6 +301,7 @@ Else If $51-02-03-0026.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -510,6 +516,7 @@ 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 EndIf ) @@ -525,6 +532,7 @@ Else If $51-02-01-0071.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -541,6 +549,7 @@ 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 EndIf ) @@ -556,6 +565,7 @@ Else If $51-02-02-0071.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -572,6 +582,7 @@ 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 EndIf ) @@ -587,6 +598,7 @@ Else If $51-02-03-0071.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -801,6 +813,7 @@ 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 EndIf ) @@ -816,6 +829,7 @@ Else If $51-02-01-0027.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -832,6 +846,7 @@ 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 EndIf ) @@ -847,6 +862,7 @@ Else If $51-02-02-0027.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -863,6 +879,7 @@ 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 EndIf ) @@ -878,6 +895,7 @@ Else If $51-02-03-0027.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1092,6 +1110,7 @@ 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 EndIf ) @@ -1107,6 +1126,7 @@ Else If $51-02-01-0028.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1123,6 +1143,7 @@ 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 EndIf ) @@ -1138,6 +1159,7 @@ Else If $51-02-02-0028.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1154,6 +1176,7 @@ 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 EndIf ) @@ -1169,6 +1192,7 @@ Else If $51-02-03-0028.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1383,6 +1407,7 @@ 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 EndIf ) @@ -1398,6 +1423,7 @@ Else If $51-02-01-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1414,6 +1440,7 @@ 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 EndIf ) @@ -1429,6 +1456,7 @@ Else If $51-02-02-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1445,6 +1473,7 @@ 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 EndIf ) @@ -1460,6 +1489,7 @@ Else If $51-02-03-0060.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1674,6 +1704,7 @@ 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 EndIf ) @@ -1689,6 +1720,7 @@ Else If $51-02-01-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1705,6 +1737,7 @@ 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 EndIf ) @@ -1720,6 +1753,7 @@ Else If $51-02-02-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1736,6 +1770,7 @@ 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 EndIf ) @@ -1751,6 +1786,7 @@ Else If $51-02-03-0061.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1965,6 +2001,7 @@ 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 EndIf ) @@ -1980,6 +2017,7 @@ Else If $51-02-01-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1996,6 +2034,7 @@ 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 EndIf ) @@ -2011,6 +2050,7 @@ Else If $51-02-02-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2027,6 +2067,7 @@ 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 EndIf ) @@ -2042,6 +2083,7 @@ Else If $51-02-03-0039.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2256,6 +2298,7 @@ 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 EndIf ) @@ -2271,6 +2314,7 @@ Else If $51-02-01-0047.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2287,6 +2331,7 @@ 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 EndIf ) @@ -2302,6 +2347,7 @@ Else If $51-02-02-0047.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2318,6 +2364,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2333,6 +2380,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2547,6 +2595,7 @@ 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 EndIf ) @@ -2562,6 +2611,7 @@ Else If $51-02-01-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2578,6 +2628,7 @@ 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 EndIf ) @@ -2593,6 +2644,7 @@ Else If $51-02-02-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2609,6 +2661,7 @@ 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 EndIf ) @@ -2624,6 +2677,7 @@ Else If $51-02-03-0040.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2838,6 +2892,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2853,6 +2908,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2869,6 +2925,7 @@ 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 EndIf ) @@ -2884,6 +2941,7 @@ Else If $51-02-02-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2900,6 +2958,7 @@ 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 EndIf ) @@ -2915,6 +2974,7 @@ Else If $51-02-03-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3096,7 +3156,7 @@ "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" - Coconut Thai Black Tea + Coconut Thai\nBlack Tea @@ -3129,6 +3189,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3144,6 +3205,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3160,6 +3222,7 @@ 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 EndIf ) @@ -3175,6 +3238,7 @@ Else If $51-02-02-0063.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3191,6 +3255,7 @@ 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 EndIf ) @@ -3206,6 +3271,7 @@ Else If $51-02-03-0063.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3267,7 +3333,7 @@ Var PD_CODE2 = "51-02-02-0063" Var PD_CODE3 = "51-02-03-0063" ; begin lang - Var aliasName[0] = "Coconut Thai Black Tea" + Var aliasName[0] = "Coconut Thai\nBlack Tea" Var aliasDesc[0] = "Coconut Syrup, Thai Tea and Water" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -3382,9 +3448,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/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" + "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" + "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" Jasmine Milk Tea @@ -3420,6 +3486,7 @@ 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 EndIf ) @@ -3435,6 +3502,7 @@ Else If $51-02-01-0046.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3451,6 +3519,7 @@ 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 EndIf ) @@ -3466,6 +3535,7 @@ Else If $51-02-02-0046.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3482,6 +3552,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3497,6 +3568,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3548,7 +3620,7 @@ $Sum51020100465102020046TextValue - Var PictureDrink = "ROOT/taobin_project/inter/aus/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_hug_in_a_cup.png" GetInstanceIDMenuTab OpenFromInstMenuTab Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $51-02-01-0046.Price @@ -3711,6 +3783,7 @@ 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 EndIf ) @@ -3726,6 +3799,7 @@ Else If $51-02-01-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3742,6 +3816,7 @@ 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 EndIf ) @@ -3757,6 +3832,7 @@ Else If $51-02-02-0045.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3773,6 +3849,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -3788,6 +3865,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4002,6 +4080,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4017,6 +4096,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4033,6 +4113,7 @@ 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 EndIf ) @@ -4048,6 +4129,7 @@ Else If $51-02-02-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4064,6 +4146,7 @@ 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 EndIf ) @@ -4079,6 +4162,7 @@ Else If $51-02-03-0064.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4293,6 +4377,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4308,6 +4393,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4324,6 +4410,7 @@ 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 EndIf ) @@ -4339,6 +4426,7 @@ Else If $51-02-02-0065.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4355,6 +4443,7 @@ 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 EndIf ) @@ -4370,6 +4459,7 @@ Else If $51-02-03-0065.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4584,6 +4674,7 @@ 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 EndIf ) @@ -4599,6 +4690,7 @@ Else If $51-02-01-0050.Discount = > 0 Then Var return !assigned StringFmt( $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4615,6 +4707,7 @@ 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 EndIf ) @@ -4630,6 +4723,7 @@ Else If $51-02-02-0050.Discount = > 0 Then Var return !assigned StringFmt( $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -4646,6 +4740,7 @@ 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 EndIf ) @@ -4661,6 +4756,7 @@ Else If $51-02-03-0050.Discount = > 0 Then Var return !assigned StringFmt( $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf 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 da18da3d..0a93ecbe 100644 --- a/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml +++ b/inter/aus/xml/multi/v3/page_catalog_group_whey.lxml @@ -114,7 +114,7 @@ 000082 000083 000013 - ShowOriginalPrice + "true" ;banners @@ -160,6 +160,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -175,6 +176,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -191,6 +193,7 @@ 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 EndIf ) @@ -206,6 +209,7 @@ Else If $51-04-02-0011.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -222,6 +226,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -237,6 +242,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -451,6 +457,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -466,6 +473,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -482,6 +490,7 @@ 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 EndIf ) @@ -497,6 +506,7 @@ Else If $51-04-02-0016.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -513,6 +523,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -528,6 +539,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -742,6 +754,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -757,6 +770,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -773,6 +787,7 @@ 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 EndIf ) @@ -788,6 +803,7 @@ Else If $51-04-02-0002.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -804,6 +820,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -819,6 +836,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1033,6 +1051,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1048,6 +1067,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1064,6 +1084,7 @@ 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 EndIf ) @@ -1079,6 +1100,7 @@ Else If $51-04-02-0009.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1095,6 +1117,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1110,6 +1133,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1324,6 +1348,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1339,6 +1364,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1355,6 +1381,7 @@ 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 EndIf ) @@ -1370,6 +1397,7 @@ Else If $51-04-02-0062.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1386,6 +1414,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1401,6 +1430,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1615,6 +1645,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1630,6 +1661,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1646,6 +1678,7 @@ 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 EndIf ) @@ -1661,6 +1694,7 @@ Else If $51-04-02-0004.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1677,6 +1711,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1692,6 +1727,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1906,6 +1942,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1921,6 +1958,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1937,6 +1975,7 @@ 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 EndIf ) @@ -1952,6 +1991,7 @@ Else If $51-04-02-0013.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1968,6 +2008,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -1983,6 +2024,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2197,6 +2239,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2212,6 +2255,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2228,6 +2272,7 @@ 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 EndIf ) @@ -2243,6 +2288,7 @@ Else If $51-04-02-0018.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2259,6 +2305,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2274,6 +2321,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2488,6 +2536,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2503,6 +2552,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2519,6 +2569,7 @@ 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 EndIf ) @@ -2534,6 +2585,7 @@ Else If $51-04-02-0055.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2550,6 +2602,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2565,6 +2618,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2779,6 +2833,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2794,6 +2849,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2810,6 +2866,7 @@ 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 EndIf ) @@ -2825,6 +2882,7 @@ Else If $51-04-02-0010.Discount = > 0 Then Var return !assigned StringFmt( $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2841,6 +2899,7 @@ Var return !assigned StringFmt( $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow) Else Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf ) @@ -2856,6 +2915,7 @@ Else If $##-##-##-####.Discount = > 0 Then Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf EndIf EndIf )