Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/video/script_thank.ev

@@ -1,13 +1,18 @@
 SAVELOG "For change size this file."
 
 If SaveTheWorldCount = 2 Then
-	Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
+
+	Var video_id_to_ran = 3
+	Random2 1 4 video_id_to_ran
+
+	Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
 Else
 
 	Var video_id_to_ran = 2
-	Random2 1 2 video_id_to_ran
+	Random2 1 3 video_id_to_ran
 
-	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_thank" + video_id_to_ran
 	Var video_file_name = video_file_name + ".mp4"
 
 	If EventNewYear = 1 Then

inter/hkg/menu/lang.tsv

@@ -25,7 +25,7 @@ TextID	Note	English	Mandarin Simplified	Mandarin Traditional
 
 		Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All
 		Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All
-000014		our specialty	特色饮品	特色飲品
+000014		Best Sellers	特色饮品	特色飲品
 000015		Coffee	咖啡	咖啡
 000016		Tea	茶	茶
 000017		Milk,\nCaramel\n& Cocoa	牛奶、焦糖、可可	牛奶、焦糖、可可

inter/hkg/xml/event/promotion_2.xml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/event/promotion_3.xml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/event/promotion_pepsi_099.lxml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/menu_catalog_new.lxml

@@ -123,7 +123,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/menu_new_layout_gen_v2.py

@@ -1,5 +1,5 @@
   if "v2" in param:
-    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code):
+    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, present):
         print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
         out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
         menu_img = spl[ idx_img][1]
@@ -141,19 +141,29 @@
         out_xml( '\t\tEndIf\r\n')
 
 
-
+        if present == 3:
-        out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+          out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
-        #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
+          out_xml( '\t\tElse\r\n')
-        out_xml( '\t\tElse\r\n')
+          out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-        out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
+          out_xml( '\t\t\tElse\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
-        out_xml( '\t\t\tElse\r\n')
+          out_xml( '\t\t\tEndIf\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
+          out_xml( '\t\tEndIf\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
+        else:
-        out_xml( '\t\t\tEndIf\r\n')
+          out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-        out_xml( '\t\tEndIf\r\n')
+          #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
+          out_xml( '\t\tElse\r\n')
+          out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
+          #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
+          out_xml( '\t\t\tElse\r\n')
+          #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
+          out_xml( '\t\t\tEndIf\r\n')
+          out_xml( '\t\tEndIf\r\n')
 
 
 
@@ -452,8 +462,8 @@
 
         out_xml( '</Block>\r\n')
     
-    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
+    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, present):
-        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
+        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code], present)
         
 
     idx_lang_malay = 5
@@ -471,6 +481,7 @@
     idx_hot_product_code = 7
     idx_cold_product_code = idx_hot_product_code + 1
     idx_blend_product_code = idx_cold_product_code + 1
+    idx_default_load_topping = idx_blend_product_code + 2
     
     # 
     idx_hot_product_code2 = idx_blend_product_code + 1
@@ -578,6 +589,11 @@
             cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
             blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
             
+            try:
+              present = int(spl[idx_name][idx_default_load_topping])
+            except:
+              present = 0
+
             #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd))  + '\r\n')
             list_size = len( hot_pd)
             for idx in range( list_size):
@@ -586,9 +602,9 @@
                   print("\t\t==> ignore ")
               else:
                   print("\t\t==> gen ")
-                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
+                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], present)
         else:
-            GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
+            GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, 0)
             #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
             #print("++++++++++++++++++++++++++++++ " + str( count_test) )
             #count_test = count_test + 1
@@ -596,7 +612,7 @@
             #  break
             if len( spl[idx_name] ) >= 11:
                 if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
-                  GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
+                  GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2, 0)
 
     out_xml('</FrameScroll>\r\n')
 

inter/hkg/xml/multi/event/promotion_2.xml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/multi/event/promotion_3.xml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/multi/event/promotion_pepsi_099.lxml

@@ -263,7 +263,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/multi/menu_catalog_new.lxml

@@ -116,7 +116,7 @@
 
     
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     
     Var ButtonLanguageCurrentXPosition = 1005
     Var ButtonLanguageCurrentYPosition = 458 - 38

inter/hkg/xml/multi/menu_new_layout_gen_v2.py

@@ -1,5 +1,5 @@
   if "v2" in param:
-    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code):
+    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, present):
         print(f"spl : {spl}")
         print(" ProductCode :  "+str_hot_product_code + " : " + str_cold_product_code + " : " + str_blend_product_code + "lenstr " + str(len(spl)) )
         print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
@@ -150,18 +150,29 @@
 
 
 
-        out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+        if present == 3:
-        #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
+          out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
-        out_xml( '\t\tElse\r\n')
+          out_xml( '\t\tElse\r\n')
-        out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
+          out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
+          out_xml( '\t\t\tElse\r\n')
-        out_xml( '\t\t\tElse\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
-        #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
+          out_xml( '\t\t\tEndIf\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
+          out_xml( '\t\tEndIf\r\n')
-        out_xml( '\t\t\tEndIf\r\n')
+        else:
-        out_xml( '\t\tEndIf\r\n')
+          out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+          #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\r\n')
+          out_xml( '\t\tElse\r\n')
+          out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
+          #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
+          out_xml( '\t\t\tElse\r\n')
+          #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
+          out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
+          out_xml( '\t\t\tEndIf\r\n')
+          out_xml( '\t\tEndIf\r\n')
 
 
 
@@ -492,8 +503,8 @@
 
         out_xml( '</Block>\r\n')
     
-    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
+    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, present):
-        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
+        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code], present)
         
     # idx_lang_msc = 8
     # idx_lang_mtc = 7
@@ -517,6 +528,7 @@
     idx_hot_product_code = 7
     idx_cold_product_code = idx_hot_product_code + 1
     idx_blend_product_code = idx_cold_product_code + 1
+    idx_default_load_topping = idx_blend_product_code + 2
     
     # 
     idx_hot_product_code2 = idx_blend_product_code + 1
@@ -624,6 +636,11 @@
             cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
             blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
             
+            try:
+              present = int(spl[idx_name][idx_default_load_topping])
+            except:
+              present = 0
+
             #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd))  + '\r\n')
             list_size = len( hot_pd)
             for idx in range( list_size):
@@ -633,9 +650,9 @@
               else:
                   print("\t\t==> gen ")
                   print("\t\t==> hot_pd "+hot_pd[ idx])
-                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
+                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], present)
         else:
-            GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
+            GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code, 0)
             #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
             #print("++++++++++++++++++++++++++++++ " + str( count_test) )
             #count_test = count_test + 1
@@ -643,7 +660,7 @@
             #  break
             if len( spl[idx_name] ) >= 11:
                 if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
-                  GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
+                  GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2, 0)
 
     out_xml('</FrameScroll>\r\n')
 

inter/hkg/xml/multi/page_catalog.lxml

@@ -479,7 +479,7 @@
 	Play PlaySoundLag	
 	Var countDownRetrun = 120
 
-	Var LanguageButtonEnable = "Enable"
+	Var LanguageButtonEnable = "Invisible"
 	Var ButtonLanguageCurrentXPosition = 1005
     Var ButtonLanguageCurrentYPosition = 458 - 38
 

inter/hkg/xml/multi/page_catalog_group_coffee.lxml

@@ -252,7 +252,7 @@
 		Var aliasDesc[4] = ""
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
-		Var NameLang[0][0] = "Hot VANILLA CARAMEL latte (s)"
+		Var NameLang[0][0] = "Hot GINGER CAFE LATTE"
 		Var NameLang[0][1] = "热香草焦糖拿铁咖啡"
 		Var NameLang[0][2] = "熱雲呢拿焦糖拿鐵咖啡"
 		Var NameLang[0][3] = ""
@@ -264,7 +264,7 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "Iced VANILLA CARAMEL latte (s)"
+		Var NameLang[1][0] = "Iced GINGER CAFE LATTE"
 		Var NameLang[1][1] = "冰香草焦糖拿铁咖啡"
 		Var NameLang[1][2] = "冰雲呢拿焦糖拿鐵咖啡"
 		Var NameLang[1][3] = ""
@@ -13885,13 +13885,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-11-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-11-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-11-02-0001"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -14184,13 +14184,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-31-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-31-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-31-02-0001"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -14483,13 +14483,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0004"
-			Else
 			Topping "Load" "54-01-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0002"
+			Else
+			Topping "Load" "54-01-01-0004"
 			EndIf
 		EndIf
 		
@@ -14786,13 +14786,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0004"
-			Else
 			Topping "Load" "54-21-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0002"
+			Else
+			Topping "Load" "54-21-01-0004"
 			EndIf
 		EndIf
 		
@@ -15089,13 +15089,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-11-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0005"
-			Else
 			Topping "Load" "54-11-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-11-02-0002"
+			Else
+			Topping "Load" "54-01-01-0005"
 			EndIf
 		EndIf
 		
@@ -15392,13 +15392,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-31-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0005"
-			Else
 			Topping "Load" "54-31-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-31-02-0002"
+			Else
+			Topping "Load" "54-21-01-0005"
 			EndIf
 		EndIf
 		
@@ -15695,13 +15695,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0006"
-			Else
 			Topping "Load" "54-01-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0003"
+			Else
+			Topping "Load" "54-01-01-0006"
 			EndIf
 		EndIf
 		
@@ -15998,13 +15998,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0006"
-			Else
 			Topping "Load" "54-21-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0003"
+			Else
+			Topping "Load" "54-21-01-0006"
 			EndIf
 		EndIf
 		
@@ -16301,13 +16301,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0004"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0007"
-			Else
 			Topping "Load" "54-01-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0004"
+			Else
+			Topping "Load" "54-01-01-0007"
 			EndIf
 		EndIf
 		
@@ -16604,13 +16604,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0004"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0007"
-			Else
 			Topping "Load" "54-21-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0004"
+			Else
+			Topping "Load" "54-21-01-0007"
 			EndIf
 		EndIf
 		
@@ -16907,13 +16907,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0031"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0031"
-			Else
 			Topping "Load" "54-01-03-0031"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0031"
+			Else
+			Topping "Load" "54-01-01-0031"
 			EndIf
 		EndIf
 		
@@ -17210,13 +17210,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0031"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0031"
-			Else
 			Topping "Load" "54-21-03-0031"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0031"
+			Else
+			Topping "Load" "54-21-01-0031"
 			EndIf
 		EndIf
 		
@@ -17513,13 +17513,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0005"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0008"
-			Else
 			Topping "Load" "54-01-03-0005"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0005"
+			Else
+			Topping "Load" "54-01-01-0008"
 			EndIf
 		EndIf
 		
@@ -17816,13 +17816,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0005"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0008"
-			Else
 			Topping "Load" "54-21-03-0005"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0005"
+			Else
+			Topping "Load" "54-21-01-0008"
 			EndIf
 		EndIf
 		
@@ -18119,13 +18119,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0008"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0011"
-			Else
 			Topping "Load" "54-01-03-0008"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0008"
+			Else
+			Topping "Load" "54-01-01-0011"
 			EndIf
 		EndIf
 		
@@ -18422,13 +18422,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0008"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0011"
-			Else
 			Topping "Load" "54-21-03-0008"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0008"
+			Else
+			Topping "Load" "54-21-01-0011"
 			EndIf
 		EndIf
 		
@@ -19331,13 +19331,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0009"
-			Else
 			Topping "Load" "54-01-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0006"
+			Else
+			Topping "Load" "54-01-01-0009"
 			EndIf
 		EndIf
 		
@@ -19634,13 +19634,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0009"
-			Else
 			Topping "Load" "54-21-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0006"
+			Else
+			Topping "Load" "54-21-01-0009"
 			EndIf
 		EndIf
 		
@@ -19937,13 +19937,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0055"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0055"
-			Else
 			Topping "Load" "54-01-03-0055"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0055"
+			Else
+			Topping "Load" "54-01-01-0055"
 			EndIf
 		EndIf
 		
@@ -20240,13 +20240,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0055"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0055"
-			Else
 			Topping "Load" "54-21-03-0055"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0055"
+			Else
+			Topping "Load" "54-21-01-0055"
 			EndIf
 		EndIf
 		
@@ -20543,13 +20543,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0029"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0029"
-			Else
 			Topping "Load" "54-01-03-0029"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0029"
+			Else
+			Topping "Load" "54-01-01-0029"
 			EndIf
 		EndIf
 		
@@ -20846,13 +20846,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0029"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0029"
-			Else
 			Topping "Load" "54-21-03-0029"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0029"
+			Else
+			Topping "Load" "54-21-01-0029"
 			EndIf
 		EndIf
 		
@@ -22361,13 +22361,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0042"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0042"
-			Else
 			Topping "Load" "54-01-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0042"
+			Else
+			Topping "Load" "54-01-01-0042"
 			EndIf
 		EndIf
 		
@@ -22664,13 +22664,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0042"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0042"
-			Else
 			Topping "Load" "54-21-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0042"
+			Else
+			Topping "Load" "54-21-01-0042"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_forkid.lxml

@@ -333,13 +333,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0005"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0005"
-			Else
 			Topping "Load" "54-03-03-0005"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0005"
+			Else
+			Topping "Load" "54-03-01-0005"
 			EndIf
 		EndIf
 		
@@ -636,13 +636,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0001"
-			Else
 			Topping "Load" "54-03-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0001"
+			Else
+			Topping "Load" "54-03-01-0001"
 			EndIf
 		EndIf
 		
@@ -939,13 +939,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0003"
-			Else
 			Topping "Load" "54-03-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0003"
+			Else
+			Topping "Load" "54-03-01-0003"
 			EndIf
 		EndIf
 		
@@ -1242,13 +1242,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0006"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1541,13 +1541,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0002"
-			Else
 			Topping "Load" "54-03-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0002"
+			Else
+			Topping "Load" "54-03-01-0002"
 			EndIf
 		EndIf
 		
@@ -1844,13 +1844,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0022"
-			Else
 			Topping "Load" "54-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0022"
+			Else
+			Topping "Load" "54-03-01-0022"
 			EndIf
 		EndIf
 		
@@ -2147,13 +2147,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0010"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0010"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -2446,13 +2446,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0020"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0020"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -2745,13 +2745,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0021"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0021"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -3044,13 +3044,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0041"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0041"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -3343,13 +3343,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0008"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0008"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0008"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -4240,13 +4240,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0009"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0009"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_milk.lxml

@@ -304,13 +304,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0005"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0005"
-			Else
 			Topping "Load" "54-03-03-0005"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0005"
+			Else
+			Topping "Load" "54-03-01-0005"
 			EndIf
 		EndIf
 		
@@ -607,13 +607,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0001"
-			Else
 			Topping "Load" "54-03-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0001"
+			Else
+			Topping "Load" "54-03-01-0001"
 			EndIf
 		EndIf
 		
@@ -910,13 +910,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0004"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0004"
-			Else
 			Topping "Load" "54-03-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0004"
+			Else
+			Topping "Load" "54-03-01-0004"
 			EndIf
 		EndIf
 		
@@ -1213,13 +1213,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0003"
-			Else
 			Topping "Load" "54-03-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0003"
+			Else
+			Topping "Load" "54-03-01-0003"
 			EndIf
 		EndIf
 		
@@ -1516,13 +1516,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0006"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1815,13 +1815,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0002"
-			Else
 			Topping "Load" "54-03-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0002"
+			Else
+			Topping "Load" "54-03-01-0002"
 			EndIf
 		EndIf
 		
@@ -2118,13 +2118,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0059"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0059"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0059"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -2417,13 +2417,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0010"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0010"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -2716,13 +2716,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0011"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0011"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -3015,13 +3015,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0009"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0009"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -3314,13 +3314,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0019"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0019"
-			Else
 			Topping "Load" "54-03-03-0019"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0019"
+			Else
+			Topping "Load" "54-03-01-0019"
 			EndIf
 		EndIf
 		
@@ -3617,13 +3617,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0020"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0020"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -3916,13 +3916,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0021"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0021"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -4215,13 +4215,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0048"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0048"
-			Else
 			Topping "Load" "54-03-03-0048"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0048"
+			Else
+			Topping "Load" "54-03-01-0048"
 			EndIf
 		EndIf
 		
@@ -4518,13 +4518,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0049"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0049"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -4817,13 +4817,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0022"
-			Else
 			Topping "Load" "54-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0022"
+			Else
+			Topping "Load" "54-03-01-0022"
 			EndIf
 		EndIf
 		
@@ -5120,13 +5120,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0025"
-			Else
 			Topping "Load" "54-03-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0025"
+			Else
+			Topping "Load" "54-03-01-0025"
 			EndIf
 		EndIf
 		
@@ -5423,13 +5423,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0026"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0026"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -5722,13 +5722,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0023"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0023"
-			Else
 			Topping "Load" "54-03-03-0023"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0023"
+			Else
+			Topping "Load" "54-03-01-0023"
 			EndIf
 		EndIf
 		
@@ -6025,13 +6025,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0024"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0024"
-			Else
 			Topping "Load" "54-03-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0024"
+			Else
+			Topping "Load" "54-03-01-0024"
 			EndIf
 		EndIf
 		
@@ -6328,13 +6328,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0058"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0058"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0058"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6926,13 +6926,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0034"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0034"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -7225,13 +7225,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0035"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0035"
-			Else
 			Topping "Load" "54-03-03-0035"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0035"
+			Else
+			Topping "Load" "54-03-01-0035"
 			EndIf
 		EndIf
 		
@@ -7528,13 +7528,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0036"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0036"
-			Else
 			Topping "Load" "54-03-03-0036"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0036"
+			Else
+			Topping "Load" "54-03-01-0036"
 			EndIf
 		EndIf
 		
@@ -7831,13 +7831,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0037"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0037"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8130,13 +8130,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0039"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0039"
-			Else
 			Topping "Load" "54-03-03-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0039"
+			Else
+			Topping "Load" "54-03-01-0039"
 			EndIf
 		EndIf
 		
@@ -8433,13 +8433,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0040"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0040"
-			Else
 			Topping "Load" "54-03-03-0040"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0040"
+			Else
+			Topping "Load" "54-03-01-0040"
 			EndIf
 		EndIf
 		
@@ -8736,13 +8736,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0041"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0041"
-			Else
 			Topping "Load" "54-03-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0041"
+			Else
+			Topping "Load" "54-03-01-0041"
 			EndIf
 		EndIf
 		
@@ -9039,13 +9039,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0042"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0042"
-			Else
 			Topping "Load" "54-03-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0042"
+			Else
+			Topping "Load" "54-03-01-0042"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_other.lxml

@@ -308,13 +308,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0007"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0007"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0007"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -906,13 +906,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0094"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0094"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0094"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1205,13 +1205,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0104"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0104"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0104"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1504,13 +1504,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0105"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0105"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0105"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -4494,13 +4494,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0114"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0114"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0114"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -5092,13 +5092,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0035"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0035"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0035"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6288,13 +6288,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0010"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0010"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0010"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6587,13 +6587,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0033"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0033"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0033"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6886,13 +6886,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0022"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -7484,13 +7484,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0041"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0041"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -7783,13 +7783,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0008"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0008"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0008"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8082,13 +8082,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0009"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0009"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0009"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8381,13 +8381,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0024"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0024"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8680,13 +8680,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0025"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8979,13 +8979,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0046"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0046"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0046"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -9278,13 +9278,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0074"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0074"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0074"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -9577,13 +9577,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0047"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0047"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0047"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11072,13 +11072,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0075"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0075"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0075"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12268,13 +12268,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0038"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0038"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0038"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12567,13 +12567,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0039"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0039"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -16753,13 +16753,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0034"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0034"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0034"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -17052,13 +17052,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0003"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -17351,13 +17351,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0004"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0004"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -17650,13 +17650,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0002"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -18248,13 +18248,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-05-01-0001"
-			Else
 			Topping "Load" "54-05-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0001"
+			Else
+			Topping "Load" "54-05-01-0001"
 			EndIf
 		EndIf
 		
@@ -18551,13 +18551,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0026"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -18850,13 +18850,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0032"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0032"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0032"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -19452,13 +19452,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-05-03-0040"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-05-03-0040"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -19751,13 +19751,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-05-03-0092"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-05-03-0092"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_recommend.lxml

@@ -95,7 +95,7 @@
 
     
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
     RefreshAll
@@ -221,7 +221,7 @@
 
     
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
 
 
     
@@ -7909,13 +7909,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0004"
-			Else
 			Topping "Load" "54-01-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0002"
+			Else
+			Topping "Load" "54-01-01-0004"
 			EndIf
 		EndIf
 		
@@ -8212,13 +8212,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0004"
-			Else
 			Topping "Load" "54-21-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0002"
+			Else
+			Topping "Load" "54-21-01-0004"
 			EndIf
 		EndIf
 		
@@ -8515,13 +8515,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0037"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0037"
-			Else
 			Topping "Load" "54-02-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0037"
+			Else
+			Topping "Load" "54-02-01-0037"
 			EndIf
 		EndIf
 		
@@ -8818,13 +8818,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0026"
-			Else
 			Topping "Load" "54-02-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0026"
+			Else
+			Topping "Load" "54-02-01-0026"
 			EndIf
 		EndIf
 		
@@ -9121,13 +9121,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0024"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0024"
-			Else
 			Topping "Load" "54-02-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0024"
+			Else
+			Topping "Load" "54-02-01-0024"
 			EndIf
 		EndIf
 		
@@ -9424,13 +9424,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0002"
-			Else
 			Topping "Load" "54-03-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0002"
+			Else
+			Topping "Load" "54-03-01-0002"
 			EndIf
 		EndIf
 		
@@ -9727,13 +9727,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0001"
-			Else
 			Topping "Load" "54-03-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0001"
+			Else
+			Topping "Load" "54-03-01-0001"
 			EndIf
 		EndIf
 		
@@ -10030,13 +10030,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0006"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -10329,13 +10329,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0011"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0011"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -10628,13 +10628,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0022"
-			Else
 			Topping "Load" "54-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0022"
+			Else
+			Topping "Load" "54-03-01-0022"
 			EndIf
 		EndIf
 		
@@ -10931,13 +10931,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0009"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0009"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11230,13 +11230,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0020"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0020"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11529,13 +11529,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0049"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0049"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12426,13 +12426,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0035"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0035"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0035"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12725,13 +12725,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0025"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_recommend.skt

@@ -97,7 +97,7 @@
 
     
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
     RefreshAll
@@ -223,7 +223,7 @@
 
     
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
 
 
     

inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml

@@ -7766,13 +7766,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-01-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-01-01-0004"
-			Else
 			Topping "Load" "54-01-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-01-02-0002"
+			Else
+			Topping "Load" "54-01-01-0004"
 			EndIf
 		EndIf
 		
@@ -8069,13 +8069,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-21-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-21-01-0004"
-			Else
 			Topping "Load" "54-21-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-21-02-0002"
+			Else
+			Topping "Load" "54-21-01-0004"
 			EndIf
 		EndIf
 		
@@ -8372,13 +8372,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0037"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0037"
-			Else
 			Topping "Load" "54-02-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0037"
+			Else
+			Topping "Load" "54-02-01-0037"
 			EndIf
 		EndIf
 		
@@ -8675,13 +8675,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0026"
-			Else
 			Topping "Load" "54-02-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0026"
+			Else
+			Topping "Load" "54-02-01-0026"
 			EndIf
 		EndIf
 		
@@ -8978,13 +8978,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0024"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0024"
-			Else
 			Topping "Load" "54-02-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0024"
+			Else
+			Topping "Load" "54-02-01-0024"
 			EndIf
 		EndIf
 		
@@ -9281,13 +9281,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0002"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0002"
-			Else
 			Topping "Load" "54-03-03-0002"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0002"
+			Else
+			Topping "Load" "54-03-01-0002"
 			EndIf
 		EndIf
 		
@@ -9584,13 +9584,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0001"
-			Else
 			Topping "Load" "54-03-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0001"
+			Else
+			Topping "Load" "54-03-01-0001"
 			EndIf
 		EndIf
 		
@@ -9887,13 +9887,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-03-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0006"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -10186,13 +10186,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0011"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0011"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -10485,13 +10485,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-03-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-03-01-0022"
-			Else
 			Topping "Load" "54-03-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-03-02-0022"
+			Else
+			Topping "Load" "54-03-01-0022"
 			EndIf
 		EndIf
 		
@@ -10788,13 +10788,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0009"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0009"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11087,13 +11087,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0020"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0020"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11386,13 +11386,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-03-03-0049"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-03-03-0049"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12283,13 +12283,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0035"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0035"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0035"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -12582,13 +12582,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-05-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0025"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		

inter/hkg/xml/multi/page_catalog_group_tea.lxml

@@ -598,13 +598,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0020"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0020"
-			Else
 			Topping "Load" "54-02-03-0020"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0020"
+			Else
+			Topping "Load" "54-02-01-0020"
 			EndIf
 		EndIf
 		
@@ -901,13 +901,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0041"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0041"
-			Else
 			Topping "Load" "54-02-03-0041"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0041"
+			Else
+			Topping "Load" "54-02-01-0041"
 			EndIf
 		EndIf
 		
@@ -1204,13 +1204,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0053"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0053"
-			Else
 			Topping "Load" "54-02-03-0053"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0053"
+			Else
+			Topping "Load" "54-02-01-0053"
 			EndIf
 		EndIf
 		
@@ -1810,13 +1810,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "54-02-03-0056"
 		Else
-			If PD_STAGE_1 = "Enable" Then
+			If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "54-02-03-0056"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -2109,13 +2109,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0027"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0017"
-			Else
 			Topping "Load" "54-05-03-0027"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0027"
+			Else
+			Topping "Load" "54-02-01-0017"
 			EndIf
 		EndIf
 		
@@ -2412,13 +2412,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0007"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0007"
-			Else
 			Topping "Load" "54-02-03-0007"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0007"
+			Else
+			Topping "Load" "54-02-01-0007"
 			EndIf
 		EndIf
 		
@@ -3018,13 +3018,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0042"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0042"
-			Else
 			Topping "Load" "54-02-03-0042"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0042"
+			Else
+			Topping "Load" "54-02-01-0042"
 			EndIf
 		EndIf
 		
@@ -3321,13 +3321,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0039"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0039"
-			Else
 			Topping "Load" "54-02-03-0039"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0039"
+			Else
+			Topping "Load" "54-02-01-0039"
 			EndIf
 		EndIf
 		
@@ -3624,13 +3624,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0040"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0040"
-			Else
 			Topping "Load" "54-02-03-0040"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0040"
+			Else
+			Topping "Load" "54-02-01-0040"
 			EndIf
 		EndIf
 		
@@ -4230,13 +4230,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0001"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0001"
-			Else
 			Topping "Load" "54-02-03-0001"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0001"
+			Else
+			Topping "Load" "54-02-01-0001"
 			EndIf
 		EndIf
 		
@@ -4533,13 +4533,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0020"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0020"
-			Else
 			Topping "Load" "54-02-03-0020"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0020"
+			Else
+			Topping "Load" "54-02-01-0020"
 			EndIf
 		EndIf
 		
@@ -4836,13 +4836,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-05-02-0027"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0017"
-			Else
 			Topping "Load" "54-05-03-0027"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-05-02-0027"
+			Else
+			Topping "Load" "54-02-01-0017"
 			EndIf
 		EndIf
 		
@@ -5139,13 +5139,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0007"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0007"
-			Else
 			Topping "Load" "54-02-03-0007"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0007"
+			Else
+			Topping "Load" "54-02-01-0007"
 			EndIf
 		EndIf
 		
@@ -5745,13 +5745,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0027"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0027"
-			Else
 			Topping "Load" "54-02-03-0027"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0027"
+			Else
+			Topping "Load" "54-02-01-0027"
 			EndIf
 		EndIf
 		
@@ -6048,13 +6048,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0024"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0024"
-			Else
 			Topping "Load" "54-02-03-0024"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0024"
+			Else
+			Topping "Load" "54-02-01-0024"
 			EndIf
 		EndIf
 		
@@ -6351,13 +6351,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0062"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0062"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0062"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6650,13 +6650,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0011"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0011"
-			Else
 			Topping "Load" "54-02-03-0011"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0011"
+			Else
+			Topping "Load" "54-02-01-0011"
 			EndIf
 		EndIf
 		
@@ -6953,13 +6953,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0025"
-			Else
 			Topping "Load" "54-02-03-0025"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0025"
+			Else
+			Topping "Load" "54-02-01-0025"
 			EndIf
 		EndIf
 		
@@ -7559,13 +7559,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0065"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0065"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0065"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8161,13 +8161,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0064"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0064"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0064"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8460,13 +8460,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0050"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0050"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0050"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -8759,13 +8759,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0003"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0003"
-			Else
 			Topping "Load" "54-02-03-0003"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0003"
+			Else
+			Topping "Load" "54-02-01-0003"
 			EndIf
 		EndIf
 		
@@ -9062,13 +9062,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0004"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0004"
-			Else
 			Topping "Load" "54-02-03-0004"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0004"
+			Else
+			Topping "Load" "54-02-01-0004"
 			EndIf
 		EndIf
 		
@@ -9365,13 +9365,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0026"
-			Else
 			Topping "Load" "54-02-03-0026"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0026"
+			Else
+			Topping "Load" "54-02-01-0026"
 			EndIf
 		EndIf
 		
@@ -9668,13 +9668,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0060"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0060"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0060"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -9967,13 +9967,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0037"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0037"
-			Else
 			Topping "Load" "54-02-03-0037"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0037"
+			Else
+			Topping "Load" "54-02-01-0037"
 			EndIf
 		EndIf
 		
@@ -10270,13 +10270,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0028"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0028"
-			Else
 			Topping "Load" "54-02-03-0028"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0028"
+			Else
+			Topping "Load" "54-02-01-0028"
 			EndIf
 		EndIf
 		
@@ -10573,13 +10573,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0011"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0011"
-			Else
 			Topping "Load" "54-02-03-0011"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0011"
+			Else
+			Topping "Load" "54-02-01-0011"
 			EndIf
 		EndIf
 		
@@ -10876,13 +10876,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0012"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0012"
-			Else
 			Topping "Load" "54-02-03-0012"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0012"
+			Else
+			Topping "Load" "54-02-01-0012"
 			EndIf
 		EndIf
 		
@@ -11179,13 +11179,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0061"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0061"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0061"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -11478,13 +11478,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0006"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0006"
-			Else
 			Topping "Load" "54-02-03-0006"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0006"
+			Else
+			Topping "Load" "54-02-01-0006"
 			EndIf
 		EndIf
 		
@@ -11781,13 +11781,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0008"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0008"
-			Else
 			Topping "Load" "54-02-03-0008"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0008"
+			Else
+			Topping "Load" "54-02-01-0008"
 			EndIf
 		EndIf
 		
@@ -12084,13 +12084,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0019"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0019"
-			Else
 			Topping "Load" "54-02-03-0019"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0019"
+			Else
+			Topping "Load" "54-02-01-0019"
 			EndIf
 		EndIf
 		
@@ -12690,13 +12690,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0022"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0022"
-			Else
 			Topping "Load" "54-02-03-0022"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0022"
+			Else
+			Topping "Load" "54-02-01-0022"
 			EndIf
 		EndIf
 		
@@ -12993,13 +12993,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0017"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "54-02-01-0016"
-			Else
 			Topping "Load" "54-02-03-0017"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0017"
+			Else
+			Topping "Load" "54-02-01-0016"
 			EndIf
 		EndIf
 		
@@ -13599,13 +13599,13 @@
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
-		If PD_STAGE_2 = "Enable" Then
+		If PD_STAGE_3 = "Enable" Then
-			Topping "Load" "54-02-02-0063"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
 			Topping "Load" "54-02-03-0063"
+		Else
+			If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "54-02-02-0063"
+			Else
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		

inter/hkg/xml/page_catalog_group_appfast.lxml

@@ -320,7 +320,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_cocktail.lxml

@@ -246,7 +246,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_coffee.lxml

@@ -312,7 +312,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_forkid.lxml

@@ -321,7 +321,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_health.lxml

@@ -312,7 +312,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_milk.lxml

@@ -310,7 +310,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_other.lxml

@@ -311,7 +311,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_recommend.lxml

@@ -329,7 +329,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_tea.lxml

@@ -312,7 +312,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_catalog_group_whey.lxml

@@ -317,7 +317,7 @@
 
     Refresh
 
-    Var LanguageButtonEnable = "Enable"
+    Var LanguageButtonEnable = "Invisible"
     Var ButtonLanguageCurrentXPosition = 990
     Var ButtonLanguageCurrentYPosition = 438 - 38
     

inter/hkg/xml/page_topping_select6.lxml

@@ -571,11 +571,17 @@
 	;Open PreviseXMLFileName2
 	DEBUGVAR OpenFromXML
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	Open "ROOT/taobin_project/xml/page_catalog.lxml"
-
 
+	DEBUGVAR OpenFromInstMenuTab
+	If OpenFromInstMenuTab > 0 Then
+		DEBUGVAR OpenFromInstMenuTab
+		TabMenuVisibleInst OpenFromInstMenuTab
+	EndIf
 
+	Open OpenFromXML
 
 </EventClick>
 </Button>
@@ -3572,14 +3578,18 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	If  Seeker = "next" Then
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
-		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	Else
+
-		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	DEBUGVAR OpenFromInstMenuTab
-		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	If OpenFromInstMenuTab > 0 Then
+		DEBUGVAR OpenFromInstMenuTab
+		TabMenuVisibleInst OpenFromInstMenuTab
 	EndIf
 
+	Open OpenFromXML
+
 </EventClick>
 <Language>
 	<X> 53 </X>

xml/page_board.xml

@@ -1083,7 +1083,10 @@
 	If CountryName = "HongKong" Then
 		If EnableMultiInstance = "true" Then
 
+			; Change lang icon for hkg
+			Var LanguageButtonEnable = "Invisible"
 			Var BtnLangToggleIndex = "Enable"
+
 			Var InternationalEnable = 1
 			Var CurrentPageShowError = 0
 			TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
@@ -1098,7 +1101,7 @@
 			Var show_eng = "true"
 			Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
 
-			Var ShowNetworkProblemText = "Network error. Payment Cash only."
+			Var ShowNetworkProblemText = "Network error."
 
 			Var CountryRootPath = "ROOT/taobin_project/inter/hkg/"
 			Var CountryShortName = "hkg"
@@ -1111,7 +1114,7 @@
 			Var ShowButtonClick2 = "Invisible"
 			Var ButtontoTopupMenu = "Invisible"
 
-			Var PriceUnitText = "HKG$"
+			Var PriceUnitText = "HK$"
 
 			Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
 			Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"

xml/page_payment_cash-HKG.xml

@@ -106,6 +106,7 @@
 
 	Var CreditCardButtonState = "Disable"
 	Var QRCodeButtonState = "Disable"
+	Var CodeButtonState = "Disable"
 
 	Var PayAmount = PriceDrink
 	Var RemainAmount = PayAmount - Seeker.IntVendingCampaign
@@ -165,51 +166,26 @@
     If RoadShow = "true" Then
         Var CreditCardButtonState = "Invisible"
         Var QRCodeButtonState = "Invisible"
+        Var CodeButtonState = "Invisible"
         Var showRemaining = "Free"
 
 	Else
-		;Var PayState1 = "Enable"
-
-		;If cash_disable = "1" Then
-		;	Var PayState1 = "Press"
-		;EndIf
 
 		Var CreditCardButtonState = "Enable"
 		Var QRCodeButtonState = "Enable"
 
-        ;If Seeker.IntVendingCampaign = 0 Then
+        If Seeker.IntVendingCampaign = 0 Then
-        ;    Var CreditCardButtonState = "Enable"
+        	Var CodeButtonState = "Enable"
-        ;    Var QRCodeButtonState = "Enable"
+        Else
-        ;Else
+        	SAVELOG "CreditCard and QRCode only IntVendingCampaign"
-        ;	SAVELOG "Cash only IntVendingCampaign"
+        	Var CodeButtonState = "Disable"
-        ;	Var PayState2 = "Disable"
+        EndIf
-        ;	Var PayState4 = "Disable"
-        ;	Var PayState5 = "Enable"
-        ;	Var PayState6 = "Disable"
-        ;EndIf
 
-		;Var PayState3 = "Enable"
+		If Seeker.IntVendingCredit > 0 Then
-
+			SAVELOG "CreditCard and QRCode only IntVendingCredit"
-
+			Var CodeButtonState = "Disable"
-		DEBUGVAR CoinAmount
-		If CoinAmount > 0 Then
-			SAVELOG "Cash only CoinAmount"
-			Var CreditCardButtonState = "Disable"
-			Var QRCodeButtonState = "Disable"
-			Var CoinInFlag = 1
 		EndIf
 
-		;If Seeker.IntVendingCredit > 0 Then
-		;	SAVELOG "Cash only IntVendingCredit"
-		;	Var PayState2 = "Disable"
-		;	Var PayState4 = "Disable"
-		;	Var PayState5 = "Disable"
-		;	Var PayState6 = "Disable"
-		;EndIf
-
-
-
-
 		Var showRemaining = charOfBaht + RemainAmountStr
 
 		If show_eng = "true" Then
@@ -398,20 +374,23 @@
 	EndIf
 
 	If SELLONLINE = 0 Then
-			SAVELOG "Cash only NetworkStatus down"
+		If IgnoreNetCore = "true" Then
 
-			Var PayState2 = "Disable"
+		Else
-			Var PayState3 = "Disable"
+			SAVELOG "Offline in page_payment_cash-HKG"
-			Var PayState4 = "Disable"
-			Var PayState5 = "Disable"
-			Var PayState6 = "Disable"
 			
-			Var PayOfflineMode = 1
+		EndIf
 
-			Var ShowNetworkProblem = "Enable"
+		Var PayState2 = "Disable"
-			Var ShowButtonClick2 = "Invisible"
+		Var PayState3 = "Disable"
+		Var PayState4 = "Disable"
+		Var PayState5 = "Disable"
+		Var PayState6 = "Disable"
 
+		Var PayOfflineMode = 1
 
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
 	Else
 		Var PayOfflineMode = 0
 
@@ -421,10 +400,6 @@
 
 	DEBUGVAR NOCashFlag
 
-	If NOCashFlag = 1 Then
-		Var PayState1 = "Disable"
-	EndIf
-
 	;cancel order
 	If SELLSTATUS = "DEACTIVE" Then
 		Var SELLONLINE = 1
@@ -441,7 +416,7 @@
 	;If DisableUsingCode = "true" Then
 	If DisableUsingCode = "-" Then
 		SAVELOG "Diable code because using topping."
-		Var PayState2 = "Disable"
+		Var CodeButtonState = "Disable"
 		Var pay_with_code_image = DirImage + "/bd_pay_with_code.png"
 	Else
 
@@ -477,30 +452,11 @@
 
 	;Open "ROOT/taobin_project/xml/page_page_camera.xml"
 
-	If RoadShow = "true" Then
-		Var PayState1 = "Invisible"
-		Var PayState2 = "Invisible"
-		Var PayState3 = "Invisible"
-		Var PayState4 = "Invisible"
-		Var PayState5 = "Invisible"
-		Var PayState6 = "Invisible"
-
-	EndIf
-
 	;Disable taobin credit
 
 	Var TopRowY = 1297
 	Var BotRowY = 1499
 
-	Var PayState4 = "Invisible"
-
-	If SettingDisableTaobinCode = "true" Then
-		Var PayState2 = "Invisible"
-	EndIf
-
-
-
-	DEBUGVAR SettingDisableTaobinCredit
 	Var CancelContinue = 0
 </EventOpen>
 
@@ -882,23 +838,19 @@
 
 
 	If Timeout >= 120 Then
-	  Var alphaState = "Invisible"
+		Var alphaState = "Invisible"
 
 
-	  If RoadShow = "true" Then
+		If RoadShow = "true" Then
-	  Else
+
-	  	If PayState3 = "Enable" Then
+		Else
-			Var PayState3 = "Disable"
+			Var CreditCardButtonState = "Disable"
+			Var QRCodeButtonState = "Disable"
 		EndIf
-		If PayState5 = "Enable" Then
-		  	Var PayState5 = "Disable"
-	  	EndIf
-	  EndIf
-
-	  Var LOADING_STATE = "Invisible"
-	  Var AlphaPopupLoadingState = "Invisible"
-	  Var QRErrorState = "Invisible"
 
+		Var LOADING_STATE = "Invisible"
+		Var AlphaPopupLoadingState = "Invisible"
+		Var QRErrorState = "Invisible"
 	EndIf
 
 
@@ -976,9 +928,6 @@
 
 
 	If CoinInOK = 1 Then
-
-		Var PayState5 = "Disable"
-
 		Var CoinInCounter = CoinInCounter + 1
 		If CoinInCounter = 1 Then
 
@@ -989,10 +938,6 @@
 			Var PayOK = 1
 
 		EndIf
-
-	Else
-		Var PayState5 = "Enable"
-
 	EndIf
 
 	Var stringLog = "Timeout " + Timeout
@@ -1664,35 +1609,8 @@
 <Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 </Image>
 
-;<Button>
-;<X>  664 </X>
-;<Y>  1276</Y>
-;<State> PayState2</State>
-;<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
-;<FilenameDisable> pay_with_code_image </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick>
-;
-;	If alphaState = "Invisible" Then
-;
-;		If CoinInFlag = 0 Then
-;			If CancelFlag = 0 Then
-;			Var TelephoneNumber = ""
-;			Var Tel_Confirm_State = "Disable"
-;
-;			Var UserChoosePayment = "Code"
-;			Open "ROOT/taobin_project/xml/page_payment_code.xml"
-;			EndIf
-;		EndIf
-;
-;	EndIf
-;</EventClick>
-;</Button>
-
 <Button>
-<X> 223 </X>
+<X> 73 </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
@@ -1746,7 +1664,7 @@ EndIf
 </Button>
 
 <Button>
-<X> 566 </X>
+<X> 394 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
@@ -1788,38 +1706,32 @@ EndIf
 </EventClick>
 </Button>
 
+<Button>
+<X> 715 </X>
+<Y> TopRowY </Y>
+<State> CodeButtonState </State>
+<Filename> Var( CountryRootPath + "/image/page_payment/bn_code.png") </Filename>
+<FilenamePress> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenamePress>
+<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
 
+	If alphaState = "Invisible" Then
 
-;<Button>
+		If CoinInFlag = 0 Then
-;<X> 439 </X>
+			If CancelFlag = 0 Then
-;<Y> 1276 </Y>
+			Var TelephoneNumber = ""
-;<State> PayState4</State>
+			Var Tel_Confirm_State = "Disable"
-;<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
-;<FilenameDisable> pay_with_credit_image </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick>
-;
-;
-;	If alphaState = "Invisible" Then
-;
-;		If CoinInFlag = 0 Then
-;			If CancelFlag = 0 Then
-;			Var TelephoneNumber = ""
-;			Var Tel_Confirm_State = "Disable"
-;
-;			Var UserChoosePayment = "Credit"
-;			Open "ROOT/taobin_project/xml/page_payment_credit.xml"
-;			EndIf
-;		EndIf
-;
-;	EndIf
-;
-;
-;</EventClick>
-;</Button>
 
+			Var UserChoosePayment = "Code"
+			Open "ROOT/taobin_project/xml/page_payment_code.xml"
+			EndIf
+		EndIf
+
+	EndIf
+</EventClick>
+</Button>
 
 <Button>
 <X> 360 </X>
@@ -2494,27 +2406,6 @@ eval(
 <Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
 </Image>
 
-;<Text>
-;<X> 267 </X>
-;<Y> 1065 </Y>
-;<Width> 516 </Width>
-;<Height> 75 </Height>
-;<Size> 48 </Size>
-;<Font> RobotoBold </Font>
-;<Color> eval(
-	;If AlphaLoadingState = "Enable" Then
-		;Var return = 0xFFFFFF
-	;Else
-		;Var return = 0x5A5A5A
-	;EndIf
-;)
-;</Color>
-;<Align> Center </Align>
-;<State> LOADING_STATE </State>
-;<Value> "Just Moment, Please" </Value>
-;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
-;</Text>
-
 <Image>
 <X> LOADING_STATE_X </X>
 <Y> 1065 </Y>
@@ -2567,28 +2458,4 @@ eval(
 </Text>
 
 
-<EventUnitTest1>
-
-Var SELLONLINE = 1
-Var EnoughChange = "nay"
-Var PayState1 = "Enable"
-
-</EventUnitTest1>
-
-<EventUnitTest2>
-
-Var SELLONLINE = 1
-Var EnoughChange = "yes"
-Var PayState1 = "Enable"
-
-</EventUnitTest2>
-
-<EventUnitTest3>
-
-MakeDrinkV1  SelectDrink SelectSugarID
-Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
-</EventUnitTest3>
-
-
 </Popup>

xml/page_payment_code.xml

@@ -44,10 +44,20 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
 	EndIf
 
-	If LanguageShow = "MSC" Then
+	If CountryName = "HongKong" Then
-		Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
+		If LanguageShow = "MSC" Then
+			Var DirImage = "ROOT/taobin_project/inter/hkg/image/collectiing_msc/"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = "ROOT/taobin_project/inter/hkg/image/collectiing_mtc/"
+		EndIf
+	Else
+		If LanguageShow = "MSC" Then
+			Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
+		EndIf
 	EndIf
 	
+
 	If web_readyOK = "true" Then
 		Var web_readyOK = "false"
 

xml/page_show_error.lxml

@@ -206,7 +206,12 @@
 <EventLanguageOnChange>
 	DEBUGVAR LanguageShow
 
-	Var LanguageButtonEnable = "Enable"
+	If CountryName = "HongKong" Then
+		Var LanguageButtonEnable = "Invisible"
+	Else
+		Var LanguageButtonEnable = "Enable"
+	EndIf
+
 	Var ButtonLanguageCurrentXPosition = 990
 	Var ButtonLanguageCurrentYPosition = 648
 

xml/testscanQRcode.xml

@@ -6,8 +6,6 @@
 
 <EventOpen>
 
-    Var KornCameraXW = 800
-    Var KornCameraXH = 800
     Var scanresult = ""
     Var scanmsg = ""
 
@@ -61,12 +59,12 @@
 
 
 <CameraX>
-<X> 200 </X>
+<X> 120 </X>
-<Y> 400 </Y>
+<Y> 900 </Y>
 <Name>"usbfront"</Name>
-<Width> KornCameraXW </Width>
+<Width> 850 </Width>
-<Height> KornCameraXH </Height>
+<Height> 800 </Height>
-<State> Enable </State>
+<State> CameraState </State>
 </CameraX>
 
 

xml/testscanQRcodeResult.xml

@@ -38,7 +38,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-	Open "ROOT/taobin_project/xml/page_board.xml"
+	Open "ROOT/taobin_project/xml/testscanQRcode.xml"
 </EventClick>
 
 </Button>

xml/topview2.xml

@@ -95,8 +95,8 @@
 			Var BtnLangCurrentXPosition = 990
 			Var BtnLangCurrentYPosition = 648
 		Else
-			Var BtnLangCurrentXPosition = 1005
+			Var BtnLangCurrentXPosition = 990
-			Var BtnLangCurrentYPosition = 458 - 48
+			Var BtnLangCurrentYPosition = 458 - 65
 		EndIf
 
 		If LanguageShowByIndex = 0 Then

xml/vending_info.xml

@@ -891,6 +891,41 @@
 <Value> "Enable CreditCard" </Value>
 </Text>
 
+
+<Image>
+<X> info_startX </X>
+<Y> info_13Y </Y>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<State> eval(
+	If CameraCount > 0 Then
+		Var return = "Enable"
+	Else
+		Var return = "Invisible"
+	EndIf
+) </State>
+<EventClick>
+
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/testscanQRcode.xml"
+
+</EventClick>
+</Image>
+
+<Text>
+<X> info_text_startX </X>
+<Y> info_text_13Y </Y>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+<State> eval(
+	If CameraCount > 0 Then
+		Var return = "Enable"
+	Else
+		Var return = "Invisible"
+	EndIf
+) </State>
+<Value> "QR Scanner" </Value>
+</Text>
+
 ;EnableNewBrewUI
 <Image>
 <X> info2_startX </X>