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

xml/page_topping_select7.xml

@@ -7437,17 +7437,30 @@
 
 	;Var Seeker = "curr"
 
+	Var Timeout = 0
+
 
 	Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
 	
 	__CMD "statement" 0 StatementCheckMenu "-"
 
-	
+	;If HalfPrice = "true" Then
+	;	; Discount 50
+	;	DEBUGVAR HalfPrice
+	;	__CMD "invoke-discount-50" UserSelectProductCode "-" "-"
+	;	
+	;Else
+	;	Var PriceDrink = PriceDrinkTmp		
+	;EndIf
+
 	DEBUGVAR PriceDrinkTmp
 	
 	;Var Seeker.PriceDrink = PriceDrinkTmp
 	
 	Var PriceDrink = PriceDrinkTmp
+	Var PromotionPriceDrink = PriceDrink
+
+	DEBUGVAR PriceDrink
 	
 	Var PromotionPriceDrink = PriceDrink
 
@@ -7624,6 +7637,7 @@
 	DEBUGVAR Seeker.topping8
 	DEBUGVAR Seeker.topping9
 	DEBUGVAR Seeker.topping10
+
 	DEBUGVAR Seeker.get_a_straw
 	DEBUGVAR Seeker.get_a_lid
 
@@ -7668,21 +7682,22 @@
 
 	; Set drink 
 
+	; Post Topping
+	If SugarZeroCalEnable = "true" Then
+		Var sugarToppingID = 1000
+		If SugarZeroCalCheck = "PressForever" Then
+			Var sugarToppingID = 1001
+		Else
+			Var sugarToppingID = 1000
+		EndIf
+		
+		Topping "PostTopping1-ID" sugarToppingID
+	
+	EndIf
+
 	If Seeker = "curr" Then
-		Topping "Select" UserSelectProductCode
-
-		; Set option toppinng and pack 
-		Topping "Select1-ID" topping1
-		Topping "Select2-ID" topping2
-		Topping "Select3-ID" topping3
-		Topping "Select6-ID" topping6
-		Topping "Select7-ID" topping7
-		Topping "Select8-ID" topping8
-		Topping "Select9-ID" topping9
-		Topping "Select10-ID" topping10
-
-		; Pack
-		Topping "Pack" ExtendDataCurr
+		
+		;include="ROOT/taobin_project/inc/select_drink_current.inc"
 
 		
 
@@ -7716,6 +7731,7 @@
 
 
 	EndIf
+
 	DEBUGVAR Seeker
 	DEBUGVAR Seeker.ExtendData 
 
@@ -7736,9 +7752,6 @@
 
 			
 			If SelectDrinkType = 1 Then
-				; Move to MenuReady
-				;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				;Open "ROOT/taobin_project/xml/page_payment.xml" 
 			EndIf
 		EndIf