From f320c5f55f1b316b1f68f0912fb3679b86208189 Mon Sep 17 00:00:00 2001
From: wanlop run <wanlop.r@forth.co.th>
Date: Thu, 27 Mar 2025 18:09:21 +0700
Subject: [PATCH] Add column for present topping

---
 xml/menu_new_layout_gen.py                    |  64 ++-
 xml/page_catalog_group_appfast.xml            |  10 +-
 xml/page_catalog_group_cocktail.xml           |  32 +-
 xml/page_catalog_group_coffee.xml             | 512 +++++++++++++----
 xml/page_catalog_group_deep_fryer.xml         |  36 +-
 xml/page_catalog_group_forkid.xml             | 164 +++++-
 xml/page_catalog_group_health.xml             | 166 ++++--
 xml/page_catalog_group_milk.xml               | 540 ++++++++++++++++--
 xml/page_catalog_group_oreo.xml               | 140 ++++-
 xml/page_catalog_group_other.xml              | 494 +++++++++++++---
 xml/page_catalog_group_other_other.xml        | 398 +++++++++++--
 xml/page_catalog_group_pepsi_7up.xml          | 130 ++++-
 xml/page_catalog_group_pro_12_day_12_menu.xml |  96 +++-
 ...ge_catalog_group_pro_7up_lucky_draw_x2.xml |  46 +-
 xml/page_catalog_group_pro_bad_valentine.xml  |  70 ++-
 ...og_group_pro_banana_mint_lucky_draw_x3.xml | 108 +++-
 xml/page_catalog_group_pro_buble_tea.xml      | 330 +++++++++--
 xml/page_catalog_group_pro_cocoa_77.xml       | 196 ++++++-
 xml/page_catalog_group_pro_coconut_milk.xml   |  70 ++-
 xml/page_catalog_group_pro_freefile.xml       |  36 +-
 xml/page_catalog_group_pro_halloween.xml      |  84 ++-
 xml/page_catalog_group_pro_happy_trios.xml    |  46 +-
 xml/page_catalog_group_pro_jemila.xml         |  96 +++-
 ...age_catalog_group_pro_kingdom_thai_tea.xml |  84 ++-
 xml/page_catalog_group_pro_lipit.xml          |  60 +-
 ...age_catalog_group_pro_matcha_every_day.xml | 138 ++++-
 xml/page_catalog_group_pro_mom_cocoa.xml      | 144 ++++-
 xml/page_catalog_group_pro_monday_banana.xml  |  36 +-
 xml/page_catalog_group_pro_mymint.xml         |  82 ++-
 ...page_catalog_group_pro_nam_hom_coconut.xml | 180 +++++-
 xml/page_catalog_group_pro_oreo_11.xml        | 238 ++++++--
 ...page_catalog_group_pro_ovaltine_school.xml |  36 +-
 xml/page_catalog_group_pro_passion_mint.xml   |  36 +-
 xml/page_catalog_group_pro_peach.xml          |  70 ++-
 ..._catalog_group_pro_pepsi_second_cup_30.xml |  12 +-
 xml/page_catalog_group_pro_pepsi_x_taobin.xml |  44 +-
 ...e_catalog_group_pro_red_string_of_fate.xml |  36 +-
 xml/page_catalog_group_pro_rerun.xml          |  38 +-
 ...page_catalog_group_pro_robinson_beauty.xml |  48 +-
 ...ge_catalog_group_pro_strawberry_series.xml |  94 ++-
 xml/page_catalog_group_pro_tea_time.xml       | 152 ++++-
 ..._catalog_group_pro_thick_tea_by_brewer.xml |  36 +-
 ...page_catalog_group_pro_wednesday_melon.xml |  48 +-
 ...age_catalog_group_pro_weekday_discount.xml | 166 +++++-
 ...og_group_pro_weekday_discount_event_on.xml | 166 +++++-
 xml/page_catalog_group_recommend.xml          | 456 ++++++++++++---
 xml/page_catalog_group_soft_serve.xml         | 190 +++++-
 xml/page_catalog_group_songkran.xml           |   8 +-
 xml/page_catalog_group_tea.xml                | 150 ++---
 xml/page_catalog_group_whey.xml               |  30 +-
 xml/page_catalog_momday.xml                   |  36 +-
 51 files changed, 5541 insertions(+), 1137 deletions(-)

diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index c164ce01..a04fc5db 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -41,8 +41,6 @@
         return ""
 
   button_add_string = ""
-  print(" current_file_name " + current_file_name + " ")
-
 
   if "v2" in param:
     print("Version 1 ignore ")
@@ -429,7 +427,7 @@
           pd_code_3 = pd_code_available
           pd_stage3 = '"Disable2"'
 
-        print(" pd_code_1 " + pd_code_1 + " pd_code_2 " + pd_code_2 + " pd_code_3 " + pd_code_3)
+
 
 
         out_xml( '\t<Button>\r\n')
@@ -554,9 +552,32 @@
 
 
 
-        if len(spl) > 15 and len(spl[15].strip()) != 0:
+        if len(spl) > 15:
+            try:
+              present = int(spl[15].strip())
+            except:
+              present = 0
 
-          out_xml( '\t\tTopping "Load" "' + spl[3 + int(spl[15].strip())].replace("-alter", "") + '"\r\n')
+            if present == 3:
+              out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n')
+              out_xml( '\t\tElse\r\n')
+              out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n')
+              out_xml( '\t\t\tElse\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n')
+              out_xml( '\t\t\tEndIf\r\n')
+              out_xml( '\t\tEndIf\r\n')
+            else:
+              out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\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\tElse\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n')
+              out_xml( '\t\t\tEndIf\r\n')
+              out_xml( '\t\tEndIf\r\n')
         else:
           out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
           #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
@@ -1252,18 +1273,41 @@
           out_xml( '\t\tEndIf\r\n')
 
 
-          if len(spl) > 15 and len(spl[15].strip()) != 0:
-            out_xml( '\t\tTopping "Load" "' + spl[7 + int(spl[15].strip())].replace("-alter", "") + '"\r\n')
+          if len(spl) > 15:
+            try:
+              present = int(spl[15].strip())
+            except:
+              present = 0
+
+            if present == 3:
+              out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n')
+              out_xml( '\t\tElse\r\n')
+              out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\r\n')
+              out_xml( '\t\t\tElse\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[8] +'"\r\n')
+              out_xml( '\t\t\tEndIf\r\n')
+              out_xml( '\t\tEndIf\r\n')
+            else:
+              out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\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\tElse\r\n')
+              out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n')
+              out_xml( '\t\t\tEndIf\r\n')
+              out_xml( '\t\tEndIf\r\n')
+
+            
           else:
             out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-            #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
             out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\r\n')
             out_xml( '\t\tElse\r\n')
             out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
-            #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
             out_xml( '\t\t\tTopping "Load" "'+ spl[8] +'"\r\n')
             out_xml( '\t\t\tElse\r\n')
-            #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
             out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n')
             out_xml( '\t\t\tEndIf\r\n')
             out_xml( '\t\tEndIf\r\n')
diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml
index f9c940c2..20e45466 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" "12-04-02-1018"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -353,7 +353,7 @@ Essential nutrients" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-1019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -606,7 +606,7 @@ Essential nutrients" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-1020"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -860,7 +860,7 @@ Essential nutrients" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-1021"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1114,7 +1114,7 @@ Essential nutrients" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-1022"
+			Topping "Load" "-"
 		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 a86deebb..e4c0e791 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" "11-99-05-0001"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -343,7 +343,7 @@ Soda, Ice, Malibu" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0002"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -594,7 +594,7 @@ Soda, Ice, Malibu" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0003"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -847,7 +847,7 @@ Soda, Malibu" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0004"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1100,7 +1100,7 @@ Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0005"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1355,7 +1355,7 @@ Soda, Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0006"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1606,7 +1606,7 @@ Soda, Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0007"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1857,7 +1857,7 @@ Soda, Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0008"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2110,7 +2110,7 @@ Juice Ice, Malibu" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0009"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2363,7 +2363,7 @@ Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0010"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2618,7 +2618,7 @@ Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0012"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2869,7 +2869,7 @@ Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0013"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3622,7 +3622,7 @@ Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0015"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3873,7 +3873,7 @@ Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0014"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -4124,7 +4124,7 @@ Ice, Mount Gay Rum" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -4377,7 +4377,7 @@ Soda, Ice, Gin" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0020"
+			Topping "Load" "-"
 		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 66dc71c5..b49ad2df 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-01-02-0001"
+			Topping "Load" "12-21-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0003"
+			Topping "Load" "12-21-01-0003"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -548,7 +548,7 @@
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0090 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -596,7 +596,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0090"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0090"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -841,7 +849,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0090"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0090"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1538,7 +1554,7 @@ Sugar And Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0030 12-01-02-0030 12-01-03-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1586,7 +1602,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0030"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0030"
+			Else
+			Topping "Load" "12-01-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0030.NameE
 		Var menu_desc_eng_hot = $12-01-01-0030.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0030.Name
@@ -1833,7 +1857,15 @@ And Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0030"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0030"
+			Else
+			Topping "Load" "12-21-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0030.NameE
 		Var menu_desc_eng_hot = $12-21-01-0030.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0030.Name
@@ -2033,7 +2065,7 @@ And Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0074 12-01-02-0074 12-01-03-0074 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2081,7 +2113,15 @@ And Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0074"
+			Else
+			Topping "Load" "12-01-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0074.NameE
 		Var menu_desc_eng_hot = $12-01-01-0074.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0074.Name
@@ -2329,7 +2369,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0074"
+			Else
+			Topping "Load" "12-21-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0074.NameE
 		Var menu_desc_eng_hot = $12-21-01-0074.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0074.Name
@@ -2530,7 +2578,7 @@ Coffee, Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0078 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2578,7 +2626,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2821,7 +2877,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3069,7 +3133,7 @@ Caramel Oreo" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0001"
+			Topping "Load" "12-21-01-0001"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -3576,7 +3640,7 @@ Caramel Oreo" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-11-01-0001"
+			Topping "Load" "12-31-01-0001"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4592,7 +4656,7 @@ Espresso" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0013"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4851,7 +4915,7 @@ strawberry, Orange, Floral" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0020"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5110,7 +5174,7 @@ note: Blue Berry & Floral" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0043"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5369,7 +5433,7 @@ note: Strawberry & Floral" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0046"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5626,7 +5690,7 @@ Espresso" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0049"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5883,7 +5947,7 @@ Espresso" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0022"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -6142,7 +6206,7 @@ note: Strawberry & Floral" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0024"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -6401,7 +6465,7 @@ note: Jasmine & Honey" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0026"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -6660,7 +6724,7 @@ note: Whisky & Vanilla" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0028"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -6919,7 +6983,7 @@ note: Peach, Tea, Chocolate" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0033"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -7177,7 +7241,7 @@ Espresso" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0036"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -7433,7 +7497,7 @@ Geisha" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0037"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -7688,7 +7752,7 @@ pink​ Rose & Berry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0041"
+			Topping "Load" "12-21-02-0041"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -8187,10 +8251,10 @@ pink​ Rose & Berry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0011"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0014"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -8446,10 +8510,10 @@ strawberry, Orange, Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0019"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -8705,10 +8769,10 @@ note: Blue Berry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0044"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -8964,10 +9028,10 @@ note: Strawberry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0047"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0047"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -9221,10 +9285,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0050"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0050"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -9478,10 +9542,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0021"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0021"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -9737,10 +9801,10 @@ note: Strawberry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0025"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0025"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -9996,10 +10060,10 @@ note: Whisky & Vanilla" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0023"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0023"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -10255,10 +10319,10 @@ note: Jasmine & Honey" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0027"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0027"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -10514,10 +10578,10 @@ note: Peach, Tea, Chocolate" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0032"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0032"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -10772,10 +10836,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0035"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0035"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -11029,10 +11093,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0038"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0038"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -11288,7 +11352,7 @@ pink​ Rose & Berry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0020"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -11543,7 +11607,7 @@ note: Blue Berry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0022"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -11798,7 +11862,7 @@ note: Strawberry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0045"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -12559,7 +12623,7 @@ Almost Dirty" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0026"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -12814,7 +12878,7 @@ note: Whisky & Vanilla" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0024"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13069,7 +13133,7 @@ note: Jasmine & Honey" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0018"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13324,7 +13388,7 @@ strawberry, Orange, Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0028"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13579,7 +13643,7 @@ note: Peach, Tea, Chocolate" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0033"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13833,7 +13897,7 @@ Almost Dirty" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0036"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -14086,7 +14150,7 @@ Almost Dirty" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0037"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -14340,7 +14404,15 @@ pink​ Rose & Berry" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-11-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-31-02-0001"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-31-03-0001"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14582,7 +14654,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-31-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-31-02-0001"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-31-03-0001"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14825,7 +14905,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0004"
+			Else
+			Topping "Load" "12-21-03-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0004.NameE
 		Var menu_desc_eng_hot = $12-01-01-0004.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0004.Name
@@ -15070,7 +15158,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0004"
+			Else
+			Topping "Load" "12-21-03-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0004.NameE
 		Var menu_desc_eng_hot = $12-21-01-0004.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0004.Name
@@ -15316,7 +15412,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-11-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-31-02-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0005"
+			Else
+			Topping "Load" "12-31-03-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0005.NameE
 		Var menu_desc_eng_hot = $12-01-01-0005.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0005.Name
@@ -15561,7 +15665,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-31-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-31-02-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0005"
+			Else
+			Topping "Load" "12-31-03-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0005.NameE
 		Var menu_desc_eng_hot = $12-21-01-0005.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0005.Name
@@ -15807,7 +15919,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0006"
+			Else
+			Topping "Load" "12-21-03-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0006.NameE
 		Var menu_desc_eng_hot = $12-01-01-0006.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0006.Name
@@ -16052,7 +16172,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0006"
+			Else
+			Topping "Load" "12-21-03-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0006.NameE
 		Var menu_desc_eng_hot = $12-21-01-0006.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0006.Name
@@ -16298,7 +16426,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0004"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0007"
+			Else
+			Topping "Load" "12-21-03-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0007.NameE
 		Var menu_desc_eng_hot = $12-01-01-0007.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0007.Name
@@ -16545,7 +16681,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0004"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0007"
+			Else
+			Topping "Load" "12-21-03-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0007.NameE
 		Var menu_desc_eng_hot = $12-21-01-0007.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0007.Name
@@ -16793,7 +16937,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0031"
+			Else
+			Topping "Load" "12-21-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0031.NameE
 		Var menu_desc_eng_hot = $12-01-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0031.Name
@@ -17040,7 +17192,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0031"
+			Else
+			Topping "Load" "12-21-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0031.NameE
 		Var menu_desc_eng_hot = $12-21-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0031.Name
@@ -17288,7 +17448,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0005"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0008"
+			Else
+			Topping "Load" "12-21-03-0005"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0008.NameE
 		Var menu_desc_eng_hot = $12-01-01-0008.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0008.Name
@@ -17535,7 +17703,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0005"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0008"
+			Else
+			Topping "Load" "12-21-03-0005"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0008.NameE
 		Var menu_desc_eng_hot = $12-21-01-0008.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0008.Name
@@ -17783,7 +17959,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0008"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0011"
+			Else
+			Topping "Load" "12-21-03-0008"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0011.NameE
 		Var menu_desc_eng_hot = $12-01-01-0011.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0011.Name
@@ -18031,7 +18215,15 @@ Kokuto" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0008"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0011"
+			Else
+			Topping "Load" "12-21-03-0008"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0011.NameE
 		Var menu_desc_eng_hot = $12-21-01-0011.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0011.Name
@@ -18281,10 +18473,10 @@ Kokuto" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0039"
+			Topping "Load" "12-21-02-0039"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0039"
+			Topping "Load" "12-21-01-0039"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -18791,7 +18983,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0006"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0009"
+			Else
+			Topping "Load" "12-21-03-0006"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0009.NameE
 		Var menu_desc_eng_hot = $12-01-01-0009.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0009.Name
@@ -19039,7 +19239,15 @@ Milk, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0006"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0009"
+			Else
+			Topping "Load" "12-21-03-0006"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0009.NameE
 		Var menu_desc_eng_hot = $12-21-01-0009.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0009.Name
@@ -19288,7 +19496,15 @@ Milk, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0029"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0029"
+			Else
+			Topping "Load" "12-21-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0029.NameE
 		Var menu_desc_eng_hot = $12-01-01-0029.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0029.Name
@@ -19534,7 +19750,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0029"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0029"
+			Else
+			Topping "Load" "12-21-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0029.NameE
 		Var menu_desc_eng_hot = $12-21-01-0029.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0029.Name
@@ -19733,7 +19957,7 @@ Cafe Latte" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0055 12-01-02-0055 12-01-03-0055 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -19781,7 +20005,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0055"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0055"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0055"
+			Else
+			Topping "Load" "12-01-03-0055"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0055.NameE
 		Var menu_desc_eng_hot = $12-01-01-0055.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0055.Name
@@ -20027,7 +20259,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0055"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0055"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0055"
+			Else
+			Topping "Load" "12-21-03-0055"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0055.NameE
 		Var menu_desc_eng_hot = $12-21-01-0055.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0055.Name
@@ -20274,7 +20514,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0030"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0030"
+			Else
+			Topping "Load" "12-21-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0030.NameE
 		Var menu_desc_eng_hot = $12-01-01-0030.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0030.Name
@@ -20522,7 +20770,15 @@ Milk, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0030"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0030"
+			Else
+			Topping "Load" "12-21-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0030.NameE
 		Var menu_desc_eng_hot = $12-21-01-0030.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0030.Name
@@ -20772,10 +21028,10 @@ Milk, Sugar" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0017"
+			Topping "Load" "12-21-02-0017"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0017"
+			Topping "Load" "12-21-01-0017"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -21281,10 +21537,10 @@ Sugar, Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0040"
+			Topping "Load" "12-21-02-0040"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0040"
+			Topping "Load" "12-21-01-0040"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -21789,7 +22045,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0042"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0042"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0042"
+			Else
+			Topping "Load" "12-21-03-0042"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0042.NameE
 		Var menu_desc_eng_hot = $12-01-01-0042.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0042.Name
@@ -22036,7 +22300,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0042"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0042"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0042"
+			Else
+			Topping "Load" "12-21-03-0042"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0042.NameE
 		Var menu_desc_eng_hot = $12-21-01-0042.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0042.Name
@@ -22236,7 +22508,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0057 12-01-02-0057 12-01-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -22284,7 +22556,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0057"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0057"
+			Else
+			Topping "Load" "12-01-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0057.NameE
 		Var menu_desc_eng_hot = $12-01-01-0057.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0057.Name
@@ -22530,7 +22810,15 @@ Sugar, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0057"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0057"
+			Else
+			Topping "Load" "12-21-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0057.NameE
 		Var menu_desc_eng_hot = $12-21-01-0057.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0057.Name
@@ -23747,7 +24035,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0060 12-01-02-0060 12-01-03-0060 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -23795,7 +24083,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0060"
+			Else
+			Topping "Load" "12-01-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0060.NameE
 		Var menu_desc_eng_hot = $12-01-01-0060.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0060.Name
@@ -24041,7 +24337,15 @@ Sugar, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0060"
+			Else
+			Topping "Load" "12-21-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0060.NameE
 		Var menu_desc_eng_hot = $12-21-01-0060.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0060.Name
@@ -25291,7 +25595,7 @@ Sugar, Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0069"
+			Topping "Load" "12-21-02-0069"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -25794,7 +26098,7 @@ Coffee" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0070"
+			Topping "Load" "12-21-02-0070"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
diff --git a/xml/page_catalog_group_deep_fryer.xml b/xml/page_catalog_group_deep_fryer.xml
index 609460c6..0524501f 100644
--- a/xml/page_catalog_group_deep_fryer.xml
+++ b/xml/page_catalog_group_deep_fryer.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; TAOTIM - 12-51-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-51-01-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "TAOTIM"
+			Else
+			Topping "Load" "12-51-01-0001"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $TAOTIM.NameE
 		Var menu_desc_eng_hot = $TAOTIM.descriptionE
 		Var menu_name_thai_hot = $TAOTIM.Name
@@ -274,7 +282,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; TAOTIM - 12-51-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -322,7 +330,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-51-01-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "TAOTIM"
+			Else
+			Topping "Load" "12-51-01-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $TAOTIM.NameE
 		Var menu_desc_eng_hot = $TAOTIM.descriptionE
 		Var menu_name_thai_hot = $TAOTIM.Name
@@ -512,7 +528,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; TAOTIM - 12-51-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -560,7 +576,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-51-01-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "TAOTIM"
+			Else
+			Topping "Load" "12-51-01-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $TAOTIM.NameE
 		Var menu_desc_eng_hot = $TAOTIM.descriptionE
 		Var menu_name_thai_hot = $TAOTIM.Name
diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml
index 5ab08954..52b94e99 100644
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@@ -99,7 +99,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0041"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -294,7 +302,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0094 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -342,7 +350,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0094"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -539,7 +555,7 @@ Volcano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0095 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -587,7 +603,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0095"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0095"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -832,7 +856,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0005"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0005.NameE
 		Var menu_desc_eng_hot = $12-03-01-0005.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0005.Name
@@ -1079,7 +1111,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0001.NameE
 		Var menu_desc_eng_hot = $12-03-01-0001.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0001.Name
@@ -1326,7 +1366,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0003.NameE
 		Var menu_desc_eng_hot = $12-03-01-0003.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0003.Name
@@ -1574,7 +1622,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1818,7 +1874,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0002.NameE
 		Var menu_desc_eng_hot = $12-03-01-0002.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0002.Name
@@ -2065,7 +2129,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0022.NameE
 		Var menu_desc_eng_hot = $12-03-01-0022.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0022.Name
@@ -2312,7 +2384,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2557,7 +2637,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2801,7 +2889,7 @@ Smoothie" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3053,7 +3141,7 @@ Smoothie" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0045"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3304,7 +3392,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3501,7 +3597,7 @@ Volcano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0023 12-03-02-0023 12-03-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3549,7 +3645,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0023"
+			Else
+			Topping "Load" "12-03-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0023.NameE
 		Var menu_desc_eng_hot = $12-03-01-0023.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0023.Name
@@ -3749,7 +3853,7 @@ Banana Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3797,7 +3901,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0024.NameE
 		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0024.Name
@@ -3998,7 +4110,7 @@ Banana Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4046,7 +4158,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml
index 601f462d..a911bb99 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-01-02-1001"
+			Topping "Load" "12-21-02-1001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-1003"
+			Topping "Load" "12-21-01-1003"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -596,10 +596,10 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-1002"
+			Topping "Load" "12-21-02-1002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-1004"
+			Topping "Load" "12-21-01-1004"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -1105,10 +1105,10 @@ Foamed Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-1003"
+			Topping "Load" "12-21-02-1003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-1006"
+			Topping "Load" "12-21-01-1006"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -1616,10 +1616,10 @@ Milk, Sugar" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-1099"
+			Topping "Load" "12-21-02-1099"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-1099"
+			Topping "Load" "12-21-01-1099"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2125,10 +2125,10 @@ Foamed Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1024"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1024"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2380,10 +2380,10 @@ Foamed Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1025"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1025"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2637,10 +2637,10 @@ And Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1026"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1026"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2892,10 +2892,10 @@ And Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1027"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1027"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -3147,10 +3147,10 @@ And Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1029"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1029"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -3402,10 +3402,10 @@ And Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1030"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1030"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -3658,10 +3658,10 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1031"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1031"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -3913,10 +3913,10 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1032"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1032"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4171,10 +4171,10 @@ Water, And Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1037"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1037"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4426,10 +4426,10 @@ Water, And Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-03-02-1002"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-03-01-1002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4681,10 +4681,10 @@ Water, And Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-03-02-1005"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-03-01-1005"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -4936,10 +4936,10 @@ Water, And Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-1001"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-05-01-1001"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5191,7 +5191,7 @@ Water, And Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-1010"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -5443,10 +5443,10 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1038"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1038"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -6160,7 +6160,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0075 12-03-03-0075 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6208,7 +6208,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0075"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0075"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0075"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6403,7 +6411,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0124 12-05-03-0124 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6451,7 +6459,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0124"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0124"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0124"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6646,7 +6662,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0068 12-02-03-0068 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6694,7 +6710,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0068"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0068"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0068"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7639,7 +7663,7 @@ Limenade" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0076 12-03-03-0076 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -7687,7 +7711,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0076"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0076"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0076"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7882,7 +7914,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0069 12-02-03-0069 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -7930,7 +7962,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0069"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0069"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0069"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8125,7 +8165,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0126 12-05-03-0126 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -8173,7 +8213,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0126"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0126"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0126"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8368,7 +8416,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0127 12-05-03-0127 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -8416,7 +8464,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0127"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0127"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0127"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8611,7 +8667,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0070 12-02-03-0070 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -8659,7 +8715,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0070"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0070"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0070"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml
index 17b5c4aa..aa1645d1 100644
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@@ -87,7 +87,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0032"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0032"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -332,7 +340,15 @@ VOLCANO" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0009"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0009"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -577,7 +593,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0067"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0067"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0067"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -820,7 +844,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0094"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0094"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1065,7 +1097,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0087"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0087"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1308,7 +1348,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0103"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0103"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1555,7 +1603,15 @@ And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0104"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0104"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1802,7 +1858,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0105"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0105"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2049,7 +2113,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0106"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0106"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2296,7 +2368,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0090"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-01-03-0090"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2541,7 +2621,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0090"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-21-03-0090"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2787,7 +2875,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-01-03-0078"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3030,7 +3126,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-21-03-0078"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3274,7 +3378,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0057"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3519,7 +3631,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0058"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3764,7 +3884,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0010"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0010"
+			Else
+			Topping "Load" "12-03-01-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0010.NameE
 		Var menu_desc_eng_hot = $12-03-01-0010.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0010.Name
@@ -4013,7 +4141,15 @@ Cocoa, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0027"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0027"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4259,7 +4395,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0019"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0019"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0019"
+			Else
+			Topping "Load" "12-03-01-0019"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0019.NameE
 		Var menu_desc_eng_hot = $12-03-01-0019.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0019.Name
@@ -4506,7 +4650,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0095"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0095"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4751,7 +4903,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0005"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0005"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0005"
+			Else
+			Topping "Load" "12-03-01-0005"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0005.NameE
 		Var menu_desc_eng_hot = $12-03-01-0005.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0005.Name
@@ -4998,7 +5158,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0001"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0001"
+			Else
+			Topping "Load" "12-03-01-0001"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0001.NameE
 		Var menu_desc_eng_hot = $12-03-01-0001.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0001.Name
@@ -5245,7 +5413,15 @@ Super Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0004"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0004"
+			Else
+			Topping "Load" "12-03-01-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0004.NameE
 		Var menu_desc_eng_hot = $12-03-01-0004.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0004.Name
@@ -5494,7 +5670,15 @@ Caramel" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0003"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0003"
+			Else
+			Topping "Load" "12-03-01-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0003.NameE
 		Var menu_desc_eng_hot = $12-03-01-0003.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0003.Name
@@ -5742,7 +5926,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0006"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0006"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5986,7 +6178,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0002"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0002"
+			Else
+			Topping "Load" "12-03-01-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0002.NameE
 		Var menu_desc_eng_hot = $12-03-01-0002.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0002.Name
@@ -6233,7 +6433,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0065"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0065"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0065"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6476,7 +6684,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0011"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0011"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6721,7 +6937,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0022"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0022"
+			Else
+			Topping "Load" "12-03-01-0022"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0022.NameE
 		Var menu_desc_eng_hot = $12-03-01-0022.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0022.Name
@@ -6968,7 +7192,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0025"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0025"
+			Else
+			Topping "Load" "12-03-01-0025"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0025.NameE
 		Var menu_desc_eng_hot = $12-03-01-0025.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0025.Name
@@ -7215,7 +7447,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0026"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7462,7 +7702,15 @@ Sugar Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0023"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0023"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0023"
+			Else
+			Topping "Load" "12-03-01-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0023.NameE
 		Var menu_desc_eng_hot = $12-03-01-0023.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0023.Name
@@ -7710,7 +7958,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+			Else
+			Topping "Load" "12-03-01-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0024.NameE
 		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0024.Name
@@ -7959,7 +8215,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0034"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8205,7 +8469,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0035"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0035"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0035"
+			Else
+			Topping "Load" "12-03-01-0035"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0035.NameE
 		Var menu_desc_eng_hot = $12-03-01-0035.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0035.Name
@@ -8453,7 +8725,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0036"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0036"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0036"
+			Else
+			Topping "Load" "12-03-01-0036"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0036.NameE
 		Var menu_desc_eng_hot = $12-03-01-0036.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0036.Name
@@ -8700,7 +8980,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0037"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0037"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8945,7 +9233,15 @@ Strawberry" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0038"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0038"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0038"
+			Else
+			Topping "Load" "12-03-01-0038"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0038.NameE
 		Var menu_desc_eng_hot = $12-03-01-0038.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0038.Name
@@ -9192,7 +9488,15 @@ Strawberry" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0039"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0039"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9436,7 +9740,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0040"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0040"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9681,7 +9993,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0041"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9928,7 +10248,15 @@ Sugar, Biscof" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0042"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10175,7 +10503,15 @@ Sugar, Biscof" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0043"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0043"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10422,7 +10758,15 @@ Sugar, Biscof" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0061"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0061"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10669,7 +11013,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0085"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-01-03-0085"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10910,7 +11262,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0085"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-21-03-0085"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11152,7 +11512,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0086"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0086"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11395,7 +11763,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0087"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0087"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11638,7 +12014,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0090"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0090"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11881,7 +12265,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0091"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0091"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -12124,7 +12516,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0061"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0061"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -12367,7 +12767,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0093"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0093"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -12610,7 +13018,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0092"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0092"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -12853,7 +13269,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0058"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0058"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0058"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -13098,7 +13522,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0059"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0059"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0059"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml
index 9b7c1f80..c6e4a686 100644
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0009"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0009"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -329,7 +337,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0027"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0027"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -576,7 +592,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0028"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0028"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -822,7 +846,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0029"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1068,7 +1100,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0030"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0030"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1314,7 +1354,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0031"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0031"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1561,7 +1609,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0043"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0043"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1807,7 +1863,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0044"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0044"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2053,7 +2117,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0043"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-01-03-0043"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2299,7 +2371,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0026"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2546,7 +2626,15 @@ Sugar Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0045"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0045"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2792,7 +2880,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0034"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3037,7 +3133,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0040"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0040"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3280,7 +3384,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index 14d354ad..b4e88e1f 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -40,7 +40,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 100
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0143 12-05-03-0143 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -88,7 +88,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0143"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0143"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0143"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1039,7 +1047,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0144 12-05-03-0144 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1087,7 +1095,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0144"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0144"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0144"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1282,7 +1298,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0145 12-05-03-0145 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1330,7 +1346,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0145"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0145"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0145"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1525,7 +1549,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0146 12-05-03-0146 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1573,7 +1597,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0146"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0146"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0146"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3274,7 +3306,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0104 12-05-03-0104 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3322,7 +3354,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0104"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0104"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0104"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3816,7 +3856,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4059,7 +4107,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4254,7 +4310,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0136 12-05-03-0136 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4302,7 +4358,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0136"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0136"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0136"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4501,7 +4565,7 @@ Strawberry Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0137 12-05-03-0137 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4549,7 +4613,15 @@ Strawberry Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0137"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0137"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0137"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4748,7 +4820,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0138 12-05-03-0138 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4796,7 +4868,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0138"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0138"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0138"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4995,7 +5075,7 @@ Lychee Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0139 12-05-03-0139 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5043,7 +5123,15 @@ Lychee Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0139"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0139"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0139"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5242,7 +5330,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0140 12-05-03-0140 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5290,7 +5378,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0140"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0140"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0140"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5489,7 +5585,7 @@ Caramel Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0141 12-05-03-0141 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5537,7 +5633,15 @@ Caramel Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0141"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0141"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0141"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5736,7 +5840,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0142 12-05-03-0142 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5784,7 +5888,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0142"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0142"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0142"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6031,7 +6143,15 @@ Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6275,7 +6395,15 @@ Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6521,7 +6649,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0095"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -6772,7 +6900,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0096"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7025,7 +7153,7 @@ Plum Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7277,7 +7405,7 @@ Plum Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0045"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7528,7 +7656,15 @@ Plum Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7772,7 +7908,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0033"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8015,7 +8159,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8262,7 +8414,7 @@ Limenade, Soda & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0115"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -8466,7 +8618,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0023 12-05-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -8514,7 +8666,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8762,7 +8922,7 @@ Sugar, Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0012"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -9012,7 +9172,15 @@ Sugar, Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0041"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9255,7 +9423,15 @@ Sugar, Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9498,7 +9674,15 @@ Sugar, Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9744,7 +9928,7 @@ Soda & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0100"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -9995,7 +10179,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10238,7 +10430,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10435,7 +10635,7 @@ Soda & Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0074 12-05-03-0074 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -10483,7 +10683,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10727,7 +10935,7 @@ Soda & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0097"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -10979,7 +11187,7 @@ Soda & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0101"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -11231,7 +11439,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11426,7 +11642,7 @@ Strawberry Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0105 12-05-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -11474,7 +11690,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0105"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0105"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0105"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -11669,7 +11893,7 @@ Strawberry Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0075 12-05-03-0075 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -11717,7 +11941,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0075"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0075"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0075"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -12463,7 +12695,7 @@ Strawberry Lime" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0102"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13467,7 +13699,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0038"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -13710,7 +13950,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -13955,7 +14203,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0051"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -14206,7 +14454,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0052"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -14709,7 +14957,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0116"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -17930,7 +18178,7 @@ Lemon Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0092 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -17978,7 +18226,15 @@ Lemon Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0092"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0092"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -18424,7 +18680,7 @@ Lemon Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0091 12-05-03-0091 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -18472,7 +18728,15 @@ Lemon Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0091"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0091"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0091"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -18667,7 +18931,7 @@ Lemon Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0114 12-05-03-0114 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -18715,7 +18979,15 @@ Lemon Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0114"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0114"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0114"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -19212,7 +19484,7 @@ Lychee Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0103"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -19463,7 +19735,7 @@ Lychee Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0014"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -19714,7 +19986,7 @@ Lychee Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0015"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -19964,7 +20236,15 @@ Lychee Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -20209,7 +20489,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -20453,7 +20741,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -20698,7 +20994,7 @@ Water & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0005"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -20950,7 +21246,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-05-01-0001.NameE
 		Var menu_desc_eng_hot = $12-05-01-0001.descriptionE
 		Var menu_name_thai_hot = $12-05-01-0001.Name
@@ -21197,7 +21501,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -21440,7 +21752,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0032"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -21684,7 +22004,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0040"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -22183,7 +22511,7 @@ Water, Ice" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-06-01-0001"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -22439,7 +22767,7 @@ Plant Protein" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-06-01-0002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -22691,7 +23019,7 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -22942,7 +23270,7 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0016"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -23193,10 +23521,10 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0018"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-05-01-0002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
diff --git a/xml/page_catalog_group_other_other.xml b/xml/page_catalog_group_other_other.xml
index ef0b84fc..b7a34965 100644
--- a/xml/page_catalog_group_other_other.xml
+++ b/xml/page_catalog_group_other_other.xml
@@ -40,7 +40,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 75
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0143 12-05-03-0143 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -88,7 +88,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0143"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0143"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0143"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1039,7 +1047,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0144 12-05-03-0144 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1087,7 +1095,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0144"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0144"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0144"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1282,7 +1298,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0145 12-05-03-0145 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1330,7 +1346,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0145"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0145"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0145"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1525,7 +1549,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0146 12-05-03-0146 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1573,7 +1597,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0146"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0146"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0146"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3525,7 +3557,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0104 12-05-03-0104 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3573,7 +3605,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0104"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0104"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0104"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3816,7 +3856,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4011,7 +4059,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-05-01-0040 12-05-02-0040 12-05-03-0040 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4059,7 +4107,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0040"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0040"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-05-01-0040"
+			Else
+			Topping "Load" "12-05-03-0040"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-05-01-0040.NameE
 		Var menu_desc_eng_hot = $12-05-01-0040.descriptionE
 		Var menu_name_thai_hot = $12-05-01-0040.Name
@@ -4258,7 +4314,7 @@ Soda Extra" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0041 12-05-03-0041 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4306,7 +4362,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0041"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0041"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0041"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4503,7 +4567,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0023 12-05-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4551,7 +4615,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4750,7 +4822,7 @@ Sugar, Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0136 12-05-03-0136 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4798,7 +4870,15 @@ Sugar, Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0136"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0136"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0136"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4997,7 +5077,7 @@ Strawberry Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0137 12-05-03-0137 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5045,7 +5125,15 @@ Strawberry Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0137"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0137"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0137"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5244,7 +5332,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0138 12-05-03-0138 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5292,7 +5380,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0138"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0138"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0138"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5491,7 +5587,7 @@ Lychee Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0139 12-05-03-0139 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5539,7 +5635,15 @@ Lychee Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0139"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0139"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0139"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5738,7 +5842,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0140 12-05-03-0140 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5786,7 +5890,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0140"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0140"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0140"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5985,7 +6097,7 @@ Caramel Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0141 12-05-03-0141 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6033,7 +6145,15 @@ Caramel Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0141"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0141"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0141"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6232,7 +6352,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0142 12-05-03-0142 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6280,7 +6400,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0142"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0142"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0142"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6527,7 +6655,15 @@ Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6772,7 +6908,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7017,7 +7161,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0095"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7268,7 +7412,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7520,7 +7664,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0045"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7771,7 +7915,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8015,7 +8167,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0033"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8258,7 +8418,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8504,7 +8672,15 @@ Limenade, Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8747,7 +8923,15 @@ Limenade, Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8992,7 +9176,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9235,7 +9427,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9480,7 +9680,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0038"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9723,7 +9931,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9968,7 +10184,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0051"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -10219,7 +10435,7 @@ Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0052"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -12687,7 +12903,7 @@ Lemon Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0092 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -12735,7 +12951,15 @@ Lemon Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0092"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0092"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -13483,7 +13707,7 @@ Lychee Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0014"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13734,7 +13958,7 @@ Lychee Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0015"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -13984,7 +14208,15 @@ Lychee Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14229,7 +14461,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14473,7 +14713,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14717,7 +14965,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-05-01-0001.NameE
 		Var menu_desc_eng_hot = $12-05-01-0001.descriptionE
 		Var menu_name_thai_hot = $12-05-01-0001.Name
@@ -14964,7 +15220,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -15207,7 +15471,15 @@ Water & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0032"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -15706,7 +15978,7 @@ Water & Ice" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-06-01-0001"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -15962,7 +16234,7 @@ Plant Protein" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-06-01-0002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -16214,7 +16486,7 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -16465,7 +16737,7 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0016"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -16716,10 +16988,10 @@ Plant Protein" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0018"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-05-01-0002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
diff --git a/xml/page_catalog_group_pepsi_7up.xml b/xml/page_catalog_group_pepsi_7up.xml
index ee73739f..1a1559df 100644
--- a/xml/page_catalog_group_pepsi_7up.xml
+++ b/xml/page_catalog_group_pepsi_7up.xml
@@ -87,7 +87,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2039,7 +2047,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0114 12-05-03-0114 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2087,7 +2095,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0114"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0114"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0114"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2330,7 +2346,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2525,7 +2549,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0104 12-05-03-0104 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2573,7 +2597,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0104"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0104"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0104"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2768,7 +2800,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0094 12-05-03-0094 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2816,7 +2848,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0094"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0094"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3311,7 +3351,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0096"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3564,7 +3604,7 @@ Plum Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0115"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3817,7 +3857,7 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0100"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -4020,7 +4060,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0074 12-05-03-0074 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4068,7 +4108,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4312,7 +4360,7 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0097"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -4564,7 +4612,7 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0101"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -4816,7 +4864,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5011,7 +5067,7 @@ Strawberry Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0105 12-05-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5059,7 +5115,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0105"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0105"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0105"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5254,7 +5318,7 @@ Strawberry Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0075 12-05-03-0075 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5302,7 +5366,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0075"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0075"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0075"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6048,7 +6120,7 @@ Strawberry Lime" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0102"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7053,7 +7125,7 @@ Strawberry Lime" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0116"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -8260,7 +8332,7 @@ Strawberry Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0091 12-05-03-0091 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -8308,7 +8380,15 @@ Strawberry Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0091"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0091"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0091"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8552,7 +8632,7 @@ Strawberry Lime" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0103"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
diff --git a/xml/page_catalog_group_pro_12_day_12_menu.xml b/xml/page_catalog_group_pro_12_day_12_menu.xml
index 1617affd..6c3cdcf3 100644
--- a/xml/page_catalog_group_pro_12_day_12_menu.xml
+++ b/xml/page_catalog_group_pro_12_day_12_menu.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 12
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0067 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -86,7 +86,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0067"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0067"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -282,7 +290,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -333,7 +341,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -531,7 +547,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -582,7 +598,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -781,7 +805,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -832,7 +856,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0006"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1536,7 +1568,7 @@ Smoothie" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1587,7 +1619,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0011"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0011"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1785,7 +1825,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1836,7 +1876,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2543,7 +2591,7 @@ Iced Espresso" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0064 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2594,7 +2642,15 @@ Iced Espresso" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0064"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0064"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2793,7 +2849,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2844,7 +2900,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
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 ef06b6c4..20e29bc0 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" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0046"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -6377,7 +6377,7 @@ And Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0007"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -6628,7 +6628,7 @@ And Soda" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0094"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -9392,7 +9392,15 @@ Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9635,7 +9643,15 @@ Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10130,7 +10146,15 @@ And Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -10373,7 +10397,15 @@ And Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0105"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_bad_valentine.xml b/xml/page_catalog_group_pro_bad_valentine.xml
index e401003b..cbbc542d 100644
--- a/xml/page_catalog_group_pro_bad_valentine.xml
+++ b/xml/page_catalog_group_pro_bad_valentine.xml
@@ -37,7 +37,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 9
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-01-02-0061 12-01-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -85,7 +85,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -330,7 +338,15 @@ cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1035,7 +1051,7 @@ matcha, Milk" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1083,7 +1099,15 @@ matcha, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1282,7 +1306,7 @@ milk, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0045 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1330,7 +1354,15 @@ milk, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0045"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0045"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1529,7 +1561,7 @@ milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1577,7 +1609,15 @@ milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2284,7 +2324,7 @@ hard–the real deal." </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0023 12-03-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2332,7 +2372,15 @@ hard–the real deal." </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml b/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
index 62a91668..96a871ee 100644
--- a/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
+++ b/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
@@ -1033,7 +1033,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0050 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1081,7 +1081,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0050"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0050"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2028,7 +2036,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0036 12-03-02-0036 12-03-03-0036 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2076,7 +2084,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0036"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0036"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0036"
+			Else
+			Topping "Load" "12-03-03-0036"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0036.NameE
 		Var menu_desc_eng_hot = $12-03-01-0036.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0036.Name
@@ -2275,7 +2291,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0037 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2323,7 +2339,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0037"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2520,7 +2544,7 @@ Strawberry" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2568,7 +2592,15 @@ Strawberry" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0034"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4273,7 +4305,7 @@ Mint Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-01-02-0061 12-01-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4321,7 +4353,15 @@ Mint Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4767,7 +4807,7 @@ Mint Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4815,7 +4855,15 @@ Mint Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5010,7 +5058,7 @@ Mint Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0045 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5058,7 +5106,15 @@ Mint Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0045"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0045"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5253,7 +5309,7 @@ Mint Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5301,7 +5357,15 @@ Mint Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5998,7 +6062,7 @@ Mint Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0023 12-03-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6046,7 +6110,15 @@ Mint Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_buble_tea.xml b/xml/page_catalog_group_pro_buble_tea.xml
index a0c30e48..6b63a935 100644
--- a/xml/page_catalog_group_pro_buble_tea.xml
+++ b/xml/page_catalog_group_pro_buble_tea.xml
@@ -33,7 +33,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 16
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-21-62-0002 12-21-63-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -81,7 +81,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-63-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-62-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-63-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -322,7 +330,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -516,7 +532,7 @@
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-21-62-0003 12-21-63-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -564,7 +580,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-63-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-62-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-63-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -805,7 +829,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -999,7 +1031,7 @@
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-21-62-0004 12-21-63-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1047,7 +1079,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-63-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-62-0004"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-63-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1290,7 +1330,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1486,7 +1534,7 @@ Caramel " </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-62-0002 12-03-63-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1534,7 +1582,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-62-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1775,7 +1831,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1969,7 +2033,7 @@ Caramel " </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-62-0005 12-03-63-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2017,7 +2081,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0005"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-62-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0005"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2258,7 +2330,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2452,7 +2532,7 @@ Caramel " </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-62-0006 12-03-63-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2500,7 +2580,15 @@ Caramel " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-62-0006"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0006"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2743,7 +2831,15 @@ Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2939,7 +3035,7 @@ Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-62-0007 12-03-63-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2987,7 +3083,15 @@ Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-62-0007"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0009"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3228,7 +3332,15 @@ Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3422,7 +3534,7 @@ Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-62-0009 12-05-63-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3470,7 +3582,15 @@ Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-63-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-62-0009"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-63-0007"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3712,7 +3832,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3907,7 +4035,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-62-0025 12-05-63-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3955,7 +4083,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-63-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-62-0025"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-63-0009"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4196,7 +4332,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4390,7 +4534,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-62-0035 12-05-63-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4438,7 +4582,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-63-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-62-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-63-0025"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4679,7 +4831,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4873,7 +5033,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-62-0046 12-05-63-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4921,7 +5081,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-63-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-62-0046"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-63-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5162,7 +5330,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5356,7 +5532,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-62-0026 12-03-63-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5404,7 +5580,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0026"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0026"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5645,7 +5829,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5839,7 +6031,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-62-0039 12-03-63-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5887,7 +6079,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0039"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6128,7 +6328,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6322,7 +6530,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-62-0047 12-03-63-0047 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6370,7 +6578,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-63-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0047"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-63-0047"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6611,7 +6827,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6805,7 +7029,7 @@ Soda & Ice" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-62-0025 12-02-63-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6853,7 +7077,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-63-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0025"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-63-0025"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7094,7 +7326,15 @@ Soda & Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" ""
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" ""
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" ""
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_cocoa_77.xml b/xml/page_catalog_group_pro_cocoa_77.xml
index e5156f30..ebf66431 100644
--- a/xml/page_catalog_group_pro_cocoa_77.xml
+++ b/xml/page_catalog_group_pro_cocoa_77.xml
@@ -92,7 +92,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0006"
+			Else
+			Topping "Load" "12-21-03-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0006.NameE
 		Var menu_desc_eng_hot = $12-01-01-0006.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0006.Name
@@ -341,7 +349,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0006"
+			Else
+			Topping "Load" "12-21-03-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0006.NameE
 		Var menu_desc_eng_hot = $12-21-01-0006.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0006.Name
@@ -592,10 +608,10 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-1003"
+			Topping "Load" "12-21-02-1003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-1006"
+			Topping "Load" "12-21-01-1006"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -1059,7 +1075,7 @@ Milk, Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-01-02-0061 12-01-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1110,7 +1126,15 @@ Milk, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1356,7 +1380,15 @@ Cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1603,7 +1635,15 @@ Cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0002.NameE
 		Var menu_desc_eng_hot = $12-03-01-0002.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0002.Name
@@ -1855,10 +1895,10 @@ Cocoa, Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-03-02-1002"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-03-01-1002"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2113,7 +2153,15 @@ Cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0004.NameE
 		Var menu_desc_eng_hot = $12-03-01-0004.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0004.Name
@@ -2315,7 +2363,7 @@ Caramel" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2366,7 +2414,15 @@ Caramel" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0024.NameE
 		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0024.Name
@@ -2619,7 +2675,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0025.NameE
 		Var menu_desc_eng_hot = $12-03-01-0025.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0025.Name
@@ -2819,7 +2883,7 @@ Banana Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0035 12-03-02-0035 12-03-03-0035 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2870,7 +2934,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0035"
+			Else
+			Topping "Load" "12-03-03-0035"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0035.NameE
 		Var menu_desc_eng_hot = $12-03-01-0035.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0035.Name
@@ -3326,7 +3398,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0059 12-03-03-0059 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3377,7 +3449,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0059"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0059"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0059"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3627,7 +3707,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3876,7 +3964,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4075,7 +4171,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0044 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4126,7 +4222,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0044"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0044"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4324,7 +4428,7 @@ Milk, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4375,7 +4479,15 @@ Milk, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4575,7 +4687,7 @@ Sugar, Biscoff" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4626,7 +4738,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0017"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0017"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4823,7 +4943,7 @@ Milk Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0067 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4874,7 +4994,15 @@ Milk Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0067"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0067"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5071,7 +5199,7 @@ Volcano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0068 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5122,7 +5250,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0068"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0068"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_coconut_milk.xml b/xml/page_catalog_group_pro_coconut_milk.xml
index 24e2e510..ef39baf9 100644
--- a/xml/page_catalog_group_pro_coconut_milk.xml
+++ b/xml/page_catalog_group_pro_coconut_milk.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 5
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0103 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0103"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0103"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -283,7 +291,7 @@ And Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0104 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -331,7 +339,15 @@ And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0104"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0104"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -530,7 +546,7 @@ Milk, Sugar And Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -578,7 +594,15 @@ Milk, Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0105"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0105"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -777,7 +801,7 @@ Sugar And Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0106 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -825,7 +849,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0106"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0106"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1024,7 +1056,7 @@ Sugar And Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0090 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1072,7 +1104,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0090"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0090"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1317,7 +1357,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0090"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0090"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_freefile.xml b/xml/page_catalog_group_pro_freefile.xml
index 9b106784..128b29aa 100644
--- a/xml/page_catalog_group_pro_freefile.xml
+++ b/xml/page_catalog_group_pro_freefile.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0026"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -280,7 +288,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0067 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -328,7 +336,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0067"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0067"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -523,7 +539,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0066 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -571,7 +587,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0066"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0066"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_halloween.xml b/xml/page_catalog_group_pro_halloween.xml
index 18ac19c8..9effe942 100644
--- a/xml/page_catalog_group_pro_halloween.xml
+++ b/xml/page_catalog_group_pro_halloween.xml
@@ -288,7 +288,7 @@ Horrifying" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0128 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -336,7 +336,15 @@ Horrifying" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0128"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0128"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -534,7 +542,7 @@ Drink , 7Up And Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0084 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -582,7 +590,15 @@ Drink , 7Up And Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0084"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0084"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -781,7 +797,7 @@ and Lime" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0085 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -829,7 +845,15 @@ and Lime" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0085"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0085"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1788,7 +1812,7 @@ And Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0081 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1836,7 +1860,15 @@ And Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0081"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0081"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2787,7 +2819,7 @@ And Ovaltine" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0080 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2835,7 +2867,15 @@ And Ovaltine" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0080"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0080"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3796,7 +3836,7 @@ And Soda" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0082 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3844,7 +3884,15 @@ And Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0082"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0082"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4040,7 +4088,7 @@ And Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0083 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4088,7 +4136,15 @@ And Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0083"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0083"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_happy_trios.xml b/xml/page_catalog_group_pro_happy_trios.xml
index 17f1a51b..97c2c6f8 100644
--- a/xml/page_catalog_group_pro_happy_trios.xml
+++ b/xml/page_catalog_group_pro_happy_trios.xml
@@ -37,7 +37,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0078 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -85,7 +85,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -329,7 +337,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -526,7 +542,7 @@ Caramel Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -574,7 +590,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -772,7 +796,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -820,7 +844,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_jemila.xml b/xml/page_catalog_group_pro_jemila.xml
index 9f912f7f..65bf23e5 100644
--- a/xml/page_catalog_group_pro_jemila.xml
+++ b/xml/page_catalog_group_pro_jemila.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0075 12-03-03-0075 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0075"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0075"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0075"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -280,7 +288,7 @@ Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0124 12-05-03-0124 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -328,7 +336,15 @@ Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0124"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0124"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0124"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -525,7 +541,7 @@ Drink" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0068 12-02-03-0068 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -573,7 +589,15 @@ Drink" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0068"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0068"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0068"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1525,7 +1549,7 @@ It Strong" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0076 12-03-03-0076 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1573,7 +1597,15 @@ It Strong" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0076"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0076"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0076"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1770,7 +1802,7 @@ Miracles" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0069 12-02-03-0069 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1818,7 +1850,15 @@ Miracles" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0069"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0069"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0069"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2014,7 +2054,7 @@ Miracles" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0126 12-05-03-0126 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2062,7 +2102,15 @@ Miracles" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0126"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0126"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0126"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2259,7 +2307,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0127 12-05-03-0127 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2307,7 +2355,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0127"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0127"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0127"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2503,7 +2559,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0070 12-02-03-0070 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2551,7 +2607,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0070"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0070"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0070"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_kingdom_thai_tea.xml b/xml/page_catalog_group_pro_kingdom_thai_tea.xml
index b035f89a..a0f37f14 100644
--- a/xml/page_catalog_group_pro_kingdom_thai_tea.xml
+++ b/xml/page_catalog_group_pro_kingdom_thai_tea.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0091 12-02-02-0091 12-02-03-0091 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0091"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0091"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0091"
+			Else
+			Topping "Load" "12-02-03-0091"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0091.NameE
 		Var menu_desc_eng_hot = $12-02-01-0091.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0091.Name
@@ -283,7 +291,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0092 12-02-02-0092 12-02-03-0092 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -331,7 +339,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0092"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0092"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0092"
+			Else
+			Topping "Load" "12-02-03-0092"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0092.NameE
 		Var menu_desc_eng_hot = $12-02-01-0092.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0092.Name
@@ -531,7 +547,7 @@ Thai Milk Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0093 12-02-02-0093 12-02-03-0093 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -579,7 +595,15 @@ Thai Milk Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0093"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0093"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0093"
+			Else
+			Topping "Load" "12-02-03-0093"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0093.NameE
 		Var menu_desc_eng_hot = $12-02-01-0093.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0093.Name
@@ -779,7 +803,7 @@ Thai Milk Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0094 12-02-02-0094 12-02-03-0094 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -827,7 +851,15 @@ Thai Milk Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0094"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0094"
+			Else
+			Topping "Load" "12-02-03-0094"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0094.NameE
 		Var menu_desc_eng_hot = $12-02-01-0094.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0094.Name
@@ -1027,7 +1059,7 @@ Thai Milk Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0095 12-02-02-0095 12-02-03-0095 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1075,7 +1107,15 @@ Thai Milk Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0095"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0095"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0095"
+			Else
+			Topping "Load" "12-02-03-0095"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0095.NameE
 		Var menu_desc_eng_hot = $12-02-01-0095.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0095.Name
@@ -1276,7 +1316,7 @@ Thai Milk Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0096 12-02-02-0096 12-02-03-0096 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1324,7 +1364,15 @@ Thai Milk Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0096"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0096"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0096"
+			Else
+			Topping "Load" "12-02-03-0096"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0096.NameE
 		Var menu_desc_eng_hot = $12-02-01-0096.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0096.Name
@@ -1524,7 +1572,7 @@ Thai Milk Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0039 12-02-02-0039 12-02-03-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1572,7 +1620,15 @@ Thai Milk Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0039"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0039"
+			Else
+			Topping "Load" "12-02-03-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0039.NameE
 		Var menu_desc_eng_hot = $12-02-01-0039.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0039.Name
diff --git a/xml/page_catalog_group_pro_lipit.xml b/xml/page_catalog_group_pro_lipit.xml
index 586ff4bc..87fb1c72 100644
--- a/xml/page_catalog_group_pro_lipit.xml
+++ b/xml/page_catalog_group_pro_lipit.xml
@@ -37,7 +37,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -85,7 +85,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -281,7 +289,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0047 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -329,7 +337,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0047"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1029,7 +1045,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0063 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1077,7 +1093,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0063"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0063"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1527,7 +1551,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0053 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1575,7 +1599,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0053"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0053"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2277,7 +2309,7 @@ Thai Tea Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0064 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2325,7 +2357,15 @@ Thai Tea Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0064"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0064"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_matcha_every_day.xml b/xml/page_catalog_group_pro_matcha_every_day.xml
index 810266c7..0e73da9e 100644
--- a/xml/page_catalog_group_pro_matcha_every_day.xml
+++ b/xml/page_catalog_group_pro_matcha_every_day.xml
@@ -287,7 +287,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0097 12-02-02-0097 12-02-03-0097 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -335,7 +335,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0097"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0097"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0097"
+			Else
+			Topping "Load" "12-02-03-0097"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0097.NameE
 		Var menu_desc_eng_hot = $12-02-01-0097.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0097.Name
@@ -785,7 +793,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0106 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -833,7 +841,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0106"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0106"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1080,7 +1096,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0026.NameE
 		Var menu_desc_eng_hot = $12-02-01-0026.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0026.Name
@@ -1279,7 +1303,7 @@ Sugar And Ice" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1327,7 +1351,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1524,7 +1556,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0084 12-02-02-0084 12-02-03-0084 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1572,7 +1604,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0084"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0084"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0084"
+			Else
+			Topping "Load" "12-02-03-0084"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0084.NameE
 		Var menu_desc_eng_hot = $12-02-01-0084.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0084.Name
@@ -1772,7 +1812,7 @@ Matcha" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0083 12-02-02-0083 12-02-03-0083 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1820,7 +1860,15 @@ Matcha" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0083"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0083"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0083"
+			Else
+			Topping "Load" "12-02-03-0083"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0083.NameE
 		Var menu_desc_eng_hot = $12-02-01-0083.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0083.Name
@@ -2068,7 +2116,15 @@ Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0031"
+			Else
+			Topping "Load" "12-21-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0031.NameE
 		Var menu_desc_eng_hot = $12-01-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0031.Name
@@ -2315,7 +2371,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0031"
+			Else
+			Topping "Load" "12-21-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0031.NameE
 		Var menu_desc_eng_hot = $12-21-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0031.Name
@@ -2515,7 +2579,7 @@ Cafe Latte" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0060 12-02-03-0060 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2563,7 +2627,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2809,7 +2881,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0027"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0027.NameE
 		Var menu_desc_eng_hot = $12-02-01-0027.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0027.Name
@@ -3056,7 +3136,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0028"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0028.NameE
 		Var menu_desc_eng_hot = $12-02-01-0028.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0028.Name
@@ -3256,7 +3344,7 @@ Limenade" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0061 12-02-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3304,7 +3392,15 @@ Limenade" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3549,10 +3645,10 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-1026"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-1026"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
diff --git a/xml/page_catalog_group_pro_mom_cocoa.xml b/xml/page_catalog_group_pro_mom_cocoa.xml
index 3e356eb9..b5fa9d61 100644
--- a/xml/page_catalog_group_pro_mom_cocoa.xml
+++ b/xml/page_catalog_group_pro_mom_cocoa.xml
@@ -2294,7 +2294,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0006 12-01-02-0003 12-01-03-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2342,7 +2342,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0003"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0006"
+			Else
+			Topping "Load" "12-01-03-0003"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0006.NameE
 		Var menu_desc_eng_hot = $12-01-01-0006.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0006.Name
@@ -2798,7 +2806,7 @@ Milk, Sugar" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-01-02-0061 12-01-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2846,7 +2854,15 @@ Milk, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3042,7 +3058,7 @@ Cocoa, Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0002 12-03-02-0002 12-03-03-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3090,7 +3106,15 @@ Cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0002"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0002"
+			Else
+			Topping "Load" "12-03-03-0002"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0002.NameE
 		Var menu_desc_eng_hot = $12-03-01-0002.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0002.Name
@@ -3540,7 +3564,7 @@ Cocoa, Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0004 12-03-02-0004 12-03-03-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3588,7 +3612,15 @@ Cocoa, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0004"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0004"
+			Else
+			Topping "Load" "12-03-03-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0004.NameE
 		Var menu_desc_eng_hot = $12-03-01-0004.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0004.Name
@@ -3789,7 +3821,7 @@ Caramel" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0024 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3837,7 +3869,15 @@ Caramel" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0024"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0024.NameE
 		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0024.Name
@@ -4036,7 +4076,7 @@ Caramel" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0025 12-03-02-0025 12-03-03-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4084,7 +4124,15 @@ Caramel" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0025"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0025"
+			Else
+			Topping "Load" "12-03-03-0025"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0025.NameE
 		Var menu_desc_eng_hot = $12-03-01-0025.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0025.Name
@@ -4283,7 +4331,7 @@ Caramel" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0035 12-03-02-0035 12-03-03-0035 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4331,7 +4379,15 @@ Caramel" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0035"
+			Else
+			Topping "Load" "12-03-03-0035"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0035.NameE
 		Var menu_desc_eng_hot = $12-03-01-0035.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0035.Name
@@ -4531,7 +4587,7 @@ sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0039 12-03-03-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4579,7 +4635,15 @@ sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0039"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4775,7 +4839,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0059 12-03-03-0059 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4823,7 +4887,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0059"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0059"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0059"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5019,7 +5091,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5067,7 +5139,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5263,7 +5343,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5311,7 +5391,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5508,7 +5596,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0044 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5556,7 +5644,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0044"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0044"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_monday_banana.xml b/xml/page_catalog_group_pro_monday_banana.xml
index 5005fb4f..31c0cbb1 100644
--- a/xml/page_catalog_group_pro_monday_banana.xml
+++ b/xml/page_catalog_group_pro_monday_banana.xml
@@ -37,7 +37,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -88,7 +88,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -285,7 +293,7 @@ Is Relieve" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -336,7 +344,15 @@ Is Relieve" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -534,7 +550,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0023 12-03-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -585,7 +601,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_mymint.xml b/xml/page_catalog_group_pro_mymint.xml
index 9a4b5c28..5867e768 100644
--- a/xml/page_catalog_group_pro_mymint.xml
+++ b/xml/page_catalog_group_pro_mymint.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 13
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0057 12-01-02-0057 12-01-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0057"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0057"
+			Else
+			Topping "Load" "12-01-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0057.NameE
 		Var menu_desc_eng_hot = $12-01-01-0057.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0057.Name
@@ -331,7 +339,15 @@ Sugar, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0057"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0057"
+			Else
+			Topping "Load" "12-21-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0057.NameE
 		Var menu_desc_eng_hot = $12-21-01-0057.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0057.Name
@@ -1045,7 +1061,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0050 12-02-02-0050 12-02-03-0050 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1093,7 +1109,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0050"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0050"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0050"
+			Else
+			Topping "Load" "12-02-03-0050"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0050.NameE
 		Var menu_desc_eng_hot = $12-02-01-0050.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0050.Name
@@ -1295,7 +1319,7 @@ Mint" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0035 12-03-02-0035 12-03-03-0035 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1343,7 +1367,15 @@ Mint" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0035"
+			Else
+			Topping "Load" "12-03-03-0035"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0035.NameE
 		Var menu_desc_eng_hot = $12-03-01-0035.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0035.Name
@@ -1545,7 +1577,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0036 12-03-02-0036 12-03-03-0036 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1593,7 +1625,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0036"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0036"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0036"
+			Else
+			Topping "Load" "12-03-03-0036"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0036.NameE
 		Var menu_desc_eng_hot = $12-03-01-0036.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0036.Name
@@ -1794,7 +1834,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0037 12-03-03-0037 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1842,7 +1882,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0037"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0037"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2041,7 +2089,7 @@ Strawberry " </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2089,7 +2137,15 @@ Strawberry " </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0034"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_nam_hom_coconut.xml b/xml/page_catalog_group_pro_nam_hom_coconut.xml
index f8b56130..6cde9e12 100644
--- a/xml/page_catalog_group_pro_nam_hom_coconut.xml
+++ b/xml/page_catalog_group_pro_nam_hom_coconut.xml
@@ -540,7 +540,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0092 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -588,7 +588,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0092"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0092"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -786,7 +794,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0058 12-03-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -834,7 +842,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0058"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1034,7 +1050,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0059 12-03-03-0059 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1082,7 +1098,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0059"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0059"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0059"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1282,7 +1306,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0060 12-02-03-0060 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1330,7 +1354,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1529,7 +1561,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0061 12-02-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1577,7 +1609,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0061"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0061"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1775,7 +1815,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0062 12-02-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1823,7 +1863,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0062"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0062"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0062"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2023,7 +2071,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0063 12-02-03-0063 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2071,7 +2119,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0063"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0063"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0063"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2269,7 +2325,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0064 12-02-03-0064 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2317,7 +2373,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0064"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0064"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0064"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2516,7 +2580,7 @@ Water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-02-02-0065 12-02-03-0065 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2564,7 +2628,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0065"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0065"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0065"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3016,7 +3088,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0091 12-05-03-0091 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3064,7 +3136,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0091"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0091"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0091"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3766,7 +3846,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0024 12-03-03-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3814,7 +3894,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4011,7 +4099,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4059,7 +4147,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5267,7 +5363,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0050 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5315,7 +5411,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0050"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0050"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6267,7 +6371,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6315,7 +6419,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0034"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6513,7 +6625,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0037 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6561,7 +6673,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0037"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_oreo_11.xml b/xml/page_catalog_group_pro_oreo_11.xml
index 9f429913..764625f4 100644
--- a/xml/page_catalog_group_pro_oreo_11.xml
+++ b/xml/page_catalog_group_pro_oreo_11.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 19
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0043 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0043"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0043"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -281,7 +289,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0044 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -329,7 +337,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0044"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0044"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -528,7 +544,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -576,7 +592,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0009"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -774,7 +798,7 @@ Volcano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -822,7 +846,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0026"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1022,7 +1054,7 @@ Sugar Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1070,7 +1102,15 @@ Sugar Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0027"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0027"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1270,7 +1310,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1318,7 +1358,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0030"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0030"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1518,7 +1566,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1566,7 +1614,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1766,7 +1822,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1814,7 +1870,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0032"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0032"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2011,7 +2075,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0048 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2059,7 +2123,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0048"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0048"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2259,7 +2331,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0043 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2307,7 +2379,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0043"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0043"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2507,7 +2587,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2555,7 +2635,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0028"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0028"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2755,7 +2843,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2803,7 +2891,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0029"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3002,7 +3098,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3050,7 +3146,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0034"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3248,7 +3352,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0056 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3296,7 +3400,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0056"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0056"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3495,7 +3607,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0086 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3543,7 +3655,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0086"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0086"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3743,7 +3863,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0087 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3791,7 +3911,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0087"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0087"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3990,7 +4118,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0078 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4038,7 +4166,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4282,7 +4418,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4479,7 +4623,7 @@ Caramel Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4527,7 +4671,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4725,7 +4877,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4773,7 +4925,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_ovaltine_school.xml b/xml/page_catalog_group_pro_ovaltine_school.xml
index 902ab3eb..43d2def8 100644
--- a/xml/page_catalog_group_pro_ovaltine_school.xml
+++ b/xml/page_catalog_group_pro_ovaltine_school.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0019 12-03-02-0019 12-03-03-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0019"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0019"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0019"
+			Else
+			Topping "Load" "12-03-03-0019"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0019.NameE
 		Var menu_desc_eng_hot = $12-03-01-0019.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0019.Name
@@ -284,7 +292,7 @@ and Sugar" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0094 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -332,7 +340,15 @@ and Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0094"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -530,7 +546,7 @@ and Sugar" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0095 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -578,7 +594,15 @@ and Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0095"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0095"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_passion_mint.xml b/xml/page_catalog_group_pro_passion_mint.xml
index 491025fd..13319952 100644
--- a/xml/page_catalog_group_pro_passion_mint.xml
+++ b/xml/page_catalog_group_pro_passion_mint.xml
@@ -1050,7 +1050,7 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0050 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1101,7 +1101,15 @@ Sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0050"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0050"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2061,7 +2069,7 @@ Sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2112,7 +2120,15 @@ Sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0034"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0034"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2310,7 +2326,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0037 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2361,7 +2377,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0037"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_peach.xml b/xml/page_catalog_group_pro_peach.xml
index 949b3405..0d48e3ac 100644
--- a/xml/page_catalog_group_pro_peach.xml
+++ b/xml/page_catalog_group_pro_peach.xml
@@ -545,7 +545,7 @@ sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0060 12-01-02-0060 12-01-03-0060 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -593,7 +593,15 @@ sugar, Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0060"
+			Else
+			Topping "Load" "12-01-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0060.NameE
 		Var menu_desc_eng_hot = $12-01-01-0060.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0060.Name
@@ -840,7 +848,15 @@ sugar, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0060"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0060"
+			Else
+			Topping "Load" "12-21-03-0060"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0060.NameE
 		Var menu_desc_eng_hot = $12-21-01-0060.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0060.Name
@@ -1040,7 +1056,7 @@ sugar, Milk" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0051 12-02-02-0051 12-02-03-0051 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1088,7 +1104,15 @@ sugar, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0051"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0051"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0051"
+			Else
+			Topping "Load" "12-02-03-0051"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0051.NameE
 		Var menu_desc_eng_hot = $12-02-01-0051.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0051.Name
@@ -1541,7 +1565,7 @@ water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0038 12-03-02-0038 12-03-03-0038 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1589,7 +1613,15 @@ water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0038"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0038"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0038"
+			Else
+			Topping "Load" "12-03-03-0038"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0038.NameE
 		Var menu_desc_eng_hot = $12-03-01-0038.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0038.Name
@@ -1790,7 +1822,7 @@ water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-03-02-0039 12-03-03-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1838,7 +1870,15 @@ water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0039"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2036,7 +2076,7 @@ water" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0040 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2084,7 +2124,15 @@ water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0040"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0040"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_pepsi_second_cup_30.xml b/xml/page_catalog_group_pro_pepsi_second_cup_30.xml
index ca6560d7..0bf1b968 100644
--- a/xml/page_catalog_group_pro_pepsi_second_cup_30.xml
+++ b/xml/page_catalog_group_pro_pepsi_second_cup_30.xml
@@ -3078,7 +3078,7 @@ ANGRY sun mode" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3126,7 +3126,15 @@ ANGRY sun mode" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0007"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_pepsi_x_taobin.xml b/xml/page_catalog_group_pro_pepsi_x_taobin.xml
index 618d4af4..4725e3c6 100644
--- a/xml/page_catalog_group_pro_pepsi_x_taobin.xml
+++ b/xml/page_catalog_group_pro_pepsi_x_taobin.xml
@@ -2044,7 +2044,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0046 12-05-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2092,7 +2092,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0046"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2287,7 +2295,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0104 12-05-03-0104 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2335,7 +2343,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0104"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0104"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0104"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2578,7 +2594,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2821,7 +2845,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0094"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_red_string_of_fate.xml b/xml/page_catalog_group_pro_red_string_of_fate.xml
index 4da02b33..619cda73 100644
--- a/xml/page_catalog_group_pro_red_string_of_fate.xml
+++ b/xml/page_catalog_group_pro_red_string_of_fate.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 3
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0100 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0100"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0100"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -281,7 +289,7 @@ Lime, Ovaltine" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0101 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -329,7 +337,15 @@ Lime, Ovaltine" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0101"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0101"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -524,7 +540,7 @@ Lime, Ovaltine" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0102 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -572,7 +588,15 @@ Lime, Ovaltine" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0102"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0102"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_rerun.xml b/xml/page_catalog_group_pro_rerun.xml
index 54b70ba5..d704fb7a 100644
--- a/xml/page_catalog_group_pro_rerun.xml
+++ b/xml/page_catalog_group_pro_rerun.xml
@@ -343,7 +343,7 @@ House" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0043"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1055,7 +1055,7 @@ House" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1104,7 +1104,15 @@ House" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2319,7 +2327,7 @@ the Past" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0035 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2368,7 +2376,15 @@ the Past" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0035"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0035"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2822,7 +2838,7 @@ sugar, Cocoa" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0066 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2871,7 +2887,15 @@ sugar, Cocoa" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0066"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0066"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_robinson_beauty.xml b/xml/page_catalog_group_pro_robinson_beauty.xml
index d7029c33..a600fda2 100644
--- a/xml/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/page_catalog_group_pro_robinson_beauty.xml
@@ -37,7 +37,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 10
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0064 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -85,7 +85,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0064"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0064"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1295,7 +1303,7 @@ Straw Cano" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1343,7 +1351,15 @@ Straw Cano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2550,7 +2566,7 @@ Cafe Latte" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0053 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2598,7 +2614,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0053"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0053"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2795,7 +2819,7 @@ Chee Tea Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0115 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2843,7 +2867,15 @@ Chee Tea Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0115"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0115"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_strawberry_series.xml b/xml/page_catalog_group_pro_strawberry_series.xml
index 2895a0f0..850b9f45 100644
--- a/xml/page_catalog_group_pro_strawberry_series.xml
+++ b/xml/page_catalog_group_pro_strawberry_series.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 7
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0023 12-05-03-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0023"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0023"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -283,7 +291,7 @@ Sugar, Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0022 12-02-02-0022 12-02-03-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -331,7 +339,15 @@ Sugar, Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0022"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0022"
+			Else
+			Topping "Load" "12-02-03-0022"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0022.NameE
 		Var menu_desc_eng_hot = $12-02-01-0022.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0022.Name
@@ -532,7 +548,7 @@ Jasmine Tea, Sugar" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0041 12-05-03-0041 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -580,7 +596,15 @@ Jasmine Tea, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0041"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0041"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0041"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -777,7 +801,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-05-01-0040 12-05-02-0040 12-05-03-0040 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -825,7 +849,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0040"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0040"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-05-01-0040"
+			Else
+			Topping "Load" "12-05-03-0040"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-05-01-0040.NameE
 		Var menu_desc_eng_hot = $12-05-01-0040.descriptionE
 		Var menu_name_thai_hot = $12-05-01-0040.Name
@@ -1024,7 +1056,7 @@ Soda" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-03-01-0010 12-03-02-0010 12-03-03-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1072,7 +1104,15 @@ Soda" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0010"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-03-01-0010"
+			Else
+			Topping "Load" "12-03-03-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0010.NameE
 		Var menu_desc_eng_hot = $12-03-01-0010.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0010.Name
@@ -1273,7 +1313,7 @@ Cocoa, Sugar" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0074 12-01-02-0074 12-01-03-0074 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1321,7 +1361,15 @@ Cocoa, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0074"
+			Else
+			Topping "Load" "12-01-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0074.NameE
 		Var menu_desc_eng_hot = $12-01-01-0074.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0074.Name
@@ -1569,7 +1617,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0074"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0074"
+			Else
+			Topping "Load" "12-21-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0074.NameE
 		Var menu_desc_eng_hot = $12-21-01-0074.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0074.Name
@@ -1770,7 +1826,7 @@ Coffee, Sugar" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1818,7 +1874,15 @@ Coffee, Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0027"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0027"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_tea_time.xml b/xml/page_catalog_group_pro_tea_time.xml
index 5998aac3..e7f478ce 100644
--- a/xml/page_catalog_group_pro_tea_time.xml
+++ b/xml/page_catalog_group_pro_tea_time.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 26
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0039 12-02-02-0039 12-02-03-0039 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0039"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0039"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0039"
+			Else
+			Topping "Load" "12-02-03-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0039.NameE
 		Var menu_desc_eng_hot = $12-02-01-0039.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0039.Name
@@ -795,7 +803,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0055 12-01-02-0055 12-01-03-0055 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -843,7 +851,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0055"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0055"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0055"
+			Else
+			Topping "Load" "12-01-03-0055"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0055.NameE
 		Var menu_desc_eng_hot = $12-01-01-0055.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0055.Name
@@ -1089,7 +1105,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0055"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0055"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0055"
+			Else
+			Topping "Load" "12-21-03-0055"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0055.NameE
 		Var menu_desc_eng_hot = $12-21-01-0055.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0055.Name
@@ -2556,7 +2580,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0045 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2604,7 +2628,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0045"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0045"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2802,7 +2834,7 @@ sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0026 12-02-02-0026 12-02-03-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2850,7 +2882,15 @@ sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0026"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0026"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0026"
+			Else
+			Topping "Load" "12-02-03-0026"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0026.NameE
 		Var menu_desc_eng_hot = $12-02-01-0026.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0026.Name
@@ -3306,7 +3346,7 @@ sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0027 12-02-02-0027 12-02-03-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3354,7 +3394,15 @@ sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0027"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0027"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0027"
+			Else
+			Topping "Load" "12-02-03-0027"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0027.NameE
 		Var menu_desc_eng_hot = $12-02-01-0027.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0027.Name
@@ -3810,7 +3858,7 @@ sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0028 12-02-02-0028 12-02-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3858,7 +3906,15 @@ sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0028"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0028"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0028"
+			Else
+			Topping "Load" "12-02-03-0028"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0028.NameE
 		Var menu_desc_eng_hot = $12-02-01-0028.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0028.Name
@@ -4058,7 +4114,7 @@ sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-01-01-0031 12-01-02-0031 12-01-03-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -4106,7 +4162,15 @@ sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0031"
+			Else
+			Topping "Load" "12-01-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-01-01-0031.NameE
 		Var menu_desc_eng_hot = $12-01-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-01-01-0031.Name
@@ -4353,7 +4417,15 @@ sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0031"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0031"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0031"
+			Else
+			Topping "Load" "12-21-03-0031"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-21-01-0031.NameE
 		Var menu_desc_eng_hot = $12-21-01-0031.descriptionE
 		Var menu_name_thai_hot = $12-21-01-0031.Name
@@ -5308,7 +5380,7 @@ Matcha, Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0037 12-02-02-0037 12-02-03-0037 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5356,7 +5428,15 @@ Matcha, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0037"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0037"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0037"
+			Else
+			Topping "Load" "12-02-03-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0037.NameE
 		Var menu_desc_eng_hot = $12-02-01-0037.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0037.Name
@@ -5812,7 +5892,7 @@ Matcha, Milk" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0043 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -5860,7 +5940,15 @@ Matcha, Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0043"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0043"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6310,7 +6398,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-99-01-0042 12-99-02-0044 12-99-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6358,7 +6446,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-99-02-0044"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-99-01-0042"
+			Else
+			Topping "Load" "12-99-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-99-01-0042.NameE
 		Var menu_desc_eng_hot = $12-99-01-0042.descriptionE
 		Var menu_name_thai_hot = $12-99-01-0042.Name
@@ -6558,7 +6654,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-99-01-0043 12-99-02-0045 12-99-03-0047 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -6606,7 +6702,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-99-02-0045"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-99-01-0043"
+			Else
+			Topping "Load" "12-99-03-0047"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-99-01-0043.NameE
 		Var menu_desc_eng_hot = $12-99-01-0043.descriptionE
 		Var menu_name_thai_hot = $12-99-01-0043.Name
diff --git a/xml/page_catalog_group_pro_thick_tea_by_brewer.xml b/xml/page_catalog_group_pro_thick_tea_by_brewer.xml
index 420c8cde..8f8880c1 100644
--- a/xml/page_catalog_group_pro_thick_tea_by_brewer.xml
+++ b/xml/page_catalog_group_pro_thick_tea_by_brewer.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 15
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0083 12-02-02-0083 12-02-03-0083 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0083"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0083"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0083"
+			Else
+			Topping "Load" "12-02-03-0083"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0083.NameE
 		Var menu_desc_eng_hot = $12-02-01-0083.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0083.Name
@@ -284,7 +292,7 @@ Tea" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0084 12-02-02-0084 12-02-03-0084 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -332,7 +340,15 @@ Tea" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0084"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0084"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0084"
+			Else
+			Topping "Load" "12-02-03-0084"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0084.NameE
 		Var menu_desc_eng_hot = $12-02-01-0084.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0084.Name
@@ -532,7 +548,7 @@ Matcha" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0085 12-02-02-0085 12-02-03-0085 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -580,7 +596,15 @@ Matcha" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0085"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0085"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0085"
+			Else
+			Topping "Load" "12-02-03-0085"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0085.NameE
 		Var menu_desc_eng_hot = $12-02-01-0085.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0085.Name
diff --git a/xml/page_catalog_group_pro_wednesday_melon.xml b/xml/page_catalog_group_pro_wednesday_melon.xml
index 26fde811..282b376e 100644
--- a/xml/page_catalog_group_pro_wednesday_melon.xml
+++ b/xml/page_catalog_group_pro_wednesday_melon.xml
@@ -86,7 +86,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0022.NameE
 		Var menu_desc_eng_hot = $12-03-01-0022.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0022.Name
@@ -338,10 +346,10 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0039"
+			Topping "Load" "12-21-02-0039"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0039"
+			Topping "Load" "12-21-01-0039"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -856,7 +864,15 @@ Cafe Latte" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0028"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1107,7 +1123,7 @@ Sugar, Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1362,7 +1378,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1558,7 +1582,7 @@ Sugar, Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - 12-05-02-0105 12-05-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1609,7 +1633,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0105"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0105"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0105"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_weekday_discount.xml b/xml/page_catalog_group_pro_weekday_discount.xml
index 84256e52..23b80c9f 100644
--- a/xml/page_catalog_group_pro_weekday_discount.xml
+++ b/xml/page_catalog_group_pro_weekday_discount.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-01-03-0078 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-01-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -326,7 +334,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-03-0078"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -522,7 +538,7 @@ Caramel Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0057 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -570,7 +586,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0057"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -767,7 +791,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -815,7 +839,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1012,7 +1044,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1060,7 +1092,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1258,7 +1298,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1306,7 +1346,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0011"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0011"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1503,7 +1551,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0059 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1551,7 +1599,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0059"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0059"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1748,7 +1804,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-02-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1796,7 +1852,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0062"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-02-03-0062"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1993,7 +2057,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2041,7 +2105,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2238,7 +2310,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2286,7 +2358,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2482,7 +2562,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2530,7 +2610,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0032"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0032"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2725,7 +2813,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0067 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2773,7 +2861,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0067"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0067"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2968,7 +3064,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-03-03-0065 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3016,7 +3112,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0065"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0065"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3710,7 +3814,7 @@ Smoothie" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-05-03-0127 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3758,7 +3862,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0127"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0127"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_pro_weekday_discount_event_on.xml b/xml/page_catalog_group_pro_weekday_discount_event_on.xml
index 39ba991d..9ff252dd 100644
--- a/xml/page_catalog_group_pro_weekday_discount_event_on.xml
+++ b/xml/page_catalog_group_pro_weekday_discount_event_on.xml
@@ -35,7 +35,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 14
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0074 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -83,7 +83,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0074"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0074"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -326,7 +334,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0075"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0075"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -522,7 +538,7 @@ Caramel Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0076 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -570,7 +586,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0076"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0076"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -767,7 +791,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0077 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -815,7 +839,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0077"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0077"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1012,7 +1044,7 @@ Caramel Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0058 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1060,7 +1092,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0058"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0058"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1258,7 +1298,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1306,7 +1346,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0011"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0011"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1503,7 +1551,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0059 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1551,7 +1599,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0059"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0059"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1748,7 +1804,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0062 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -1796,7 +1852,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0062"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0062"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1993,7 +2057,7 @@ Coconut" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2041,7 +2105,15 @@ Coconut" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0004"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2238,7 +2310,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2286,7 +2358,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0010"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2483,7 +2563,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2531,7 +2611,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0032"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0032"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2726,7 +2814,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0067 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2774,7 +2862,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0067"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0067"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2969,7 +3065,7 @@ Smoothie" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0065 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3017,7 +3113,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0065"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0065"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3711,7 +3815,7 @@ Smoothie" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0127 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3759,7 +3863,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0127"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0127"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index b2a0b3b7..b2f9112c 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -361,7 +361,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0103"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0103"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -608,7 +616,15 @@ And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0106"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0106"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1354,7 +1370,15 @@ Sugar And Ice" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0057"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0057"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1599,7 +1623,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0058"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0058"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1844,7 +1876,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-01-03-0078"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-01-03-0078"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2087,7 +2127,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-21-03-0078"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-21-03-0078"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2830,7 +2878,15 @@ Caramel Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0009"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0009"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3075,7 +3131,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0026"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0026"
+			Else
+			Topping "Load" "12-02-01-0026"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0026.NameE
 		Var menu_desc_eng_hot = $12-02-01-0026.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0026.Name
@@ -3322,7 +3386,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0039"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0039"
+			Else
+			Topping "Load" "12-02-01-0039"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0039.NameE
 		Var menu_desc_eng_hot = $12-02-01-0039.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0039.Name
@@ -3569,7 +3641,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0143"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-05-03-0143"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-05-02-0143"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3815,7 +3895,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0067"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0067"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0067"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4058,7 +4146,15 @@ Soda Extra" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0094"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0094"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4304,10 +4400,10 @@ Volcano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0001"
+			Topping "Load" "12-21-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0003"
+			Topping "Load" "12-21-01-0003"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5061,7 +5157,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0092"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-05-03-0092"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5304,7 +5408,15 @@ Volcano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0058"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0058"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0058"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -5549,7 +5661,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0066"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-99-03-0066"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6043,7 +6163,15 @@ Water" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0029"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0029"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6289,7 +6417,15 @@ Sugar, Oreo" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0024"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0024"
+			Else
+			Topping "Load" "12-03-01-0024"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0024.NameE
 		Var menu_desc_eng_hot = $12-03-01-0024.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0024.Name
@@ -6538,7 +6674,15 @@ Banana Milk" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0041"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -6785,7 +6929,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0042"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7032,7 +7184,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0043"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0043"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7279,7 +7439,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0061"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0061"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7526,7 +7694,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-63-0026"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-63-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0026"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -7769,7 +7945,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-63-0039"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-63-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0039"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8012,7 +8196,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-63-0047"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-63-0047"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0047"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8255,7 +8447,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-63-0025"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-63-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-62-0025"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8498,7 +8698,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0028"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-41-03-0028"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "TAOTIM"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $TAOTIM.NameE
 		Var menu_desc_eng_hot = $TAOTIM.descriptionE
 		Var menu_name_thai_hot = $TAOTIM.Name
@@ -8736,7 +8944,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-83-0011"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-83-0011"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-82-0011"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -8980,7 +9196,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-83-0041"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-83-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-82-0041"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9224,7 +9448,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-83-0042"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-83-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-82-0042"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9468,7 +9700,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-83-0043"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-83-0043"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-82-0043"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -9712,7 +9952,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0037"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-02-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0037"
+			Else
+			Topping "Load" "12-02-01-0037"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0037.NameE
 		Var menu_desc_eng_hot = $12-02-01-0037.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0037.Name
@@ -9959,7 +10207,15 @@ Sugar, Biscoff" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0022"
+		If PD_STAGE_3 = "Enable" Then
+			Topping "Load" "12-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-03-02-0022"
+			Else
+			Topping "Load" "12-03-01-0022"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0022.NameE
 		Var menu_desc_eng_hot = $12-03-01-0022.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0022.Name
@@ -10714,10 +10970,10 @@ Sugar, Biscoff" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0011"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0014"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -10973,10 +11229,10 @@ Ethiopia Guji" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0019"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -11232,10 +11488,10 @@ note: Blue Berry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0021"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0021"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -11491,10 +11747,10 @@ note: Strawberry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0025"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0025"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -11750,10 +12006,10 @@ note: Whisky & Vanilla" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0023"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0023"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -12009,10 +12265,10 @@ note: Jasmine & Honey" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0027"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0027"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -12268,10 +12524,10 @@ note: Peach, Tea, Chocolate" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0032"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0032"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -12526,10 +12782,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0035"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0035"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -12783,10 +13039,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0038"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0038"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -13042,10 +13298,10 @@ pink​ Rose & Berry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0044"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -13301,10 +13557,10 @@ note: Strawberry & Floral" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0047"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0047"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -13558,10 +13814,10 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-01-02-0050"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0050"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -13766,7 +14022,7 @@ Americano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0045 12-02-02-0045 12-02-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -13814,7 +14070,15 @@ Americano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0045"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0045"
+			Else
+			Topping "Load" "12-02-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0045.NameE
 		Var menu_desc_eng_hot = $12-02-01-0045.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0045.Name
@@ -14013,7 +14277,7 @@ Americano" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-02-01-0046 12-02-02-0046 12-02-03-0047 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -14061,7 +14325,15 @@ Americano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-02-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-02-02-0046"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-02-01-0046"
+			Else
+			Topping "Load" "12-02-03-0047"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-02-01-0046.NameE
 		Var menu_desc_eng_hot = $12-02-01-0046.descriptionE
 		Var menu_name_thai_hot = $12-02-01-0046.Name
@@ -14308,7 +14580,15 @@ Americano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-03-01-0001.NameE
 		Var menu_desc_eng_hot = $12-03-01-0001.descriptionE
 		Var menu_name_thai_hot = $12-03-01-0001.Name
@@ -14555,7 +14835,15 @@ Americano" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -14800,7 +15088,15 @@ Sugar" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-03-03-0011"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -15045,7 +15341,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -15288,7 +15592,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -15531,7 +15843,15 @@ Smoothie" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-05-03-0025"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_soft_serve.xml b/xml/page_catalog_group_soft_serve.xml
index 5ce30a6c..0f145c8e 100644
--- a/xml/page_catalog_group_soft_serve.xml
+++ b/xml/page_catalog_group_soft_serve.xml
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0001"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -327,7 +335,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0002"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -570,7 +586,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0003"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -813,7 +837,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0004"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1056,7 +1088,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0005"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1299,7 +1339,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0006"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1542,7 +1590,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0007"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -1785,7 +1841,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0008"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2028,7 +2092,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0009"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2271,7 +2343,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0010"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2514,7 +2594,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0011"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -2757,7 +2845,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0012"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3000,7 +3096,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0013"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3243,7 +3347,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0016"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3486,7 +3598,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0018"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3729,7 +3849,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0021"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -3972,7 +4100,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0022"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4217,7 +4353,15 @@ Banana" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0023"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
@@ -4460,7 +4604,15 @@ Banana" </Value>
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-41-03-0029"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml
index 08f36cc0..b657733a 100644
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@@ -723,7 +723,7 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0043"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -974,7 +974,7 @@ Americano" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0044"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1226,7 +1226,7 @@ House" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0055"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1477,7 +1477,7 @@ House" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0056"
+			Topping "Load" "-"
 		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 519fd330..3c8fed54 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" "12-02-02-0004"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0004"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0004"
+			Topping "Load" "-"
 			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" "12-02-02-0026"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0026"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0026"
+			Topping "Load" "-"
 			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" "12-02-02-0039"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0039"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0039"
+			Topping "Load" "-"
 			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" "12-02-02-0024"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0024"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0024"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0024.NameE
@@ -6715,12 +6715,12 @@ Caramel Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0020"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0020"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0020"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0020.NameE
@@ -6970,12 +6970,12 @@ Caramel Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0041"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0041"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0041"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0041.NameE
@@ -7225,12 +7225,12 @@ Caramel Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0027"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0017"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-05-03-0027"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0017.NameE
@@ -7480,12 +7480,12 @@ Caramel Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0007"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0007"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0007"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0007.NameE
@@ -7738,7 +7738,7 @@ Caramel Oreo" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0021"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -7991,12 +7991,12 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0042"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0042"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0042"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0042.NameE
@@ -8247,12 +8247,12 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0040"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0040"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0040"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0040.NameE
@@ -8502,10 +8502,10 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0047"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0047"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -9267,12 +9267,12 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0037"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0037"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0037"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0037.NameE
@@ -9522,12 +9522,12 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0027"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0027"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0027"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0027.NameE
@@ -9777,12 +9777,12 @@ Ginger Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0028"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0028"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0028"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0028.NameE
@@ -10033,12 +10033,12 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0011"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0011"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0011"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0011.NameE
@@ -10288,12 +10288,12 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0012"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0012"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0012"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0012.NameE
@@ -11054,12 +11054,12 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0050"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0050"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0050"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0050.NameE
@@ -13335,12 +13335,12 @@ Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0006"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0006"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0006"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0006.NameE
@@ -13592,12 +13592,12 @@ Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0008"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0008"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0008"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0008.NameE
@@ -13847,12 +13847,12 @@ Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0019"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0019"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0019.NameE
@@ -14102,10 +14102,10 @@ Tea" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-01-0009"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-02-0009"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -14359,12 +14359,12 @@ Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0016"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-02-03-0017"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0016.NameE
@@ -14614,10 +14614,10 @@ Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0029"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0029"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -14869,10 +14869,10 @@ Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0030"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0030"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -15125,10 +15125,10 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0031"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0031"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -15381,10 +15381,10 @@ Limenade" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0032"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0032"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -15638,10 +15638,10 @@ Water" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0038"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0038"
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 9be45c43..0b8b09c6 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" "12-04-02-0001"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -347,7 +347,7 @@ Matcha, & Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0016"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -599,7 +599,7 @@ Matcha, & Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0002"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -851,7 +851,7 @@ Cocoa, & Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0003"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1105,7 +1105,7 @@ Strawberry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0013"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1359,7 +1359,7 @@ Strawberry" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0018"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1612,7 +1612,7 @@ Melon" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0004"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1864,7 +1864,7 @@ Melon" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0005"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2116,7 +2116,7 @@ Thai Tea, & Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0015"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2620,7 +2620,7 @@ Thai Tea, & Milk" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0006"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -2874,7 +2874,7 @@ Kokuto" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0008"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3128,7 +3128,7 @@ Taiwanese Tea, Sugar" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0017"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3382,7 +3382,7 @@ Taiwanese Tea, Sugar" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0009"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3635,7 +3635,7 @@ Caramel" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0010"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3886,7 +3886,7 @@ Caramel" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-04-02-0011"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
diff --git a/xml/page_catalog_momday.xml b/xml/page_catalog_momday.xml
index 2dc211ce..1818e435 100644
--- a/xml/page_catalog_momday.xml
+++ b/xml/page_catalog_momday.xml
@@ -36,7 +36,7 @@
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 6
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-99-01-0042 12-99-02-0044 12-99-03-0046 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -84,7 +84,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0046"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-99-02-0044"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-99-01-0042"
+			Else
+			Topping "Load" "12-99-03-0046"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-99-01-0042.NameE
 		Var menu_desc_eng_hot = $12-99-01-0042.descriptionE
 		Var menu_name_thai_hot = $12-99-01-0042.Name
@@ -283,7 +291,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; 12-99-01-0043 12-99-02-0045 12-99-03-0047 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -331,7 +339,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0047"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-99-02-0045"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-99-01-0043"
+			Else
+			Topping "Load" "12-99-03-0047"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $12-99-01-0043.NameE
 		Var menu_desc_eng_hot = $12-99-01-0043.descriptionE
 		Var menu_name_thai_hot = $12-99-01-0043.Name
@@ -530,7 +546,7 @@
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
+	; ==================> Len = 15
 	; - - 12-99-03-0048 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -578,7 +594,15 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		Topping "Load" "12-99-03-0048"
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0048"
+			EndIf
+		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name