order conti order

xml/page_drinkok.xml

@@ -138,6 +138,8 @@
 <Timeout> 500 </Timeout>
 <EventTimeout> 
 
+	DEBUGVAR LastMakeDrinkResult
+
 	DEBUGVAR MachineStage
 	DEBUGVAR CupOnArm
 	DEBUGVAR buttonRemoveCup
@@ -168,22 +170,22 @@
 				;Pay Multi
 				If sendPayMultiFlag = 0 Then
 
-					If PayWithQR = 0 Then
+					If Seeker.PayWithQR = 0 Then
 						Var ServiceType = "coffee-multi"
 					Else
 						Var ServiceType = "coffee-multiQR"
 					EndIf
 
-					If TNumberTaobinCredit = "" Then
+					If Seeker.TNumberTaobinCredit = "" Then
 						Var TelephoneNumber = "0899999999"
 						Var PayO2 = ""
-						If TNumberTaobinMember = "" Then
+						If Seeker.TNumberTaobinMember = "" Then
 						Else
-							Var TelephoneNumber = TNumberTaobinMember
+							Var TelephoneNumber = Seeker.TNumberTaobinMember
 						EndIf
 					Else
-						Var TelephoneNumber = TNumberTaobinCredit
-						Var PayO2 = CoffeePinNumber
+						Var TelephoneNumber = Seeker.TNumberTaobinCredit
+						Var PayO2 = Seeker.CoffeePinNumber
 					EndIf
 
 					Var ServiceCredit = "00-00-00-0000"
@@ -195,7 +197,7 @@
 					SAVELOG PayO2
 
 					Var VendingCampaign = IntVendingCampaign
-					Var CreditReference = CreditReferenceTmp
+					Var CreditReference = Seeker.CreditReferenceTmp
 
 					Var PayType = ""
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
@@ -227,12 +229,21 @@
 
 		Else
 			If sendPayMultiFlag = 1 Then
-				Var TNumberTaobinMember = ""
+				Var Seeker.TNumberTaobinMember = ""
 				
 				If FailedCount > 0 Then
 					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
 				Else
-					Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					If  NextOrder = "true" Then
+						Var NextOrder = "false"
+
+						TransferVar "next" "curr"
+						Var Seeker = "curr"
+						
+						Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+					Else
+						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					EndIf
 				EndIf
 			EndIf
 		EndIf
@@ -252,7 +263,19 @@
 	
 	If MachineStage = "remove-cup" Then
 		If CART_COUNT = 0 Then
-			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			If  NextOrder = "false" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			Else
+				Var buttonRemoveCup = "Enable"
+
+				Var Timeout2 = Timeout2 + 1
+
+				If Timeout2 > 15 Then
+					Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+					Var Timeout2 = 0
+				EndIf
+
+			EndIf
 		Else
 	
 			Var buttonRemoveCup = "Enable"