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

xml/page_payment_credit2.xml

@@ -41,9 +41,12 @@
 
 	Var Ext1a = ""
 
+	Var AcceptAuto = "false"
+
 
 	If web_readyOK = "true" Then
 		Var web_readyOK = "false"
+		Var AcceptAuto = "true"
 
 
 		Var Tel_Confirm_State = "Enable"

xml/page_payment_credit3.xml

@@ -23,8 +23,18 @@
 
 	Var NotEnoughFlag = 0
 
+	Var timeCountUp = 0
+
 	If SumCreditAmount >= PayAmount Then 
 		Var Tel_Confirm_State = "Enable"
+
+
+		If AcceptAuto = "true" Then
+
+			
+
+		EndIf
+
 	Else
 		Var Tel_Confirm_State = "Enable"
 		Var ShowNotEnoughText = "Enable"
@@ -48,6 +58,36 @@
 	;Open "ROOT/xml/page_board.xml" 
 
 	Var Timeout = Timeout + 1
+
+
+	If AcceptAuto = "true" Then
+		If Timeout > 0 Then
+			CoinVending OFF
+
+
+			Var TNumberTaobinCredit = TelephoneNumber
+			Var CoffeePinNumber = PinNumber
+
+			Var StoreCreditFlag = 1
+
+			If CART_COUNT >= 1 Then 
+
+				Cart "PreparID" 1
+				Var CART_INDEX = 1
+				Var PayReference = ""
+				GenHashWithTimeStamp PayReference
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			Else
+				Var CART_INDEX = 0
+				
+				MakeDrinkV1  SelectDrink SelectSugarID
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			EndIf
+		EndIf
+	EndIf
+
+
+
 	If Timeout > 30 Then
 		Var PayState1 = "PressForever"
 		Var PayState2 = "Enable"