fix problemf

xml/page_brewing3.xml

@@ -24,6 +24,7 @@
 
 	Var waitAckPay = 0
 	Var VendingTSIDTmp = ""
+	Var VendingTSIDProblem = ""
 
 	
 
@@ -286,7 +287,7 @@
 	EndIf
 
 	If  waitAckPay = 2 Then  
-		If Timeout > 60 Then
+		If Timeout > 10 Then
 
 			If CodeChannel = 1 Then 
 				Var SessionID2 = SelectSlot + ":"
@@ -365,10 +366,10 @@
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
 
-			If CodeChannel = 0 Then 
+			;If CodeChannel = 0 Then 
-				SAVELOG "back_to_main from line  > 315."
+			;	SAVELOG "back_to_main from line  > 315."
-				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
-			EndIf
+			;EndIf
 
 			Var waitAckPay = 2
 			Var Timeout = 5
@@ -409,10 +410,10 @@
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
-			If CodeChannel = 0 Then 
+			;If CodeChannel = 0 Then 
-				SAVELOG "back_to_main from line  > 357."
+			;	SAVELOG "back_to_main from line  > 357."
-				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
-			EndIf
+			;EndIf
 
 			Var waitAckPay = 2
 			Var Timeout = 5
@@ -562,7 +563,6 @@
 
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
-			;Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		EndIf
 

xml/page_drinkfail2-2.xml

@@ -46,8 +46,16 @@
 		StrLen TelephoneNumberProblem TelNumLen
 		If TelNumLen >= 10 Then  
 
+			If PayWithQR = 1 Then
+				Var  VendingTSIDProblem = VendingTSIDTmp
+			Else
+				Var VendingTSIDProblem = VendingTSID
+			EndIf
+
+			Var ProblemID = 7
+
 			Var ChooseProblem = "taobin purchasing problems"
-			PROBLEM  TelephoneNumberProblem ChooseProblem
+			PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
 
 		EndIf
 
@@ -95,8 +103,16 @@
 	StrLen TelephoneNumberProblem TelNumLen
 	If TelNumLen >= 10 Then  
 
+		If PayWithQR = 1 Then
+			Var  VendingTSIDProblem = VendingTSIDTmp
+		Else
+			Var VendingTSIDProblem = VendingTSID
+		EndIf
+
+		Var ProblemID = 7
+
 		Var ChooseProblem = "taobin purchasing problems"
-		PROBLEM  TelephoneNumberProblem ChooseProblem
+		PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
 
 	EndIf
 

xml/page_drinkfail2.xml

@@ -8,6 +8,7 @@
 <EventOpen>
 	; On open
 
+	Var TNumberTaobinMember = ""
 	
 	If TelephoneNumberProblem = "" Then
 
@@ -30,31 +31,6 @@
 	
 	Var Timeout = 0
 
-	Var TNumberTaobinMember = ""
-
-	If TNumberTaobinMember = "" Then
-
-	Else
-		If PayWithQR = 1 Then
-			Var VendingTSID = VendingTSIDTmp
-		EndIf 	
-
-
-		Var BmiYear = PointTaobinStr
-		Var PointCrm = ""
-		If FromConsent = 1 Then 
-			Var PointCrm = "pdpa1"
-		EndIf
-		Var GetScore = VendingTSID
-		If TaobinErrorNetwork = 0 Then
-			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
-		Else
-			Var PointCrm = ""
-			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
-		EndIf
-		Var TNumberTaobinMember = ""
-		Var VendingTSID = ""
-	EndIf
 	
 	StopLongPlay
 
@@ -474,8 +450,16 @@
 	StrLen TelephoneNumberProblem TelNumLen
 	If TelNumLen >= 10 Then  
 
+		If PayWithQR = 1 Then
+			Var  VendingTSIDProblem = VendingTSIDTmp
+		Else
+			Var VendingTSIDProblem = VendingTSID
+		EndIf
+
+		Var ProblemID = 7
+
 		Var ChooseProblem = "taobin purchasing problems"
-		PROBLEM  TelephoneNumberProblem ChooseProblem
+		PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
 
 
 		If MachineStage = "remove-cup" Then