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

xml/page_payment_cash.xml

@@ -1044,6 +1044,9 @@
 </EventActionOk>
 
 <EventActionError>
+	SAVELOG "EventActionError"
+	DEBUGVAR VendingCashless
+	DEBUGVAR CoinInOK
 
 	If ActionOKCase = 0 Then 
 		If ReqPayInfoFlag > 0 Then	
@@ -1061,8 +1064,12 @@
 
 
 	If VendingCashless = "ERROR" Then
-		Var Timeout = 0
-		
+		If CoinInOK = 1 Then
+
+		Else
+			Var Timeout = 0
+		EndIf
+
 		;Var QRErrorFlag = 1
 		If alphaState = "Enable" Then
 			Var QRErrorState = "Enable"
@@ -1078,6 +1085,7 @@
 </EventActionError>
 
 <EventCashlessCard>
+	SAVELOG "EventCashlessCard"
 
 	Var CreditCardRef = ""
 	GenHashWithTimeStamp CreditCardRef
@@ -1108,6 +1116,11 @@
 
 	EndIf
 
+	DEBUGVAR Timeout
+	DEBUGVAR PayOK
+	DEBUGVAR ChangeOK
+	DEBUGVAR CancelFlag
+
 
 	If CamFlag = 1 Then
 		Var CamCount = CamCount + 1
@@ -1558,6 +1571,7 @@
 					Var RemainAmountKeep = ViewBill
 				EndIf
 
+				DEBUGVAR Timeout
 				Var Timeout = 0
 
 
@@ -1618,6 +1632,7 @@
 				Var RemainAmountStr = "" + RemainAmount
 			EndIf
 
+			DEBUGVAR Timeout
 			Var Timeout = 0
 
 			;Var RemainAmount = 0
@@ -1678,9 +1693,19 @@
 <X> 91 </X>
 <Y> 1180 </Y>
 <State> MenuCautionImageStage0 </State>
-<Filename> "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" </Filename>
+<Filename> eval(
+	If show_eng = "true" Then 
+		Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_en.png"
+	Else
+		Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png"
+	
+	EndIf
+)
+</Filename>
 </Image>
 
+; 
+
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>