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

xml/page_payment.xml

@@ -128,7 +128,8 @@
 	EndIf
 
 
-
+	Var Delay = 0
+	Var DelayCount = 0
 				
 	
 </EventOpen>
@@ -153,6 +154,7 @@
 				EndIf
 			EndIf
 		EndIf
+	Else
 
 	EndIf
 
@@ -190,15 +192,22 @@
 
 
 
-	If CountStepPackPayment = CountStepForCupFlagDelay Then
-
-		SAVELOG ExtendData
+	If CountStepPackPayment >= CountStepForCupFlagDelay Then
+		If Seeker = "curr" Then
+			Var Seeker.ExtendData = ExtendDataCurr
+		Else
+			Var Seeker.ExtendData = ExtendDataNext
+		EndIf
+		DEBUGVAR Seeker
+		DEBUGVAR Seeker.ExtendData
 
 		If GetPayInfoFlag = 0 Then
 			SaveLog "RoadShow test"
 			If RoadShow = "false" Then
 				;CoinVending ON
 				CoinVending XBILL
+				;Var CoinAmount = 0
+				Var Delay = 1
 			EndIf
 
 			
@@ -207,7 +216,7 @@
 
 
 			Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + ExtendData
+			Var SessionID2 = SessionID2 + Seeker.ExtendData
 
 			;Var CreditAmount1 = ""
 			;Var ServiceAmountFlow = ""
@@ -243,28 +252,34 @@
 		; Reset
 		Var MachineState_Result = 0
 
-
-		DEBUGVAR ExtendData
+		DEBUGVAR Seeker
+		DEBUGVAR Seeker.ExtendData
 
 
-		If web_readyOK = "true" Then
+	EndIf
 
-		Var  Seeker.selected_a_drink = SelectDrink
-		Var  Seeker.ServiceAmount2 = PriceDrink
-		Var PayAmount = PriceDrink
+	If Delay = 1 Then
+		Var DelayCount = DelayCount + 1
 
-			If web_payment = "CODE" Then
-				Open "ROOT/taobin_project/xml/page_payment_code.xml"
-			EndIf
-
-			If web_payment = "CREDIT" Then
-				Open "ROOT/taobin_project/xml/page_payment_credit.xml"
+		If DelayCount >= 2 Then
+			If web_readyOK = "true" Then
+		
+				Var  Seeker.selected_a_drink = SelectDrink
+				Var  Seeker.ServiceAmount2 = PriceDrink
+				Var PayAmount = PriceDrink
+		
+				If web_payment = "CODE" Then
+					Open "ROOT/taobin_project/xml/page_payment_code.xml"
+				EndIf
+		
+				If web_payment = "CREDIT" Then
+					Open "ROOT/taobin_project/xml/page_payment_credit.xml"
+				EndIf
+		
 			EndIf
 
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 		EndIf
-
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
-	
 	EndIf