Add make not wait

xml/page_board.xml

@@ -52,6 +52,10 @@
 	Var Seeker.CurrCreditTelNum = ""
 	Var Seeker.CurrCreditPinNum = ""
 
+	DEBUGVAR PaySuccessWithDaemonTask
+
+	Var PaidPaymentFromNextStage = 0
+	Var DrinkPaid = "-"
 	
 
 	; On open

xml/page_brewing3.xml

@@ -5,6 +5,7 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	Var SendNotiPaySuccess = 2
 
 	DEBUGVAR TxRef1
 
@@ -678,6 +679,8 @@
 	EndIf
 
 	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+
 		If  waitAckPay = 0 Then 
 
 			Var waitAckPay = 0 
@@ -790,6 +793,9 @@
 			
 		EndIf
 
+		__CMD "clear-stock-data" 0 "-" "-"
+
+
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
 			SAVELOG "waitAckPay=0"

xml/page_brewing3Conti.xml

@@ -538,6 +538,8 @@
 	EndIf
 
 	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+	
 		If  waitAckPay = 0 Then 
 
 			Var waitAckPay = 0 
@@ -651,6 +653,8 @@
 			
 		EndIf
 
+		__CMD "clear-stock-data" 0 "-" "-"
+
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
 

xml/page_main_blank.xml

@@ -1,4 +1,59 @@
 <Page>
 <Width> 1080 </Width>
 <Height> 1312 </Height>
+<EventOpen>
+	DEBUGVAR PaySuccessWithDaemonTask
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+	If PaySuccessWithDaemonTask = 1 Then
+		
+		DEBUGVAR PaidPaymentFromNextStage
+		DEBUGVAR LastMakeDrinkResult
+		; from 
+		If LastMakeDrinkResult = "success" Then
+			If PaidPaymentFromNextStage = 1 Then
+				Var DelayForMakeDrink = 0
+				Var PaidPaymentFromNextStage = 2
+			EndIf
+		EndIf
+
+		If PaidPaymentFromNextStage = 2 Then
+			DEBUGVAR HaveCup
+			DEBUGVAR MachineStage
+			DEBUGVAR DoorCupPosition
+			If HaveCup = "false" Then
+				If DoorCupPosition = "bottom" Then
+
+					Topping "Select" next.UserSelectDrinkFromPaid
+
+					; Set option toppinng and pack 
+					Topping "Select1-ID" next.UserSelecttopping1Paid
+					Topping "Select2-ID" next.UserSelecttopping2Paid
+					Topping "Select3-ID" next.UserSelecttopping3Paid
+
+					; Pack
+					Topping "Pack" ExtendDataCurr
+
+					Var DelayForMakeDrink = 2
+					Var PaidPaymentFromNextStage = 3
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+	
+	DEBUGVAR DelayForMakeDrink
+	If DelayForMakeDrink > 3 Then
+		DEBUGVAR DelayForMakeDrink
+		Var DelayForMakeDrink = DelayForMakeDrink - 1
+		If DelayForMakeDrink = 0 Then
+			MakeDrinkV1  SelectDrink SelectSugarID
+		EndIf
+	EndIf
+
+	; hurr
+	TimerReset
+</EventTimeout>
 </Page>

xml/page_payment_cash.xml

@@ -243,12 +243,17 @@
 		Var Seeker.FreeVendingCampaign = 1
 		CoinVending OFF	
 		If Seeker = "curr" Then	
+		
 			MakeDrinkV1  SelectDrink SelectSugarID
 			Var TxRef1 = ""
 			CreateTxRef1 TxRef1
 		Else
 			Var TxRef1 = ""
 			CreateTxRef1 TxRef1
+			
+			Var DrinkPaid = SelectDrink
+			Var PaidPaymentFromNextStage = 1
+			
 		EndIf
 		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 
@@ -802,12 +807,16 @@
 		If PayOK = 1 Then
 			
 			If Seeker = "curr" Then
+			
 				MakeDrinkV1  SelectDrink SelectSugarID
 				Var TxRef1 = ""
 				CreateTxRef1 TxRef1
 			Else
 				Var TxRef1 = ""
 				CreateTxRef1 TxRef1
+				Var DrinkPaid = SelectDrink
+				Var PaidPaymentFromNextStage = 1
+
 			EndIf
 
 			Open "ROOT/taobin_project/xml/page_thankyou.xml" 

xml/page_payment_code.xml

@@ -232,6 +232,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeDtac.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeGLX.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeLotus.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeSCG.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeThe1.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_codeTrue.xml

@@ -147,6 +147,9 @@
 							DEBUGVAR Seeker
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1
+
+							Var DrinkPaid = SelectDrink
+							Var PaidPaymentFromNextStage = 1
 						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf

xml/page_payment_credit2.xml

@@ -195,6 +195,9 @@
 					DEBUGVAR Seeker
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1
+
+					Var DrinkPaid = SelectDrink
+					Var PaidPaymentFromNextStage = 1
 				EndIf
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf

xml/page_payment_credit3.xml

@@ -170,6 +170,9 @@
 					DEBUGVAR Seeker
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1
+
+					Var DrinkPaid = SelectDrink
+					Var PaidPaymentFromNextStage = 1
 				EndIf
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf

xml/page_payment_storeCredit3.xml

@@ -73,6 +73,9 @@
 					DEBUGVAR Seeker
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1
+
+					Var DrinkPaid = SelectDrink
+					Var PaidPaymentFromNextStage = 1
 				EndIf
 				
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 

xml/page_thankyouConti.xml

@@ -246,7 +246,9 @@
 		Var ShowCountDownBrewing = CountDownBrewing
 		Var MachineState_Result = 0
 		If MachineStage = "show-menu" Then
-       		MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
+
+       		;MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
+       		
        		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
      	EndIf
        

xml/page_topping_select4.xml

@@ -2327,6 +2327,13 @@
 		; Pack
 		Topping "__pack" ExtendDataNext
 
+		next.UserSelectDrinkFromPaid = UserSelectProductCode
+		next.UserSelecttopping1Paid = topping1
+		next.UserSelecttopping2Paid = topping2
+		next.UserSelecttopping3Paid = topping3
+
+
+
 	EndIf
 	DEBUGVAR Seeker
 	DEBUGVAR Seeker.ExtendData 

xml/vending_info.xml

@@ -123,6 +123,12 @@
 	Var Text1_9 = Text1_9 + "  "
 	Var Text1_9 = Text1_9 + SystemDate
 
+	Var skr = "curr"
+	DEBUGVAR skr.NOBONUS
+
+	Var skr = "next"
+	DEBUGVAR skr.NOBONUS
+
 	Refresh
 	TimerReset