keep trans, status sell, error code 1303

xml/page_board.xml

@@ -182,11 +182,18 @@
 	EndIf
 
 
-	
+	DEBUGVAR SELLSTATUS
-
-
 	DEBUGVAR NetworkStatus
-	If NetworkStatus = "ACTIVATE" Then
+
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
+
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 		Machine NetworkUp
@@ -204,6 +211,9 @@
 		WEB "ENABLE"
 		
 	Else
+
+		
+
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
@@ -212,6 +222,7 @@
 
 		Var QRCODE99 = ""
 		WEB "DISABLE"
+		
 	EndIf
 
 
@@ -237,7 +248,14 @@
 	Else
 		Machine Initial
 		Var StartUpExt = "false"
+		;DEBUGVAR "FlushTxRef1"
+		;FlushTxRef1
 	EndIf
+
+	;DEBUGVAR "FlushTxRef1"
+	;FlushTxRef1
+
+	
 	
 	StopLongPlay
 
@@ -447,7 +465,7 @@
 	
 	Topping "ClearNextOrder" "-"
 
-	If NetworkStatus = "DEACTIVE" Then
+	If SELLSTATUS = "DEACTIVE" Then
 		Open "/ROOT/xml/offline.xml" 
 	EndIf	
 
@@ -502,6 +520,11 @@
 	Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
 
 
+	If SELLSTATUS = "DEACTIVE" Then
+			Open "/ROOT/xml/offline.xml" 
+	EndIf
+
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -513,7 +536,7 @@
 			;Open "/ROOT/xml/outservice.xml" 
 			Var WebAppShow = "Invisible"
 		EndIf
-		If NetworkStatus = "DEACTIVE" Then
+		If SELLSTATUS = "DEACTIVE" Then
 				Open "/ROOT/xml/offline.xml" 
 		EndIf	
 
@@ -730,7 +753,9 @@
 
 <EventNetDeactive>
 	SAVELOG NetworkStatus
-	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+	If SELLSTATUS = "DEACTIVE" Then
+		Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+	EndIf
 </EventNetDeactive>
 
 <EventWebApp>

xml/page_board_1.xml

@@ -128,9 +128,10 @@
 
 	Else
 		If NetworkStatus = "DOWN" Then
-			Open "/ROOT/xml/outservice.xml" 
+			;Open "/ROOT/xml/outservice.xml" 
+			Var WebAppShow = "Invisible"
 		EndIf
-		If NetworkStatus = "DEACTIVE" Then
+		If SELLSTATUS = "DEACTIVE" Then
 				Open "/ROOT/xml/offline.xml" 
 		EndIf	
 
@@ -244,7 +245,9 @@
 
 <EventNetDeactive>
 	SAVELOG NetworkStatus
-	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+	If SELLSTATUS = "DEACTIVE" Then
+		Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+	EndIf
 </EventNetDeactive>
 
 

xml/page_brewing3.xml

@@ -6,6 +6,8 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
+	DEBUGVAR TxRef1
+
 	SAVELOG "page_brewing3.xml"
 	DEBUGVAR MachineStage
 
@@ -163,6 +165,8 @@
 	Var CreditReference = Seeker.CreditReferenceTmp
 	Var VendingDiscount = Seeker.VendingDiscount
 	Var VendingCampaign = Seeker.VendingCampaign
+	Var TxReference = Seeker.TxRef1
+	DEBUGVAR TxReference
 
 
 	If show_eng = "true" Then 
@@ -498,15 +502,24 @@
 
 
 			If NextOrderStatus = "Disable" Then
-				Var PayDetail="1/F:1221/0/"
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 			Else
 
 
-				Var PayDetail = "1/" + HURR_FOREVER
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
+
+
+				Var PayDetail = "2/" + HURR_FOREVER
 				Var PayDetail = PayDetail + "/"  
 				Var PayDetail = PayDetail + SAMESALARY
 				Var PayDetail = PayDetail + "/"
 				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 			EndIf
 
@@ -552,14 +565,23 @@
 
 
 			If NextOrderStatus = "Disable" Then
-				Var PayDetail="1/F:1221/0/"
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 			Else
 
-				Var PayDetail = "1/" + HURR_FOREVER
+
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
+
+				Var PayDetail = "2/" + HURR_FOREVER
 				Var PayDetail = PayDetail + "/"  
 				Var PayDetail = PayDetail + SAMESALARY
 				Var PayDetail = PayDetail + "/"
 				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 			EndIf
 
@@ -598,15 +620,22 @@
 
 
 			If NextOrderStatus = "Disable" Then
-				Var PayDetail="1/F:1221/0/"
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 			Else
 
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
 
-				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = "2/" + HURR_FOREVER
 				Var PayDetail = PayDetail + "/"  
 				Var PayDetail = PayDetail + SAMESALARY
 				Var PayDetail = PayDetail + "/"
 				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 				
 			EndIf
 
@@ -669,18 +698,20 @@
 			Var ServiceCredit = SelectDrink
 			Var SuggestID  = ""
 
-			Var PayDetail = "1/" + HURR_FOREVER
+			Var PayDetail = "2/" + HURR_FOREVER
 			Var PayDetail = PayDetail + "/"  
 			Var PayDetail = PayDetail + SAMESALARY
 			Var PayDetail = PayDetail + "/"
 			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 			
  			;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
 
 			If GetFreeFromError = 1 Then
 				Var Seeker.CodeChannel = 1 
-				Var Seeker.VendingCode = "C48"
+				Var Seeker.VendingCode = "FAU"
 				Var Seeker.CodeNumber = "0000000000"
 				Var VendingCampaign = ServiceAmount2
 			EndIf

xml/page_brewing3Conti.xml

@@ -125,6 +125,8 @@
 	Var CreditReference = Seeker.CreditReferenceTmp
 	Var VendingDiscount = Seeker.VendingDiscount
 	Var VendingCampaign = Seeker.VendingCampaign
+	Var TxReference = Seeker.TxRef1
+	DEBUGVAR TxReference
 
 
 	Var DirImage = "ROOT/taobin_project/image/complete/"
@@ -387,11 +389,18 @@
 			EndIf
 
 
-			Var PayDetail = "1/" + HURR_FOREVER
+			If HURR_FOREVER = "S:0" Then
+				Var HURR_FOREVER = "F:1303"
+			EndIf
+
+
+			Var PayDetail = "2/" + HURR_FOREVER
 			Var PayDetail = PayDetail + "/"  
 			Var PayDetail = PayDetail + SAMESALARY
 			Var PayDetail = PayDetail + "/"
 			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 
 
@@ -434,11 +443,18 @@
 				Var PayO2 = Seeker.CoffeePinNumber
 			EndIf
 
-			Var PayDetail = "1/" + HURR_FOREVER
+
+			If HURR_FOREVER = "S:0" Then
+				Var HURR_FOREVER = "F:1303"
+			EndIf
+
+			Var PayDetail = "2/" + HURR_FOREVER
 			Var PayDetail = PayDetail + "/"  
 			Var PayDetail = PayDetail + SAMESALARY
 			Var PayDetail = PayDetail + "/"
 			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
 
@@ -474,11 +490,18 @@
 				Var ACC = Seeker.TNumberTaobinMember
 			EndIf
 
-			Var PayDetail = "1/" + HURR_FOREVER
+
+			If HURR_FOREVER = "S:0" Then
+				Var HURR_FOREVER = "F:1303"
+			EndIf
+
+			Var PayDetail = "2/" + HURR_FOREVER
 			Var PayDetail = PayDetail + "/"  
 			Var PayDetail = PayDetail + SAMESALARY
 			Var PayDetail = PayDetail + "/"
 			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 
 
@@ -543,11 +566,13 @@
 			Var ServiceCredit = SelectDrink
 			Var SuggestID  = ""
 
-			Var PayDetail = "1/" + HURR_FOREVER
+			Var PayDetail = "2/" + HURR_FOREVER
 			Var PayDetail = PayDetail + "/"  
 			Var PayDetail = PayDetail + SAMESALARY
 			Var PayDetail = PayDetail + "/"
 			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 			
  			;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"

xml/page_cannotConti.xml

@@ -427,19 +427,28 @@
 
 			If NextOrderStatus = "Disable" Then
 				Var PayDetail="1/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 			Else
 				DEBUGVAR error_code_stop_now
 
 				If error_code_stop_now > 0 Then
 					Var PayDetail="1/F:" + error_code_stop_now
 					Var PayDetail = PayDetail + "/0/"
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				Else
 
+
+					
+
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
 					Var PayDetail = PayDetail + SAMESALARY
 					Var PayDetail = PayDetail + "/"
 					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				EndIf
 			EndIf
 
@@ -486,18 +495,27 @@
 
 			If NextOrderStatus = "Disable" Then
 				Var PayDetail="1/F:1221/0/"	
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 			Else
 				DEBUGVAR error_code_stop_now
 				If error_code_stop_now > 0 Then
 					Var PayDetail="1/F:" + error_code_stop_now
 					Var PayDetail = PayDetail + "/0/"
+					Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 				Else
 
+
+					
+
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
 					Var PayDetail = PayDetail + SAMESALARY
 					Var PayDetail = PayDetail + "/"
 					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				EndIf
 			EndIf
 
@@ -537,18 +555,28 @@
 
 			If NextOrderStatus = "Disable" Then
 				Var PayDetail="1/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
 				
 			Else
 				DEBUGVAR error_code_stop_now
 				If error_code_stop_now > 0 Then
 					Var PayDetail="1/F:" + error_code_stop_now
 					Var PayDetail = PayDetail + "/0/"
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				Else
+
+
+					
+
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
 					Var PayDetail = PayDetail + SAMESALARY
 					Var PayDetail = PayDetail + "/"
 					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
 
 				EndIf
 				

xml/page_catalog.xml

@@ -65,14 +65,24 @@
 	Var StrawAutoRelease2 = "false"
 
 
-	If NetworkStatus = "ACTIVATE" Then
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
+
+
+
+	If SELLONLINE = 1 Then
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
 	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 

xml/page_catalog2.xml

@@ -47,15 +47,23 @@
 	Var StrawAutoRelease1 = "false"
 	Var StrawAutoRelease2 = "false"
 
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+
+	If SELLONLINE = 1 Then
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
 	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 

xml/page_catalog_cocktail.xml

@@ -57,15 +57,22 @@
 	Var StrawAutoRelease1 = "false"
 	Var StrawAutoRelease2 = "false"
 
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
 	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 

xml/page_catalog_free.xml

@@ -37,15 +37,21 @@
 	Var StrawAutoRelease1 = "false"
 	Var StrawAutoRelease2 = "false"
 
-	
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
 	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
+	If SELLONLINE = 1 Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 		

xml/page_collect_point_3.xml

@@ -644,7 +644,7 @@
 	
 
 	Var Timeout = Timeout + 1
-	If Timeout > 60 Then
+	If Timeout > 5 Then
 
 		
 

xml/page_get_yourchange.xml

@@ -28,7 +28,7 @@
 		Var DirImage = "ROOT/taobin_project/image/page_thankyou"
 	EndIf
 
-	
+
 
 
 </EventOpen>
@@ -49,6 +49,12 @@
 
         If Timeout >= 30 Then
 
+         	If Seeker.PayWithQR = 0 Then
+				DEBUGVAR TxRef1
+				UpdateTxRef1 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail
+			EndIf
+
+
             If Seeker = "next" Then
                 ;CoinBack
                 Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  

xml/page_lid_straw.xml

@@ -77,16 +77,44 @@
 
 	;If lidAndStrawOldPageIgnore = "true" Then
 	;	Var lidAndStrawOldPageIgnore = "false"
+
+	If Seeker.PayWithQR = 0 Then
+				
+			
+				If Seeker.TNumberTaobinCredit = "" Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+
+					If Seeker.TNumberTaobinMember = "" Then
+					Else
+						Var TelephoneNumber = Seeker.TNumberTaobinMember
+					EndIf
+
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinCredit
+					Var PayO2 = Seeker.CoffeePinNumber
+				EndIf
+			
+	EndIf
 	
 	If Seeker = "next" Then
 		;CoinBack
 		If ChangeFlag2 = 0 Then
+			If Seeker.PayWithQR = 0 Then
+				DEBUGVAR TxRef1
+				UpdateTxRef1 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail
+			EndIf
 			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
 		Else
 			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
 		EndIf
 	Else
 		If ChangeFlag2 = 0 Then
+			If Seeker.PayWithQR = 0 Then
+				DEBUGVAR TxRef1
+				UpdateTxRef1 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail
+			EndIf
+			
 			Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 		Else
 			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  

xml/page_member_topupCash.xml

@@ -117,6 +117,9 @@
 			Var ServiceType = "credit"
 			Var SessionID2 = "00-00-00-0000"
 			Var ServiceCredit = "coffee"
+
+			
+
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				
 			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
@@ -274,6 +277,9 @@
 				Var CoinInOK = 1
 				Var CoinInCounter = 0
 
+				Var TxRef1 = ""	
+				CreateTxRef1 TxRef1
+
 
 
 			Else

xml/page_member_topupSuccess.xml

@@ -49,28 +49,42 @@
 	EndIf
 
 
-	If PayCreditChannel = "cash" Then 
+	Var FlagPayCredit = 1
-		Var SumCreditAmount = TaobinCredit + CoinAmount
+	Var ExitState = "Disable"
-
-		Var TelephoneNumber = TelephoneNumber
-		Var PayO2 = PinNumber
-					
-					
-		Var VendingDiscount = 0
-		Var VendingCampaign = 0
-		Var ServiceType = "credit"
-		Var SessionID2 = "00-00-00-0000"
-		Var ServiceCredit = "coffee"
-		Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-	Else
-
-	EndIf
 			
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 
 	
+	If Timeout > 1 Then
+		If FlagPayCredit = 1 Then
+			If PayCreditChannel = "cash" Then 
+				Var SumCreditAmount = TaobinCredit + CoinAmount
+
+				Var TelephoneNumber = TelephoneNumber
+				Var PayO2 = PinNumber
+
+
+				DEBUGVAR TxRef1
+
+				Var TxReference = TxRef1
+							
+							
+				Var VendingDiscount = 0
+				Var VendingCampaign = 0
+				Var ServiceType = "credit"
+				Var SessionID2 = "00-00-00-0000"
+				Var ServiceCredit = "coffee"
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				Var FlagPayCredit = 0
+			Else
+
+			EndIf
+		EndIf
+
+		Var ExitState = "Enable"
+	EndIf
 
 	
 
@@ -138,13 +152,17 @@
 <Button>
 <X> 99 </X>
 <Y> 1688 </Y>
+<State> ExitState </State>
 <Filename> Var( DirImage + "/bn_main.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_main.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-    Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	If Timeout > 2 Then
+
+    	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	EndIf
 		
 </EventClick>
 </Button>
@@ -152,13 +170,17 @@
 <Button>
 <X> 695 </X>
 <Y> 1688 </Y>
+<State> ExitState </State>
 <Filename> Var( DirImage + "/bn_drink.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_drink.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
+
+	If Timeout > 2 Then
 	
-	Open "ROOT/taobin_project/xml/page_catalog.xml"  
+		Open "ROOT/taobin_project/xml/page_catalog.xml"  
+	EndIf
 
 </EventClick>
 </Button>

xml/page_payment.xml

@@ -63,6 +63,12 @@
     Var CountStepForCupFlagDelay = 1
 
 
+	Var VendingBank = "other"
+
+
+	Var Seeker.TxRef1 = ""
+	Var Seeker.OrderChanel = "Normal"
+	
 	Var Seeker.CurrCreditAmount = 0
 	Var Seeker.CurrCreditUse    = 0
 	Var Seeker.CurrCreditTelNum = ""
@@ -167,6 +173,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>
@@ -255,7 +269,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
@@ -316,6 +334,8 @@
 
 		If DelayCount >= 2 Then
 			If web_readyOK = "true" Then
+
+				Var  Seeker.OrderChanel = "WebApp"
 		
 				Var  Seeker.selected_a_drink = SelectDrink
 				Var  Seeker.ServiceAmount2 = PriceDrink

xml/page_payment_cash.xml

@@ -236,6 +236,11 @@
 		CoinVending OFF	
 		If Seeker = "curr" Then	
 			MakeDrinkV1  SelectDrink SelectSugarID
+			Var TxRef1 = ""
+			CreateTxRef1 TxRef1
+		Else
+			Var TxRef1 = ""
+			CreateTxRef1 TxRef1
 		EndIf
 		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 
@@ -300,9 +305,15 @@
 	
 	Var EnoughChange = "yes"
 
-	
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
 
-	If NetworkStatus = "DOWN" Then
+	If SELLONLINE = 0 Then
 			SAVELOG "Cash only NetworkStatus down"
 			
 			Var PayState2 = "Disable"
@@ -312,20 +323,39 @@
 			Var PayState6 = "Disable"
 
 			Var PayOfflineMode = 1
+
+			Var ShowNetworkProblem = "Enable"
+			Var ShowButtonClick2 = "Invisible"
+			Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+
 	Else
 		Var PayOfflineMode = 0
-	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
-		
-	Else
-		Var ShowNetworkProblem = "Enable"
-		Var ShowButtonClick2 = "Invisible"
-		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 	EndIf
 
+	If NOCashFlag = 1 Then
+		Var PayState1 = "Disable"
+	EndIf
+
+	;cancel order 
+	If SELLSTATUS = "DEACTIVE" Then
+		Var SELLONLINE = 1
+	EndIf
+
+	;If NetworkStatus = "ACTIVATE" Then
+	;	Var ShowNetworkProblem = "Invisible"
+	;	Var ShowNetworkProblemText = ""
+	;	
+	;Else
+	;	Var ShowNetworkProblem = "Enable"
+	;	Var ShowButtonClick2 = "Invisible"
+	;	Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+	;EndIf
+
+	
+
 	Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
 	Var pay_with_chanel_text = DirImage + "/text_1.png"
 	
@@ -511,7 +541,15 @@
 
 
 			If ReqPayInfoFlag2 = 1 Then
-				Var Seeker.CampaignPayChanel = "kbank"
+
+				DEBUGVAR VendingBank
+				If VendingBank = "kbank" Then
+					Var Seeker.CampaignPayChanel = "kbank"
+				Else
+					Var Seeker.CampaignPayChanel = "cash"
+				EndIf
+				 
+
 			EndIf
 			If ReqPayInfoFlag2 = 2 Then
 				Var Seeker.CampaignPayChanel = "shopee"
@@ -525,6 +563,8 @@
 			
 			If Seeker = "curr" Then
 				MakeDrinkV1  SelectDrink SelectSugarID
+				;Var TxRef1 = ""
+				;CreateTxRef1 TxRef1
 			EndIf
 			Var Seeker.PayWithQR = 1
 			Var Seeker.VendingTSID = VendingTSID
@@ -758,6 +798,11 @@
 			
 			If Seeker = "curr" Then
 				MakeDrinkV1  SelectDrink SelectSugarID
+				Var TxRef1 = ""
+				CreateTxRef1 TxRef1
+			Else
+				Var TxRef1 = ""
+				CreateTxRef1 TxRef1
 			EndIf
 
 			Open "ROOT/taobin_project/xml/page_thankyou.xml" 

xml/page_payment_cashMore.xml

@@ -283,9 +283,15 @@
 	
 	Var EnoughChange = "yes"
 
-	
+	Var SELLONLINE = 0
+	If SELLSTATUS = "SELLONLINE" Then
+		Var SELLONLINE = 1
+	EndIf
+	If SELLSTATUS = "SELLNOCASH" Then
+		Var SELLONLINE = 1
+	EndIf
 
-	If NetworkStatus = "DOWN" Then
+	If SELLONLINE = 0 Then
 	
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
@@ -293,20 +299,19 @@
 			Var PayState5 = "Disable"
 
 			Var PayOfflineMode = 1
+
+			Var ShowNetworkProblem = "Enable"
+			Var ShowButtonClick2 = "Invisible"
+			Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 	Else
 		Var PayOfflineMode = 0
-	EndIf
 
-	If NetworkStatus = "ACTIVATE" Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
-		
-	Else
-		Var ShowNetworkProblem = "Enable"
-		Var ShowButtonClick2 = "Invisible"
-		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 	EndIf
 
+	
+
 	Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
 	Var pay_with_chanel_text = DirImage + "/text_1.png"
 	

xml/page_payment_code.xml

@@ -226,8 +226,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeAIS.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeDtac.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeLotus.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeSCG.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeThe1.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeTrue.xml

@@ -141,8 +141,12 @@
 
 						If Seeker = "curr" Then
 							MakeDrinkV1  SelectDrink SelectSugarID
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						Else
 							DEBUGVAR Seeker
+							Var TxRef1 = ""
+							CreateTxRef1 TxRef1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_credit2.xml

@@ -188,8 +188,13 @@
 				
 				If Seeker = "curr" Then
 					MakeDrinkV1  SelectDrink SelectSugarID
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
+
 				Else
 					DEBUGVAR Seeker
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
 				EndIf
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf

xml/page_payment_credit3.xml

@@ -162,8 +162,14 @@
 				
 				If Seeker = "curr" Then
 					MakeDrinkV1  SelectDrink SelectSugarID
+
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
+
 				Else
 					DEBUGVAR Seeker
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
 				EndIf
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf

xml/page_payment_storeCredit3.xml

@@ -67,8 +67,12 @@
 
 				If Seeker = "curr" Then
 					MakeDrinkV1  SelectDrink SelectSugarID
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
 				Else
 					DEBUGVAR Seeker
+					Var TxRef1 = ""
+					CreateTxRef1 TxRef1
 				EndIf
 				
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 

xml/page_thankyou.xml

@@ -234,6 +234,52 @@
 		If RoadShow = "true" Then
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
+
+			If Seeker.PayWithQR = 0 Then
+				Var ServiceAmount2 = Seeker.ServiceAmount2
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+				If Seeker.TNumberTaobinCredit = "" Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinCredit
+					Var PayO2 = Seeker.CoffeePinNumber
+				EndIf
+				Var ServiceType = "coffee"
+				Var ServiceCredit = SelectDrink
+				Var SuggestID  = ""
+
+				Var PdpaAccept = 0
+				Var CreditReference = Seeker.CreditReferenceTmp
+				Var VendingDiscount = Seeker.VendingDiscount
+				Var VendingCampaign = Seeker.VendingCampaign
+				Var PayDetail = "2/F:1115/0//XML|" +  Seeker.OrderChanel
+				Var PayType = ""
+				Var Seeker.TxRef1 = TxRef1
+
+				If Seeker.CodeChannel = 1 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + Seeker.CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + Seeker.VendingCode
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + SelectDrink
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + BoxID
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + "S"
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + Seeker.CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
+					UpdateTxRef1 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail
+				Else
+					DEBUGVAR TxRef1
+					UpdateTxRef1 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail
+				EndIf
+			EndIf
+
 			If PayOfflineMode = 1 Then
 
 				If StoreCreditAmount > 0 Then

xml_main/startup.xml

@@ -8,6 +8,7 @@
 <Background> "/ROOT/pictures/startup.bmp" </Background>
 <Timeout> 3000 </Timeout>
 <EventTimeout> 
+	FlushTxRef1
 	Open "/ROOT/xml/main.xml" 
 </EventTimeout>
 <EventOpen>