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

xml/event/tricker.ev

@@ -123,6 +123,7 @@ Var NewCollectPoint = 1
 Var ShouldCollectPromotionPoint = 0
 
 Var NewFlowPaymentCode = 0
+Var New_Payment = 0
 
 Var XMLLiveInfoEnable = 0
 
@@ -234,8 +235,8 @@ EndIf
 
 
 If BoxID = 173149 Then
-	Var ProBadValentineEnable = 0
 	Var NewFlowPaymentCode = 1
+	Var New_Payment = 1
 	Var NamHomCoconutPro = 0
  	Var Cocoa77Pro = 0
 	Var 7UpLuckyDrawX2Pro = 1
@@ -250,6 +251,7 @@ EndIf
 
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
+	Var New_Payment = 1
 	Var NamHomCoconutPro = 0
  	Var Cocoa77Pro = 0
 	Var 7UpLuckyDrawX2Pro = 0

xml/page_NewBrewing3Conti.xml

@@ -0,0 +1,993 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	Var ActionOKCase = 0
+	Var Seeker = "curr"
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	Var next_pic_bn = DirImage + "/bn_add_order.png"
+	Var next_pic_bp = DirImage + "/bp_add_order.png"
+	Var text_next_order = DirImage + "/text_next_order.png"
+
+	Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
+	Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
+
+	Var EnableTopupCreditBetweenBrew = "Enable"
+
+	If NextOrder = "true" Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	Else
+		Var EnableSelectMenuBetweenBrew = "Enable"
+	EndIf
+
+	If GetFreeFromError = 1 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		Var EnableSelectMenuBetweenBrewBlink = "Enable"
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+	
+
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+	EndIf
+
+	Var TimeoutWaitPay = 10 
+	
+    Var PayReference = ""
+	Var PayType = "newpay"
+	Var MachineState_Result = 0
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+
+	Var ExtendData = Seeker.ExtendData
+	Var SelectDrink = Seeker.selected_a_drink
+	Var ServiceAmount2 = Seeker.ServiceAmount2
+	Var PriceDrink = Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.selected_a_drink
+	DEBUGVAR Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker.CodeNumber
+    
+	Var SessionID2 = SelectSlot + ":"
+	Var SessionID2 = SessionID2 + ExtendData
+	
+	
+	; On open move from page_brewing3.xml
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+	DEBUGVAR Seeker.TNumberTaobinMember 
+	DEBUGVAR Seeker.PointTaobinStr
+
+	If LedLidBlink = "true" Then
+		Var LedLidBlink = "no"
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
+
+	Var CreditReference = Seeker.CreditReferenceTmp
+	Var VendingDiscount = Seeker.VendingDiscount
+	Var VendingCampaign = Seeker.VendingCampaign
+	Var TxReference = Seeker.TxRef1
+	DEBUGVAR TxReference
+
+
+	Var DirImage = "ROOT/taobin_project/image/complete/"
+	Var next_pic_bg = DirImage + "/Preparing.png"
+
+	Var bg_strawlid_ST = "Invisible"
+	Var bg_strawProblem_ST = "Invisible"
+	Var StrawStateX = "Invisible"
+	Var LidStateX = "Invisible"
+
+	If Seeker.CreditCard = 1 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"  
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If MachineState_Result > 0 Then 
+		Var EnableTopupCreditBetweenBrew = "Invisible"  
+	EndIf
+
+	Var CreditCardVoid = 0
+
+	DEBUGVAR ButtonGameCountDownState
+
+</EventOpen>
+
+
+<EventActionOk>
+
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+	
+	If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			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 Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 142."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			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 Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 204."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+
+	If MOVE_CUP_TO_DOOR = "true" Then
+		Var MOVE_CUP_TO_DOOR = "false"
+	EndIf
+
+	If BREW_COUNT_DOWN_FROM_APP = "on" Then
+		Var CountDownBrewing = BREW_CNT
+	Else
+
+		If CountDownBrewing > 0 Then
+			Var CountDownBrewing = CountDownBrewing - 1
+		EndIf
+	Endif
+
+	If Simulation = "true" Then
+		If CountDownBrewing = 0 Then
+			;Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+	EndIf
+
+	If Timeout = 4 Then
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+	EndIf
+	
+	; run test;
+	;If CountDownBrewing = 40 Then 
+	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
+	;EndIf
+	If CountDownBrewing = 0 Then
+		;Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	EndIf
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	If Timeout > 540 Then
+		SAVELOG "back_to_main from line  > 217."
+		Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+	EndIf
+	
+
+	If Timeout > 480 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+	
+	If  waitAckPay = 2 Then  
+		If Timeout > TimeoutWaitPay Then
+
+			If Seeker.CodeChannel = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+
+				DEBUGVAR SessionID2
+				
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "coffee"
+				Var ECommerce = ""
+				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 Timeout = 0
+			EndIf
+				
+			SAVELOG "back_to_main from line  > 309."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+			
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		If ActionOKCase = 0 Then
+		
+			Var ActionOKCase = 1
+			If Seeker.CodeChannel = 0 Then 
+				SAVELOG "back_to_main from line  > 391."
+				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			EndIf
+
+			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
+			Var Timeout = 5
+
+		EndIf
+	EndIf
+
+	If MachineState_Result = 1 Then
+
+		;Var MachineState_Result = 2
+
+	EndIf
+
+	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+	
+		If  waitAckPay = 0 Then 
+
+			Var waitAckPay = 0 
+			Var Timeout = 0
+
+			If Seeker.PayWithQR = 0 Then
+
+				If Seeker.CreditCard = 1 Then
+					CashlessReq SUCCESS
+				EndIf
+
+			Else
+
+			EndIf
+			
+		EndIf
+
+		__CMD "clear-stock-data" 0 "-" "-"
+
+		Var ServiceSuccess = "yes"
+		If  waitAckPay = 0 Then
+			SAVELOG "waitAckPay = 0 Timeout"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		EndIf
+
+	EndIf
+
+	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+
+			If Seeker.PayWithQR = 0 Then 
+
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
+				Else
+				
+
+					If Seeker.CodeChannel = 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
+							EndIf
+								
+						EndIf
+
+					Else
+
+						
+						
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount3
+							EndIf
+								
+						EndIf
+					
+
+
+					EndIf
+				EndIf
+
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+			
+		EndIf
+	EndIf
+
+
+
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineStage
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	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
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		If EnableSelectMenuBetweenBrewBlink = "Enable" Then 
+			Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+		Else
+			Var EnableSelectMenuBetweenBrewBlink = "Enable"
+		EndIf
+		
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
+	DEBUGVAR CountUpBrewing
+	; animation video loop
+	If AnimationOn = "true" Then
+		Var CountUpBrewing = CountUpBrewing + 1
+
+		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+		
+		If PreviseStepVideo = SlotVideo Then
+			;SAVELOG SlotVideo
+		Else
+			Var PreviseStepVideo = SlotVideo
+			;SAVELOG PreviseStepVideo
+			;SAVELOG SlotVideo
+			;SAVELOG CountUpBrewing
+
+			;Var CountDownVideoTime = CountDownVideoTimeReload
+			
+			Var StepVideo = SlotVideo + 2
+			
+			;SAVELOG StepVideo
+
+			If StepVideo = 1 Then
+				Var videoID = VideoID1
+			EndIf
+			If StepVideo = 2 Then
+				Var videoID = VideoID2
+			EndIf
+			If StepVideo = 3 Then
+				Var videoID = VideoID3
+			EndIf
+			If StepVideo = 4 Then
+				Var videoID = VideoID4
+			EndIf
+			If StepVideo = 5 Then
+				Var videoID = VideoID5
+			EndIf
+			If StepVideo = 6 Then
+				Var videoID = VideoID6
+			EndIf
+			If StepVideo = 7 Then
+				Var videoID = VideoID7
+			EndIf
+			If StepVideo = 8 Then
+				Var videoID = VideoID8
+			EndIf
+			If StepVideo = 9 Then
+				Var videoID = VideoID9
+			EndIf
+
+			;SAVELOG videoID
+
+			If videoID = 0 Then
+
+			Else
+				If videoID = "---" Then
+
+				Else
+
+					Var VideoPlayFile = VideoPath
+					Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+					Var VideoPlayFile = VideoPlayFile + videoID
+					Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+					Var PictureFile = PicturePath
+					Var PictureFile = PictureFile + PictureBegin
+					Var PictureFile = PictureFile + videoID
+					Var PictureFile = PictureFile + PictureEnd
+					
+					DEBUGVAR VideoPlayFile
+					DEBUGVAR PictureFile
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
+	If IgnoreNetCore = "true" Then 
+		If CountDownBrewing = 0 Then
+			SAVELOG "CountDownBrewing = 0"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+	EndIf
+
+
+	If ButtonGameCountDown > 0 Then
+		If ButtonGameCountDown = 1 Then
+			Var ButtonGameCountDownState = "Invisible"
+			Var ButtonGamePressToPlayState = "Enable"
+		EndIf
+		Var ButtonGameCountDown = ButtonGameCountDown - 1
+		DEBUGVAR ButtonGameCountDown
+	EndIf
+
+
+	DEBUGVAR BREW_CNT
+	DEBUGVAR ButtonGamePressToPlayState
+	If BREW_CNT > 60 Then
+
+	Else
+		Var ButtonGamePressToPlayState = "Invisible"
+		Var Game01Enable = 0
+	EndIf
+	
+
+
+	
+
+	Refresh
+	TimerReset
+
+</EventTimeout> 
+
+<EventMachine>
+	
+</EventMachine>
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080</Width>
+<Height> 840 </Height>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> VideoPlayFile </Filename>
+</Video>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+
+
+
+
+<Image>
+<X> 60 </X>
+<Y> 1290 </Y>
+<Filename> PictureFile</Filename>
+</Image>
+
+;<Image>
+;<X> 60 </X>
+;<Y> 1649 </Y>
+;<Filename> BottomText </Filename>
+;</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 1655 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
+<Filename> text_next_order </Filename>
+<Image>
+
+<Image>
+<X> 835 </X>
+<Y> 1735 </Y>
+<State>EnableSelectMenuBetweenBrewBlink</State>
+<Filename> "ROOT/taobin_project/image/page_payment/arrow_1.png" </Filename>
+<Image>
+
+
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+<Button>
+<X> 792 </X>
+<Y> 1787 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
+<Filename> next_pic_bn </Filename>
+<FilenamePress> next_pic_bp </FilenamePress>
+<EventClick> 
+	If MachineState_Result = 0 Then
+	
+		SAVELOG "User click next button"
+
+		Var Seeker = "next"
+		Var MultiPayEnable = "false"
+		;CoinPause
+		Var PayCredit = 0
+
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+</EventClick> 
+</Button>
+
+<Button>
+<X> 262 </X>
+<Y> 1787 </Y>
+<State>EnableTopupCreditBetweenBrew</State>
+<Filename> topup_credit_bn </Filename>
+<FilenamePress> topup_credit_bp </FilenamePress>
+<EventClick> 
+	If MachineState_Result = 0 Then
+
+		If NextOrder = "true" Then
+			Var topupCreditWithCash = "Disable"
+
+			Var SeekerTmp = "next"
+			Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
+		Else
+			Var topupCreditWithCash = "Enable"
+
+			Var SeekerTmp = "curr"
+			Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
+
+			;CoinPause
+		EndIf
+	
+		SAVELOG "User click topup-credit button"
+		Var Seeker = "topupCredit"
+		
+		Var PayCredit = 0
+
+		If TelephoneNumber = "" Then 
+			Open "ROOT/taobin_project/xml/page_topup_credit.xml" 
+		Else 
+			Open "ROOT/taobin_project/xml/page_topup_credit-ChooseNumber.xml"
+		EndIf
+
+	EndIf
+</EventClick> 
+</Button>
+
+
+
+<GIF>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>
+<State> ButtonGamePressToPlayState </State>
+<Filename> "ROOT/taobin_project/app/game/TAMATIAN-01.gif" </Filename>
+</GIF>
+
+<Image>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>	
+<State> ButtonGamePressToPlayState </State>
+<EventClick>
+	DEBUGVAR Game01Enable
+	SAVELOG "Press play game conti"
+	Var Game01Enable = 0
+	Var ButtonGamePressToPlayState = "Invisible"
+	RunApp "com.NDF.taobin"
+</EventClick>
+</Image>
+
+
+
+<Button>
+<X> 10 </X>
+<Y> 500 </Y>
+<State>bg_strawlid_ST</State>
+<Filename> bg_strawlid </Filename>
+<EventClick> 
+
+</EventClick> 
+</Button>
+
+; straw left
+<Button>
+<X> 50 </X>
+<Y> 572 </Y>
+<State> StrawStateX </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 StrawStateX = "Press" Then
+		;Var StrawStateX = "Enable"	
+	Else
+		Var StrawStateX = "Press"
+		Var Seeker.strawAction = 1
+		
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 579 </Y>
+<State> StrawStateX </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 StrawStateX = "Press" Then
+		;Var StrawStateX = "Enable"	
+	Else
+		Var StrawStateX = "Press"
+		Var Seeker.strawAction = 1
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+
+; LID left
+<Button>
+<X> 50 </X>
+<Y> 648 </Y>
+<State> LidStateX </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> 
+
+	If Seeker.thankLidFlag = 0 Then
+		
+		SAVELOG "Click LID pic"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		
+
+		DEBUGVAR SugarState1
+		Refresh
+
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 655 </Y>
+<State> LidStateX </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> 
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		Refresh
+	
+	EndIf
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 526 </X>
+<Y> 1787 </Y>
+<State> ButtonGameCountDownState </State>
+<Filename>  "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </FilenamePress>
+<EventClick> 
+
+</EventClick>
+<Text>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Size> 64 </Size>
+	<Align> Center </Align>
+	<Width> 240 </Width>
+	<Font> KanitBoldTTF </Font>
+	<Color> 0xFFFFFF </Color>
+	<State> ButtonGameCountDownState </State>
+	<Value> ButtonGameCountDown </Value>
+</Text>
+</Button>
+
+</Popup>

xml/page_NewCannotConti.xml

@@ -0,0 +1,557 @@
+<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>
+	; On open
+	Var CountDownThankyou = 4
+	Var CountDownBrewing = BrewTime
+	Var CountUpBrewing = 0
+	SAVELOG BrewTime
+	Var ShowCountDownBrewing = CountDownBrewing
+	Var Timeout = 0
+	Var ChangeFlag = 0
+	Var ErrTimeout = 0
+	Var ActionOKCase = 0
+	Var ChangeTimeout = 0
+	Var ChangeOK = 0
+	
+	Var MachineState_Result = 0
+
+	Var FailedCount = 0
+	Var ChangeAmountSum = 0
+	
+	Var Tel_Confirm_Flag = 0
+	Var LastMakeDrinkResult = "-"
+	
+	DEBUGVAR MachineStage
+	DEBUGVAR NextOrderStatus
+
+	If show_eng = "true" Then 
+		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+        Var TextErrorShow = "Sorry, unable to produce the next order"
+	Else
+		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" 
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var BottomText = PicturePath + "text_bottom_thai2.png"
+
+        Var TextErrorShow = "เต่าบินขัดข้องไม่สามารถทำเครื่องดื่มได้"
+	EndIf
+
+	DEBUGVAR StarwState
+	DEBUGVAR LidState
+	DEBUGVAR BottomText
+
+	DEBUGVAR Seeker.TNumberTaobinCredit
+	DEBUGVAR TelephoneNumber
+	DEBUGVAR Seeker.StoreCreditFlag
+
+
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.selected_a_drink
+	DEBUGVAR Seeker.ServiceAmount2
+
+
+    If Seeker = "curr" Then
+    	SAVELOG " cannot on curr"
+    	
+		Var ExtendData = Seeker.ExtendData
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + Seeker.ExtendData
+		
+		DEBUGVAR SessionID2
+
+		Topping "ClearNextOrder" "-"
+	EndIf
+
+    Var LastMakeDrinkResult = "fail"
+    Var NextOrderStatus = "Disable"
+
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineStage
+	DEBUGVAR NextOrderStatus
+
+	DEBUGVAR error_code_stop_now
+
+    ; page_brewing3.xml
+    DEBUGVAR MachineStage
+
+    Var PayReference = ""
+	Var PayType = ""
+    
+
+	Var SelectDrink = Seeker.selected_a_drink
+	Var ServiceAmount2 = Seeker.ServiceAmount2
+	Var PriceDrink = Seeker.ServiceAmount2
+
+
+	; On open move from page_brewing3.xml
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+	Var waitAckPay = 0
+	Var VendingTSIDTmp = ""
+	Var VendingTSIDProblem = ""
+	Var CreditReference = ""
+	Var PayCredit = 0
+
+	If Seeker.TNumberTaobinCredit = "" Then
+
+		If Seeker.TNumberTaobinMember = "" Then
+			Var TelephoneNumberProblem = ""
+		Else
+			Var TelephoneNumberProblem = Seeker.TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
+	EndIf
+
+	If TelephoneNumberProblem = "" Then
+		;Var TelephoneNumberProblem = ""
+    	Var ShowTextNumber = "Enable"
+    	Var Tel_Confirm_State = "Disable"
+	Else
+		Var ShowTextNumber = "Invisible"
+    	Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
+
+	DEBUGVAR show_eng 
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+
+	DEBUGVAR VendingCampaign
+
+	Var CreditCardVoid = 0
+
+
+</EventOpen>
+
+<EventActionOk>
+
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+
+	
+	If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + Seeker.ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			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 Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 142."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+
+	
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + Seeker.ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			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 Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 204."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	
+	Var Timeout = Timeout + 1
+
+	If Timeout > 540 Then
+		SAVELOG "back_to_main from line  > 217."
+		Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+	EndIf
+	
+
+	If Timeout > 480 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+
+
+	If  waitAckPay = 2 Then  
+		If Timeout > 10 Then
+
+			If Seeker.CodeChannel = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + Seeker.ExtendData
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "coffee"
+				Var ECommerce = ""
+				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 Timeout = 0
+			EndIf
+				
+			SAVELOG "back_to_main from line  > 309."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+			
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		If ActionOKCase = 0 Then
+
+			Var ActionOKCase = 1
+			If Seeker.CodeChannel = 0 Then 
+				SAVELOG "back_to_main from line  > 391."
+				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+
+		EndIf
+	EndIf
+
+
+	
+
+	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			If Seeker.PayWithQR = 0 Then 
+
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
+				Else
+				
+
+					If Seeker.CodeChannel = 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
+							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 = 2
+								Else
+									Change ServiceAmount3
+								EndIf
+								
+							EndIf
+						Else
+							Var ChangeOK = 2
+						EndIf
+
+
+					EndIf
+				EndIf
+
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+			
+			
+		EndIf
+	EndIf
+
+	
+
+	
+	Refresh
+	TimerReset
+
+</EventTimeout> 
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+<Text>
+<X> 0 </X>
+<Y> 427 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 46 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Refresh> "Enable" </Refresh>
+<Value> TextErrorShow </Value>
+</Text>
+
+
+<Image>
+<X> 375 </X>
+<Y> 623 </Y>
+<Width> 331 </Width>
+<Height> 435 </Height>
+<Filename> Seeker.PictureDrink </Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 938 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> Seeker.showname </Value>
+</Text>
+
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+
+</Popup>

xml/page_brewing3.xml

@@ -5,6 +5,12 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+
+	If New_Payment = 1 Then 
+		Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+	EndIf
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 2

xml/page_brewing3Conti.xml

@@ -6,6 +6,13 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
+
+	
+	If New_Payment = 1 Then
+		Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"  
+	EndIf
+
+
 	If InternationalEnable = 1 Then
 		Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"  
 		DEBUGVAR Brewing3ContiXMLFile
@@ -14,6 +21,7 @@
 	EndIf
 
 
+
 	Var ActionOKCase = 0
 	Var Seeker = "curr"
 

xml/page_cannotConti.xml

@@ -6,6 +6,11 @@
 <Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+	If New_Payment = 1 Then 
+		Open "ROOT/taobin_project/xml/page_NewCannotConti.xml"  
+	EndIf
+
 	; On open
 	Var CountDownThankyou = 4
 	Var CountDownBrewing = BrewTime

xml/page_get_yourchange.xml

@@ -83,6 +83,9 @@
 				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
 			EndIf
 
+			If New_Payment = 1 Then
+				TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+			EndIf
 
             If Seeker = "next" Then
                 ;CoinBack

xml/page_lid_straw.xml

@@ -129,6 +129,11 @@
 
 				Open brewing3ContiInter
 			Else
+
+				If New_Payment = 1 Then
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+				EndIf
+				
 				Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
 			EndIf
 
@@ -155,6 +160,11 @@
 				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
                 Open Brew3Inter
 			Else
+
+				If New_Payment = 1 Then
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+				EndIf
+
 				Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 			EndIf	
 		Else

xml/page_payment.xml

@@ -484,6 +484,12 @@
 
 	__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
 
+	;new payment coffee-payment
+	If New_Payment = 1 Then 
+		Var Seeker.ORDER_ID = ""
+		GenHashWithTimeStamp Seeker.ORDER_ID
+	EndIf
+	
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 

xml/page_payment_cash.xml

@@ -368,6 +368,7 @@
 		CoinVending OFF	
 		If Seeker = "curr" Then	
 		
+			__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 			MakeDrinkV1  SelectDrink SelectSugarID
 			Var TxRef1 = ""
 			CreateTxRef1 TxRef1
@@ -390,6 +391,7 @@
 		CoinVending OFF	
 		If Seeker = "curr" Then	
 		
+			__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 			MakeDrinkV1  SelectDrink SelectSugarID
 			Var TxRef1 = ""
 			CreateTxRef1 TxRef1
@@ -1128,13 +1130,16 @@
 
 
 			
+			
+			Var Seeker.PayWithQR = 1
+			Var Seeker.VendingTSID = VendingTSID
+
 			If Seeker = "curr" Then
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				MakeDrinkV1  SelectDrink SelectSugarID
 				;Var TxRef1 = ""
 				;CreateTxRef1 TxRef1
 			EndIf
-			Var Seeker.PayWithQR = 1
-			Var Seeker.VendingTSID = VendingTSID
 			
 
 			Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
@@ -1627,6 +1632,7 @@
 		Refresh
 
 		If Seeker = "curr" Then
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				MakeDrinkV1  SelectDrink SelectSugarID
 		EndIf
 		Var Seeker.CreditCard = 1
@@ -1849,7 +1855,8 @@
 		If PayOK = 1 Then
 			
 			If Seeker = "curr" Then
-			
+
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				MakeDrinkV1  SelectDrink SelectSugarID
 				Var TxRef1 = ""
 				CreateTxRef1 TxRef1

xml/page_payment_code.xml

@@ -255,6 +255,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeAEON.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeAIS.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeDtac.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeGLX.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeGrab.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeInfinyx.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeKBANK.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeLH.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeLotus.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeMCard.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeRabbit.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeSCG.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeThe1.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_codeTrue.xml

@@ -140,6 +140,7 @@
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							MakeDrinkV1  SelectDrink SelectSugarID
 							Var TxRef1 = ""
 							CreateTxRef1 TxRef1

xml/page_payment_credit2.xml

@@ -197,6 +197,7 @@
 				Var CART_INDEX = 0
 				
 				If Seeker = "curr" Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 					MakeDrinkV1  SelectDrink SelectSugarID
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1

xml/page_payment_credit3-0.xml

@@ -111,6 +111,7 @@
 				Var CART_INDEX = 0
 				
 				If Seeker = "curr" Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 					MakeDrinkV1  SelectDrink SelectSugarID
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1

xml/page_payment_credit3-TopupSuccess.xml

@@ -81,7 +81,7 @@
                 If Seeker = "curr" Then
 
 					DEBUGVAR "MakeDrinkV1"
-			
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
                     MakeDrinkV1  SelectDrink SelectSugarID
                     Var TxRef1 = ""
                     CreateTxRef1 TxRef1

xml/page_payment_credit3.xml

@@ -190,6 +190,7 @@
 				Var CART_INDEX = 0
 				
 				If Seeker = "curr" Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 					MakeDrinkV1  SelectDrink SelectSugarID
 
 					Var TxRef1 = ""

xml/page_payment_storeCredit3.xml

@@ -93,6 +93,7 @@
 				Var CART_INDEX = 0
 
 				If Seeker = "curr" Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 					MakeDrinkV1  SelectDrink SelectSugarID
 					Var TxRef1 = ""
 					CreateTxRef1 TxRef1

xml/page_thankyouConti.xml

@@ -30,7 +30,6 @@
 	Var Tel_Confirm_Flag = 0
 	Var LastMakeDrinkResult = "-"
 	
-	DEBUGVAR MIGGAZE2
 	DEBUGVAR MachineStage
 	DEBUGVAR NextOrderStatus
 
@@ -310,6 +309,7 @@
 
 			Else
 				Var LastMakeDrinkResult = "-"
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
        			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
        	
        		EndIf

xml/process/addpoint.ev

@@ -0,0 +1,132 @@
+
+
+	Var AddData = 1
+
+	DEBUGVAR Seeker.TNumberTaobinMember 
+	DEBUGVAR Seeker.PointTaobinStr
+
+	If Seeker.TNumberTaobinCredit = "" Then
+		Var TelephoneNumber = "0899999999"
+		Var PayO2 = ""
+
+		If Seeker.TNumberTaobinMember = "" Then
+			Var AddData = 0
+		Else
+			Var TelephoneNumber = Seeker.TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumber = Seeker.TNumberTaobinCredit
+		Var PayO2 = Seeker.CoffeePinNumber
+	EndIf
+
+
+	If Seeker.VendingCode = "MKFOO" Then
+		Var AddData = 0
+	EndIf 
+
+	If MyMintEnable = 1 Then
+		If FromMyMintPro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
+	If ProBadValentineEnable = 1 Then
+		If FromBadValentinePro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
+	DEBUGVAR Seeker.CodeChannel
+	DEBUGVAR Seeker.CollectPointMain
+	DEBUGVAR LipitPro
+	DEBUGVAR FromLipitPro
+	If LipitPro = 1 Then
+		If FromLipitPro = 1 Then
+			If Seeker.CodeChannel = 1 Then
+				If Seeker.CollectPointMain = 0 Then
+					Var AddData = 0
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+	DEBUGVAR FromPowerUpPro
+	If FreeEnergyDrink = 1 Then
+		If FromPowerUpPro = 1 Then
+				; AddData
+
+			; +1 in quota in this id card
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			If IDNum = "" Then
+
+			Else
+				AddData 44 TelephoneNumber IDNum Param1 Param2
+			EndIf
+
+			; clear id
+			Var IDNum = ""
+			Var FromPowerUpPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		Else
+			Var DisableFromPowerup = ""
+		EndIf
+	EndIf
+
+	If EnergyDrink1BathPro = 1 Then
+		If FromEnergyDrink1BathPro = 1 Then
+			SAVELOG "Adding Energy drink 1 Bath pro quota"
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			If IDNum = "" Then
+
+			Else
+				AddData 44 TelephoneNumber IDNum Param1 Param2
+			EndIf
+
+			; clear id
+			Var IDNum = ""
+			Var FromEnergyDrink1BathPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		Else
+			Var DisableFromPowerup = ""
+		EndIf
+	EndIf
+
+	Var PointCrm = ""
+	If Seeker.FromConsent = 1 Then 
+		Var PointCrm = "pdpa1"
+	EndIf
+
+	If Seeker.PayWithQR = 1 Then
+		Var GetScore = Seeker.VendingTSID
+	Else
+		Var GetScore = ""
+	EndIf 	
+
+	If AddData = 1 Then
+		Var Cid = 26
+		DEBUGVAR "Befor Brewing3"
+		DEBUGVAR Seeker
+		DEBUGVAR Seeker.UseGet15Discount
+		If NewCollectPoint = 1 Then
+			If Seeker.UseGet15Discount = 1 Then
+				Var Cid = 39
+			Else
+				Var Cid = 40
+				Var PreviousSeeker.UseGetDrink5Bath = 0
+			EndIf
+		EndIf
+
+		AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+	EndIf
+
+
+

xml/process/payext_setup.ev

@@ -0,0 +1,6 @@
+DEBUGVAR TelephoneNumber
+Var TelephoneNumberExt = TelephoneNumber
+If TelephoneNumberExt = "" Then
+    Var TelephoneNumberExt = "0899999999"
+EndIf
+__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID 

xml/process/payment.ev

@@ -0,0 +1,95 @@
+DEBUGVAR "MIGGAZE0"
+If Seeker.PayWithQR = 1 Then
+		
+
+		Var ServiceAmount2 = Seeker.ServiceAmount2
+		Var CreditReference = ""
+		Var TxReference = ""
+		Var VendingDiscount = 0
+		Var VendingCampaign = 0
+		Var SelectDrink = Seeker.selected_a_drink
+		Var SuggestID  = ""
+
+		If ChangeFlag2 = 1 Then
+			Var TelephoneNumber = "0899999999"
+			Var PayO2 = ""
+			Var ServiceType = "credit"
+			Var SessionID2 = SelectDrink
+			Var ServiceCredit = "coffee"
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+						
+		Else
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+				Var ServiceType = "credit"
+				Var SessionID2 = SelectDrink
+				Var ServiceCredit = "coffee"
+				Var PayDetail = ""
+				Var PayDetail2 = ""
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+									
+			EndIf
+		EndIf
+					
+		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+	Else
+
+		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+
+		Var SelectDrink = Seeker.selected_a_drink
+		Var ExtendData = Seeker.ExtendData
+		Var ServiceAmount2 = Seeker.ServiceAmount2
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + ExtendData
+
+		Var CreditReference = Seeker.CreditReferenceTmp
+		Var VendingDiscount = Seeker.VendingDiscount
+		Var VendingCampaign = Seeker.VendingCampaign
+		Var TxReference = Seeker.TxRef1
+		Var VendingOrderID = Seeker.ORDER_ID
+
+		Var ServiceType = "coffee-payment"
+		Var ServiceCredit = SelectDrink
+		Var SuggestID  = ""
+
+		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
+
+		If GetFreeFromError = 1 Then
+			Var Seeker.CodeChannel = 1 
+			Var Seeker.VendingCode = "FAU"
+			Var Seeker.CodeNumber = "0000000000"
+			Var VendingCampaign = ServiceAmount2
+		EndIf
+
+		If Seeker.CodeChannel = 1 Then
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + ""
+			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 + "/"
+
+						
+			Var PayDetail2 = Seeker.PayDetail2
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		Else
+						
+		
+			Var PayDetail2 = Seeker.PayDetail2
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+						
+		EndIf
+	EndIf