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

xml/page_payment.xml

@@ -67,6 +67,12 @@
 	Var VendingBank = "other"
 
 
+	
+
+
+	Var Seeker.TxRef1 = ""
+	Var Seeker.OrderChanel = "Normal"
+	
 	Var Seeker.CurrCreditAmount = 0
 	Var Seeker.CurrCreditUse    = 0
 	Var Seeker.CurrCreditTelNum = ""
@@ -171,6 +177,14 @@
 		MakeDrinkV1  SelectDrink SelectSugarID
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"  
 	EndIf
+
+	Var NOCashFlag = 0
+
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var NOCashFlag = 1
+	EndIf
+
+	
 				
 	
 </EventOpen>
@@ -259,7 +273,11 @@
 				If AdultFlag = 1 Then
 					Var CoinAmount = 0 
 				Else
-					CoinVending XBILL
+					If NOCashFlag = 0 Then
+						CoinVending XBILL
+					Else
+						Var CoinAmount = 0 
+					EndIf
 				EndIf
 				;Var CoinAmount = 0
 				Var Delay = 1
@@ -320,6 +338,8 @@
 
 		If DelayCount >= 2 Then
 			If web_readyOK = "true" Then
+
+				Var  Seeker.OrderChanel = "WebApp"
 		
 				Var  Seeker.selected_a_drink = SelectDrink
 				Var  Seeker.ServiceAmount2 = PriceDrink