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

xml/page_drinkfail2.xml

@@ -15,22 +15,7 @@
 	DEBUGVAR Seeker.PromotionIDCurrentOrder
 
 
-	If Seeker.PromotionIDCurrentOrder > 1 Then
-		If MachineStage = "remove-cup" Then
-			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
-		Else
-			If  NextOrder = "true" Then
-				Var NextOrder = "false"
-
-				TransferVar "next" "curr"
-				Var Seeker = "curr"
-							
-				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
-			Else
-				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
-			EndIf
-		EndIf
-	EndIf 
+	
 
 
 

xml/page_thankyou.xml

@@ -273,6 +273,11 @@
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
 
+			Var Seeker.OrderChanel = Seeker.OrderChanel + ":"
+			Var Seeker.OrderChanel = Seeker.OrderChanel + Seeker.CampaignPayChanel
+			Var Seeker.OrderChanel = Seeker.OrderChanel + ":"
+			Var Seeker.OrderChanel = Seeker.OrderChanel + Seeker
+
 			If Seeker.PayWithQR = 0 Then
 				Var ServiceAmount2 = Seeker.ServiceAmount2
 				Var SessionID2 = SelectSlot + ":"
@@ -292,6 +297,8 @@
 				Var CreditReference = Seeker.CreditReferenceTmp
 				Var VendingDiscount = Seeker.VendingDiscount
 				Var VendingCampaign = Seeker.VendingCampaign
+
+
 				Var PayDetail = "2/F:1311/0//XML|" +  Seeker.OrderChanel
 				Var PayType = ""
 				Var Seeker.TxRef1 = TxRef1