Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

spiral/xml/page_catalog_vending_machine.xml

@@ -9,6 +9,7 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	Var SpiralOption = 0
 	Var SpiralSoftwareVersion = "1.04"	
 	Var ColorBrown = 0x746253
 	Var ColorBrown2 = 0x513C2F
@@ -2657,6 +2658,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
+		Var SpiralOption = 1
 		Var SpiralSelectdetail1 = $03-01-01-0039.detail1
 		Var SpiralSelectheader2 = $03-01-01-0039.header2
 		Var SpiralSelectdetail2 = $03-01-01-0039.detail2	
@@ -2815,6 +2817,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
+		Var SpiralOption = 1
 		Var SpiralSelectdetail1 = $03-01-01-0040.detail1
 		Var SpiralSelectheader2 = $03-01-01-0040.header2
 		Var SpiralSelectdetail2 = $03-01-01-0040.detail2	

spiral/xml/page_spiral_check_cash.xml

@@ -10,10 +10,27 @@
 	Var GotoStoreCredit0 = 0
 	Var LastMakeSpiralResult = 0
 	Var MachineSpiralStage = ""
+	
 	If SellLeaw = 0 Then
 		SPIRAL_SELL ServiceCredit SpiralRef
 		Var TestSellSpiral = 1
 		DEBUGVAR TestSellSpiral
+		If Seeker.thankToppingFlag = 1 Then
+			If StrawState = "Press" Then
+				Machine StrawOrder	
+				Var LedLidBlink = "true"
+			EndIf
+
+			If LidState = "Press" Then
+				Machine LidOrder	
+				Var LedLidBlink = "true"
+			EndIf
+			
+			Var SelectDrink = "12-05-02-0017"
+			Var SelectSugarID = 0
+			MakeDrinkV1  SelectDrink SelectSugarID
+		EndIf
+
 		Var SellLeaw = 1
 	EndIf
 </EventOpen>

spiral/xml/page_spiral_failmuti.xml

@@ -0,0 +1,988 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	Var SetPayMuti = 0
+	Var Timeout3 = 0
+	;Var LastMakeDrinkResult = "-"
+	;Var MachineState_Result = 2
+
+	Var ChangeFlag3 = 0
+	Var ChangeFailSpiral = 0
+	Var ChangeFailCoffee = 0
+	Var SpiralText1 = 0
+	Var MultiGo = 0
+	DEBUGVAR SpiralText1
+	Var Timeout = 0
+	Var ShowPictureFail = 0
+	If  ChangeOK = 1 Then
+		Var  ChangeOK = 2 
+	EndIf
+
+	If show_eng = "true" Then 	
+		Var DirImage = "ROOT/taobin_project/image/complete_en/text_bottom.png"
+		Var DirImage1 = "ROOT/taobin_project/spiral/image/page_spiral/en_spiral_text_fail.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/complete/text_bottom.png"
+		Var DirImage1 = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_fail.png"
+	EndIf
+
+
+	Var SpiralPickDrink = "Invisible"	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+
+<EventActionOk>
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 3
+	EndIf
+
+	If Seeker.thankToppingFlag = 1 Then
+	Else
+		If SpiralCodeOk = 1 Then
+			If  CheckAckCode = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+				DEBUGVAR SessionID2
+
+				DEBUGVAR SessionID2
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "locker"
+				Var ECommerce = ""
+				Var ECommerce = "locker5/"
+				Var ECommerce = ECommerce + PriceDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + DiscountDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SessionID2 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SelectDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C:"
+				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+
+				Var SpiralCodeOk = 2
+
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" 
+			EndIf
+		EndIf
+	EndIf
+</EventActionOk>
+
+
+<EventTimeout> 
+
+	DEBUGVAR LastMakeSpiralResult
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineState_Result
+	DEBUGVAR MachineStage	
+	DEBUGVAR SpiralPickDrink
+
+;	DEBUGVAR waitAckPay
+;	DEBUGVAR Timeout	
+;	DEBUGVAR sendPayMultiFlag
+;	DEBUGVAR PayOk
+;	DEBUGVAR SetPayMuti
+;	DEBUGVAR MultiGo
+;	DEBUGVAR ChangeOK
+;	DEBUGVAR ChangeStatus
+;	DEBUGVAR Seeker.TNumberTaobinCredit 
+;	DEBUGVAR Seeker.StoreCreditFlag 
+;	DEBUGVAR Seeker.PayWithQR
+;	DEBUGVAR Seeker.CodeChannel 
+;	DEBUGVAR CheckAckCodeTimer
+;
+;	DEBUGVAR Seeker.pageStoreCredit0
+;	
+;	DEBUGVAR SpiralCodeOk
+;	DEBUGVAR CheckAckCode
+;	DEBUGVAR CheckAckCodeTimer
+
+	Var Timeout = Timeout + 1
+
+	Var ChangeTimeout = ChangeTimeout - 1
+	Var CheckAckCodeTimer = CheckAckCodeTimer - 1
+
+	If MachineStage = "pickup-cup" Then
+		Var SpiralPickDrink = "Enable"
+	Else
+		Var SpiralPickDrink = "Invisible"	
+	EndIf
+
+	If  ChangeTimeout < 1 Then
+		If ChangeOK = 1 Then
+			Var ChangeOK = 2
+			Var ChangeTimeout = 30
+		EndIf
+	EndIf
+	If  ChangeTimeout < 1 Then
+		If ChangeFlag2 = 1 Then
+			Var ChangeOK = 3
+			Var ChangeFlag2 = 2
+			Var ChangeTimeout = 30
+		EndIf
+	EndIf
+
+	If SpiralCodeOk = 1 Then
+		If CheckAckCode = 1 Then
+			If LastMakeSpiralResult = 2 Then
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+				DEBUGVAR SessionID2
+
+				DEBUGVAR SessionID2
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "locker"
+				Var ECommerce = ""
+				Var ECommerce = "locker5/"
+				Var ECommerce = ECommerce + PriceDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + DiscountDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SessionID2 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SelectDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C:"
+				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+
+				Var SpiralCodeOk = 2
+
+			EndIf
+		EndIf
+	EndIf
+
+	If PayOk = 9 Then
+		Var SetPayMuti = SetPayMuti + 1
+		If SetPayMuti = 2 Then
+			Var PayOk = 2
+			Var SetPayMuti = 0
+		EndIf
+	EndIf
+
+	If PayOk = 8 Then
+		Var SetPayMuti = SetPayMuti + 1
+		If SetPayMuti = 2 Then
+			Var PayOk = 3
+			Var SetPayMuti = 0
+		EndIf
+	EndIf
+
+	If PayOk = 7 Then
+		Var SetPayMuti = SetPayMuti + 1
+		If SetPayMuti = 2 Then
+			Var PayOk = 5
+			Var SetPayMuti = 0
+		EndIf
+	EndIf
+
+	If LastMakeSpiralResult = 2 Then
+		If ChangeOK = 3 Then
+			If PayOk = 0 Then
+				Var PayOk = 9
+				Var SessionID4 = MachineSpiralID
+				Var SessionID4 = SessionID4 + ":"
+				Var SessionID4 = SessionID4 + MachineSpiralSlotID
+				
+				Var SessionID3 = SessionID3 + MachineSpiralID
+				Var SessionID3 = SessionID3 + "/"
+				Var SessionID3 = SessionID3 + MachineSpiralSlotID
+
+				If SpiralCodeOk = 1 Then
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + Seeker.VendingCode
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + Seeker.CodeNumber	
+				EndIf
+
+
+				;Var PayDetail="1/F:1221/0/"
+				Var PayDetail="1/F:"
+				Var PayDetail = PayDetail + MachineSpiralErrorCode
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SessionID4 
+
+				If Seeker.PayWithQR = 1 Then
+					;If waitAckPay = 0 Then
+						; Var waitAckPay = 1
+						; Var SVT = "locker"
+						; Var ACC = "0899999999"
+						; Var DEE = PayDetail
+
+						If Seeker.TNumberTaobinCredit = "" Then
+						Else
+							Var ACC = Seeker.TNumberTaobinCredit
+						EndIf
+						;PAYEXT SVT ACC VendingTSIDTmp DEE
+
+						Var ServiceCredit = KeepServiceCredit
+						Var ServiceType = "locker"
+
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
+						If SpiralCodeOk = 1 Then
+							Var CheckAckCode = 1 
+							Var CheckAckCodeTimer = 10
+						Else
+							Var ShowPictureFail = 1
+						EndIf
+					;EndIf
+				Else
+					
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
+					If SpiralCodeOk = 1 Then
+						Var CheckAckCode = 1 
+						Var CheckAckCodeTimer = 10
+					Else
+						Var ShowPictureFail = 1
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
+ 	If LastMakeSpiralResult = 2 Then
+ 		If Seeker.PayWithQR = 0 Then 
+			If Seeker.CreditCard = 1 Then
+				If CreditCardVoid = 0 Then
+					
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
+				;	Var ChangeOK = 3
+				EndIf
+
+				If CoinAmount > 0 Then	
+ 					If ChangeFlag = 0 Then
+ 						Var ChangeFlag = 1 
+ 						Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+				
+ 						If Seeker.StoreCreditFlag = 1 Then
+ 							Var ChangeOK = 2
+ 						Else
+ 							Change ServiceAmount3
+							Var ChangeFlag2 = 1
+							Var ChangeTimeout = 30
+ 						EndIf	
+ 					EndIf
+ 				;Else
+ 				;	Var ChangeOK = 3
+ 				EndIf
+
+			Else
+ 				If Seeker.CodeChannel = 0 Then
+ 					If ChangeFlag = 0 Then
+ 						Var ChangeFlag = 1 
+ 						If Seeker.StoreCreditFlag = 1 Then
+ 							Var ChangeOK = 3
+ 						Else
+							Var ChangeFailSpiral = 1
+							;Var ServiceAmount2 = ServiceAmount2 - PriceDrinkTopping
+ 							;Change ServiceAmount2
+							Var ChangeTimeout = 30
+							Var ChangeFlag2 = 1
+ 						EndIf
+ 					EndIf
+ 				Else
+ 					If CoinAmount > 0 Then	
+ 						If ChangeFlag = 0 Then
+ 							Var ChangeFlag = 1 
+ 							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+ 							If Seeker.StoreCreditFlag = 1 Then
+ 								Var ChangeOK = 3
+								; test edit
+ 							Else
+ 								Change ServiceAmount3
+								Var ChangeFlag2 = 1
+								Var ChangeTimeout = 30
+ 							EndIf	
+ 						EndIf
+ 					Else
+						If ChangeOK = 3 Then
+						Else
+ 							Var ChangeOK = 2
+						EndIf
+ 					EndIf
+ 				EndIf
+			EndIf
+ 		Else
+ 			Var ChangeOK = 3
+ 		EndIf
+ 	EndIf	
+
+If Seeker.thankToppingFlag = 1 Then
+	If MachineStage = "close-maintenance" Then
+		If MachineState_Result = 0 Then
+			SAVELOG "back_to_main from line  > 663."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+	
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			SAVELOG " drink-failed...."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MultiGo = 0 Then
+		If 	MachineState_Result = 2  Then 
+			If SaveCoinAmount > 0 Then
+				If Seeker.TNumberTaobinCredit = "" Then
+					Change PriceDrinkTopping
+					Var MultiGo = 1
+				Else
+					Var MultiGo = 2
+				EndIf
+			Else
+				Var MultiGo = 2
+			EndIf
+		EndIf
+	EndIf
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+
+	If PayOk = 2 Then
+		If MultiGo = 2 Then
+			If  waitAckPay = 0 Then 
+				If MachineState_Result = 2 Then
+					If Timeout3 = 0 Then
+						Var  waitAckPay = 1 
+						Var PayOk = 8
+						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
+
+						Var PayDetail= "1/F:1221/0/"
+						Var ServiceType = "coffee"
+
+						Var SuggestID  = ""
+						Var SessionID2 = ""
+						Var ServiceCredit = SelectDrink
+
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+						Var sendPayMultiFlag = 2
+						If Seeker.PayWithQR = 0 Then 
+							If Seeker.CodeChannel = 0 Then
+									If Seeker.StoreCreditFlag = 1 Then
+
+									Else	
+										Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
+										;Var MultiGo = 0		
+									EndIf
+							EndIf
+						EndIf
+					EndIf	
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
+	If PayOk = 2 Then
+			If MachineState_Result = 1 Then
+				DEBUGVAR PaySuccessWithDaemonTask
+
+				If  waitAckPay = 0 Then 
+					Var PayOk = 8
+					Var waitAckPay = 1 
+					Var Timeout = 0
+					Var Timeout3 = 2
+					Var ProcessText = "" 
+
+					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
+
+
+					Var ServiceType = "coffee"
+					Var ServiceCredit = SelectDrink
+					Var SuggestID  = ""
+
+					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
+
+
+
+					If GetFreeFromError = 1 Then
+						Var Seeker.CodeChannel = 1 
+						Var Seeker.VendingCode = "FAU"
+						Var Seeker.CodeNumber = "0000000000"
+						Var VendingCampaign = ServiceAmount2
+					EndIf
+
+					If Seeker.PayWithQR = 0 Then
+						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 + "/"
+
+							If Seeker.CreditCard = 1 Then
+
+									CashlessReq SUCCESS
+									;CashlessReq FAIL
+
+							EndIf
+
+							Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+							Var sendPayMultiFlag = 2
+						Else
+
+								If Seeker.CreditCard = 1 Then
+
+									CashlessReq SUCCESS
+									;CashlessReq FAIL
+
+								EndIf
+
+								Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+								Var sendPayMultiFlag = 2
+
+
+						EndIf
+
+
+					Else
+
+						;no wait ack pay
+						Var waitAckPay = 1
+
+						Var SVT = "coffee"
+						Var ACC = "0899999999"
+						Var DEE = PayDetail
+
+						If Seeker.TNumberTaobinMember = "" Then
+						Else
+							Var ACC = Seeker.TNumberTaobinMember
+						EndIf
+
+						;PAYEXT SVT ACC VendingTSIDTmp DEE
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+						Var sendPayMultiFlag = 2
+
+
+					EndIf
+
+				EndIf
+
+				__CMD "clear-stock-data" 0 "-" "-"
+
+
+				Var ServiceSuccess = "yes"
+				If  waitAckPay = 1 Then
+					SAVELOG "waitAckPay=0"
+				;	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+				EndIf
+
+			EndIf
+	EndIf
+
+	If Seeker.PayWithQR = 0 Then
+		If ChangeFlag3 = 0 Then
+			If MachineState_Result = 2 Then
+				Var ChangeFailCoffee = 1
+				Var ChangeMuti = ServiceAmountSum - Seeker.VendingCampaign
+				Var ChangeFlag3 = 1
+			EndIf
+			If MachineState_Result = 1 Then
+				Var ChangeFailCoffee = 1
+				Var ChangeMuti = ServiceAmountSum - Seeker.VendingCampaign
+				;Var ChangeMuti = ServiceAmountSum - PriceDrinkTopping
+				Var ChangeFlag3 = 1
+			EndIf
+		EndIf
+
+		If ChangeFlag3 = 1 Then
+			If Seeker.TNumberTaobinCredit = "" Then
+				Change ChangeMuti
+				Var ChangeFlag3 = 2
+			EndIf
+		EndIf
+	EndIf
+
+	If PayOk = 3 Then
+		If ChangeOK = 3 Then
+			If sendPayMultiFlag = 2 Then
+				Var PayOk = 7
+				If Seeker.PayWithQR = 0 Then
+					Var ServiceType = "coffee-multi"
+				Else
+					Var ServiceType = "coffee-multiQR"
+				EndIf
+
+				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
+				;	Var ServiceType = "coffee-multi"
+
+					Var ServiceCredit = "00-00-00-0000"
+					Var SuggestID  = ""
+					
+				
+					If LastMakeSpiralResult = 1 Then
+						Var PayDetail="1/S:0/0/"
+					Else
+						Var PayDetail="1/F:0/0/"
+					EndIf
+		
+
+					Var CART_COUNT = "2"
+					Var SessionID3 = "" + CART_COUNT
+					Var SessionID3 = SessionID3 + ":00000"
+
+					SAVELOG PayO2
+
+					Var VendingCampaign = IntVendingCampaign
+					Var CreditReference = Seeker.CreditReferenceTmp 
+
+					If LastMakeSpiralResult = 2 Then
+						Var ServiceAmountSum = ServiceAmountSum - PriceDrink
+						Var ServiceAmountSum = ServiceAmountSum - PriceDrinkTopping
+					EndIf
+					;If MachineState_Result = 2 Then
+					;	Var ServiceAmountSum = ServiceAmountSum - PriceDrinkTopping
+					;EndIf
+					Var PayType = ""
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
+
+
+					If Seeker.PayWithQR = 1 Then
+						Var SVT = "coffee-multi"
+						
+						If Seeker.TNumberTaobinCredit = "" Then
+							Var TelephoneNumber = "0899999999"
+							If Seeker.TNumberTaobinMember = "" Then
+							Else
+							Var TelephoneNumber = Seeker.TNumberTaobinMember
+							EndIf
+						Else
+							Var TelephoneNumber = Seeker.TNumberTaobinCredit
+						EndIf
+
+						Var DEE = PayDetail
+						
+						PAYEXT SVT TelephoneNumber Seeker.VendingTSID DEE
+					EndIf
+
+				Var sendPayMultiFlag = 1
+			EndIf
+		EndIf
+	EndIf
+EndIf
+
+
+
+
+
+	If PayOk = 5 Then
+		If sendPayMultiFlag = 1 Then
+			If MachineStage = "remove-cup" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+			If MachineStage = "close-maintenance" Then
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+			EndIf
+			If MachineStage = "show-menu" Then
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+			EndIf
+		EndIf
+	EndIf
+
+	If Timeout >= 120 Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+
+	 Refresh
+	TimerReset
+</EventTimeout> 
+
+
+
+<EventChangeStatus>
+	If ChangeOK = 2 Then
+		If ChangeStatus = "payout-end" Then 
+			Var ChangeOK = 3
+			Var MultiGo = 2
+		EndIf
+	EndIf
+	If ChangeOK = 1 Then
+		If ChangeStatus = "payout-end" Then 
+			Var ChangeOK = 2
+			Var ChangeTimeout = 999
+		EndIf
+	EndIf
+	
+</EventChangeStatus>
+
+
+
+
+<Image>
+<X> 89 </X>
+<Y> 400 </Y>
+<Width> 902 </Width>
+<Height> 902 </Height>
+<Filename> "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" </Filename>
+</Image>
+
+<Image>
+<X> 84 </X>
+<Y> 1100 </Y>
+<Width> 911 </Width>
+<Height> 265 </Height>
+<Filename> DirImage1 </Filename>
+</Image>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+ 
+<Image>
+<X> 0 </X>
+<Y> 1418 </Y>
+<State> SpiralPickDrink </State>
+<Filename> DirImage </Filename>
+</Image>
+
+
+;<Text>
+;<X> 92 </X>
+;<Y> 1121 </Y>
+;<Width>150</Width>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Timeout </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1181 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> ChangeTimeout </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 650 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> LastMakeSpiralResult </Value>
+;</Text>
+;
+;
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1250 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "Seeker.CreditCard"  </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1250 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Seeker.CreditCard </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1350 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "PayOk"  </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1350 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> PayOk  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1400 </Y>
+;<Size> 40 </Size
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "ChangeOK"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1400 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> ChangeOK  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1450 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "Seeker.StoreCreditFlag"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1450 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Seeker.StoreCreditFlag  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1500 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "ChangeFlag2"  </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1500 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> ChangeFlag2  </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1550 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "Seeker.PayWithQR"  </Value>
+;</Text>
+;
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1550 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Seeker.PayWithQR  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1600 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "Seeker.CodeChannel"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1600 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Seeker.CodeChannel  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1650 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "ChangeFlag"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1650 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> ChangeFlag  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1700 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "Canout"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1700 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> Canout  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1750 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "SpiralCodeOk"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1750 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> SpiralCodeOk  </Value>
+;</Text>
+;
+;<Text>
+;<X> 292 </X>
+;<Y> 1800 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> "CoinAmount"  </Value>
+;</Text>
+;
+;<Text>
+;<X> 92 </X>
+;<Y> 1800 </Y>
+;<Size> 40 </Size>
+;<Font> KanitTTF </Font>
+;<Color> 0xB78F24 </Color>
+;<Value> CoinAmount  </Value>
+;</Text>
+
+</Popup>

spiral/xml/page_spiral_payment.xml

@@ -18,7 +18,7 @@
 	Var DiscountDrink = 0
 	Var SelectSlot = "1"
 	Var SpiralCodeOk = 0
-
+	Var LastMakeDrinkResult = "-"
 	SAVELOG BoxID
 	Var SpiralKeepCredit = 0
 	Var QRCODE1 = "A000000677010112"
@@ -195,9 +195,13 @@
 			EndIf
 
 		EndIf
-
+		If Seeker.thankToppingFlag = 1 Then
-		Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+			Var QRCODE5 = "2"
-	
+    		Var QRCODE6 = "00-00-00-0000"
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+		Else
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+		EndIf
 	EndIf
 
 	TimerReset

spiral/xml/page_spiral_payment_cash.xml

@@ -976,7 +976,7 @@
 
 	Var CoinInFlag = 1
 
-	
+	DEBUGVAR ViewBill
 
 	If ViewBill > 0 Then
 
@@ -1792,8 +1792,14 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-
+		If SpiralKeepCredit = 1 Then	
-		Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" 
+			CoinVending BILLSTACKALL
+			Var CoffeeCreditKeep = RemainAmountKeep
+			
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit3.xml" 
+		Else
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" 
+		EndIf
 </EventClick>
 </Button>
 

spiral/xml/page_spiral_payment_cashOther.xml

@@ -53,8 +53,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
 		EndIf
@@ -116,14 +116,39 @@
 				;CoinVending OFF
 				VendingQR ON
 
-			
-				Var SessionID2 = "1:00000"
 
+
+			If Seeker.thankToppingFlag = 1 Then	
+				Var SelectSlot = "2"
+				Var SessionID2 = SelectSlot + ":00000"	
+				;Var SessionID2 = "1:00000"
+				Var SelectDrink = "00-00-00-0000"
+				Var DiscountDrink = 0
+
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				Var ECommerceQR = ""
+				Var ECommerceQR = ECommerceQR + PriceDrink
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + DiscountDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SessionID2 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SelectDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + "TWN:2/"
+
+			Else
+				Var SessionID2 = "1:00000"
 				Var CreditAmount1 = ""
 				Var ServiceAmountFlow = ""
 				Var TelephoneNumberQR = "0899999999"
 				Var ServiceType = "locker"
 				Var ECommerceQR = "locker5/"
+
 				Var ECommerceQR = ECommerceQR + PriceDrink
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + DiscountDrink 
@@ -132,7 +157,8 @@
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + ServiceCredit 
 				Var ECommerceQR =	ECommerceQR + "/"
-				Var ECommerceQR =	ECommerceQR + "TWN:2/"
+				Var ECommerceQR =	ECommerceQR + "TWN:2/"	
+			EndIf
 
 
 
@@ -170,7 +196,11 @@
 
 				Var ReqPayInfoFlag = 3
                 Var ReqPayInfoFromCashOther = 1
-				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"	
+				If Seeker.thankToppingFlag = 1 Then
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+				Else
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+				EndIf
 
 
 </EventClick>
@@ -196,14 +226,37 @@
 				;CoinVending OFF
 				VendingQR ON
 
-			
+			If Seeker.thankToppingFlag = 1 Then
-				Var SessionID2 = "1:00000"
+				Var SelectSlot = "2"
+				Var SessionID2 = SelectSlot + ":00000"	
+				;Var SessionID2 = "1:00000"
+				Var SelectDrink = "00-00-00-0000"
+				Var DiscountDrink = 0
 
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				Var ECommerceQR = ""
+				Var ECommerceQR = ECommerceQR + PriceDrink
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + DiscountDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SessionID2 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SelectDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + "AIR:2/"
+
+			Else
+				Var SessionID2 = "1:00000"
 				Var CreditAmount1 = ""
 				Var ServiceAmountFlow = ""
 				Var TelephoneNumberQR = "0899999999"
 				Var ServiceType = "locker"
 				Var ECommerceQR = "locker5/"
+
 				Var ECommerceQR = ECommerceQR + PriceDrink
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + DiscountDrink 
@@ -212,7 +265,9 @@
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + ServiceCredit 
 				Var ECommerceQR =	ECommerceQR + "/"
-				Var ECommerceQR =	ECommerceQR + "AIR:2/"
+				Var ECommerceQR =	ECommerceQR + "AIR:2/"	
+			EndIf
+
 
 
 
@@ -250,7 +305,11 @@
 
 				Var ReqPayInfoFlag = 2
                 Var ReqPayInfoFromCashOther = 1
-				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"	
+				If Seeker.thankToppingFlag = 1 Then
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+				Else
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+				EndIf
 
 					
 
@@ -277,14 +336,36 @@
 				;CoinVending OFF
 				VendingQR ON
 
-			
+			If Seeker.thankToppingFlag = 1 Then
-				Var SessionID2 = "1:00000"
+				Var SelectSlot = "2"
+				Var SessionID2 = SelectSlot + ":00000"	
+				;Var SessionID2 = "1:00000"
+				Var SelectDrink = "00-00-00-0000"
+				Var DiscountDrink = 0
 
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				Var ECommerceQR = ""
+				Var ECommerceQR = ECommerceQR + PriceDrink
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + DiscountDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SessionID2 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SelectDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + "DOL:2/"
+			Else
+				Var SessionID2 = "1:00000"
 				Var CreditAmount1 = ""
 				Var ServiceAmountFlow = ""
 				Var TelephoneNumberQR = "0899999999"
 				Var ServiceType = "locker"
 				Var ECommerceQR = "locker5/"
+
 				Var ECommerceQR = ECommerceQR + PriceDrink
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + DiscountDrink 
@@ -293,7 +374,9 @@
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + ServiceCredit 
 				Var ECommerceQR =	ECommerceQR + "/"
-				Var ECommerceQR =	ECommerceQR + "DOL:2/"
+				Var ECommerceQR =	ECommerceQR + "DOL:2/"	
+			EndIf
+
 
 
 
@@ -331,7 +414,11 @@
 
 				Var ReqPayInfoFlag = 4
                 Var ReqPayInfoFromCashOther = 1
-				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"	
+				If Seeker.thankToppingFlag = 1 Then
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+				Else
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+				EndIf
 
 </EventClick>
 </Button>
@@ -360,14 +447,37 @@
 					VendingQR ON
 					
 
-					
-				Var SessionID2 = "1:00000"
 
+			If Seeker.thankToppingFlag = 1 Then
+				Var SelectSlot = "2"
+				Var SessionID2 = SelectSlot + ":00000"	
+				Var SelectDrink = "00-00-00-0000"
+				Var DiscountDrink = 0
+
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				Var ECommerceQR = ""
+				Var ECommerceQR = ECommerceQR + PriceDrink
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + DiscountDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SessionID2 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + SelectDrink 
+				Var ECommerceQR =	ECommerceQR + "/"
+				Var ECommerceQR =	ECommerceQR + "LPY:2/"
+			Else
+
+				Var SessionID2 = "1:00000"
 				Var CreditAmount1 = ""
 				Var ServiceAmountFlow = ""
 				Var TelephoneNumberQR = "0899999999"
 				Var ServiceType = "locker"
 				Var ECommerceQR = "locker5/"
+
 				Var ECommerceQR = ECommerceQR + PriceDrink
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + DiscountDrink 
@@ -377,7 +487,7 @@
 				Var ECommerceQR =	ECommerceQR + ServiceCredit 
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + "LPY:2/"
-
+			EndIf
 
 				If  Seeker.IntVendingCampaign > 0 Then
 					Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
@@ -412,7 +522,11 @@
 
 				Var ReqPayInfoFlag = 5
                 Var ReqPayInfoFromCashOther = 1
-				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"	
+				If Seeker.thankToppingFlag = 1 Then
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+				Else
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+				EndIf
 
 </EventClick>
 </Button>
@@ -442,11 +556,15 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-					Var QR_POPUP = "/img_popup8.png"
+		Var QR_POPUP = "/img_popup8.png"
-					Var alphaState = "Enable"
+		Var alphaState = "Enable"
-					Coin CARD
+		Coin CARD
-                    Var ReqPayInfoFromCashOther = 2
+        Var ReqPayInfoFromCashOther = 2
-					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"	
+		If Seeker.thankToppingFlag = 1 Then
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
+		Else
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
+		EndIf
 
 </EventClick>
 </Button>
@@ -497,8 +615,8 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
-	If CART_COUNT >= 1 Then 
+	If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 	EndIf

spiral/xml/page_spiral_payment_code.xml

@@ -27,6 +27,12 @@
 	Var ShowErrorText = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
 	Var ErrorCause = ""
+	Var Seeker.ExtendData = ""
+
+	If Seeker.thankToppingFlag = 1 Then
+		Var Seeker.ExtendData = "10000"
+	EndIf
+
 
 	
     If show_eng = "true" Then 
@@ -53,6 +59,7 @@
 			Var RemainAmount = 0
 			;PrepareDrink SelectDrink SelectSugarID
 
+			
 			Var SessionID2 = SelectSlot + ":"
 			Var SessionID2 = SessionID2 + Seeker.ExtendData
 
@@ -80,6 +87,10 @@
 			Var GetScore = ""
 			Var OperatorName = ""
 			Var SessionID = ""
+			
+			DEBUGVAR SessionID2
+			DEBUGVAR Seeker.ExtendData
+			DEBUGVAR Seeker.thankToppingFlag
 
 
 			GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
@@ -99,6 +110,9 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	;Open "ROOT/xml/page_board.xml" 
+	DEBUGVAR SessionID2
+			DEBUGVAR Seeker.ExtendData
+			DEBUGVAR Seeker.thankToppingFlag
 
 	
 
@@ -111,8 +125,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 		EndIf
@@ -147,7 +161,10 @@
 
 
 <EventActionOk>
-	
+	DEBUGVAR SessionID2
+			DEBUGVAR Seeker.ExtendData
+			DEBUGVAR Seeker.thankToppingFlag
+
 
     If Seeker.CodeChannel = 1 Then
 
@@ -244,8 +261,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
@@ -317,8 +335,8 @@
 		Var Seeker.CodeChannel = 1
 		Var QRCODE99 = ""
 		Var QRCODETMP = ""
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
 	EndIf
@@ -672,8 +690,8 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
-	If CART_COUNT >= 1 Then 
+	If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
 	EndIf

spiral/xml/page_spiral_payment_codeAIS.xml

@@ -156,8 +156,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeDtac.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeGLX.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeLH.xml

@@ -156,8 +156,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeLotus.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeOther.xml

@@ -51,8 +51,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
 		EndIf
@@ -251,8 +251,8 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
-	If CART_COUNT >= 1 Then 
+	If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml"
 	EndIf

spiral/xml/page_spiral_payment_codeSCG.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeThe1.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_codeTrue.xml

@@ -159,8 +159,9 @@
 
 				Var Seeker.CodeChannel = 1
 		
-				If CART_COUNT >= 1 Then 
+				If Seeker.thankToppingFlag = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+					Var SpiralCodeOk = 1
+					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 				Else
 					Var SpiralCodeOk = 1
 					Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 

spiral/xml/page_spiral_payment_credit.xml

@@ -70,8 +70,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 		EndIf
@@ -612,8 +612,8 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
-	If CART_COUNT >= 1 Then 
+	If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 	EndIf

spiral/xml/page_spiral_payment_credit2.xml

@@ -103,8 +103,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 		EndIf

spiral/xml/page_spiral_payment_credit3.xml

@@ -106,8 +106,8 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
+		If Seeker.thankToppingFlag = 1 Then
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 		Else
 			Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 		EndIf
@@ -178,8 +178,9 @@
 
 			Var Seeker.StoreCreditFlag = 1
 
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Var SpiralKeepCredit = 1
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 			Else
 				Var SpiralKeepCredit = 1
 				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
@@ -252,8 +253,8 @@
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
 	SAVELOG "payment_credit3-p121."
-	If CART_COUNT >= 1 Then 
+	If Seeker.thankToppingFlag = 1 Then
-		Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 	Else
 		Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 	EndIf

spiral/xml/page_spiral_payment_storeCredit.xml

@@ -53,8 +53,8 @@
 			EndIf
 		Else
 			CoinVending BILLREJECT
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 			Else
 				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 			EndIf
@@ -64,8 +64,8 @@
 
 	If FlagWaitUpdateCoinAmount = 1 Then
 		If Timeout > 2 Then
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 			Else
 				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 			EndIf
@@ -107,7 +107,7 @@
 			If ViewBill < RemainAmount Then
 
 				CoinVending BILLSTACKALL
-				
+				Var SpiralKeepCredit = 1
 				Var FlagWaitUpdateCoinAmount = 1
 				Var Timeout = 0
 			Else
@@ -627,8 +627,8 @@
 			EndIf
 	Else
 			CoinVending BILLREJECT
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 			Else
 				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 			EndIf

spiral/xml/page_spiral_payment_storeCredit2-2.xml

@@ -56,8 +56,8 @@
 
 	If FlagWaitUpdateCoinAmount = 1 Then
 		If Timeout > 2 Then
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-			    Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+			    Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
             Else
                 Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
             EndIf

spiral/xml/page_spiral_payment_storeCredit2.xml

@@ -47,8 +47,8 @@
 
 	If FlagWaitUpdateCoinAmount = 1 Then
 		If Timeout > 2 Then
-			If CART_COUNT >= 1 Then 
+			If Seeker.thankToppingFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml"
 			Else
 				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" 
 			EndIf

spiral/xml/page_spiral_select.xml

@@ -5,16 +5,36 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	Var PayType = ""
+	Var PayReference = ""
+	Var ServiceAmountSum = 0
+
+	Var Seeker.thankToppingFlag = 0
 	Var y_topping_bg = 912
 
 	WEB "DISABLE"
 ;	Var DrinkDescriptionTH = $01-00-00-0001.description
 
+	Var PicSpiralOption = "Invisible"
+	Var StrawState = "Invisible"
+	Var LidDeactiveButton = "Invisible" 
+	Var SpiralIce_STAGE = $12-05-02-0017.Button
+	Var PriceDrinkTopping = 10
 
-
+	If SpiralOption = 1 Then
+		Var PicSpiralOption = "Enable"
+		Var StrawState = "Enable"
+		Var LidDeactiveButton = "Invisible"
+		If SpiralIce_STAGE = "Disable" Then
+			Var StrawState = "Disable"
+			Var LidDeactiveButton = "Enable" 
+		EndIf
+	EndIf
+	
+	
 
 	DEBUGVAR video_menu_0
-
+	
 	Var DisableUsingCode = "false"
 	Var ShowLidStraw = "Invisible" 
 	Var ShowLidOnly = "Invisible" 
@@ -58,6 +78,8 @@
 		Var SpiralSelectdetai2 = SpiralSelectdetail2E
 
 		Var DirImage = "ROOT/taobin_project/image/topping_en"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/en_"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 		Var showname = NameDrink
@@ -74,6 +96,8 @@
 		Var SpiralSelectdetai2 = SpiralSelectdetail2	
 	
 		Var DirImage = "ROOT/taobin_project/image/topping"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/"
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 		Var showname = NameDrinkTH
@@ -98,7 +122,9 @@
 	;- Begin
 	Var PriceDrinkNoTop = PriceDrink
 	Var PriceDrinkTmp = PriceDrink
+	Var PriceDrinkTmp2 = PriceDrink
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+	Var PriceDrinkTmpShow2 = charOfBaht + PriceDrinkTmp
 	Var Timeout = 0
 	
 	SAVELOG PriceDrinkTmp
@@ -252,7 +278,7 @@
 <Size> 80 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> ColorOrange </Color>
-<Value> PriceDrinkTmpShow </Value>
+<Value> PriceDrinkTmpShow2 </Value>
 </Text>
 
 
@@ -265,8 +291,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 	
-	
 </EventClick>
 </Button>
 
@@ -340,6 +365,71 @@
 ;</EventClick>
 ;</Button>
 
+
+; SpiralOption
+<Image>
+<X> 52 </X>
+<Y> 1610 </Y>
+<State> PicSpiralOption </State>
+<Filename> Var( DirImage3 + "spiral_option_ice.png" ) </Filename>
+</Image>
+
+
+; topping left
+<Button>
+<X> 90 </X>
+<Y> 1684 </Y>
+<State> StrawState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/spiral/image/page_spiral/bn_toppingice.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/spiral/image/page_spiral/bd_toppingice.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/spiral/image/page_spiral/bd_toppingice.png" </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click straw cb"
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
+		Var Seeker.thankToppingFlag = 0
+		Var PriceDrinkTmp = PriceDrink
+		Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+
+	Else
+		Var StrawState = "Press"
+		Var Seeker.thankToppingFlag = 1
+		Var PriceDrinkTmp = PriceDrinkTmp + PriceDrinkTopping
+		Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 950 </X>
+<Y> 1691 </Y>
+<State> StrawState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click straw cb"
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
+		Var Seeker.thankToppingFlag = 0
+		Var PriceDrinkTmp = PriceDrink
+		Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+
+	Else
+		Var StrawState = "Press"
+		Var Seeker.thankToppingFlag = 1
+		Var PriceDrinkTmp = PriceDrinkTmp + PriceDrinkTopping
+		Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
 ; next
 <Button>
 <X> 673 </X>
@@ -350,8 +440,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	If CART_COUNT  = 0 Then
 
+If Seeker.thankToppingFlag = 1 Then
+	Var UserSelectProductCode = "12-05-02-0017"
+	Var SelectDrink = UserSelectProductCode
+	Var PriceDrink = PriceDrink
+	DEBUGVAR PriceDrink
+	Open "ROOT/taobin_project/spiral/xml/page_spiral_select_topping.xml" 
+Else	
+	If CART_COUNT  = 0 Then
+		
 		Var PriceDrink = PriceDrinkTmp
 		SAVELOG "USER press next ( topping )"
 		DEBUGVAR topping1
@@ -449,6 +547,7 @@
 		Var CartUpdate = "true"
 		Var ButtonNext = "true"
 	EndIf
+EndIf
 </EventClick>
 </Button>
 
@@ -508,12 +607,56 @@
     Else
         Var show_eng = "true"
     EndIf
-	Open CurrentXMLFileName2	
+	
+	If show_eng = "true" Then 
+		
+		Var SpiralSelectdetail = SpiralSelectdetail1E
+		Var SpiralSelectheader = SpiralSelectheader2E
+		Var SpiralSelectdetail = SpiralSelectdetail2E
+
+		Var DirImage = "ROOT/taobin_project/image/topping_en"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/en_"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var showname = NameDrink
+		Var showdesc = DrinkDescription	
+		Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png"
+		Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png"
+
+		Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" 
+
+	Else
+
+		Var SpiralSelectdetail = SpiralSelectdetail1
+		Var SpiralSelectheader = SpiralSelectheader2
+		Var SpiralSelectdetail = SpiralSelectdetail2	
+	
+		Var DirImage = "ROOT/taobin_project/image/topping"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var showname = NameDrinkTH
+		Var showdesc = DrinkDescriptionTH
+		Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png"
+		Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png
+
+	EndIf
+
+
+	CRLFToSpace showname
+	RefreshAll	
+	
 </EventClick>
 </Button>
 
-
+<Image>
-
+<State> LidDeactiveButton </State>
+<X> 650 </X>
+<Y> 1677 </Y>
+<Filename>  Var( DirImage3 + "unavalible.png" ) </Filename>
+</Image>
 
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 

spiral/xml/page_spiral_select_topping.xml

@@ -0,0 +1,544 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	Var Timeout = 0
+	Var StrawState = "Enable"	
+	Var LidState = "Enable"
+	Topping "Load" "12-05-02-0017"
+
+	If show_eng = "true" Then 
+		
+		Var DirImage = "ROOT/taobin_project/image/topping2_en"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+		Var text_show_thai = "Invisible"
+		Var text_show_eng = "Enable"
+
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 510
+		Var text_show_normal_x = 408
+	Else
+	
+		Var DirImage = "ROOT/taobin_project/image/topping2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+		Var text_show_thai = "Enable"
+		Var text_show_eng = "Invisible"
+
+		Var topping_shot_price_x = 600
+		Var text_x_add_oreo_price = 490
+		Var text_show_normal_x = 386
+	
+	EndIf
+
+	Var bg_strawlid = DirImage + "/bg_strawlid.png"
+	Var bg_straw_only = DirImage + "/bg_straw_only.png"
+	Var bg_lid_only = DirImage + "/bg_lid_only.png"
+
+		If IgnoreLidStraw = "true" Then
+			Var IgnoreLidStraw = "false"
+			Var ShowLidStraw = "Invisible" 
+			Var ShowLidOnly = "Invisible" 
+			Var ShowStrawOnly = "Invisible"
+			
+
+		Else
+			Var ShowLidStraw = "Enable" 
+			
+
+			If StrawState = "Press" Then
+				Var Seeker.thankStrawFlag = 1
+			Else
+				Var Seeker.thankStrawFlag = 0
+			EndIf
+
+
+			If LidState = "Enable" Then
+				If MAT_ID_9601 = "Enable" Then
+					Var LidState = MAT_ID_9601
+				Else
+					Var LidState = MAT_ID_9601
+				EndIf
+			EndIf
+			
+		EndIf
+		
+		; Override all
+		If Service_LidStraw = "Disable" Then
+			Var ShowLidStraw = "Enable" 
+			;Var ShowLidOnly = "Invisible" 
+			;Var ShowStawOnly = "Invisible"
+
+			
+			Var StrawState = "Disable"
+			Var LidState = "Disable"
+
+		EndIf
+
+		If StrawState = "Enable" Then
+			Var StrawDeactiveButton = "Invisible" 
+		Else
+			If StrawState = "Press" Then
+				Var StrawDeactiveButton = "Invisible" 
+			Else
+				Var StrawDeactiveButton = "Enable" 
+			EndIf
+		EndIf
+		
+
+		If LidState = "Enable" Then
+			Var LidDeactiveButton = "Invisible" 
+		Else
+			If LidState = "Press" Then
+				Var LidDeactiveButton = "Invisible" 
+			Else
+				Var LidDeactiveButton = "Enable" 
+			EndIf
+		EndIf
+
+
+		DEBUGVAR StrawDeactiveButton
+		DEBUGVAR LidDeactiveButton
+		DEBUGVAR StrawState
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	Var Timeout = Timeout + 1
+
+	
+	If Timeout > 30 Then
+		Var Timeout = 0
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+	EndIf
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 864 </Height>
+<Color> 0xFFFFFF </Color>
+</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 555 </Y>
+<Width> 1080 </Width>
+<Height> 437 </Height>
+<Filename> SpiralProduct </Filename>
+</Image>
+
+<Image>
+<X> 143 </X>
+<Y> 360 </Y>
+<Filename> ShowHeadSpiralSelect </Filename>
+</Image>
+
+
+
+<Text>
+<X> 0 </X>
+<Y> 982 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 65 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> ColorBrown2 </Color>
+<Value> showname </Value>
+</Text>
+
+
+<Text>
+<X> 0 </X>
+<Y> 1058 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 40 </Size>
+<Font> KanitTTF </Font>
+<Color> ColorBrown </Color>
+<Value> showdesc </Value>
+</Text>
+
+
+
+<Image>
+<X> 85 </X>
+<Y> 1232 </Y>
+<Width> 956 </Width>
+<Height> 405 </Height>
+<Filename> Spiraldetail </Filename>
+</Image>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+;-BEGIN Lid straw
+<Image>
+<X> 47 </X>
+<Y> 1307 </Y>
+<Width> 986 </Width>
+<Height> 240 </Height>
+<MarginTop> 20 </MarginTop>
+<Filename> bg_strawlid </Filename>
+</Image>
+
+; straw left
+<Button>
+<X> 90 </X>
+<Y> 1380 </Y>
+<State> StrawState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click straw cb"
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
+
+		Var Seeker.thankStrawFlag = 0
+
+	Else
+		Var StrawState = "Press"
+
+		Var Seeker.thankStrawFlag = 1
+
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+; straw 
+<Button>
+<X> 943 </X>
+<Y> 1386 </Y>
+<State> StrawState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click straw cb"
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
+
+		Var Seeker.thankStrawFlag = 0
+
+	Else
+		Var StrawState = "Press"
+
+		Var Seeker.thankStrawFlag = 1
+
+	EndIf
+	DEBUGVAR StrawState
+	Refresh
+</EventClick>
+</Button>
+
+
+; LID left
+<Button>
+<X> 90 </X>
+<Y> 1455 </Y>
+<State> LidState </State>
+<Mode> "No" </Mode>
+<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click LID pic"
+	If LidState = "Press" Then
+		Var LidState = "Enable"	
+
+		Var Seeker.thankLidFlag = 0
+		
+	Else
+		Var LidState = "Press"
+
+		Var Seeker.thankLidFlag = 1
+		
+	EndIf
+	
+
+	DEBUGVAR SugarState1
+	Refresh
+
+</EventClick>
+</Button>
+
+; LID 
+<Button>
+<X> 943 </X>
+<Y> 1462 </Y>
+<State> LidState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<EventClick> 
+	SAVELOG "Click LID cb"
+	If LidState = "Press" Then
+		Var LidState = "Enable"	
+
+		Var Seeker.thankLidFlag = 0
+
+	Else
+		Var LidState = "Press"
+
+		Var Seeker.thankLidFlag = 1
+
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+
+<Image>
+<State> StrawDeactiveButton </State>
+<X> 643 </X>
+<Y> 1252 </Y>
+<Filename>  Var( DirImage + "/text20.png" ) </Filename>
+</Image>
+
+
+<Image>
+<State> LidDeactiveButton </State>
+<X> 643 </X>
+<Y> 1452 </Y>
+<Filename>  Var( DirImage + "/text21.png" ) </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 44 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_cancel.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	
+</EventClick>
+</Button>
+
+; next
+<Button>
+<X> 673 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_next.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	If CART_COUNT  = 0 Then
+
+		Var PriceDrink = PriceDrinkTmp
+		SAVELOG "USER press next ( topping )"
+		DEBUGVAR topping1
+		DEBUGVAR topping2
+		DEBUGVAR topping3
+
+		DEBUGVAR LidState
+		DEBUGVAR StarwState
+		DEBUGVAR HAVE_UV_DOOR_LID
+
+		If HAVE_UV_DOOR_LID = "true" Then
+
+			If StarwState = "Press" Then
+				Machine StrawOrder	
+			EndIf
+
+			If LidState = "Press" Then
+				Machine LidOrder	
+			EndIf
+
+			Var StarwState = "Enable"
+			Var LidState = "Enable"
+			
+		EndIf
+
+		; Set drink 
+		Topping "Select" SelectDrink
+
+		; Set option toppinng and pack 
+		Topping "Select1-ID" topping1
+		Topping "Select2-ID" topping2
+		Topping "Select3-ID" topping3
+
+		; Pack
+		Topping "Pack" ExtendData
+
+
+		Open "ROOT/taobin_project/spiral/xml/page_spiral_payment.xml" 
+
+	Else
+
+		Var PriceDrink = PriceDrinkTmp
+		SAVELOG "USER press next ( topping ) - new"
+		DEBUGVAR topping1
+		DEBUGVAR topping2
+		DEBUGVAR topping3
+
+		DEBUGVAR LidState
+		DEBUGVAR StarwState
+		DEBUGVAR UserSelectProductCode
+		DEBUGVAR HAVE_UV_DOOR_LID
+
+		If HAVE_UV_DOOR_LID = "true" Then
+
+			If StarwState = "Press" Then
+				Machine StrawOrder	
+				Var LedLidBlink = "true"
+			EndIf
+
+			If LidState = "Press" Then
+				Machine LidOrder	
+				Var LedLidBlink = "true"
+			EndIf
+
+			Var StarwState = "Enable"
+			Var LidState = "Enable"
+			; 
+			
+		EndIf
+
+		Var SelectDrink = UserSelectProductCode
+		; Set drink 
+		Topping "Select" UserSelectProductCode
+
+		; Set option toppinng and pack 
+		Topping "Select1-ID" topping1
+		Topping "Select2-ID" topping2
+		Topping "Select3-ID" topping3
+
+		; Pack
+		Topping "Pack" ExtendData
+
+		If CART1_STATUS = "EMPTY" Then
+			Cart "AddMenuID" 1
+		Else
+			If CART2_STATUS = "EMPTY" Then
+				Cart "AddMenuID" 2
+			Else
+				If CART3_STATUS = "EMPTY" Then
+					Cart "AddMenuID" 3
+				EndIf
+			EndIf
+		EndIf
+		
+		Var CartUpdate = "true"
+		Var ButtonNext = "true"
+	EndIf
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1127 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 80 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> ColorOrange </Color>
+<Value> PriceDrinkTmpShow2 </Value>
+</Text>
+
+<Text>
+<X> 924 </X>
+<Y> 1804 </Y>
+<Font> KanitTTF </Font>
+<Size> 36 </Size>
+<Width> 1080 </Width>
+<Color> 0xFFFFFF </Color>
+<Animation>
+<Style> "shake-text" </Style>
+<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+<Value> PriceDrinkTmpShow </Value>
+</Text>
+
+
+<Button>
+<X> 1000 </X>
+<Y> 415 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; eng
+    If show_eng = "true" Then 
+        Var show_eng = "false"
+    Else
+        Var show_eng = "true"
+    EndIf
+	
+	If show_eng = "true" Then 
+		
+		Var SpiralSelectdetail = SpiralSelectdetail1E
+		Var SpiralSelectheader = SpiralSelectheader2E
+		Var SpiralSelectdetail = SpiralSelectdetail2E
+
+
+		Var DirImage = "ROOT/taobin_project/image/topping2_en"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/en_"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var showname = NameDrink
+		Var showdesc = DrinkDescription	
+		Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png"
+		Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png"
+
+		Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" 
+
+	Else
+
+		Var SpiralSelectdetail = SpiralSelectdetail1
+		Var SpiralSelectheader = SpiralSelectheader2
+		Var SpiralSelectdetail = SpiralSelectdetail2	
+	
+		Var DirImage = "ROOT/taobin_project/image/topping2"
+		Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
+		Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var showname = NameDrinkTH
+		Var showdesc = DrinkDescriptionTH
+		Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png"
+		Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png
+
+	EndIf
+	Var bg_strawlid = DirImage + "/bg_strawlid.png"
+	Var bg_straw_only = DirImage + "/bg_straw_only.png"
+	Var bg_lid_only = DirImage + "/bg_lid_only.png"
+
+	CRLFToSpace showname
+	RefreshAll	
+	
+</EventClick>
+</Button>
+
+</Popup>

spiral/xml/page_spiral_thankyou.xml

@@ -6,13 +6,16 @@
 ;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-
+	Var Rraiwa = "Young"
-
+	Var SaveCoinAmount = 0
+	Var SaveCoinAmount = CoinAmount
+	Var MachineState_Result = 0
 	Var SwapVDO = 0
 	Var TimeSwapVDO = 0
 	Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" 
-
+	Var CheckCoin = 0
-
+	Var KeepServiceCredit = ""
+	Var KeepServiceCredit = ServiceCredit
 	Var PayFlagCoinQR = 0
 	Var SetFlagCoinQR = 0
 	Var SetFlagCoinQRTimer = 999999
@@ -20,6 +23,7 @@
 	Var Timeout = 0
 	Var ServiceType = "locker"
 	Var ServiceCharge = 0
+	Var PayReferenceTmp = ""
 	If TelephoneNumber = "" Then
 		Var TelephoneNumber = "0899999999"
 	EndIf
@@ -30,7 +34,22 @@
 	Var VendingCampaign = IntVendingCampaign
 	
 	Var PayType = ""
-	
+	If Seeker.thankToppingFlag = 1 Then
+		Var PayType = "multi"
+		;Var PayReference = "123456"
+
+		If Seeker.PayWithQR = 1 Then
+			DEBUGVAR PayReference
+		Else
+			Var PayReference = ""
+			GenHashWithTimeStamp PayReference
+		EndIf
+
+
+		Var PriceDrink = PriceDrinkTmp2
+		Var ServiceAmountSum = PriceDrinkTmp2  + PriceDrinkTopping	
+	EndIf
+
 	Var PayOk = 0
 	Var ChangeFlag = 0
 	
@@ -79,6 +98,16 @@
 	Var CreditReference = Seeker.CreditReferenceTmp
 	Var VendingDiscount = Seeker.VendingDiscount
 	Var VendingCampaign = Seeker.VendingCampaign
+	
+	If Seeker.thankToppingFlag = 1 Then
+		If SpiralCodeOk = 1 Then
+			If Seeker.VendingCampaign >= PayAmount Then
+				Var VendingCampaign = Seeker.VendingCampaign - PriceDrinkTopping
+			Else
+				Var VendingCampaign = 0
+			EndIf
+		EndIf
+	EndIf
 
 	;SendSpiralResult = spiral-success , spiral-failed , spiral-valid , spiral-invalid	
 	If SellLeaw = 1 Then
@@ -88,11 +117,46 @@
 		Var TestSellSpiral = 2
 		DEBUGVAR TestSellSpiral
 		Var SellLeaw = 1
+		If Seeker.thankToppingFlag = 1 Then
+			Topping "Select" SelectDrink
+			; Pack
+			Topping "Pack" ExtendDataCurr
+
+
+			If StrawState = "Press" Then
+				Machine StrawOrder	
+				Var LedLidBlink = "true"
+			EndIf
+
+			If LidState = "Press" Then
+				Machine LidOrder	
+				Var LedLidBlink = "true"
+			EndIf
+			Var SelectDrink = "12-05-02-0017"
+			Var SelectSugarID = 0
+			MakeDrinkV1  SelectDrink SelectSugarID
+		EndIf
 	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	DEBUGVAR LastMakeSpiralResult
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineState_Result
+	DEBUGVAR MachineStage
+
+	DEBUGVAR Seeker.thankToppingFlag
+	DEBUGVAR VendingCampaign	
+	DEBUGVAR Seeker.VendingCampaign
+	DEBUGVAR SpiralCodeOk
+	DEBUGVAR SetFlagCoinQR
+	DEBUGVAR Rraiwa
+	DEBUGVAR Seeker.StoreCreditFlag
+	DEBUGVAR SetFlagCoinQR
+	DEBUGVAR CheckCoin
+	DEBUGVAR KeepServiceCredit
+	DEBUGVAR ChangeOK
+
 	Var Timeout = Timeout + 1
 	Var ChangeTimeout = ChangeTimeout - 1
 	Var CheckAckCodeTimer = CheckAckCodeTimer - 1
@@ -179,13 +243,29 @@
 					;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate	
 				Else
 					If Seeker.StoreCreditFlag = 1 Then
-						Var VendingDiscount = 0
+					
-						Var VendingCampaign = 0
+						Var CheckCoin = CoinAmount
-						Var CreditReference = ""
+                    	If CheckCoin > 0 Then
-						Var ServiceType = "credit"
+							Var VendingDiscount = 0
-						Var SessionID2 = SelectDrink
+							Var VendingCampaign = 0
-						Var ServiceCredit = "locker"
+							Var CreditReference = ""
-						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+							Var ServiceType = "credit"
+							Var SessionID2 = SelectDrink
+							Var ServiceCredit = "locker"
+							Var Rraiwa = "PAY"
+							Var PayReferenceTmp = PayReference
+							Var PayReference = ""
+							Var PayType = ""
+
+							Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+							
+	
+							Var ServiceCredit = KeepServiceCredit
+							Var ServiceType = "locker"
+							Var PayReference = PayReferenceTmp
+							Var PayType = "multi"
+
+						EndIf
 					EndIf
 				EndIf
         EndIf
@@ -212,6 +292,7 @@
 	EndIf
 
 	If  SetFlagCoinQR = 2 Then
+
 		DEBUGVAR "tube2"
 		Var SetFlagCoinQR = 3
 		Var TelephoneNumber = "0899999999"
@@ -222,7 +303,19 @@
 		Var ServiceType = "credit"
 		Var SessionID2 = SelectDrink
 		Var ServiceCredit = "locker"
+		Var Rraiwa = "PAY2"
+
+		Var PayReferenceTmp = PayReference
+		Var PayReference = ""
+		Var PayType = ""
+
 		Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate	
+
+		Var PayReference = PayReferenceTmp
+		Var PayType = "multi"
+		Var ServiceCredit = KeepServiceCredit
+		Var ServiceType = "locker"
+
 	EndIf
 
 	If LastMakeSpiralResult = 1 Then
@@ -237,10 +330,14 @@
 				Var SessionID3 = SessionID3 + MachineSpiralSlotID
 
 				If SpiralCodeOk = 1 Then
-					Var SessionID3 = SessionID3 + "/"
+					If Seeker.thankToppingFlag = 1 Then
-					Var SessionID3 = SessionID3 + Seeker.VendingCode
+						Var VendingCampaign = 0
-					Var SessionID3 = SessionID3 + "/"
+					Else
-					Var SessionID3 = SessionID3 + Seeker.CodeNumber	
+						Var SessionID3 = SessionID3 + "/"
+						Var SessionID3 = SessionID3 + Seeker.VendingCode
+						Var SessionID3 = SessionID3 + "/"
+						Var SessionID3 = SessionID3 + Seeker.CodeNumber	
+					EndIf
 				EndIf
 
 				Var PayOk = 1
@@ -258,12 +355,22 @@
 						Else
 							Var ACC = Seeker.TNumberTaobinCredit
 						EndIf
-						PAYEXT SVT ACC VendingTSIDTmp DEE
+						
-						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+							If Seeker.thankToppingFlag = 1 Then
+								Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
+								Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" 
+							Else
+								PAYEXT SVT ACC VendingTSIDTmp DEE
+								Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+							EndIf
 					EndIf
 				Else
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
-					Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+					If Seeker.thankToppingFlag = 1 Then
+						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" 
+					Else
+						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+					EndIf
 				EndIf
 			EndIf
 		EndIf
@@ -301,12 +408,24 @@
 						Else
 							Var ACC = Seeker.TNumberTaobinCredit
 						EndIf
-						PAYEXT SVT ACC VendingTSIDTmp DEE
+						
-						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+						If Seeker.thankToppingFlag = 1 Then
+							;edit test
+							Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
+							Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" 
+						Else
+							;edit test
+							PAYEXT SVT ACC VendingTSIDTmp DEE
+							Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+						EndIf
 					EndIf
 				Else
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
-					Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+					If Seeker.thankToppingFlag = 1 Then
+						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" 
+					Else
+						Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml"  
+					EndIf  
 				EndIf
 
 			EndIf
@@ -361,7 +480,11 @@
 	EndIf
 
 	If LastMakeSpiralResult = 2 Then
-		Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" 
+		If Seeker.thankToppingFlag = 1 Then
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_failmuti.xml" 
+		Else
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" 
+		EndIf
 	EndIf
 
 	;If LastMakeSpiralResult = 2 Then
@@ -425,7 +548,12 @@
 	If Timeout > 180 Then
 		Var LastMakeSpiralResult = 2
 		SAVELOG "Spiral Timeout 180 sec"
-		Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml"  
+
+		If Seeker.thankToppingFlag = 1 Then
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_failmuti.xml" 
+		Else
+			Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" 
+		EndIf
 	EndIf
 
 
@@ -500,12 +628,9 @@
 <Refresh> "Reload" </Refresh>
 <Loop> "true" </Loop>
 <Filename> ShowSwapVDO </Filename>
-;Filename> "ROOT/taobin_project/spiral/video/sp01.mp4" </Filename>
+;<Filename> "ROOT/taobin_project/spiral/video/sp01.mp4" </Filename>
 </Video>
 
-
-
-
 <EventActionOk>
 
 	If SpiralCodeOk = 1 Then
@@ -555,14 +680,6 @@
 
 </EventActionOk>
 
-;<Image>
-;<X> 89 </X>
-;<Y> 700 </Y>
-;<Width> 902 </Width>
-;<Height> 902 </Height>
-;<Filename> "ROOT/taobin_project/spiral/image/page_spiral/thankyou.png" </Filename>
-;</Image>
-
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
@@ -593,244 +710,4 @@
 
 
 
-;	Var SwapVDO = 0
-;	Var TimeSwapVDO = 0
-;	Var ShowSwapVDO = "
-
-
-
-;<Text>
-;<X> 92 </X>
-;<Y> 650 </Y>
-;<Width>150</Width>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> SwapVDO </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 750 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> TimeSwapVDO </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 850 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> ShowSwapVDO </Value>
-;</Text>
-
-
-;<Text>
-;<X> 292 </X>
-;<Y> 1250 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "SetFlagCoinQRTimer"  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1250 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> SetFlagCoinQRTimer  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1350 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "PayOk"  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1350 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> PayOk  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1400 </Y>
-;<Size> 40 </Size
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "ChangeOK"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1400 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> ChangeOK  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1450 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "Seeker.StoreCreditFlag"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1450 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> Seeker.StoreCreditFlag  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1500 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "ChangeFlag2"  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1500 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> ChangeFlag2  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1550 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "Seeker.PayWithQR"  </Value>
-;</Text>
-;
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1550 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> Seeker.PayWithQR  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1600 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "Seeker.CodeChannel"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1600 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> Seeker.CodeChannel  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1650 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "ChangeFlag"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1650 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> ChangeFlag  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1700 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "Canout"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1700 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> Canout  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1750 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "SpiralCodeOk"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1750 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> SpiralCodeOk  </Value>
-;</Text>
-;
-;<Text>
-;<X> 292 </X>
-;<Y> 1800 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> "CheckAckCodeTimer"  </Value>
-;</Text>
-;
-;<Text>
-;<X> 92 </X>
-;<Y> 1800 </Y>
-;<Size> 40 </Size>
-;<Font> KanitTTF </Font>
-;<Color> 0xB78F24 </Color>
-;<Value> CheckAckCodeTimer  </Value>
-;</Text>
-
 </Popup>

spiral/xml/page_spiral_thankyou3.xml

@@ -0,0 +1,475 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	Var LastMakeDrinkResult = "-"
+	Var MachineState_Result = 2
+	Var SpiralPickDrink = "Invisible"
+	Var Timeout = 0
+	Var waitAckPay = 0
+	Var MultiGo = 0
+
+	If show_eng = "true" Then 	
+		Var DirImage = "ROOT/taobin_project/image/complete_en/text_bottom.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/complete/text_bottom.png"
+	EndIf
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+
+	DEBUGVAR LastMakeSpiralResult
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineState_Result
+	DEBUGVAR MachineStage	
+	DEBUGVAR waitAckPay
+	DEBUGVAR Timeout	
+	DEBUGVAR sendPayMultiFlag
+	DEBUGVAR SaveCoinAmount
+	DEBUGVAR MultiGo
+	DEBUGVAR PriceDrinkTopping
+	DEBUGVAR VendingCampaign	
+	DEBUGVAR Seeker.VendingCampaign
+	DEBUGVAR SessionID2
+
+	If MachineStage = "pickup-cup" Then
+		Var SpiralPickDrink = "Enable"
+	Else
+		Var SpiralPickDrink = "Invisible"	
+	EndIf
+
+If Seeker.thankToppingFlag = 1 Then
+	If MachineStage = "close-maintenance" Then
+		If MachineState_Result = 0 Then
+			SAVELOG "back_to_main from line  > 663."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+	
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			SAVELOG " drink-failed...."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
+	If MultiGo = 0 Then
+		If 	MachineState_Result = 2  Then 
+			If SaveCoinAmount > 0 Then
+				If LastMakeSpiralResult = 1 Then
+					Var MultiGo = 2
+				Else
+					Change PriceDrinkTopping
+					Var MultiGo = 1
+				EndIf
+			Else
+				Var MultiGo = 2
+			EndIf
+		EndIf
+	EndIf
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MultiGo = 2 Then
+		If  waitAckPay = 0 Then 
+			If MachineState_Result = 2 Then
+				Var  waitAckPay = 1 
+				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
+
+				If Seeker.thankToppingFlag = 1 Then
+					If SpiralCodeOk = 1 Then
+						If Seeker.VendingCampaign >= PayAmount Then
+							If MachineState_Result = 2 Then
+								Var VendingCampaign = 0
+							Else
+								Var VendingCampaign = 0
+								;Var VendingCampaign = Seeker.VendingCampaign - PriceDrinkTopping
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+
+
+				Var PayDetail="1/F:1221/0/"
+				Var ServiceType = "coffee"
+
+				Var SuggestID  = ""
+				Var SessionID2 = ""
+				Var ServiceCredit = SelectDrink
+
+				DEBUGVAR CART3_PRICE
+				DEBUGVAR ServiceAmountSum
+
+
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+
+				If Seeker.PayWithQR = 0 Then 
+					If Seeker.CodeChannel = 0 Then
+							If Seeker.StoreCreditFlag = 1 Then
+
+							Else	
+								Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
+								;Var MultiGo = 0		
+							EndIf
+					EndIf
+				EndIf
+			EndIf	
+		EndIf
+	EndIf
+
+
+	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+
+		If  waitAckPay = 0 Then 
+
+			Var waitAckPay = 1 
+			Var Timeout = 0
+
+			Var ProcessText = "" 
+
+			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
+
+
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+
+			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
+
+			If Seeker.thankToppingFlag = 1 Then
+				If SpiralCodeOk = 1 Then
+					If Seeker.VendingCampaign >= PayAmount Then
+						Var VendingCampaign = 0
+						;Var VendingCampaign = Seeker.VendingCampaign - PriceDrink
+					EndIf
+				EndIf
+			EndIf
+
+			If GetFreeFromError = 1 Then
+				Var Seeker.CodeChannel = 1 
+				Var Seeker.VendingCode = "FAU"
+				Var Seeker.CodeNumber = "0000000000"
+				Var VendingCampaign = ServiceAmount2
+			EndIf
+
+			If Seeker.PayWithQR = 0 Then
+				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 + "/"
+
+					If Seeker.CreditCard = 1 Then
+					
+							CashlessReq SUCCESS
+							;CashlessReq FAIL
+
+					EndIf
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+				Else
+					
+						If Seeker.CreditCard = 1 Then
+					
+							CashlessReq SUCCESS
+							;CashlessReq FAIL
+
+						EndIf
+						
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate
+						
+
+				EndIf
+
+			
+			Else
+
+				;no wait ack pay
+				Var waitAckPay = 1
+
+				Var SVT = "coffee"
+				Var ACC = "0899999999"
+				Var DEE = PayDetail
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var ACC = Seeker.TNumberTaobinMember
+				EndIf
+
+				;PAYEXT SVT ACC VendingTSIDTmp DEE
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate
+
+			EndIf
+			
+		EndIf
+
+		__CMD "clear-stock-data" 0 "-" "-"
+
+
+		Var ServiceSuccess = "yes"
+		If  waitAckPay = 1 Then
+			SAVELOG "waitAckPay=0"
+		;	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+
+	EndIf
+
+
+
+	If sendPayMultiFlag = 0 Then
+		If waitAckPay = 1 Then
+			If Seeker.PayWithQR = 0 Then
+				Var ServiceType = "coffee-multi"
+			Else
+				Var ServiceType = "coffee-multiQR"
+			EndIf
+
+			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
+				;Var ServiceType = "coffee-multi"
+
+				Var ServiceCredit = "00-00-00-0000"
+				Var SuggestID  = ""
+
+				If LastMakeSpiralResult = 1 Then
+					Var PayDetail="1/S:0/0/"
+				Else
+					Var PayDetail="1/F:0/0/"
+				EndIf
+
+
+
+				Var CART_COUNT = "2"
+				Var SessionID3 = "" + CART_COUNT
+				Var SessionID3 = SessionID3 + ":00000"
+				If SpiralCodeOk = 1 Then
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + Seeker.CodeNumber
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + Seeker.VendingCode
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + ServiceCredit
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + BoxID
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + "S"
+					Var SessionID3 = SessionID3 + "/"
+					Var SessionID3 = SessionID3 + Seeker.CodeNumber
+					Var SessionID3 = SessionID3 + "/"
+				EndIf
+
+				
+
+
+				SAVELOG PayO2
+
+				Var VendingCampaign = IntVendingCampaign
+				Var CreditReference = Seeker.CreditReferenceTmp
+
+				If LastMakeSpiralResult = 2 Then
+					Var ServiceAmountSum = ServiceAmountSum - PriceDrink
+					If Seeker.thankToppingFlag = 1 Then
+						If SpiralCodeOk = 1 Then
+							If Seeker.VendingCampaign >= PayAmount Then
+								Var VendingCampaign = Seeker.VendingCampaign - PriceDrink
+							EndIf
+						EndIf
+					EndIf	
+				Else
+					Var VendingCampaign = Seeker.VendingCampaign
+				EndIf
+				If MachineState_Result = 2 Then
+					Var ServiceAmountSum = ServiceAmountSum
+				;	Var ServiceAmountSum = ServiceAmountSum - PriceDrinkTopping
+					If Seeker.thankToppingFlag = 1 Then
+						If SpiralCodeOk = 1 Then
+							If Seeker.VendingCampaign >= PayAmount Then
+								Var VendingCampaign = VendingCampaign - PriceDrinkTopping
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+
+
+				Var PayType = ""
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
+
+				If Seeker.PayWithQR = 1 Then
+					Var SVT = "coffee-multi"
+					
+					If Seeker.TNumberTaobinCredit = "" Then
+						Var TelephoneNumber = "0899999999"
+						If Seeker.TNumberTaobinMember = "" Then
+						Else
+							Var TelephoneNumber = Seeker.TNumberTaobinMember
+						EndIf
+					Else
+						Var TelephoneNumber = Seeker.TNumberTaobinCredit
+					EndIf
+
+
+					Var DEE = PayDetail
+
+					PAYEXT SVT TelephoneNumber Seeker.VendingTSID DEE
+				EndIf
+
+				Var sendPayMultiFlag = 1
+		EndIf
+	EndIf
+EndIf
+		DEBUGVAR ServiceType
+		DEBUGVAR SessionID3
+		DEBUGVAR sendPayMultiFlag
+
+	Var Timeout = Timeout + 1
+
+	If Timeout > 180 Then
+		SAVELOG " Timeout > 180"
+		Var MachineState_Result = 2
+		Var MultiGo = 2
+	EndIf
+	
+
+
+	If Timeout >= 200 Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+	If  sendPayMultiFlag = 1 Then
+		If MachineState_Result = 1 Then
+			If Timeout >= 5 Then
+				If MachineStage = "remove-cup" Then
+					Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+				EndIf
+				If MachineStage = "close-maintenance" Then
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+				EndIf
+				If MachineStage = "show-menu" Then
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+	If  sendPayMultiFlag = 1 Then
+		If MachineState_Result = 2 Then
+			If Timeout >= 5 Then
+				If MachineStage = "remove-cup" Then
+					Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+				EndIf
+				If MachineStage = "close-maintenance" Then
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+				EndIf
+				If MachineStage = "show-menu" Then
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+	Refresh
+	TimerReset
+
+</EventTimeout>
+
+<EventChangeStatus>
+	If MultiGo = 1 Then
+		If ChangeStatus = "payout-end" Then 
+			Var MultiGo = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+<Video>
+<X> 0 </X>
+<Y> 600 </Y>
+<Width> 1080</Width>
+<Height> 840 </Height>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/spiral/video/sp02.mp4" </Filename>
+</Video>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+<Image>
+<X> 0 </X>
+<Y> 1518 </Y>
+<State> SpiralPickDrink </State>
+<Filename> DirImage </Filename>
+</Image>
+
+
+</Popup>