edit spiral

spiral/xml/page_spiral_payment_cash.xml

@@ -22,7 +22,7 @@
 	DEBUGVAR SelectDrink
 
 	DEBUGVAR video_menu_0
-
+	Var CashlessPayFlag = 0
 	Var PayDetail = ""
 	Var FlagQROpened = 0
 	Var PayInfoCFlag = 0
@@ -479,7 +479,10 @@
 
 			Var ReqPayInfoFromCashOther = 0
 	EndIf
-
+	If ReqPayInfoFromCashOther = 2 Then
+			Var alphaState = "Enable"
+			Var ReqPayInfoFromCashOther = 0
+	EndIf
 </EventOpen>
 
 <EventActionOk>
@@ -602,10 +605,57 @@
 			EndIf
 		EndIf
 
+		If ReqPayInfoFlag = 5 Then	
+			If VendingQRTypeResult = "LPY:2" Then
+				Var CashTextWarning = ""
+				Var QRErrorState = "Invisible"
+				Var QRCODE99Shoppy = ""
+				Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1
+				SAVELOG Ext1
+				SAVELOG QRCODE99Shoppy
+				Var QRCODE99Shoppy = QRCODE99Shoppy + Ext2
+				Var QRCODE99Shoppy = QRCODE99Shoppy + Ext31
+				Var ReqPayInfoFlag = 0
+				Var ReqPayInfoFlag2 = 5
+				SAVELOG QRCODE99Shoppy
+				SAVELOG Ext2
+
+				Var QRCODE99 = QRCODE99Shoppy
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf	
+
 	Else
 		Var PayInfoCFlag = 1
     EndIf
 
+	
+	If VendingCashless = "OK" Then
+		DEBUGVAR CashlessCode
+		Var Timeout = 0
+
+		Var QRErrorState = "Invisible"
+		Var LOADING_STATE = "Invisible"
+
+		If ViewBill > 0 Then
+				CoinVending BILLREJECT
+		EndIf
+			
+		VendingQR OFF
+		CoinVending OFF
+		Refresh
+
+		If Seeker = "curr" Then
+		;		MakeDrinkV1  SelectDrink SelectSugarID
+		EndIf
+		Var Seeker.CreditCard = 1
+		Var Seeker.CreditCardRef = CreditCardRef
+
+
+		Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou_creditcard.xml" 
+
+	EndIf
+
 </EventActionOk>
 
 <EventActionError>
@@ -639,6 +689,13 @@
 				Var LOADING_STATE = "Invisible"
 			EndIf
 		EndIf
+		If ReqPayInfoFlag = 5 Then	
+			Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+				Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
 	Else
 		Var PayInfoCFlag = 1
 	EndIf
@@ -647,6 +704,29 @@
 
 </EventActionError>
 
+<EventCashlessCard>
+
+	Var CreditCardRef = ""
+	GenHashWithTimeStamp CreditCardRef
+	DEBUGVAR VendingCashless 
+
+	If VendingCashless = "READY" Then
+		Var QRCODE99 = ""
+		Var Timeout = 0
+		Var QRErrorState = "Invisible"
+		Var QR_POPUP = "/img_popup8-2.png"
+		Var VendingCashless = "-"
+		Var LOADING_STATE = "Enable"
+		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign  
+		CashlessPay RemainAmountX CreditCardRef
+		Var CashlessPayFlag = 1
+	EndIf
+
+	Refresh
+
+
+</EventCashlessCard>
+
 
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -764,6 +844,11 @@
 				Var CancelFlag = 1
 				Var cancelState = "Enable"
 
+				If CashlessPayFlag = 1 Then
+					Var CashlessPayFlag = 0 
+					CashlessReq FAIL
+				EndIf
+
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
 
@@ -1466,7 +1551,12 @@
 			If FlagQROpened = 1 Then 
 				Var CancelNumber = 12
 			EndIf
-			
+
+			If CashlessPayFlag = 1 Then
+				Var CashlessPayFlag = 0 
+				CashlessReq FAIL
+			EndIf
+
         EndIf
 	EndIf
 
@@ -1582,6 +1672,14 @@
 	  Var QRCODE99 = ""
 	  ;CoinVending ON
 	  ;VendingQR OFF
+
+	CashlessReq OFF
+
+	 If CashlessPayFlag = 1 Then
+		Var CashlessPayFlag = 0 
+		CashlessReq FAIL
+	  EndIf
+
 	  Refresh
 </EventClick>
 </Button>
@@ -1629,6 +1727,11 @@
 			If FlagQROpened = 1 Then 
 				Var CancelNumber = 12
 			EndIf
+
+			If CashlessPayFlag = 1 Then
+				Var CashlessPayFlag = 0 
+				CashlessReq FAIL
+	  		EndIf
         EndIf
 	EndIf