From e25b6d6d48f1b049d15bc462b86ffe3e673d5e9a Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Wed, 2 Apr 2025 10:48:47 +0700 Subject: [PATCH] HKG: Added default blend load topping & return from topping to catalog of menus --- inter/hkg/menu/lang.tsv | 2 +- inter/hkg/xml/menu_new_layout_gen_v2.py | 54 ++- inter/hkg/xml/multi/menu_new_layout_gen_v2.py | 53 ++- .../xml/multi/page_catalog_group_coffee.lxml | 292 ++++++------ .../xml/multi/page_catalog_group_forkid.lxml | 128 +++--- .../xml/multi/page_catalog_group_milk.lxml | 316 ++++++------- .../xml/multi/page_catalog_group_other.lxml | 340 +++++++------- .../multi/page_catalog_group_recommend.lxml | 164 +++---- ...age_catalog_group_recommend_multi_pro.lxml | 164 +++---- .../hkg/xml/multi/page_catalog_group_tea.lxml | 428 +++++++++--------- inter/hkg/xml/page_topping_select6.lxml | 30 +- 11 files changed, 1007 insertions(+), 964 deletions(-) diff --git a/inter/hkg/menu/lang.tsv b/inter/hkg/menu/lang.tsv index 1572a404..87c3d270 100644 --- a/inter/hkg/menu/lang.tsv +++ b/inter/hkg/menu/lang.tsv @@ -25,7 +25,7 @@ TextID Note English Mandarin Simplified Mandarin Traditional Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All -000014 our specialty 特色饮品 特色飲品 +000014 Best Sellers 特色饮品 特色飲品 000015 Coffee 咖啡 咖啡 000016 Tea 茶 茶 000017 Milk,\nCaramel\n& Cocoa 牛奶、焦糖、可可 牛奶、焦糖、可可 diff --git a/inter/hkg/xml/menu_new_layout_gen_v2.py b/inter/hkg/xml/menu_new_layout_gen_v2.py index 0a00258e..d900c2bf 100644 --- a/inter/hkg/xml/menu_new_layout_gen_v2.py +++ b/inter/hkg/xml/menu_new_layout_gen_v2.py @@ -1,5 +1,5 @@ if "v2" in param: - def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code): + def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, present): print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] ) out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[ idx_img][1] @@ -141,19 +141,29 @@ out_xml( '\t\tEndIf\r\n') - - out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') - #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') - #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') - out_xml( '\t\t\tElse\r\n') - #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') - out_xml( '\t\t\tEndIf\r\n') - out_xml( '\t\tEndIf\r\n') + if present == 3: + out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') + out_xml( '\t\tElse\r\n') + out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') + out_xml( '\t\t\tElse\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') + out_xml( '\t\t\tEndIf\r\n') + out_xml( '\t\tEndIf\r\n') + else: + out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') + #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') + out_xml( '\t\tElse\r\n') + out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') + #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') + out_xml( '\t\t\tElse\r\n') + #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') + out_xml( '\t\t\tEndIf\r\n') + out_xml( '\t\tEndIf\r\n') @@ -452,8 +462,8 @@ out_xml( '\r\n') - def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): - GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] ) + def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, present): + GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code], present) idx_lang_malay = 5 @@ -471,6 +481,7 @@ idx_hot_product_code = 7 idx_cold_product_code = idx_hot_product_code + 1 idx_blend_product_code = idx_cold_product_code + 1 + idx_default_load_topping = idx_blend_product_code + 2 # idx_hot_product_code2 = idx_blend_product_code + 1 @@ -577,6 +588,11 @@ hot_pd = spl[ idx_name][ idx_hot_product_code].split(',') cold_pd = spl[ idx_name][ idx_cold_product_code].split(',') blend_pd = spl[ idx_name][ idx_blend_product_code].split(',') + + try: + present = int(spl[idx_name][idx_default_load_topping]) + except: + present = 0 #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd)) + '\r\n') list_size = len( hot_pd) @@ -586,9 +602,9 @@ print("\t\t==> ignore ") else: print("\t\t==> gen ") - GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] ) + GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], present) else: - GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code) + GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, 0) #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n') #print("++++++++++++++++++++++++++++++ " + str( count_test) ) #count_test = count_test + 1 @@ -596,7 +612,7 @@ # break if len( spl[idx_name] ) >= 11: if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-": - GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2) + GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2, 0) out_xml('\r\n') diff --git a/inter/hkg/xml/multi/menu_new_layout_gen_v2.py b/inter/hkg/xml/multi/menu_new_layout_gen_v2.py index ea273099..7d9d6dbf 100644 --- a/inter/hkg/xml/multi/menu_new_layout_gen_v2.py +++ b/inter/hkg/xml/multi/menu_new_layout_gen_v2.py @@ -1,5 +1,5 @@ if "v2" in param: - def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code): + def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, present): print(f"spl : {spl}") print(" ProductCode : "+str_hot_product_code + " : " + str_cold_product_code + " : " + str_blend_product_code + "lenstr " + str(len(spl)) ) print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] ) @@ -150,18 +150,29 @@ - out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') - #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') - #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') - out_xml( '\t\t\tElse\r\n') - #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') - out_xml( '\t\t\tEndIf\r\n') - out_xml( '\t\tEndIf\r\n') + if present == 3: + out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') + out_xml( '\t\tElse\r\n') + out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') + out_xml( '\t\t\tElse\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') + out_xml( '\t\t\tEndIf\r\n') + out_xml( '\t\tEndIf\r\n') + else: + out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') + #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n') + out_xml( '\t\tElse\r\n') + out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') + #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n') + out_xml( '\t\t\tElse\r\n') + #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n') + out_xml( '\t\t\tEndIf\r\n') + out_xml( '\t\tEndIf\r\n') @@ -492,8 +503,8 @@ out_xml( '\r\n') - def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): - GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] ) + def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, present): + GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code], present) # idx_lang_msc = 8 # idx_lang_mtc = 7 @@ -517,6 +528,7 @@ idx_hot_product_code = 7 idx_cold_product_code = idx_hot_product_code + 1 idx_blend_product_code = idx_cold_product_code + 1 + idx_default_load_topping = idx_blend_product_code + 2 # idx_hot_product_code2 = idx_blend_product_code + 1 @@ -623,6 +635,11 @@ hot_pd = spl[ idx_name][ idx_hot_product_code].split(',') cold_pd = spl[ idx_name][ idx_cold_product_code].split(',') blend_pd = spl[ idx_name][ idx_blend_product_code].split(',') + + try: + present = int(spl[idx_name][idx_default_load_topping]) + except: + present = 0 #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd)) + '\r\n') list_size = len( hot_pd) @@ -633,9 +650,9 @@ else: print("\t\t==> gen ") print("\t\t==> hot_pd "+hot_pd[ idx]) - GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] ) + GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], present) else: - GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code) + GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, 0) #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n') #print("++++++++++++++++++++++++++++++ " + str( count_test) ) #count_test = count_test + 1 @@ -643,7 +660,7 @@ # break if len( spl[idx_name] ) >= 11: if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-": - GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2) + GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2, 0) out_xml('\r\n') diff --git a/inter/hkg/xml/multi/page_catalog_group_coffee.lxml b/inter/hkg/xml/multi/page_catalog_group_coffee.lxml index dcf9e094..9a860687 100644 --- a/inter/hkg/xml/multi/page_catalog_group_coffee.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_coffee.lxml @@ -252,7 +252,7 @@ Var aliasDesc[4] = "" Var aliasName[5] = "" Var aliasDesc[5] = "" - Var NameLang[0][0] = "Hot VANILLA CARAMEL latte (s)" + Var NameLang[0][0] = "Hot GINGER CAFE LATTE" Var NameLang[0][1] = "热香草焦糖拿铁咖啡" Var NameLang[0][2] = "熱雲呢拿焦糖拿鐵咖啡" Var NameLang[0][3] = "" @@ -264,7 +264,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced VANILLA CARAMEL latte (s)" + Var NameLang[1][0] = "Iced GINGER CAFE LATTE" Var NameLang[1][1] = "冰香草焦糖拿铁咖啡" Var NameLang[1][2] = "冰雲呢拿焦糖拿鐵咖啡" Var NameLang[1][3] = "" @@ -13885,13 +13885,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-11-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-11-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-11-02-0001" + Else + Topping "Load" "-" EndIf EndIf @@ -14184,13 +14184,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-31-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-31-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-31-02-0001" + Else + Topping "Load" "-" EndIf EndIf @@ -14483,13 +14483,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0002" + Else + Topping "Load" "54-01-01-0004" EndIf EndIf @@ -14786,13 +14786,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0002" + Else + Topping "Load" "54-21-01-0004" EndIf EndIf @@ -15089,13 +15089,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-11-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0005" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-11-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-11-02-0002" + Else + Topping "Load" "54-01-01-0005" EndIf EndIf @@ -15392,13 +15392,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-31-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0005" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-31-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-31-02-0002" + Else + Topping "Load" "54-21-01-0005" EndIf EndIf @@ -15695,13 +15695,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0006" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0003" + Else + Topping "Load" "54-01-01-0006" EndIf EndIf @@ -15998,13 +15998,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0006" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0003" + Else + Topping "Load" "54-21-01-0006" EndIf EndIf @@ -16301,13 +16301,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0004" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0007" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0004" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0004" + Else + Topping "Load" "54-01-01-0007" EndIf EndIf @@ -16604,13 +16604,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0004" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0007" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0004" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0004" + Else + Topping "Load" "54-21-01-0007" EndIf EndIf @@ -16907,13 +16907,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0031" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0031" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0031" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0031" + Else + Topping "Load" "54-01-01-0031" EndIf EndIf @@ -17210,13 +17210,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0031" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0031" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0031" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0031" + Else + Topping "Load" "54-21-01-0031" EndIf EndIf @@ -17513,13 +17513,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0005" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0008" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0005" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0005" + Else + Topping "Load" "54-01-01-0008" EndIf EndIf @@ -17816,13 +17816,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0005" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0008" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0005" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0005" + Else + Topping "Load" "54-21-01-0008" EndIf EndIf @@ -18119,13 +18119,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0008" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0011" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0008" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0008" + Else + Topping "Load" "54-01-01-0011" EndIf EndIf @@ -18422,13 +18422,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0008" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0011" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0008" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0008" + Else + Topping "Load" "54-21-01-0011" EndIf EndIf @@ -19331,13 +19331,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0009" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0006" + Else + Topping "Load" "54-01-01-0009" EndIf EndIf @@ -19634,13 +19634,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0009" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0006" + Else + Topping "Load" "54-21-01-0009" EndIf EndIf @@ -19937,13 +19937,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0055" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0055" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0055" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0055" + Else + Topping "Load" "54-01-01-0055" EndIf EndIf @@ -20240,13 +20240,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0055" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0055" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0055" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0055" + Else + Topping "Load" "54-21-01-0055" EndIf EndIf @@ -20543,13 +20543,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0029" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0029" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0029" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0029" + Else + Topping "Load" "54-01-01-0029" EndIf EndIf @@ -20846,13 +20846,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0029" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0029" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0029" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0029" + Else + Topping "Load" "54-21-01-0029" EndIf EndIf @@ -22361,13 +22361,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0042" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0042" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0042" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0042" + Else + Topping "Load" "54-01-01-0042" EndIf EndIf @@ -22664,13 +22664,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0042" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0042" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0042" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0042" + Else + Topping "Load" "54-21-01-0042" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_forkid.lxml b/inter/hkg/xml/multi/page_catalog_group_forkid.lxml index 164aa66e..8937043f 100644 --- a/inter/hkg/xml/multi/page_catalog_group_forkid.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_forkid.lxml @@ -333,13 +333,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0005" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0005" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0005" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0005" + Else + Topping "Load" "54-03-01-0005" EndIf EndIf @@ -636,13 +636,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0001" + Else + Topping "Load" "54-03-01-0001" EndIf EndIf @@ -939,13 +939,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0003" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0003" + Else + Topping "Load" "54-03-01-0003" EndIf EndIf @@ -1242,13 +1242,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0006" + Else + Topping "Load" "-" EndIf EndIf @@ -1541,13 +1541,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0002" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0002" + Else + Topping "Load" "54-03-01-0002" EndIf EndIf @@ -1844,13 +1844,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0022" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0022" + Else + Topping "Load" "54-03-01-0022" EndIf EndIf @@ -2147,13 +2147,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0010" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0010" + Topping "Load" "-" EndIf EndIf @@ -2446,13 +2446,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0020" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0020" + Topping "Load" "-" EndIf EndIf @@ -2745,13 +2745,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0021" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0021" + Topping "Load" "-" EndIf EndIf @@ -3044,13 +3044,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0041" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0041" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0041" + Else + Topping "Load" "-" EndIf EndIf @@ -3343,13 +3343,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0008" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0008" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0008" + Else + Topping "Load" "-" EndIf EndIf @@ -4240,13 +4240,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0009" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0009" + Topping "Load" "-" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_milk.lxml b/inter/hkg/xml/multi/page_catalog_group_milk.lxml index 70fdeee6..f48cd8b8 100644 --- a/inter/hkg/xml/multi/page_catalog_group_milk.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_milk.lxml @@ -304,13 +304,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0005" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0005" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0005" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0005" + Else + Topping "Load" "54-03-01-0005" EndIf EndIf @@ -607,13 +607,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0001" + Else + Topping "Load" "54-03-01-0001" EndIf EndIf @@ -910,13 +910,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0004" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0004" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0004" + Else + Topping "Load" "54-03-01-0004" EndIf EndIf @@ -1213,13 +1213,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0003" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0003" + Else + Topping "Load" "54-03-01-0003" EndIf EndIf @@ -1516,13 +1516,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0006" + Else + Topping "Load" "-" EndIf EndIf @@ -1815,13 +1815,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0002" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0002" + Else + Topping "Load" "54-03-01-0002" EndIf EndIf @@ -2118,13 +2118,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0059" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0059" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0059" + Else + Topping "Load" "-" EndIf EndIf @@ -2417,13 +2417,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0010" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0010" + Topping "Load" "-" EndIf EndIf @@ -2716,13 +2716,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0011" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0011" + Topping "Load" "-" EndIf EndIf @@ -3015,13 +3015,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0009" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0009" + Topping "Load" "-" EndIf EndIf @@ -3314,13 +3314,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0019" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0019" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0019" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0019" + Else + Topping "Load" "54-03-01-0019" EndIf EndIf @@ -3617,13 +3617,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0020" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0020" + Topping "Load" "-" EndIf EndIf @@ -3916,13 +3916,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0021" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0021" + Topping "Load" "-" EndIf EndIf @@ -4215,13 +4215,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0048" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0048" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0048" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0048" + Else + Topping "Load" "54-03-01-0048" EndIf EndIf @@ -4518,13 +4518,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0049" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0049" + Topping "Load" "-" EndIf EndIf @@ -4817,13 +4817,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0022" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0022" + Else + Topping "Load" "54-03-01-0022" EndIf EndIf @@ -5120,13 +5120,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0025" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0025" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0025" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0025" + Else + Topping "Load" "54-03-01-0025" EndIf EndIf @@ -5423,13 +5423,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0026" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0026" + Topping "Load" "-" EndIf EndIf @@ -5722,13 +5722,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0023" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0023" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0023" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0023" + Else + Topping "Load" "54-03-01-0023" EndIf EndIf @@ -6025,13 +6025,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0024" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0024" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0024" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0024" + Else + Topping "Load" "54-03-01-0024" EndIf EndIf @@ -6328,13 +6328,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0058" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0058" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0058" + Else + Topping "Load" "-" EndIf EndIf @@ -6926,13 +6926,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0034" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0034" + Topping "Load" "-" EndIf EndIf @@ -7225,13 +7225,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0035" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0035" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0035" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0035" + Else + Topping "Load" "54-03-01-0035" EndIf EndIf @@ -7528,13 +7528,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0036" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0036" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0036" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0036" + Else + Topping "Load" "54-03-01-0036" EndIf EndIf @@ -7831,13 +7831,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0037" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0037" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0037" + Else + Topping "Load" "-" EndIf EndIf @@ -8130,13 +8130,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0039" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0039" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0039" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0039" + Else + Topping "Load" "54-03-01-0039" EndIf EndIf @@ -8433,13 +8433,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0040" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0040" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0040" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0040" + Else + Topping "Load" "54-03-01-0040" EndIf EndIf @@ -8736,13 +8736,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0041" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0041" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0041" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0041" + Else + Topping "Load" "54-03-01-0041" EndIf EndIf @@ -9039,13 +9039,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0042" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0042" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0042" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0042" + Else + Topping "Load" "54-03-01-0042" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_other.lxml b/inter/hkg/xml/multi/page_catalog_group_other.lxml index 8b54c9d6..a9125efb 100644 --- a/inter/hkg/xml/multi/page_catalog_group_other.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_other.lxml @@ -308,13 +308,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0007" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0007" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0007" + Else + Topping "Load" "-" EndIf EndIf @@ -906,13 +906,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0094" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0094" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0094" + Else + Topping "Load" "-" EndIf EndIf @@ -1205,13 +1205,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0104" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0104" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0104" + Else + Topping "Load" "-" EndIf EndIf @@ -1504,13 +1504,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0105" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0105" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0105" + Else + Topping "Load" "-" EndIf EndIf @@ -4494,13 +4494,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0114" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0114" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0114" + Else + Topping "Load" "-" EndIf EndIf @@ -5092,13 +5092,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0035" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0035" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0035" + Else + Topping "Load" "-" EndIf EndIf @@ -6288,13 +6288,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0010" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0010" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0010" + Else + Topping "Load" "-" EndIf EndIf @@ -6587,13 +6587,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0033" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0033" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0033" + Else + Topping "Load" "-" EndIf EndIf @@ -6886,13 +6886,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0022" + Else + Topping "Load" "-" EndIf EndIf @@ -7484,13 +7484,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0041" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0041" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0041" + Else + Topping "Load" "-" EndIf EndIf @@ -7783,13 +7783,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0008" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0008" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0008" + Else + Topping "Load" "-" EndIf EndIf @@ -8082,13 +8082,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0009" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0009" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0009" + Else + Topping "Load" "-" EndIf EndIf @@ -8381,13 +8381,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0024" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0024" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0024" + Else + Topping "Load" "-" EndIf EndIf @@ -8680,13 +8680,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0025" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0025" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0025" + Else + Topping "Load" "-" EndIf EndIf @@ -8979,13 +8979,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0046" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0046" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0046" + Else + Topping "Load" "-" EndIf EndIf @@ -9278,13 +9278,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0074" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0074" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0074" + Else + Topping "Load" "-" EndIf EndIf @@ -9577,13 +9577,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0047" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0047" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0047" + Else + Topping "Load" "-" EndIf EndIf @@ -11072,13 +11072,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0075" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0075" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0075" + Else + Topping "Load" "-" EndIf EndIf @@ -12268,13 +12268,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0038" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0038" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0038" + Else + Topping "Load" "-" EndIf EndIf @@ -12567,13 +12567,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0039" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0039" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0039" + Else + Topping "Load" "-" EndIf EndIf @@ -16753,13 +16753,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0034" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0034" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0034" + Else + Topping "Load" "-" EndIf EndIf @@ -17052,13 +17052,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0003" + Else + Topping "Load" "-" EndIf EndIf @@ -17351,13 +17351,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0004" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0004" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0004" + Else + Topping "Load" "-" EndIf EndIf @@ -17650,13 +17650,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0002" + Else + Topping "Load" "-" EndIf EndIf @@ -18248,13 +18248,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-05-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0001" + Else + Topping "Load" "54-05-01-0001" EndIf EndIf @@ -18551,13 +18551,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0026" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0026" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0026" + Else + Topping "Load" "-" EndIf EndIf @@ -18850,13 +18850,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0032" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0032" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0032" + Else + Topping "Load" "-" EndIf EndIf @@ -19452,13 +19452,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-05-03-0040" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-05-03-0040" + Topping "Load" "-" EndIf EndIf @@ -19751,13 +19751,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-05-03-0092" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-05-03-0092" + Topping "Load" "-" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_recommend.lxml b/inter/hkg/xml/multi/page_catalog_group_recommend.lxml index 204b6dfb..48003fc7 100644 --- a/inter/hkg/xml/multi/page_catalog_group_recommend.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_recommend.lxml @@ -7909,13 +7909,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0002" + Else + Topping "Load" "54-01-01-0004" EndIf EndIf @@ -8212,13 +8212,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0002" + Else + Topping "Load" "54-21-01-0004" EndIf EndIf @@ -8515,13 +8515,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0037" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0037" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0037" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0037" + Else + Topping "Load" "54-02-01-0037" EndIf EndIf @@ -8818,13 +8818,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0026" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0026" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0026" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0026" + Else + Topping "Load" "54-02-01-0026" EndIf EndIf @@ -9121,13 +9121,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0024" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0024" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0024" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0024" + Else + Topping "Load" "54-02-01-0024" EndIf EndIf @@ -9424,13 +9424,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0002" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0002" + Else + Topping "Load" "54-03-01-0002" EndIf EndIf @@ -9727,13 +9727,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0001" + Else + Topping "Load" "54-03-01-0001" EndIf EndIf @@ -10030,13 +10030,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0006" + Else + Topping "Load" "-" EndIf EndIf @@ -10329,13 +10329,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0011" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0011" + Topping "Load" "-" EndIf EndIf @@ -10628,13 +10628,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0022" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0022" + Else + Topping "Load" "54-03-01-0022" EndIf EndIf @@ -10931,13 +10931,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0009" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0009" + Topping "Load" "-" EndIf EndIf @@ -11230,13 +11230,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0020" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0020" + Topping "Load" "-" EndIf EndIf @@ -11529,13 +11529,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0049" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0049" + Topping "Load" "-" EndIf EndIf @@ -12426,13 +12426,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0035" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0035" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0035" + Else + Topping "Load" "-" EndIf EndIf @@ -12725,13 +12725,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0025" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0025" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0025" + Else + Topping "Load" "-" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml b/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml index 438f045b..e76f39be 100644 --- a/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml @@ -7766,13 +7766,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-01-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-01-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-01-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-01-02-0002" + Else + Topping "Load" "54-01-01-0004" EndIf EndIf @@ -8069,13 +8069,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-21-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-21-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-21-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-21-02-0002" + Else + Topping "Load" "54-21-01-0004" EndIf EndIf @@ -8372,13 +8372,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0037" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0037" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0037" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0037" + Else + Topping "Load" "54-02-01-0037" EndIf EndIf @@ -8675,13 +8675,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0026" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0026" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0026" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0026" + Else + Topping "Load" "54-02-01-0026" EndIf EndIf @@ -8978,13 +8978,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0024" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0024" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0024" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0024" + Else + Topping "Load" "54-02-01-0024" EndIf EndIf @@ -9281,13 +9281,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0002" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0002" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0002" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0002" + Else + Topping "Load" "54-03-01-0002" EndIf EndIf @@ -9584,13 +9584,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0001" + Else + Topping "Load" "54-03-01-0001" EndIf EndIf @@ -9887,13 +9887,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0006" + Else + Topping "Load" "-" EndIf EndIf @@ -10186,13 +10186,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0011" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0011" + Topping "Load" "-" EndIf EndIf @@ -10485,13 +10485,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-03-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-03-01-0022" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-03-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-03-02-0022" + Else + Topping "Load" "54-03-01-0022" EndIf EndIf @@ -10788,13 +10788,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0009" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0009" + Topping "Load" "-" EndIf EndIf @@ -11087,13 +11087,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0020" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0020" + Topping "Load" "-" EndIf EndIf @@ -11386,13 +11386,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-03-03-0049" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-03-03-0049" + Topping "Load" "-" EndIf EndIf @@ -12283,13 +12283,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0035" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0035" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0035" + Else + Topping "Load" "-" EndIf EndIf @@ -12582,13 +12582,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0025" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0025" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0025" + Else + Topping "Load" "-" EndIf EndIf diff --git a/inter/hkg/xml/multi/page_catalog_group_tea.lxml b/inter/hkg/xml/multi/page_catalog_group_tea.lxml index 904153f5..816fee6f 100644 --- a/inter/hkg/xml/multi/page_catalog_group_tea.lxml +++ b/inter/hkg/xml/multi/page_catalog_group_tea.lxml @@ -598,13 +598,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0020" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0020" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0020" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0020" + Else + Topping "Load" "54-02-01-0020" EndIf EndIf @@ -901,13 +901,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0041" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0041" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0041" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0041" + Else + Topping "Load" "54-02-01-0041" EndIf EndIf @@ -1204,13 +1204,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0053" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0053" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0053" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0053" + Else + Topping "Load" "54-02-01-0053" EndIf EndIf @@ -1810,13 +1810,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + If PD_STAGE_3 = "Enable" Then + Topping "Load" "54-02-03-0056" Else - If PD_STAGE_1 = "Enable" Then + If PD_STAGE_2 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "54-02-03-0056" + Topping "Load" "-" EndIf EndIf @@ -2109,13 +2109,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0027" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0017" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0027" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0027" + Else + Topping "Load" "54-02-01-0017" EndIf EndIf @@ -2412,13 +2412,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0007" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0007" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0007" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0007" + Else + Topping "Load" "54-02-01-0007" EndIf EndIf @@ -3018,13 +3018,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0042" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0042" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0042" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0042" + Else + Topping "Load" "54-02-01-0042" EndIf EndIf @@ -3321,13 +3321,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0039" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0039" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0039" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0039" + Else + Topping "Load" "54-02-01-0039" EndIf EndIf @@ -3624,13 +3624,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0040" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0040" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0040" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0040" + Else + Topping "Load" "54-02-01-0040" EndIf EndIf @@ -4230,13 +4230,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0001" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0001" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0001" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0001" + Else + Topping "Load" "54-02-01-0001" EndIf EndIf @@ -4533,13 +4533,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0020" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0020" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0020" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0020" + Else + Topping "Load" "54-02-01-0020" EndIf EndIf @@ -4836,13 +4836,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-05-02-0027" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0017" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-05-03-0027" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-05-02-0027" + Else + Topping "Load" "54-02-01-0017" EndIf EndIf @@ -5139,13 +5139,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0007" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0007" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0007" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0007" + Else + Topping "Load" "54-02-01-0007" EndIf EndIf @@ -5745,13 +5745,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0027" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0027" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0027" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0027" + Else + Topping "Load" "54-02-01-0027" EndIf EndIf @@ -6048,13 +6048,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0024" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0024" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0024" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0024" + Else + Topping "Load" "54-02-01-0024" EndIf EndIf @@ -6351,13 +6351,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0062" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0062" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0062" + Else + Topping "Load" "-" EndIf EndIf @@ -6650,13 +6650,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0011" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0011" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0011" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0011" + Else + Topping "Load" "54-02-01-0011" EndIf EndIf @@ -6953,13 +6953,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0025" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0025" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0025" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0025" + Else + Topping "Load" "54-02-01-0025" EndIf EndIf @@ -7559,13 +7559,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0065" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0065" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0065" + Else + Topping "Load" "-" EndIf EndIf @@ -8161,13 +8161,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0064" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0064" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0064" + Else + Topping "Load" "-" EndIf EndIf @@ -8460,13 +8460,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0050" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0050" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0050" + Else + Topping "Load" "-" EndIf EndIf @@ -8759,13 +8759,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0003" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0003" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0003" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0003" + Else + Topping "Load" "54-02-01-0003" EndIf EndIf @@ -9062,13 +9062,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0004" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0004" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0004" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0004" + Else + Topping "Load" "54-02-01-0004" EndIf EndIf @@ -9365,13 +9365,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0026" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0026" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0026" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0026" + Else + Topping "Load" "54-02-01-0026" EndIf EndIf @@ -9668,13 +9668,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0060" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0060" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0060" + Else + Topping "Load" "-" EndIf EndIf @@ -9967,13 +9967,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0037" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0037" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0037" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0037" + Else + Topping "Load" "54-02-01-0037" EndIf EndIf @@ -10270,13 +10270,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0028" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0028" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0028" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0028" + Else + Topping "Load" "54-02-01-0028" EndIf EndIf @@ -10573,13 +10573,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0011" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0011" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0011" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0011" + Else + Topping "Load" "54-02-01-0011" EndIf EndIf @@ -10876,13 +10876,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0012" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0012" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0012" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0012" + Else + Topping "Load" "54-02-01-0012" EndIf EndIf @@ -11179,13 +11179,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0061" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0061" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0061" + Else + Topping "Load" "-" EndIf EndIf @@ -11478,13 +11478,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0006" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0006" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0006" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0006" + Else + Topping "Load" "54-02-01-0006" EndIf EndIf @@ -11781,13 +11781,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0008" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0008" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0008" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0008" + Else + Topping "Load" "54-02-01-0008" EndIf EndIf @@ -12084,13 +12084,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0019" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0019" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0019" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0019" + Else + Topping "Load" "54-02-01-0019" EndIf EndIf @@ -12690,13 +12690,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0022" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0022" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0022" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0022" + Else + Topping "Load" "54-02-01-0022" EndIf EndIf @@ -12993,13 +12993,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0017" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "54-02-01-0016" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0017" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0017" + Else + Topping "Load" "54-02-01-0016" EndIf EndIf @@ -13599,13 +13599,13 @@ Var SelectCountDrinkType = SelectCountDrinkType + 1 Var DefaultDrinkType = 3 EndIf - If PD_STAGE_2 = "Enable" Then - Topping "Load" "54-02-02-0063" - Else - If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" - Else + If PD_STAGE_3 = "Enable" Then Topping "Load" "54-02-03-0063" + Else + If PD_STAGE_2 = "Enable" Then + Topping "Load" "54-02-02-0063" + Else + Topping "Load" "-" EndIf EndIf diff --git a/inter/hkg/xml/page_topping_select6.lxml b/inter/hkg/xml/page_topping_select6.lxml index 96f30c5f..cad71946 100644 --- a/inter/hkg/xml/page_topping_select6.lxml +++ b/inter/hkg/xml/page_topping_select6.lxml @@ -170,7 +170,7 @@ DEBUGVAR ShowPrice DEBUGVAR RoadShow - + If ShowPrice = "Invisible" Then Var PriceDrinkTmpShow = "Free" EndIf @@ -542,7 +542,7 @@ EndIf - + DEBUGVAR showname DEBUGVAR showdesc DEBUGVAR IndexDrinktType @@ -571,11 +571,17 @@ ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog.lxml" - + DEBUGVAR OpenFromInstMenuTab + If OpenFromInstMenuTab > 0 Then + DEBUGVAR OpenFromInstMenuTab + TabMenuVisibleInst OpenFromInstMenuTab + EndIf + Open OpenFromXML @@ -3572,14 +3578,18 @@ SoundVolume - If Seeker = "next" Then - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + + DEBUGVAR OpenFromInstMenuTab + If OpenFromInstMenuTab > 0 Then + DEBUGVAR OpenFromInstMenuTab + TabMenuVisibleInst OpenFromInstMenuTab EndIf + Open OpenFromXML + 53