Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_catalog_choose_drink1.pml

@@ -68,6 +68,30 @@
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
+
+    Var showCart = "Invisible"
+    If MultiPayEnable = "true" Then 
+        
+        If CART_COUNT = 1 Then
+            Var showCart = "Enable"
+            Var cart_image_bn = DirImageCart + "/bn_cart1.png"
+            Var cart_image_bp = DirImageCart + "/bp_cart1.png"
+        EndIf
+        
+        If CART_COUNT = 2 Then
+            Var showCart = "Enable"
+            Var cart_image_bn = DirImageCart + "/bn_cart2.png"
+            Var cart_image_bp = DirImageCart + "/bp_cart2.png"
+        EndIf
+
+    
+
+        If CART_COUNT = 3 Then
+                Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+        EndIf
+
+    EndIf
+
 </EventOpen>
 
 

xml/page_catalog_choose_drink1.xml

@@ -44,6 +44,30 @@
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
+
+    Var showCart = "Invisible"
+    If MultiPayEnable = "true" Then 
+        
+        If CART_COUNT = 1 Then
+            Var showCart = "Enable"
+            Var cart_image_bn = DirImageCart + "/bn_cart1.png"
+            Var cart_image_bp = DirImageCart + "/bp_cart1.png"
+        EndIf
+        
+        If CART_COUNT = 2 Then
+            Var showCart = "Enable"
+            Var cart_image_bn = DirImageCart + "/bn_cart2.png"
+            Var cart_image_bp = DirImageCart + "/bp_cart2.png"
+        EndIf
+
+    
+
+        If CART_COUNT = 3 Then
+                Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+        EndIf
+
+    EndIf
+
 </EventOpen>
 
 

xml/page_drinkok.xml

@@ -184,37 +184,45 @@
 	EndIf
 
 
-	If HaveCup = "false" Then
+	If MachineStage = "show-menu" Then
 
-		If MachineStage = "show-menu" Then
-
-			If 	CART_INDEX < CART_COUNT  Then   
+		If 	CART_INDEX < CART_COUNT  Then   	
+			
+			If HaveCup = "false" Then
 
 				Var CART_INDEX = CART_INDEX + 1
 				Cart "PreparID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
-
 			Else
-				If sendPayMultiFlag = 1 Then
-					Var TNumberTaobinMember = ""
-					
-					If FailedCount > 0 Then
-						Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
-					Else
-						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
-					EndIf
+
+				If CupOnArm = "true" Then
+					Var buttonRemoveCup = "Enable"
+				Else
+					Var buttonRemoveCup = "Invisible"
 				EndIf
 			EndIf
 
+		Else
+			If sendPayMultiFlag = 1 Then
+				Var TNumberTaobinMember = ""
+				
+				If FailedCount > 0 Then
+					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
+				Else
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+				EndIf
+			EndIf
 		EndIf
-	Else
+
+	EndIf
+
+	If HaveCup = "true" Then
+
 		If CupOnArm = "true" Then
 			Var buttonRemoveCup = "Enable"
 		Else
 			Var buttonRemoveCup = "Invisible"
 		EndIf
-
-			
 	EndIf
 	
 	If MachineStage = "remove-cup" Then

xml/page_topping_select.xml

@@ -7,7 +7,12 @@
 <EventOpen>
 	Var y_topping_bg = 912
 
-	
+	DEBUGVAR BrewVersionInt
+	If BrewVersionInt >= 419 Then
+		If ConfigNumer >= 380 Then 
+			Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		EndIf
+	EndIf
 	If JXMLVersionInt > 356 Then
 		If ConfigNumer >= 380 Then 
 			Open "ROOT/taobin_project/xml/page_topping_select3.xml"

xml/page_topping_select4.xml

@@ -266,6 +266,10 @@
 	DEBUGVAR SubMenuName12
 	
 	DEBUGVAR TOPPING1
+	DEBUGVAR TOPPING1_ALT_2
+	DEBUGVAR TOPPING1_ALT_3
+	
+
 	DEBUGVAR TOPPING2
 	DEBUGVAR TOPPING3
 	DEBUGVAR TOPPING4

xml_main/startup.xml

@@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.73"
+	Var XMLPageVersion = "5.74"
 
 </EventOpen>