Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/page_topping_select4.xml

@@ -13,6 +13,14 @@
 
 	DEBUGVAR SelectDrink
 	DEBUGVAR PictureDrink
+
+	If SelectDrinkLen = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+
+	If PriceDrink = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
 	
 	Var SaveProductCodeSelect = SelectDrink
 	Var UserSelectProductCode = SelectDrink
@@ -641,6 +649,32 @@
 			Refresh
 		EndIf
 
+		If TOPPING2 = "add-show-1009" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+		If TOPPING2 = "add-show-1101" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
+		If TOPPING2 = "add-show-1102" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
 ;-END
 		If TOPPING3 = "Collagen" Then
 			Var CollagenState = "Enable"
@@ -1554,8 +1588,12 @@
 
 	;Var Seeker = "curr"
 
-
-	Var Seeker.PriceDrink = PriceDrinkTmp
+	DEBUGVAR PriceDrinkTmp
+	
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	Var PriceDrink = PriceDrinkTmp
+	
 	SAVELOG "USER press next ( topping ) - new"
 
 	Var Seeker.topping1 = topping1