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

xml/page_back_to_main.xml

@@ -25,7 +25,12 @@
 		EndIf
 
 		Var GetScore = VendingTSID
-		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		If TaobinErrorNetwork = 0 Then
+			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		Else
+			Var PointCrm = ""
+			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
+		EndIf
 
 		Var TNumberTaobinMember = ""
 		Var VendingTSID = ""

xml/page_brewing3.xml

@@ -237,6 +237,14 @@
 		EndIf
 	EndIf
 
+	If  waitAckPay = 2 Then  
+		If Timeout > 60 Then
+			
+		SAVELOG "back_to_main from line  > 241."
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+	EndIf
+
 
 	If  ChangeOK = 2 Then
 		If ActionOKCase = 0 Then
@@ -322,7 +330,16 @@
 			PAYEXT SVT ACC VendingTSIDTmp DEE
 		
 			Var ActionOKCase = 1
-			;Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+			If CodeChannel = 0 Then 
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+			EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+
+
+
+
 		EndIf
 	EndIf
 

xml/page_collect_point_2.xml

@@ -17,6 +17,8 @@
 	EndIf
 
 	Var TaobinLevel = 0
+
+	Var TaobinErrorNetwork = 0
 		
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -34,6 +36,10 @@
 		Else
 			Var TaobinLevel = 0
 			Var CoffeePoint = 1 
+
+			Var TaobinErrorNetwork = 1
+			Var PointTaobinStr = "" + PayAmount
+			Var PointTaobinStr = PointTaobinStr + "/1/0"
 			Var TNumberTaobinMember = TelephoneNumber
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
@@ -131,6 +137,10 @@
 		Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 	Else
 		;Var CoffeePoint = 1 
+		Var TaobinErrorNetwork = 1
+		Var PointTaobinStr = "" + PayAmount
+		Var PointTaobinStr = PointTaobinStr + "/1/0"
+		Var TNumberTaobinMember = TelephoneNumber
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf
 

xml/page_drinkok.xml

@@ -38,7 +38,12 @@
 			Var PointCrm = "pdpa1"
 		EndIf
 		Var GetScore = VendingTSID
-		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		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

xml/page_payment_cash.xml

@@ -230,6 +230,12 @@
 	
 	Var EnoughChange = "yes"
 
+	If NetworkStatus = "DOWN" Then
+			Var PayState2 = "Disable"
+			Var PayState3 = "Disable"
+			Var PayState4 = "Disable"
+	EndIf
+
 </EventOpen>
 
 <EventActionOk>