From 226c2934873127a08d1ec42882e54b65ed95d305 Mon Sep 17 00:00:00 2001 From: wanlop run Date: Fri, 28 Mar 2025 22:48:06 +0700 Subject: [PATCH] snap 9.70 --- .../topping_revamp/bg_custom_energy_level.png | Bin 6888 -> 6724 bytes inc/button_topping_select_confirm_order.inc | 6 +- inc/select_drink_current.inc | 1 + inter/tha/.special/RoadShow.ev | 34 +++- xml/event/tricker.ev | 1 + xml/menu_new_layout_gen.py | 6 +- xml/page_catalog_group_appfast.xml | 10 +- xml/page_catalog_group_cocktail.xml | 32 +-- xml/page_catalog_group_coffee.xml | 188 +++++++++--------- xml/page_catalog_group_forkid.xml | 50 ++--- xml/page_catalog_group_health.xml | 70 +++---- xml/page_catalog_group_other.xml | 134 ++++++------- xml/page_catalog_group_other_other.xml | 100 +++++----- xml/page_catalog_group_pepsi_7up.xml | 28 +-- ...ge_catalog_group_pro_7up_lucky_draw_x2.xml | 18 +- xml/page_catalog_group_pro_cocoa_77.xml | 36 ++-- ...age_catalog_group_pro_matcha_every_day.xml | 28 +-- xml/page_catalog_group_pro_pepsi_x_taobin.xml | 8 +- xml/page_catalog_group_pro_rerun.xml | 2 +- ...page_catalog_group_pro_wednesday_melon.xml | 18 +- xml/page_catalog_group_recommend.xml | 76 +++---- xml/page_catalog_group_soft_serve.xml | 38 ++-- xml/page_catalog_group_songkran.xml | 8 +- xml/page_catalog_group_tea.xml | 150 +++++++------- xml/page_catalog_group_whey.xml | 30 +-- xml/page_payment.xml | 1 + xml/page_topping_select5.xml | 2 +- xml/page_topping_select7.xml | 5 +- xml/page_topping_select8.xml | 90 ++++++++- xml/payment_cash.ev | 14 +- xml_main/startup.xml | 4 +- xml_main/startup_dev.xml | 4 +- 32 files changed, 648 insertions(+), 544 deletions(-) diff --git a/image/topping2/topping_revamp/bg_custom_energy_level.png b/image/topping2/topping_revamp/bg_custom_energy_level.png index 2fd9a5b2ba73edbe137387c9cd66f04ae880669d..18785e81b93ea5388f58168ad8d54ccb89a19341 100644 GIT binary patch literal 6724 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 diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc index 5d83b666..d4f5bca8 100644 --- a/inc/button_topping_select_confirm_order.inc +++ b/inc/button_topping_select_confirm_order.inc @@ -86,7 +86,7 @@ EndIf Var topping11 = toppingID11index3 EndIf - + @@ -129,7 +129,9 @@ EndIf Else Var topping12 = 0 EndIf - + DEBUGVAR topping12 + DEBUGVAR toppingID12index1 + DEBUGVAR toppingID12index2 If CustomSweetState[3] = "PressForever" Then If ShiftSugarStep = 1 Then diff --git a/inc/select_drink_current.inc b/inc/select_drink_current.inc index 7b32e3df..42be13d3 100644 --- a/inc/select_drink_current.inc +++ b/inc/select_drink_current.inc @@ -1,6 +1,7 @@ SAVELOG " select_drink_current.inc select_drink_current.inc " + Topping "Select" Seeker.selected_a_drink ; Set option toppinng and pack diff --git a/inter/tha/.special/RoadShow.ev b/inter/tha/.special/RoadShow.ev index 2d44149f..00d0a4e2 100644 --- a/inter/tha/.special/RoadShow.ev +++ b/inter/tha/.special/RoadShow.ev @@ -1,5 +1,6 @@ -SAVELOG "RoadShow.ev 177287 177425 172831 " +SAVELOG "RoadShow.ev 200435 201316 EFR02 RoadShowBoxID = is 1" +SAVELOG "RoadShow.ev 172325 EFR01 RoadShowBoxID is 2" SAVELOG "17 Marrrrrrr" @@ -10,36 +11,51 @@ DEBUGVAR SystemDateDayInt ;DEBUGVAR SystemTimeMinuteInt DEBUGVAR SystemTimeHourInt - +Var RoadShowMarketCode = "EFR01" Var RoadShowBoxID = 0 If SystemDateYearInt = 2025 Then - If BoxID = 177287 Then + ; EFR02 + If BoxID = 200435 Then Var RoadShowBoxID = 1 EndIf - If BoxID = 177425 Then + If BoxID = 201316 Then Var RoadShowBoxID = 1 EndIf - If BoxID = 172831 Then - Var RoadShowBoxID = 1 + + + ; EFR01 + If BoxID = 172325 Then + Var RoadShowBoxID = 2 EndIf If SystemDateMonthInt = 3 Then If RoadShowBoxID = 1 Then - If SystemDateDayInt = 17 Then + If SystemDateDayInt = 29 Then Var RoadShow = "true" - + Var RoadShowMarketCode = "EFR02" + EndIf EndIf + If RoadShowBoxID = 2 Then + If SystemDateDayInt = 29 Then + Var RoadShow = "true" + Var RoadShowMarketCode = "EFR01" + + EndIf + + EndIf + + DEBUGVAR RoadShowBoxID EndIf - EndIf +DEBUGVAR RoadShowMarketCode DEBUGVAR RoadShow diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 8787b5a6..eb9633a9 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -190,6 +190,7 @@ If BoxID = 123456 Then Var SongkranSoundCampaign = 1 Var PepsiXTaobinPro = 1 Var MatchaEveryDayPro = 0 + Var ToppingNewUINewSystemStep2 = 1 EndIf DEBUGVAR ConfigNumer diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index a04fc5db..e4ca22ec 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -570,12 +570,12 @@ out_xml( '\t\tEndIf\r\n') else: out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n') out_xml( '\t\tElse\r\n') out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[8] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n') out_xml( '\t\t\tElse\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n') out_xml( '\t\t\tEndIf\r\n') out_xml( '\t\tEndIf\r\n') else: diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 20e45466..f9c940c2 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -99,7 +99,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-1018" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -353,7 +353,7 @@ Essential nutrients" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-1019" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -606,7 +606,7 @@ Essential nutrients" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-1020" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -860,7 +860,7 @@ Essential nutrients" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-1021" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1114,7 +1114,7 @@ Essential nutrients" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-1022" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index e4c0e791..a86deebb 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -90,7 +90,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0001" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -343,7 +343,7 @@ Soda, Ice, Malibu" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0002" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -594,7 +594,7 @@ Soda, Ice, Malibu" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0003" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -847,7 +847,7 @@ Soda, Malibu" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0004" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1100,7 +1100,7 @@ Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0005" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1355,7 +1355,7 @@ Soda, Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0006" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1606,7 +1606,7 @@ Soda, Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1857,7 +1857,7 @@ Soda, Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0008" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2110,7 +2110,7 @@ Juice Ice, Malibu" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0009" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2363,7 +2363,7 @@ Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0010" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2618,7 +2618,7 @@ Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0012" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2869,7 +2869,7 @@ Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0013" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3622,7 +3622,7 @@ Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0015" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3873,7 +3873,7 @@ Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0014" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -4124,7 +4124,7 @@ Ice, Mount Gay Rum" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0019" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -4377,7 +4377,7 @@ Soda, Ice, Gin" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "11-99-05-0020" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index b49ad2df..543533fc 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -90,10 +90,10 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0001" + Topping "Load" "12-01-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0003" + Topping "Load" "12-01-01-0003" Else Topping "Load" "-" EndIf @@ -3133,7 +3133,7 @@ Caramel Oreo" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0001" + Topping "Load" "12-01-01-0001" Else Topping "Load" "-" EndIf @@ -3640,7 +3640,7 @@ Caramel Oreo" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-31-01-0001" + Topping "Load" "12-11-01-0001" Else Topping "Load" "-" EndIf @@ -4656,7 +4656,7 @@ Espresso" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0013" Else Topping "Load" "-" EndIf @@ -4915,7 +4915,7 @@ strawberry, Orange, Floral" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0020" Else Topping "Load" "-" EndIf @@ -5174,7 +5174,7 @@ note: Blue Berry & Floral" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0043" Else Topping "Load" "-" EndIf @@ -5433,7 +5433,7 @@ note: Strawberry & Floral" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0046" Else Topping "Load" "-" EndIf @@ -5690,7 +5690,7 @@ Espresso" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0049" Else Topping "Load" "-" EndIf @@ -5947,7 +5947,7 @@ Espresso" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0022" Else Topping "Load" "-" EndIf @@ -6206,7 +6206,7 @@ note: Strawberry & Floral" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0024" Else Topping "Load" "-" EndIf @@ -6465,7 +6465,7 @@ note: Jasmine & Honey" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0026" Else Topping "Load" "-" EndIf @@ -6724,7 +6724,7 @@ note: Whisky & Vanilla" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0028" Else Topping "Load" "-" EndIf @@ -6983,7 +6983,7 @@ note: Peach, Tea, Chocolate" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0033" Else Topping "Load" "-" EndIf @@ -7241,7 +7241,7 @@ Espresso" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0036" Else Topping "Load" "-" EndIf @@ -7497,7 +7497,7 @@ Geisha" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0037" Else Topping "Load" "-" EndIf @@ -7752,7 +7752,7 @@ pink​ Rose & Berry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0041" + Topping "Load" "12-01-02-0041" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -8251,10 +8251,10 @@ pink​ Rose & Berry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0011" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0014" Else Topping "Load" "-" EndIf @@ -8510,10 +8510,10 @@ strawberry, Orange, Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0019" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0019" Else Topping "Load" "-" EndIf @@ -8769,10 +8769,10 @@ note: Blue Berry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0044" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0044" Else Topping "Load" "-" EndIf @@ -9028,10 +9028,10 @@ note: Strawberry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0047" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0047" Else Topping "Load" "-" EndIf @@ -9285,10 +9285,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0050" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0050" Else Topping "Load" "-" EndIf @@ -9542,10 +9542,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0021" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0021" Else Topping "Load" "-" EndIf @@ -9801,10 +9801,10 @@ note: Strawberry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0025" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0025" Else Topping "Load" "-" EndIf @@ -10060,10 +10060,10 @@ note: Whisky & Vanilla" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0023" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0023" Else Topping "Load" "-" EndIf @@ -10319,10 +10319,10 @@ note: Jasmine & Honey" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0027" Else Topping "Load" "-" EndIf @@ -10578,10 +10578,10 @@ note: Peach, Tea, Chocolate" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0032" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0032" Else Topping "Load" "-" EndIf @@ -10836,10 +10836,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0035" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0035" Else Topping "Load" "-" EndIf @@ -11093,10 +11093,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0038" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0038" Else Topping "Load" "-" EndIf @@ -11352,7 +11352,7 @@ pink​ Rose & Berry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0020" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -11607,7 +11607,7 @@ note: Blue Berry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0022" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -11862,7 +11862,7 @@ note: Strawberry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0045" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -12623,7 +12623,7 @@ Almost Dirty" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0026" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -12878,7 +12878,7 @@ note: Whisky & Vanilla" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0024" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13133,7 +13133,7 @@ note: Jasmine & Honey" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0018" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13388,7 +13388,7 @@ strawberry, Orange, Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0028" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13643,7 +13643,7 @@ note: Peach, Tea, Chocolate" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0033" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13897,7 +13897,7 @@ Almost Dirty" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0036" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -14150,7 +14150,7 @@ Almost Dirty" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0037" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -14405,12 +14405,12 @@ pink​ Rose & Berry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-31-02-0001" + Topping "Load" "12-11-02-0001" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "12-31-03-0001" + Topping "Load" "12-11-03-0001" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -14906,12 +14906,12 @@ Iced Espresso" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0002" + Topping "Load" "12-01-02-0002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0004" + Topping "Load" "12-01-01-0004" Else - Topping "Load" "12-21-03-0002" + Topping "Load" "12-01-03-0002" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0004.NameE @@ -15413,12 +15413,12 @@ Iced Espresso" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-31-02-0002" + Topping "Load" "12-11-02-0002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0005" + Topping "Load" "12-01-01-0005" Else - Topping "Load" "12-31-03-0002" + Topping "Load" "12-11-03-0002" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0005.NameE @@ -15920,12 +15920,12 @@ Iced Espresso" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0003" + Topping "Load" "12-01-02-0003" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0006" + Topping "Load" "12-01-01-0006" Else - Topping "Load" "12-21-03-0003" + Topping "Load" "12-01-03-0003" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0006.NameE @@ -16427,12 +16427,12 @@ Iced Espresso" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0004" + Topping "Load" "12-01-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0007" + Topping "Load" "12-01-01-0007" Else - Topping "Load" "12-21-03-0004" + Topping "Load" "12-01-03-0004" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0007.NameE @@ -16938,12 +16938,12 @@ Caramel " Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0031" + Topping "Load" "12-01-02-0031" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0031" + Topping "Load" "12-01-01-0031" Else - Topping "Load" "12-21-03-0031" + Topping "Load" "12-01-03-0031" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0031.NameE @@ -17449,12 +17449,12 @@ Cafe Latte" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0005" + Topping "Load" "12-01-02-0005" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0008" + Topping "Load" "12-01-01-0008" Else - Topping "Load" "12-21-03-0005" + Topping "Load" "12-01-03-0005" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0008.NameE @@ -17960,12 +17960,12 @@ Cafe Latte" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0008" + Topping "Load" "12-01-02-0008" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0011" + Topping "Load" "12-01-01-0011" Else - Topping "Load" "12-21-03-0008" + Topping "Load" "12-01-03-0008" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0011.NameE @@ -18473,10 +18473,10 @@ Kokuto" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0039" + Topping "Load" "12-01-02-0039" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0039" + Topping "Load" "12-01-01-0039" Else Topping "Load" "-" EndIf @@ -18984,12 +18984,12 @@ Cafe Latte" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0006" + Topping "Load" "12-01-02-0006" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0009" + Topping "Load" "12-01-01-0009" Else - Topping "Load" "12-21-03-0006" + Topping "Load" "12-01-03-0006" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0009.NameE @@ -19497,12 +19497,12 @@ Milk, Sugar" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0029" + Topping "Load" "12-01-02-0029" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0029" + Topping "Load" "12-01-01-0029" Else - Topping "Load" "12-21-03-0029" + Topping "Load" "12-01-03-0029" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0029.NameE @@ -20515,12 +20515,12 @@ Cafe Latte" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0030" + Topping "Load" "12-01-02-0030" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0030" + Topping "Load" "12-01-01-0030" Else - Topping "Load" "12-21-03-0030" + Topping "Load" "12-01-03-0030" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0030.NameE @@ -21028,10 +21028,10 @@ Milk, Sugar" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0017" + Topping "Load" "12-01-02-0017" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0017" + Topping "Load" "12-01-01-0017" Else Topping "Load" "-" EndIf @@ -21537,10 +21537,10 @@ Sugar, Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0040" + Topping "Load" "12-01-02-0040" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0040" + Topping "Load" "12-01-01-0040" Else Topping "Load" "-" EndIf @@ -22046,12 +22046,12 @@ Sugar, Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0042" + Topping "Load" "12-01-02-0042" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0042" + Topping "Load" "12-01-01-0042" Else - Topping "Load" "12-21-03-0042" + Topping "Load" "12-01-03-0042" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0042.NameE @@ -25595,7 +25595,7 @@ Sugar, Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0069" + Topping "Load" "12-01-02-0069" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -26098,7 +26098,7 @@ Coffee" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0070" + Topping "Load" "12-01-02-0070" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 52b94e99..7ed92cd4 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -100,12 +100,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0041" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0041" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -857,12 +857,12 @@ Super Volcano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0005" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0005" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0005" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0005.NameE @@ -1112,12 +1112,12 @@ Super Volcano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0001" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0001" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0001.NameE @@ -1367,12 +1367,12 @@ Super Volcano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0003" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0003" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0003" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0003.NameE @@ -1623,12 +1623,12 @@ Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0006" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0006" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1875,12 +1875,12 @@ Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0002" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0002" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0002.NameE @@ -2130,12 +2130,12 @@ Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0022" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0022" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0022" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0022.NameE @@ -2390,7 +2390,7 @@ Milk" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0010" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2638,12 +2638,12 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0008" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0008" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2889,7 +2889,7 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0044" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3141,7 +3141,7 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0045" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3398,7 +3398,7 @@ Smoothie" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0009" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index a911bb99..2a19dd46 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -87,10 +87,10 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-1001" + Topping "Load" "12-01-02-1001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-1003" + Topping "Load" "12-01-01-1003" Else Topping "Load" "-" EndIf @@ -596,10 +596,10 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-1002" + Topping "Load" "12-01-02-1002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-1004" + Topping "Load" "12-01-01-1004" Else Topping "Load" "-" EndIf @@ -1105,10 +1105,10 @@ Foamed Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-1003" + Topping "Load" "12-01-02-1003" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-1006" + Topping "Load" "12-01-01-1006" Else Topping "Load" "-" EndIf @@ -1616,10 +1616,10 @@ Milk, Sugar" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-1099" + Topping "Load" "12-01-02-1099" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-1099" + Topping "Load" "12-01-01-1099" Else Topping "Load" "-" EndIf @@ -2125,10 +2125,10 @@ Foamed Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1024" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1024" Else Topping "Load" "-" EndIf @@ -2380,10 +2380,10 @@ Foamed Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1025" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1025" Else Topping "Load" "-" EndIf @@ -2637,10 +2637,10 @@ And Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1026" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1026" Else Topping "Load" "-" EndIf @@ -2892,10 +2892,10 @@ And Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1027" Else Topping "Load" "-" EndIf @@ -3147,10 +3147,10 @@ And Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1029" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1029" Else Topping "Load" "-" EndIf @@ -3402,10 +3402,10 @@ And Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1030" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1030" Else Topping "Load" "-" EndIf @@ -3658,10 +3658,10 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1031" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1031" Else Topping "Load" "-" EndIf @@ -3913,10 +3913,10 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1032" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1032" Else Topping "Load" "-" EndIf @@ -4171,10 +4171,10 @@ Water, And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1037" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1037" Else Topping "Load" "-" EndIf @@ -4426,10 +4426,10 @@ Water, And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-1002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-1002" Else Topping "Load" "-" EndIf @@ -4681,10 +4681,10 @@ Water, And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-1005" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-1005" Else Topping "Load" "-" EndIf @@ -4936,10 +4936,10 @@ Water, And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-1001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-01-1001" Else Topping "Load" "-" EndIf @@ -5191,7 +5191,7 @@ Water, And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-1010" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -5443,10 +5443,10 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1038" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1038" Else Topping "Load" "-" EndIf diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index b4e88e1f..49b6ab09 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -3857,12 +3857,12 @@ Soda Extra" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -4108,12 +4108,12 @@ Soda Extra" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0094" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0094" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6144,12 +6144,12 @@ Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0034" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0034" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6396,12 +6396,12 @@ Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0035" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0035" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6649,7 +6649,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0095" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -6900,7 +6900,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0096" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7153,7 +7153,7 @@ Plum Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0044" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7405,7 +7405,7 @@ Plum Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0045" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7657,12 +7657,12 @@ Plum Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0010" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0010" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -7909,12 +7909,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0033" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0033" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8160,12 +8160,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0022" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0022" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8414,7 +8414,7 @@ Limenade, Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0115" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -8922,7 +8922,7 @@ Sugar, Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0012" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -9173,12 +9173,12 @@ Sugar, Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0041" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0041" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9424,12 +9424,12 @@ Sugar, Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0008" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0008" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9675,12 +9675,12 @@ Sugar, Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0009" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0009" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9928,7 +9928,7 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0100" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -10180,12 +10180,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0024" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0024" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -10431,12 +10431,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0025" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0025" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -10935,7 +10935,7 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0097" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -11187,7 +11187,7 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0101" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -11440,12 +11440,12 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0047" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0047" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -12695,7 +12695,7 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0102" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13700,12 +13700,12 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0038" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0038" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -13951,12 +13951,12 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0039" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0039" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -14203,7 +14203,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0051" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -14454,7 +14454,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0052" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -14957,7 +14957,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0116" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -19484,7 +19484,7 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0103" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -19735,7 +19735,7 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0014" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -19986,7 +19986,7 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0015" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -20237,12 +20237,12 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0003" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0003" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -20490,12 +20490,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0004" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0004" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -20742,12 +20742,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0002" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0002" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -20994,7 +20994,7 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0005" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -21247,12 +21247,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-01-0001" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0001" EndIf EndIf Var menu_name_eng_hot = $12-05-01-0001.NameE @@ -21502,12 +21502,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0026" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0026" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -21753,12 +21753,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0032" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0032" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -22010,7 +22010,7 @@ Water & Ice" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0040" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -22511,7 +22511,7 @@ Water, Ice" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-06-01-0001" Else Topping "Load" "-" EndIf @@ -22767,7 +22767,7 @@ Plant Protein" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-06-01-0002" Else Topping "Load" "-" EndIf @@ -23019,7 +23019,7 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0017" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -23270,7 +23270,7 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0016" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -23521,10 +23521,10 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0018" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-01-0002" Else Topping "Load" "-" EndIf diff --git a/xml/page_catalog_group_other_other.xml b/xml/page_catalog_group_other_other.xml index b7a34965..2bf7cff2 100644 --- a/xml/page_catalog_group_other_other.xml +++ b/xml/page_catalog_group_other_other.xml @@ -3857,12 +3857,12 @@ Soda Extra" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0094" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0094" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6656,12 +6656,12 @@ Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0035" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0035" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6909,12 +6909,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0034" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0034" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -7161,7 +7161,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0095" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7412,7 +7412,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0044" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7664,7 +7664,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0045" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7916,12 +7916,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0010" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0010" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8168,12 +8168,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0033" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0033" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8419,12 +8419,12 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0022" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0022" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8673,12 +8673,12 @@ Limenade, Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0008" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0008" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -8924,12 +8924,12 @@ Limenade, Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0009" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0009" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9177,12 +9177,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0024" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0024" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9428,12 +9428,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0025" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0025" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9681,12 +9681,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0038" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0038" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9932,12 +9932,12 @@ Soda & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0039" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0039" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -10184,7 +10184,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0051" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -10435,7 +10435,7 @@ Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0052" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13707,7 +13707,7 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0014" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -13958,7 +13958,7 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0015" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -14209,12 +14209,12 @@ Lychee Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0003" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0003" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -14462,12 +14462,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0004" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0004" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -14714,12 +14714,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0002" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0002" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -14966,12 +14966,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-01-0001" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0001" EndIf EndIf Var menu_name_eng_hot = $12-05-01-0001.NameE @@ -15221,12 +15221,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0026" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0026" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15472,12 +15472,12 @@ Water & Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0032" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0032" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15978,7 +15978,7 @@ Water & Ice" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-06-01-0001" Else Topping "Load" "-" EndIf @@ -16234,7 +16234,7 @@ Plant Protein" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-06-01-0002" Else Topping "Load" "-" EndIf @@ -16486,7 +16486,7 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0017" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -16737,7 +16737,7 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0016" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -16988,10 +16988,10 @@ Plant Protein" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0018" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-01-0002" Else Topping "Load" "-" EndIf diff --git a/xml/page_catalog_group_pepsi_7up.xml b/xml/page_catalog_group_pepsi_7up.xml index 1a1559df..7fbeaa04 100644 --- a/xml/page_catalog_group_pepsi_7up.xml +++ b/xml/page_catalog_group_pepsi_7up.xml @@ -88,12 +88,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2347,12 +2347,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0046" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0046" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3351,7 +3351,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0096" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3604,7 +3604,7 @@ Plum Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0115" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3857,7 +3857,7 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0100" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -4360,7 +4360,7 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0097" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -4612,7 +4612,7 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0101" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -4865,12 +4865,12 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0047" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0047" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -6120,7 +6120,7 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0102" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -7125,7 +7125,7 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0116" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -8632,7 +8632,7 @@ Strawberry Lime" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0103" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml b/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml index 20e29bc0..63135065 100644 --- a/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml +++ b/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml @@ -4869,7 +4869,7 @@ Refreshment" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0046" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -6377,7 +6377,7 @@ And Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -6628,7 +6628,7 @@ And Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0094" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -9398,7 +9398,7 @@ Lime" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -9649,7 +9649,7 @@ Lime" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0094" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -10147,12 +10147,12 @@ And Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0047" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0047" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -10398,12 +10398,12 @@ And Soda" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0105" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0105" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_pro_cocoa_77.xml b/xml/page_catalog_group_pro_cocoa_77.xml index ebf66431..aa907376 100644 --- a/xml/page_catalog_group_pro_cocoa_77.xml +++ b/xml/page_catalog_group_pro_cocoa_77.xml @@ -93,12 +93,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0003" + Topping "Load" "12-01-02-0003" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0006" + Topping "Load" "12-01-01-0006" Else - Topping "Load" "12-21-03-0003" + Topping "Load" "12-01-03-0003" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0006.NameE @@ -608,10 +608,10 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-1003" + Topping "Load" "12-01-02-1003" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-1006" + Topping "Load" "12-01-01-1006" Else Topping "Load" "-" EndIf @@ -1636,12 +1636,12 @@ Cocoa, Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0002" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0002" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0002.NameE @@ -1895,10 +1895,10 @@ Cocoa, Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-1002" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-1002" Else Topping "Load" "-" EndIf @@ -2154,12 +2154,12 @@ Cocoa, Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0004" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0004" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0004.NameE @@ -2676,12 +2676,12 @@ Banana Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0025" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0025" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0025" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0025.NameE @@ -3713,7 +3713,7 @@ Water" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0010" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3970,7 +3970,7 @@ Smoothie" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0030" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_pro_matcha_every_day.xml b/xml/page_catalog_group_pro_matcha_every_day.xml index 0e73da9e..0676f160 100644 --- a/xml/page_catalog_group_pro_matcha_every_day.xml +++ b/xml/page_catalog_group_pro_matcha_every_day.xml @@ -1097,12 +1097,12 @@ Sugar And Ice" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0026" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0026" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0026" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0026.NameE @@ -2117,12 +2117,12 @@ Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0031" + Topping "Load" "12-01-02-0031" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0031" + Topping "Load" "12-01-01-0031" Else - Topping "Load" "12-21-03-0031" + Topping "Load" "12-01-03-0031" EndIf EndIf Var menu_name_eng_hot = $12-01-01-0031.NameE @@ -2882,12 +2882,12 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0027" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0027" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0027.NameE @@ -3137,12 +3137,12 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0028" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0028" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0028" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0028.NameE @@ -3645,10 +3645,10 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-1026" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-1026" Else Topping "Load" "-" EndIf diff --git a/xml/page_catalog_group_pro_pepsi_x_taobin.xml b/xml/page_catalog_group_pro_pepsi_x_taobin.xml index 4725e3c6..abad793b 100644 --- a/xml/page_catalog_group_pro_pepsi_x_taobin.xml +++ b/xml/page_catalog_group_pro_pepsi_x_taobin.xml @@ -2595,12 +2595,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2846,12 +2846,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0094" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0094" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_pro_rerun.xml b/xml/page_catalog_group_pro_rerun.xml index d704fb7a..a5b63f25 100644 --- a/xml/page_catalog_group_pro_rerun.xml +++ b/xml/page_catalog_group_pro_rerun.xml @@ -343,7 +343,7 @@ House" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0043" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_pro_wednesday_melon.xml b/xml/page_catalog_group_pro_wednesday_melon.xml index 282b376e..724c9e17 100644 --- a/xml/page_catalog_group_pro_wednesday_melon.xml +++ b/xml/page_catalog_group_pro_wednesday_melon.xml @@ -87,12 +87,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0022" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0022" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0022" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0022.NameE @@ -346,10 +346,10 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0039" + Topping "Load" "12-01-02-0039" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0039" + Topping "Load" "12-01-01-0039" Else Topping "Load" "-" EndIf @@ -870,7 +870,7 @@ Cafe Latte" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0028" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1123,7 +1123,7 @@ Sugar, Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0044" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1379,12 +1379,12 @@ Sugar, Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0047" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0047" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index b2f9112c..4fa791c8 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -4400,10 +4400,10 @@ Volcano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "12-21-02-0001" + Topping "Load" "12-01-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "12-21-01-0003" + Topping "Load" "12-01-01-0003" Else Topping "Load" "-" EndIf @@ -10970,10 +10970,10 @@ Sugar, Biscoff" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0011" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0014" Else Topping "Load" "-" EndIf @@ -11229,10 +11229,10 @@ Ethiopia Guji" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0019" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0019" Else Topping "Load" "-" EndIf @@ -11488,10 +11488,10 @@ note: Blue Berry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0021" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0021" Else Topping "Load" "-" EndIf @@ -11747,10 +11747,10 @@ note: Strawberry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0025" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0025" Else Topping "Load" "-" EndIf @@ -12006,10 +12006,10 @@ note: Whisky & Vanilla" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0023" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0023" Else Topping "Load" "-" EndIf @@ -12265,10 +12265,10 @@ note: Jasmine & Honey" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0027" Else Topping "Load" "-" EndIf @@ -12524,10 +12524,10 @@ note: Peach, Tea, Chocolate" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0032" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0032" Else Topping "Load" "-" EndIf @@ -12782,10 +12782,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0035" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0035" Else Topping "Load" "-" EndIf @@ -13039,10 +13039,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0038" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0038" Else Topping "Load" "-" EndIf @@ -13298,10 +13298,10 @@ pink​ Rose & Berry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0044" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0044" Else Topping "Load" "-" EndIf @@ -13557,10 +13557,10 @@ note: Strawberry & Floral" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0047" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0047" Else Topping "Load" "-" EndIf @@ -13814,10 +13814,10 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-02-0050" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-01-01-0050" Else Topping "Load" "-" EndIf @@ -14581,12 +14581,12 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0001" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-01-0001" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0001" EndIf EndIf Var menu_name_eng_hot = $12-03-01-0001.NameE @@ -14836,12 +14836,12 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-03-02-0006" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0006" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15094,7 +15094,7 @@ Sugar" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-03-03-0011" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15342,12 +15342,12 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0007" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15593,12 +15593,12 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0046" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0046" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -15844,12 +15844,12 @@ Smoothie" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0025" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0025" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_soft_serve.xml b/xml/page_catalog_group_soft_serve.xml index 0f145c8e..77b034d8 100644 --- a/xml/page_catalog_group_soft_serve.xml +++ b/xml/page_catalog_group_soft_serve.xml @@ -90,7 +90,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0001" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -341,7 +341,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0002" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -592,7 +592,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0003" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -843,7 +843,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0004" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1094,7 +1094,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0005" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1345,7 +1345,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0006" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1596,7 +1596,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0007" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -1847,7 +1847,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0008" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2098,7 +2098,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0009" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2349,7 +2349,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0010" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2600,7 +2600,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0011" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -2851,7 +2851,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0012" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3102,7 +3102,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0013" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3353,7 +3353,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0016" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3604,7 +3604,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0018" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -3855,7 +3855,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0021" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -4106,7 +4106,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0022" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -4359,7 +4359,7 @@ Banana" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0023" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE @@ -4610,7 +4610,7 @@ Banana" If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "-" + Topping "Load" "12-41-03-0029" EndIf EndIf Var menu_name_eng_hot = $##-##-##-####.NameE diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index b657733a..08f36cc0 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -723,7 +723,7 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0043" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -974,7 +974,7 @@ Americano" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0044" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1226,7 +1226,7 @@ House" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0055" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1477,7 +1477,7 @@ House" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0056" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 3c8fed54..519fd330 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -93,12 +93,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0004" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0004" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0004" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0004.NameE @@ -348,12 +348,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0026" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0026" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0026" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0026.NameE @@ -603,12 +603,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0039" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0039" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0039" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0039.NameE @@ -858,12 +858,12 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0024" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0024" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0024" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0024.NameE @@ -6715,12 +6715,12 @@ Caramel Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0020" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0020" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0020" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0020.NameE @@ -6970,12 +6970,12 @@ Caramel Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0041" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0041" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0041" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0041.NameE @@ -7225,12 +7225,12 @@ Caramel Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-05-02-0027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0017" Else - Topping "Load" "-" + Topping "Load" "12-05-03-0027" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0017.NameE @@ -7480,12 +7480,12 @@ Caramel Oreo" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0007" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0007" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0007" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0007.NameE @@ -7738,7 +7738,7 @@ Caramel Oreo" Topping "Load" "-" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0021" Else Topping "Load" "-" EndIf @@ -7991,12 +7991,12 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0042" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0042" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0042" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0042.NameE @@ -8247,12 +8247,12 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0040" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0040" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0040" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0040.NameE @@ -8502,10 +8502,10 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0047" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0047" Else Topping "Load" "-" EndIf @@ -9267,12 +9267,12 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0037" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0037" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0037" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0037.NameE @@ -9522,12 +9522,12 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0027" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0027" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0027" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0027.NameE @@ -9777,12 +9777,12 @@ Ginger Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0028" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0028" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0028" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0028.NameE @@ -10033,12 +10033,12 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0011" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0011" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0011" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0011.NameE @@ -10288,12 +10288,12 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0012" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0012" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0012" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0012.NameE @@ -11054,12 +11054,12 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0050" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0050" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0050" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0050.NameE @@ -13335,12 +13335,12 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0006" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0006" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0006" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0006.NameE @@ -13592,12 +13592,12 @@ Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0008" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0008" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0008" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0008.NameE @@ -13847,12 +13847,12 @@ Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0019" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0019" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0019" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0019.NameE @@ -14102,10 +14102,10 @@ Tea" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0009" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0009" Else Topping "Load" "-" EndIf @@ -14359,12 +14359,12 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0017" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0016" Else - Topping "Load" "-" + Topping "Load" "12-02-03-0017" EndIf EndIf Var menu_name_eng_hot = $12-02-01-0016.NameE @@ -14614,10 +14614,10 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0029" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0029" Else Topping "Load" "-" EndIf @@ -14869,10 +14869,10 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0030" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0030" Else Topping "Load" "-" EndIf @@ -15125,10 +15125,10 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0031" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0031" Else Topping "Load" "-" EndIf @@ -15381,10 +15381,10 @@ Limenade" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0032" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0032" Else Topping "Load" "-" EndIf @@ -15638,10 +15638,10 @@ Water" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-02-0038" Else If PD_STAGE_1 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-02-01-0038" Else Topping "Load" "-" EndIf diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 0b8b09c6..9be45c43 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -95,7 +95,7 @@ Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0001" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -347,7 +347,7 @@ Matcha, & Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0016" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -599,7 +599,7 @@ Matcha, & Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0002" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -851,7 +851,7 @@ Cocoa, & Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0003" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1105,7 +1105,7 @@ Strawberry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0013" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1359,7 +1359,7 @@ Strawberry" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0018" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1612,7 +1612,7 @@ Melon" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0004" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -1864,7 +1864,7 @@ Melon" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0005" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2116,7 +2116,7 @@ Thai Tea, & Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0015" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2620,7 +2620,7 @@ Thai Tea, & Milk" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0006" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -2874,7 +2874,7 @@ Kokuto" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0008" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3128,7 +3128,7 @@ Taiwanese Tea, Sugar" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0017" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3382,7 +3382,7 @@ Taiwanese Tea, Sugar" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0009" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3635,7 +3635,7 @@ Caramel" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0010" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" @@ -3886,7 +3886,7 @@ Caramel" Var DefaultDrinkType = 3 EndIf If PD_STAGE_2 = "Enable" Then - Topping "Load" "-" + Topping "Load" "12-04-02-0011" Else If PD_STAGE_1 = "Enable" Then Topping "Load" "-" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 954d62e7..326a9f3e 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -293,6 +293,7 @@ EndIf Var Seeker.VendingCode = RoadShowMarketCode + DEBUGVAR RoadShowMarketCode Var Seeker.IntVendingCampaign = PriceDrink Var Seeker.FreeVendingCampaign = 1 diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index f99548b5..0846fd2b 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -94,7 +94,7 @@ If IsCatalogMilk = "true" Then Open "ROOT/taobin_project/xml/page_topping_select8.xml" EndIf - + If ToppingNewUINewSystemStep2 = 1 Then Var ProductSodaCat = "12-05-02-0014,12-05-02-0015,12-05-02-0008,12-05-03-0008,12-05-02-0009,12-05-03-0009,12-05-02-0003,12-05-03-0003,12-05-02-0002,12-05-03-0002,12-05-02-0033,12-05-03-0033,12-05-02-0032,12-05-03-0032,12-05-02-0041,12-05-03-0041,12-05-02-0023,12-05-03-0023,12-05-02-0040,12-05-03-0040,12-05-02-0010,12-05-03-0010,12-05-02-0001,12-05-03-0001,12-05-02-0024,12-05-03-0024,12-05-02-0025,12-05-03-0025,12-05-02-0026,12-05-03-0026,12-05-02-0090,12-05-02-0104,12-05-03-0104,12-05-02-0094,12-05-03-0094,12-05-02-0104,12-05-02-0093,12-05-02-0106,12-05-02-0114,12-05-03-0114,12-05-02-0136,12-05-03-0136,12-05-02-0137,12-05-03-0137,12-05-02-0138,12-05-03-0138,12-05-02-0139,12-05-03-0139,12-05-02-0140,12-05-03-0140,12-05-02-0141,12-05-03-0141,12-05-02-0142,12-05-03-0142,12-05-02-0143,12-05-03-0143" diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 357234c7..baa8cf8d 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -135,7 +135,10 @@ ; End Customer Coffee - Var topping12 = "1" + Var topping12 = 80 + Var Seeker.topping12 = 1 + Var Seeker.topping13 = 1 + Var showShotEnableSoda = "Disable" Var CustomEnergyState[0] = "Disable" Var CustomEnergyState[1] = "Disable" diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 7a60d7b3..159ed71c 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -180,13 +180,14 @@ Var CustomOvaltineState[2] = "Enable" - Var CustomMilkState[0] = "Disable" - Var CustomMilkState[1] = "Disable" - Var CustomMilkState[2] = "Disable" + Var CustomMilkState[0] = "Invisible" + Var CustomMilkState[1] = "Invisible" + Var CustomMilkState[2] = "Invisible" Var showShotEnableSoda = "Disable" Var CustomEnergyState[0] = "Disable" Var CustomEnergyState[1] = "Disable" + Var CustomEnergyState[3] = "Disable" ; Texts Var CustomCoffeeTextY = 47 @@ -206,8 +207,8 @@ Var CustomOvaltineCheckState = "Invisible" Var CustomCocoaCheckState = "Invisible" - - + ; enery group clear + Var topping12 = 80 Var PopupToppingSelect = "Invisible" @@ -1320,7 +1321,7 @@ Var CustomSweetrText[5] = "สุขิต" - Var CustomEspressoText[0] = "ปกติ" + Var CustomEspressoText[0] = "ไม่เพิ่ม" Var CustomEspressoText[1] = "2 ช็อต" Var CustomCocoaText[0] = "โกโก้ X2" @@ -1986,6 +1987,7 @@ Var showEnergyEnable = "Enable" EndIf + If toppingID12index2Status = "Disable" Then Var showEnergyEnable = "Enable" EndIf @@ -2027,6 +2029,16 @@ EndIf EndIf + If CustomEnergyState[0] = "Enable" Then + + If CustomEnergyState[1] = "Enable" Then + Var CustomEnergyState[3] = "PressForever" + EndIf + EndIf + + + + Var ProductSodaDisableShot = "12-05-02-0114,12-05-02-0104,12-05-02-0094" Var IsSodaDisableShot = "false" @@ -7963,6 +7975,8 @@ + + CustomEspressoTextX CustomEspressoTextY @@ -8004,7 +8018,59 @@ 0 Var( DirImage + "/topping_revamp/bg_custom_energy_level.png" ) + + + 685 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + "ไม่เติม" + 784 diff --git a/xml/payment_cash.ev b/xml/payment_cash.ev index 2eef908a..ec4c5197 100644 --- a/xml/payment_cash.ev +++ b/xml/payment_cash.ev @@ -1,9 +1,13 @@ ;for 3 langs -If LanguageShow = "ENG" Then - Var show_eng = "true" -EndIf -If LanguageShow = "THAI" Then - Var show_eng = "false" + +; Don't remove InternationalEnable +If InternationalEnable = 1 Then + If LanguageShow = "ENG" Then + Var show_eng = "true" + EndIf + If LanguageShow = "THAI" Then + Var show_eng = "false" + EndIf EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 9c05a2a0..5bb3d007 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.68" - Var XMLPageVersionInt = 968 + Var XMLPageVersion = "9.69" + Var XMLPageVersionInt = 969 ;Oreo Var OreoGuarantee = 0 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index ec459a72..f4f4c6a8 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.68" - Var XMLPageVersionInt = 1068 + Var XMLPageVersion = "10.69" + Var XMLPageVersionInt = 1069 ;Oreo Var OreoGuarantee = 0