Coffee-Multi

xml/page_back_to_remove_cup.xml

@@ -14,33 +14,7 @@
 
 	TopView "hide"
 
-	If TNumberTaobinMember = "" Then
+	
-
-	Else
-		If PayWithQR = 1 Then
-			Var VendingTSID = VendingTSIDTmp
-		EndIf 	
-
-
-		Var BmiYear = PointTaobinStr
-		Var PointCrm = ""
-
-		If FromConsent = 1 Then 
-			Var PointCrm = "pdpa1"
-		EndIf
-
-		Var GetScore = VendingTSID
-		If TaobinErrorNetwork = 0 Then
-			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
-		Else
-			Var PointCrm = ""
-			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
-		EndIf
-
-		Var TNumberTaobinMember = ""
-		Var VendingTSID = ""
-
-	EndIf
 	
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
 

xml/page_board.xml

@@ -16,6 +16,8 @@
 	Var taobin_version = "1.53"
 	
 	Cart "DeleteMenuID" "ALL"
+	Var MultiPayEnable = "true"
+	Var PayType = ""
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"

xml/page_brewing3.xml

@@ -5,6 +5,16 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+
+	If CART_COUNT >= 1 Then
+		 Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"  
+	Else
+       	Var PayReference = ""
+		Var PayType = ""
+    EndIf
+
+	
 	
 	; On open move from page_brewing3.xml
 	Var countClick2 = 0
@@ -127,6 +137,9 @@
 	EndIf
 
 
+	
+
+
 </EventOpen>
 
 
@@ -586,6 +599,9 @@
 	EndIf
 
 	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
 		If ErrTimeout = 0 Then
 			Var ErrTimeout = 1
 

xml/page_brewing3Multi.xml

@@ -0,0 +1,933 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+	; On open move from page_brewing3.xml
+
+    If CART_INDEX = 1 Then
+		
+        Var ServiceAmount2 = CART1_PRICE
+        Var SelectDrink = CART1_PDCODE
+		Var ExtendData = CART1_ONTOP
+
+	EndIf
+
+	If CART_INDEX = 2 Then
+	
+        Var ServiceAmount2 = CART2_PRICE
+        Var SelectDrink = CART2_PDCODE
+		Var ExtendData = CART2_ONTOP
+
+	EndIf
+
+	If CART_INDEX = 3 Then
+
+        Var ServiceAmount2 = CART3_PRICE
+        Var SelectDrink = CART3_PDCODE
+		Var ExtendData = CART3_ONTOP
+
+	EndIf
+
+	Var SessionID2 = "" + CART_INDEX
+	Var SessionID2 = SessionID2 + ":"
+	Var SessionID2 = SessionID2 + ExtendData
+
+
+   
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+
+    If show_eng = "true" Then 
+		;Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+	Else
+		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
+		Play "ROOT/taobin_project/sound_thai/thankyou.mp3"
+	EndIf
+
+	Var waitAckPay = 0
+	Var VendingTSIDTmp = ""
+	Var VendingTSIDProblem = ""
+
+	
+
+
+	If PayWithQR = 1 Then
+		Var VendingTSIDTmp = VendingTSID
+
+		If TNumberTaobinCredit = "" Then
+			Var TelephoneNumber = "0899999999"
+			Var PayO2 = ""
+		Else
+			Var TelephoneNumber = TNumberTaobinCredit
+			Var PayO2 = CoffeePinNumber
+		EndIf
+
+		Var PayType = ""
+
+		If ChangeFlag2 = 1 Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+					Var VendingDiscount = 0
+					Var VendingCampaign = 0
+					Var ServiceType = "credit"
+					Var SessionID2 = SelectDrink
+					Var ServiceCredit = "coffee"
+					Var PayReferenceTmp = PayReference
+					Var PayReference = ""
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					Var PayReference = PayReferenceTmp
+		Else
+
+					If StoreCreditFlag = 1 Then
+						If CoinAmount > 0 Then 
+							Var VendingDiscount = 0
+							Var VendingCampaign = 0
+							Var ServiceType = "credit"
+							Var SessionID2 = SelectDrink
+							Var ServiceCredit = "coffee"
+							Var PayReferenceTmp = PayReference
+							Var PayReference = ""
+							Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+							Var PayReference = PayReferenceTmp
+						EndIf
+
+					EndIf
+		EndIf
+	EndIf
+
+	If TNumberTaobinCredit = "" Then
+
+		If TNumberTaobinMember = "" Then
+			Var TelephoneNumberProblem = ""
+		Else
+			Var TelephoneNumberProblem = TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumberProblem = 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 TNumberTaobinMember = "" Then
+
+	Else
+		If PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		Else
+			Var VendingTSID = ""
+		EndIf 	
+
+
+		Var BmiYear = PointTaobinStr
+		Var PointCrm = ""
+		If FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+		Var GetScore = VendingTSID
+
+		If AddPointFlag = 0 Then
+			Var AddPointFlag = 1
+			If TaobinErrorNetwork = 0 Then
+				AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+			Else
+				Var PointCrm = ""
+				AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
+			EndIf
+		EndIf
+		
+		Var VendingTSID = ""
+	EndIf
+
+
+	If GetFreeFromError = 1 Then
+		;Var GetFreeFromError = 0
+		Var TelephoneNumberProblem = TelephoneNumberGOTFree
+		
+	EndIf
+
+
+	If LedLidBlink = "true" Then
+		Var LedLidBlink = "no"
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
+
+	Var PayType = "multi"
+
+
+</EventOpen>
+
+
+<EventActionOk>
+
+	
+	If ActionOKCase = 1 Then
+		If CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber2 = "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 + "C00"
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C"
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber2 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_drinkfail2Multi.xml" 
+			
+		Else 
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+
+	If waitAckPay = 1 Then	
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		
+	EndIf
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber2 = "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 + "C00"
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C"
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber2 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_drinkfail2Multi.xml" 
+			
+		Else 
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+
+	If CountDownBrewing > 0 Then
+		Var CountDownBrewing = CountDownBrewing - 1
+	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_drinkfail2Multi.xml" 
+	EndIf
+	
+
+	If Timeout > 480 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+	If  waitAckPay = 1 Then  
+		If Timeout > 60 Then
+			Var VendingTSID = ""
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
+		EndIf
+	EndIf
+
+	If  waitAckPay = 2 Then  
+		If Timeout > 10 Then
+
+			If CodeChannel = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber2 = "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 + "C00"
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C"
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber2 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_drinkfail2Multi.xml" 
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
+
+			Var PayDetail = "1/" + HURR_FOREVER
+			Var PayDetail = PayDetail + "/"  
+			Var PayDetail = PayDetail + SAMESALARY
+			Var PayDetail = PayDetail + "/"
+			Var PayDetail = PayDetail + NOBONUS
+
+
+
+			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+			;If CodeChannel = 0 Then 
+			;	SAVELOG "back_to_main from line  > 315."
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" 
+			;EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
+			Var PayDetail = "1/" + HURR_FOREVER
+			Var PayDetail = PayDetail + "/"  
+			Var PayDetail = PayDetail + SAMESALARY
+			Var PayDetail = PayDetail + "/"
+			Var PayDetail = PayDetail + NOBONUS
+
+			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			;If CodeChannel = 0 Then 
+			;	SAVELOG "back_to_main from line  > 357."
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" 
+			;EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+
+	
+		
+
+	If MachineState_Result = 1 Then
+		If  waitAckPay = 0 Then 
+
+			Var waitAckPay = 0 
+			Var Timeout = 0
+
+			Var ProcessText = "" 
+
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = TNumberTaobinMember
+				EndIf
+				
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
+
+
+			
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+
+			Var PayDetail = "1/" + HURR_FOREVER
+			Var PayDetail = PayDetail + "/"  
+			Var PayDetail = PayDetail + SAMESALARY
+			Var PayDetail = PayDetail + "/"
+			Var PayDetail = PayDetail + NOBONUS
+
+			
+ 			;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+			
+			If GetFreeFromError = 1 Then
+				Var CodeChannel = 1 
+				Var VendingCode = "C48"
+				Var CodeNumber = "0000000000"
+				Var VendingCampaign = ServiceAmount2
+			EndIf
+
+			If PayWithQR = 0 Then
+				If CodeChannel = 1 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + 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 + CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				Else
+					If CodeChannel = 2 Then
+						Var SessionID2 = SessionID2 + "/"
+						Var SessionID2 = SessionID2 + ""
+						Var SessionID2 = SessionID2 + "/"
+						Var SessionID2 = SessionID2 + 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 + CodeNumber
+						Var SessionID2 = SessionID2 + "/"
+
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					Else
+						
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					EndIf
+
+				EndIf
+
+			
+			Else
+
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			EndIf
+			
+		EndIf
+
+		Var ServiceSuccess = "yes"
+		If  waitAckPay = 0 Then
+
+		
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		EndIf
+
+	EndIf
+
+	If MachineState_Result = 2 Then
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+
+			If PayWithQR = 0 Then 
+				If CodeChannel = 0 Then
+					If ChangeFlag = 0 Then
+						Var ChangeFlag = 1 
+
+						If StoreCreditFlag = 1 Then
+							Var ChangeOK = 2
+						Else	
+							Change ServiceAmount2		
+						EndIf
+								
+					EndIf
+				Else
+
+					If CoinAmount > 0 Then
+					
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign
+
+							If StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount3
+							EndIf
+							
+						EndIf
+					Else
+						Var ChangeOK = 2
+					EndIf
+
+				EndIf
+
+				
+
+			Else
+				Var ChangeOK = 2
+			EndIf
+
+			
+
+			
+			
+					
+
+
+
+			
+
+			;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
+			
+			;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+			
+			;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+			;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+			
+		EndIf
+	EndIf
+
+
+	If MachineStage = "show-menu" Then
+		If MachineState_Result = 0 Then
+			SAVELOG "back_to_main from line  > 655."
+			;Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+			Var MachineState_Result = 1
+		EndIf
+	EndIf
+	
+	If MachineStage = "close-maintenance" Then
+		If MachineState_Result = 0 Then
+			SAVELOG "back_to_main from line  > 663."
+			Var MachineState_Result = 2
+			;Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" 
+		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
+			Var MachineState_Result = 2
+		EndIf
+	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
+			Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+	EndIf
+	
+
+	Refresh
+	TimerReset
+
+</EventTimeout> 
+
+<EventMachine>
+	
+	;If MachineStage = "drink-success" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	;EndIf
+	;If MachineStage = "drink-failed" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkfail.xml" 
+	;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
+
+	Refresh
+	
+</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>
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </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> 60 </X>
+<Y> 1290 </Y>
+<Filename> PictureFile</Filename>
+</Image>
+
+<Image>
+<X> 60 </X>
+<Y> 1649 </Y>
+<Filename> BottomText </Filename>
+</Image>
+
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </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>
+
+;<Text>
+;<X> 100 </X>
+;<Y> 470 </Y>
+;<Align> End </Align>
+;<Width> 153 </Width>
+;<Size> 30 </Size>
+;<Font> RobotoBold </Font>
+;<Color> 0x513C2F </Color>
+;<Value> MachineStage </Value>
+;</Text>
+;
+
+
+;<Text>
+;<X> 0 </X>
+;<Y> 1880 </Y>
+;<Size> 30 </Size>
+;<Align> Center </Align>
+;<Width> 1080 </Width>
+;<Font> KanitThinTTF </Font>
+;<Color> 0x513C2F </Color>
+;<Value> MachineStage </Value>
+;</Text>
+
+
+;<Button>
+;<X> 0 </X>
+;<Y> 1860 </Y>
+;<Width> 200 </Width>
+;<Height> 50 </Height>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;	Var countClick = countClick + 1
+;	If countClick = 3 Then
+;		
+;	EndIf
+;
+;	If countClick = 5 Then
+;		Var countClick = 0
+;		MainMenu
+;	EndIf
+;	Refresh
+;</EventClick>
+;</Button>
+
+<Button>
+<X> 870 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick2 = countClick2 + 1
+	If countClick2 = 3 Then
+		
+	EndIf
+
+	If countClick2 = 5 Then
+		Var countClick2 = 0
+		Var HaveCup = "true"
+    	Var MachineStage = "drink-success"
+	    Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+</Popup>

xml/page_catalog.xml

@@ -369,12 +369,9 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-		If CART_COUNT = 1 Then
+		
-
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-			Open "ROOT/taobin_project/xml/page_payment.xml"
+		
-		Else
-			Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-		EndIf
 	
 </EventClick>
 </Button>

xml/page_catalog_free.xml

@@ -283,7 +283,6 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<State> alphaState3 </State>
 <Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
 </Image>
 

xml/page_check_member.xml

@@ -95,7 +95,7 @@
 
 			Var CoffeePointRank = Ext1b
 			INT CoffeePointRank
-
+			Var CoffeePointRankTmp = CoffeePointRank
 
 
 			GETACCEXT TelephoneNumber 15

xml/page_check_member2.xml

@@ -30,7 +30,7 @@
 	
 	EndIf
 	
-
+    Var CoffeePointRank = CoffeePointRankTmp
 	;Var PointDiff = 150 - CoffeePointRank
 
 
@@ -216,11 +216,11 @@
             Var TaobinLeveImg = "/taoLevel2.png"
 
             If CoffeePointRank > 149 Then
-				Var TaobinLeveImg = "/taoLevel3.png"
+				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				Var TaobinLevelDesc1 =  "Flying turtle level "
+				;Var TaobinLevelDesc1 =  "Flying turtle level "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 150
+				;Var CoffeePointRank = CoffeePointRank - 150
 
 			EndIf
 
@@ -237,11 +237,11 @@
             Var TaobinLeveImg = "/taoLevel3.png"
 
             If CoffeePointRank > 349 Then
-				Var TaobinLeveImg = "/taoLevel4.png"
+				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				Var TaobinLevelDesc1 =  "Master turtle level "
+				;Var TaobinLevelDesc1 =  "Master turtle level "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 350
+				;Var CoffeePointRank = CoffeePointRank - 350
 
 			EndIf
 
@@ -277,11 +277,11 @@
             Var TaobinLeveImg = "/taoLevel2.png"
 
             If CoffeePointRank > 149 Then
-				Var TaobinLeveImg = "/taoLevel3.png"
+				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
+				;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 150
+				;Var CoffeePointRank = CoffeePointRank - 150
 
 			EndIf
         EndIf
@@ -298,11 +298,11 @@
             Var TaobinLeveImg = "/taoLevel3.png"
 
             If CoffeePointRank > 349 Then
-				Var TaobinLeveImg = "/taoLevel4.png"
+				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
+				;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 350
+				;Var CoffeePointRank = CoffeePointRank - 350
 
 			EndIf
         EndIf

xml/page_collect_point_2.xml

@@ -130,6 +130,7 @@
 				Var CoffeePoint = PointTaobin + CoffeePoint1
 				Var CoffeePointOld = CoffeePoint1
 				Var CoffeePointRank = CoffeePointRank + PointTaobin
+				Var CoffeePointRankTmp = CoffeePointRank
 
 				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 

xml/page_collect_point_3.xml

@@ -246,11 +246,11 @@
             Var TaobinLeveImg = "/taoLevel2.png"
 
 			If CoffeePointRank > 149 Then
-				Var TaobinLeveImg = "/taoLevel3.png"
+				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				Var TaobinLevelDesc1 =  "Flying turtle level "
+				;Var TaobinLevelDesc1 =  "Flying turtle level "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 150
+				;Var CoffeePointRank = CoffeePointRank - 150
 
 			EndIf
 
@@ -267,11 +267,11 @@
             Var TaobinLeveImg = "/taoLevel3.png"
 
 			If CoffeePointRank > 349 Then
-				Var TaobinLeveImg = "/taoLevel4.png"
+				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				Var TaobinLevelDesc1 =  "Master turtle level "
+				;Var TaobinLevelDesc1 =  "Master turtle level "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 350
+				;Var CoffeePointRank = CoffeePointRank - 350
 
 			EndIf
 
@@ -310,11 +310,11 @@
             Var TaobinLeveImg = "/taoLevel2.png"
 
 			If CoffeePointRank > 149 Then
-				Var TaobinLeveImg = "/taoLevel3.png"
+				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
+				;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 150
+				;Var CoffeePointRank = CoffeePointRank - 150
 
 			EndIf
 
@@ -331,11 +331,11 @@
             Var TaobinLeveImg = "/taoLevel3.png"
 
 			If CoffeePointRank > 349 Then
-				Var TaobinLeveImg = "/taoLevel4.png"
+				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
+				;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
             	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 350
+				;Var CoffeePointRank = CoffeePointRank - 350
 
 			EndIf
 

xml/page_drinkfail2.xml

@@ -25,6 +25,13 @@
 		DEBUGVAR ERROR_BREW_CAUSE_THAI
 
 
+		If FailedCount > 0 Then 
+			Var ERROR_PAY_TIMEOUT = "false"
+			DEBUGVAR FailedCount
+			DEBUGVAR ERROR_PAY_TIMEOUT
+		EndIf
+
+
 		If ERROR_PAY_TIMEOUT = "true" Then
 			
 			If NumberFailed = "false" Then
@@ -138,17 +145,12 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	
-	
+	SAVELOG MachineStage
 
     Var Timeout = Timeout + 1
 
 	If Timeout > 60 Then
 
-		
-
-
-
-
         If MachineStage = "remove-cup" Then
 			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 		Else

xml/page_drinkfail2Multi.xml

@@ -0,0 +1,335 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/complete_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/complete/"
+	EndIf
+
+	Var Timeout = 0
+	Var Timeout2 = 0
+	StopLongPlay
+
+
+	Var FailedCount = FailedCount + 1
+
+    Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+	Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2
+
+    Var sendPayMultiFlag = 0
+	Var next_pic = ""
+	Var next_name = ""
+	Var nextCount = ""
+	Var next_pic_bg = ""
+	Var next_ready = "true"
+	Var cart_next = 0
+
+	If show_eng = "true" Then 
+		If CART_COUNT > 0 Then
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var next_pic_bg = DirImage + "/Preparing.png"
+
+				Var cart_next = CART_INDEX + 1 
+				Var nextCount = "" + cart_next
+				Var nextCount = nextCount + "/"
+				Var nextCount = nextCount + CART_COUNT
+
+				If cart_next = 2 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+					Var next_name = CART2_NAME_ENG
+					Var next_ready = CART2_READY
+
+					SAVELOG cart_next
+					
+				EndIf
+
+				If cart_next = 3 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+					Var next_name = CART3_NAME_ENG
+					Var next_ready = CART3_READY
+				
+				EndIf
+			EndIf
+		EndIf
+
+	Else
+
+		If CART_COUNT > 0 Then
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var next_pic_bg = DirImage + "/Preparing.png"
+
+				Var cart_next = CART_INDEX + 1 
+				Var nextCount = "" + cart_next
+				Var nextCount = nextCount + "/"
+				Var nextCount = nextCount + CART_COUNT
+
+				If cart_next = 2 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+					Var next_name = CART2_NAME_THAI
+					Var next_ready = CART2_READY
+
+					SAVELOG cart_next
+					
+				EndIf
+
+				If cart_next = 3 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+					Var next_name = CART3_NAME_THAI
+					Var next_ready = CART3_READY
+				
+				EndIf
+			EndIf
+		EndIf
+
+	EndIf
+
+
+	SAVELOG next_ready
+
+
+
+	If next_ready = "false" Then
+		Var next_pic = ""
+		Var next_name = ""
+		Var nextCount = ""
+		Var next_pic_bg = ""
+
+
+		If cart_next = 2 Then
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+				If TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = TNumberTaobinMember
+				EndIf
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+			
+			Var PayDetail="1/F:0/0/"
+			Var ServiceType = "coffee"
+			Var ServiceCredit = CART2_PDCODE
+			Var SuggestID  = ""
+			Var SessionID2 = 
+
+			Var ServiceAmount2 = CART2_PRICE
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		EndIf
+
+		If cart_next < CART_COUNT  Then   
+			Var cart_next = cart_next + 1
+		EndIf
+
+		If cart_next = 3 Then
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+				If TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = TNumberTaobinMember
+				EndIf
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+			
+			Var PayDetail="1/F:0/0/"
+			Var ServiceType = "coffee"
+			Var ServiceCredit = CART3_PDCODE
+			Var SuggestID  = ""
+			Var SessionID2 = 
+
+			Var ServiceAmount2 = CART3_PRICE
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		EndIf
+
+
+
+		Var CART_INDEX = CART_COUNT
+
+	EndIf
+
+
+	
+
+	If 	CART_INDEX = CART_COUNT  Then  
+
+		;Pay Multi
+		If sendPayMultiFlag = 0 Then
+			
+					If PayWithQR = 0 Then
+						Var ServiceType = "coffee-multi"
+					Else
+						Var ServiceType = "coffee-multiQR"
+					EndIf
+
+					If TNumberTaobinCredit = "" Then
+						Var TelephoneNumber = "0899999999"
+						Var PayO2 = ""
+						If TNumberTaobinMember = "" Then
+						Else
+							Var TelephoneNumber = TNumberTaobinMember
+						EndIf
+					Else
+						Var TelephoneNumber = TNumberTaobinCredit
+						Var PayO2 = CoffeePinNumber
+					EndIf
+					
+					Var ServiceCredit = "00-00-00-0000"
+					Var SuggestID  = ""
+					Var PayDetail="1/S:0/0/"
+					Var SessionID3 = "" + CART_COUNT
+					Var SessionID3 = SessionID3 + ":00000"
+
+						
+					SAVELOG PayO2
+
+					Var PayType = ""
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
+							
+
+					Var sendPayMultiFlag = 1
+		EndIf
+	EndIf
+
+
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	SAVELOG MachineStage
+
+    Var Timeout = Timeout + 1
+
+	If MachineStage = "show-menu" Then
+
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var CART_INDEX = CART_INDEX + 1
+				Cart "PreparID" CART_INDEX
+				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
+
+			Else
+				If sendPayMultiFlag = 1 Then
+					Var TNumberTaobinMember = ""
+					;Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
+				EndIf
+			EndIf
+
+	EndIf
+
+    If MachineStage = "remove-cup" Then
+		;Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+
+		Var Timeout2 = Timeout2 + 1
+
+		If Timeout2 > 15 Then
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+				Var Timeout2 = 0
+		EndIf
+
+	Else
+		;Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+
+ 
+	
+
+	
+    Refresh
+	TimerReset
+
+</EventTimeout> 
+
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+
+
+
+<Image>
+<X> 46 </X>
+<Y> 592 </Y>
+<Filename> Var( DirImage + "/imgDrinkFailed.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 22 </X>
+<Y> 1384 </Y>
+<Filename> Var( DirImage + "/txtDrinkFailed.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 757 </X>
+<Y> 424 </Y>
+<Filename> next_pic_bg </Filename>
+</Image>
+
+<Text>
+<X> 757 </X>
+<Y> 448 </Y>
+<Size> 20 </Size>
+<Width> 280</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> nextCount </Value>
+</Text>
+
+<Text>
+<X> 757 </X>
+<Y> 538 </Y>
+<Size> 20 </Size>
+<Width> 280</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> next_name </Value>
+</Text>
+
+<Image>
+<X> 823 </X>
+<Y> 600 </Y>
+<Width> 148 </Width>
+<Height> 200 </Height>
+<Filename> next_pic </Filename>
+</Image>
+
+
+
+
+
+
+
+
+
+</Popup>

xml/page_drinkok.xml

@@ -36,47 +36,171 @@
 	Var VideoPlayFile = VideoPlayFile + "24"
 	Var VideoPlayFile = VideoPlayFile + VideoFileEnd
 	Var Timeout = 0
-
+	Var Timeout2 = 0
-	Var TNumberTaobinMember = ""
-
-	If TNumberTaobinMember = "" Then
-
-	Else
-		If PayWithQR = 1 Then
-			Var VendingTSID = VendingTSIDTmp
-		EndIf 	
-
-
-		Var BmiYear = PointTaobinStr
-		Var PointCrm = ""
-		If FromConsent = 1 Then 
-			Var PointCrm = "pdpa1"
-		EndIf
-		Var GetScore = VendingTSID
-		If TaobinErrorNetwork = 0 Then
-			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
-		Else
-			Var PointCrm = ""
-			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
-		EndIf
-		Var TNumberTaobinMember = ""
-		Var VendingTSID = ""
-	EndIf
 
 	StopLongPlay
 
 	Var show_eng = "false"	
 
+
+	Var sendPayMultiFlag = 0
+	Var next_pic = ""
+	Var next_name = ""
+	Var nextCount = ""
+	Var next_pic_bg = ""
+
+
+	If show_eng = "true" Then 
+		If CART_COUNT > 0 Then
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var next_pic_bg = DirImage + "/Preparing.png"
+
+				Var cart_next = CART_INDEX + 1 
+				Var nextCount = "" + cart_next
+				Var nextCount = nextCount + "/"
+				Var nextCount = nextCount + CART_COUNT
+
+				If cart_next = 2 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+					Var next_name = CART2_NAME_ENG
+					
+				EndIf
+
+				If cart_next = 3 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+					Var next_name = CART3_NAME_ENG
+				
+				EndIf
+			EndIf
+
+		EndIf
+
+
+	Else
+
+		If CART_COUNT > 0 Then
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var next_pic_bg = DirImage + "/Preparing.png"
+
+				Var cart_next = CART_INDEX + 1 
+				Var nextCount = "" + cart_next
+				Var nextCount = nextCount + "/"
+				Var nextCount = nextCount + CART_COUNT
+
+				If cart_next = 2 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+					Var next_name = CART2_NAME_THAI
+					
+				EndIf
+
+				If cart_next = 3 Then
+					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+					Var next_name = CART3_NAME_THAI
+				
+				EndIf
+			EndIf
+
+		EndIf
+
+	EndIf
+
+
+		If CART_COUNT = 0 Then
+			Var sendPayMultiFlag = 1
+		Else
+			If 	CART_INDEX = CART_COUNT  Then  
+
+				;Pay Multi
+				If sendPayMultiFlag = 0 Then
+
+					If PayWithQR = 0 Then
+						Var ServiceType = "coffee-multi"
+					Else
+						Var ServiceType = "coffee-multiQR"
+					EndIf
+
+					If TNumberTaobinCredit = "" Then
+						Var TelephoneNumber = "0899999999"
+						Var PayO2 = ""
+						If TNumberTaobinMember = "" Then
+						Else
+							Var TelephoneNumber = TNumberTaobinMember
+						EndIf
+					Else
+						Var TelephoneNumber = TNumberTaobinCredit
+						Var PayO2 = CoffeePinNumber
+					EndIf
+
+					Var ServiceCredit = "00-00-00-0000"
+					Var SuggestID  = ""
+					Var PayDetail="1/S:0/0/"
+					Var SessionID3 = "" + CART_COUNT
+					Var SessionID3 = SessionID3 + ":00000"
+
+					SAVELOG PayO2
+
+					Var VendingCampaign = IntVendingCampaign
+
+					Var PayType = ""
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
+						
+					Var sendPayMultiFlag = 1
+				EndIf
+			EndIf
+		EndIf 
+	
+
+
+
 </EventOpen>
 <Timeout> 500 </Timeout>
 <EventTimeout> 
-	
+
+	SAVELOG MachineStage
+
 	If HaveCup = "false" Then
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+
+		If MachineStage = "show-menu" Then
+
+			If 	CART_INDEX < CART_COUNT  Then   
+
+				Var CART_INDEX = CART_INDEX + 1
+				Cart "PreparID" CART_INDEX
+				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
+
+			Else
+				If sendPayMultiFlag = 1 Then
+					Var TNumberTaobinMember = ""
+					
+					If FailedCount > 0 Then
+						Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
+					Else
+						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					EndIf
+				EndIf
+			EndIf
+
+		EndIf
+
+
+			
 	EndIf
 	
 	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+		If CART_COUNT = 0 Then
+			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+		Else
+
+			Var Timeout2 = Timeout2 + 1
+
+			If Timeout2 > 15 Then
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+				Var Timeout2 = 0
+			EndIf
+
+		EndIf
 
 	EndIf
 
@@ -163,4 +287,42 @@
 <Value> countClick2 </Value>
 </Text>
 
+
+<Image>
+<X> 757 </X>
+<Y> 424 </Y>
+<Filename> next_pic_bg </Filename>
+</Image>
+
+<Text>
+<X> 757 </X>
+<Y> 448 </Y>
+<Size> 20 </Size>
+<Width> 280</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> nextCount </Value>
+</Text>
+
+<Text>
+<X> 757 </X>
+<Y> 538 </Y>
+<Size> 20 </Size>
+<Width> 280</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> next_name </Value>
+</Text>
+
+<Image>
+<X> 823 </X>
+<Y> 600 </Y>
+<Width> 148 </Width>
+<Height> 200 </Height>
+<Filename> next_pic </Filename>
+</Image>
+
 </Popup>
+

xml/page_payment.xml

@@ -49,6 +49,7 @@
 
 	Var TNumberTaobinMember = ""
 	Var VendingTSIDTmp = ""
+	Var PayType = ""
 
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@@ -77,6 +78,10 @@
 	EndIf
 
 	Var MachineStage = "-"
+
+	Var PayReference = ""
+	
+				
 	
 </EventOpen>
 <Timeout> 900 </Timeout>

xml/page_payment_code.xml

@@ -48,7 +48,11 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var CodeChannel = 0
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 
 		Refresh
 	EndIf
@@ -107,7 +111,6 @@
 
 		SAVELOG VendingCode
 		SAVELOG VendingCampaignRI3
-		
 
 
 		If VendingCode = "C00" Then
@@ -128,8 +131,19 @@
 					Var FreeVendingCampaign = 1
 					CoinVending OFF
 					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
+					If CART_COUNT >= 1 Then 
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+
+						Cart "PreparID" 1
+						Var CART_INDEX = 1
+						Var PayReference = ""
+						GenHashWithTimeStamp PayReference
+						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+					Else
+						Var CART_INDEX = 0
+
+						MakeDrinkV1  SelectDrink SelectSugarID
+						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+					EndIf
 				EndIf
 
 
@@ -272,7 +286,11 @@
 		Var QRCODETMP = QRCODE99
 		Var CodeChannel = 1
 		
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 		
 
 	EndIf
@@ -303,7 +321,11 @@
 		Var CodeChannel = 1
 		Var QRCODE99 = ""
 		Var QRCODETMP = ""
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 	EndIf
 
 
@@ -585,7 +607,11 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var CodeChannel = 0
-	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -605,11 +631,11 @@
 		
 
 	If UnitTestType = "2" Then
-		If TelephoneNumber = "00000000" Then
+		If TelephoneNumber = "00000001" Then
 			Var ShowErrorText = "Enable"
 		EndIf
 	Else
-		If TelephoneNumber = "00000000" Then
+		If TelephoneNumber = "00000002" Then
 			Var ShowErrorText = "Enable"
 		EndIf
 		If TelephoneNumber = "99999999" Then

xml/page_payment_credit.xml

@@ -47,7 +47,11 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var CodeChannel = 0
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		EndIf
 	EndIf
 
 
@@ -553,7 +557,11 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var CodeChannel = 0
-	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 
 </EventClick>
 </Button>

xml/page_payment_credit2.xml

@@ -52,7 +52,11 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var CodeChannel = 0
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		EndIf
 	EndIf
 
 	If StateBGetSMS = "Disable" Then

xml/page_payment_credit3.xml

@@ -19,6 +19,7 @@
 	INT CoffeeCredit 
 
 	Var SumCreditAmount = CoffeeCredit
+	;Var SumCreditAmount = 5
 
 	Var NotEnoughFlag = 0
 
@@ -37,6 +38,10 @@
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
 	EndIf
+
+	Var PrepareFlag = 0
+	Var PrepareTime = 0
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -113,7 +118,11 @@
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var CodeChannel = 0
-	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	If CART_COUNT >= 1 Then 
+		Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -141,9 +150,20 @@
 		Var CoffeePinNumber = PinNumber
 
 		Var StoreCreditFlag = 1
+
+		If CART_COUNT >= 1 Then 
+
+			Cart "PreparID" 1
+			Var CART_INDEX = 1
+			Var PayReference = ""
+			GenHashWithTimeStamp PayReference
+			Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+		Else
+			Var CART_INDEX = 0
 			
-		MakeDrinkV1  SelectDrink SelectSugarID
+			MakeDrinkV1  SelectDrink SelectSugarID
-		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+		EndIf
 
 	Else
 
@@ -164,7 +184,11 @@
 		Var CreditAmount1 = ""
 		Var ServiceAmountFlow = ""
 		Var TelephoneNumberQR = "0899999999"
-		Var ServiceType = "coffee"
+		If CART_COUNT >= 1 Then 
+			Var ServiceType = "coffee-multi"
+		Else
+			Var ServiceType = "coffee"
+		EndIf
 		Var ECommerceQR = ""
 		Var ECommerceQR = ECommerceQR + PriceDrink
 		Var ECommerceQR =	ECommerceQR + "/"
@@ -199,7 +223,11 @@
 
 		Var StoreCreditFlag = 1
 
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		If CART_COUNT >= 1 Then 
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		EndIf
 
 	EndIf
 	

xml/page_payment_multi.xml

@@ -2,8 +2,119 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> "0xFFFFFF" </Background>
 <EventOpen>
+
+	DEBUGVAR CART1_PICTURE
+	DEBUGVAR CART2_PICTURE
+	DEBUGVAR CART3_PICTURE
+
+	DEBUGVAR CART1_PDCODE
+	DEBUGVAR CART2_PDCODE
+	DEBUGVAR CART3_PDCODE
+
+	DEBUGVAR CART1_NAME_ENG
+	DEBUGVAR CART2_NAME_ENG
+	DEBUGVAR CART3_NAME_ENG
+
+	DEBUGVAR CART1_NAME_THAI
+	DEBUGVAR CART2_NAME_THAI
+	DEBUGVAR CART3_NAME_THAI
+
+
+	DEBUGVAR CART1_PRICE
+	DEBUGVAR CART2_PRICE
+	DEBUGVAR CART3_PRICE
+
+	Var cart1_pic = ""
+	Var cart2_pic = ""
+	Var cart3_pic = ""
+
+	Var cart1_name = ""
+	Var cart2_name = ""
+	Var cart3_name = ""
+
+	Var cart1_price = ""
+	Var cart2_price = ""
+	Var cart3_price = ""
+
+	Var cart1_en = "Invisible"
+	Var cart2_en = "Invisible"
+	Var cart3_en = "Invisible"
+
+	Var PriceDrink = 0
+
+
+
+	If show_eng = "true" Then 
+
+		If CART_COUNT >= 1 Then
+			Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE
+			Var cart1_name = CART1_NAME_ENG
+			Var cart1_price = "" + CART1_PRICE
+			Var cart1_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART1_PRICE
+
+		EndIf
+
+		If CART_COUNT >= 2 Then
+			Var cart2_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+			Var cart2_name = CART2_NAME_ENG
+			Var cart2_price = "" + CART2_PRICE
+			Var cart2_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART2_PRICE
+
+		EndIf
+
+		If CART_COUNT = 3 Then
+			Var cart3_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+			Var cart3_name = CART3_NAME_ENG
+			Var cart3_price = "" + CART3_PRICE
+			Var cart3_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART3_PRICE
+		EndIf
+
+
+	Else
+
+
+
+		If CART_COUNT >= 1 Then
+			Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE
+			Var cart1_name = CART1_NAME_THAI
+			Var cart1_price = "" + CART1_PRICE
+			Var cart1_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART1_PRICE
+
+		EndIf
+
+		If CART_COUNT >= 2 Then
+			Var cart2_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
+			Var cart2_name = CART2_NAME_THAI
+			Var cart2_price = "" + CART2_PRICE
+			Var cart2_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART2_PRICE
+
+		EndIf
+
+		If CART_COUNT = 3 Then
+			Var cart3_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
+			Var cart3_name = CART3_NAME_THAI
+			Var cart3_price = "" + CART3_PRICE
+			Var cart3_en = "Enable"
+
+			Var PriceDrink = PriceDrink + CART3_PRICE
+		EndIf
+	EndIf
+
+	Var ServiceAmountSum = PriceDrink
+	
+
 	; On open
 	Var GetPayInfoFlag = 0
 	Var SessionID2 = ""
@@ -14,10 +125,11 @@
 	Var QRChannel = 0
 	Var HaveCup = "true"
 
-	;Var PriceDrink = 5
+	
-
+					
+	Var SelectDrink = "00-00-00-0000"
 	Var DiscountDrink = 0
-	Var SelectSlot = "1"
+	Var SelectSlot = "" + CART_COUNT
 
 	SAVELOG BoxID
 
@@ -47,8 +159,12 @@
 	Var TNumberTaobinMember = ""
 	Var VendingTSIDTmp = ""
 
-	Var TNumberTaobinMember = ""
+	
-	Var VendingTSIDTmp = ""
+	Var MultiTSID = ""
+	Var PayReference = ""
+
+	Var AddPointFlag = 0
+	Var PayType = ""
 
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@@ -79,27 +195,16 @@
 	Var MachineStage = "-"
 
 
-	DEBUGVAR CART1_PICTURE
+	Var cartNumText = "" + CART_COUNT
-	DEBUGVAR CART2_PICTURE
+	If show_eng = "true" Then 
-	DEBUGVAR CART3_PICTURE
+    	Var cartNumText = cartNumText + " cups"
-
+	Else
-	DEBUGVAR CART1_PDCODE
+		Var cartNumText = cartNumText + " แก้ว"
-	DEBUGVAR CART2_PDCODE
+	EndIf
-	DEBUGVAR CART3_PDCODE
-
-	DEBUGVAR CART1_NAME_ENG
-	DEBUGVAR CART2_NAME_ENG
-	DEBUGVAR CART3_NAME_ENG
-
-	DEBUGVAR CART1_NAME_THAI
-	DEBUGVAR CART2_NAME_THAI
-	DEBUGVAR CART3_NAME_THAI
-
-
-	DEBUGVAR CART1_PRICE
-	DEBUGVAR CART2_PRICE
-	DEBUGVAR CART3_PRICE
 
+	Var PayAmount = PriceDrink
+	Var RemainAmountStr = "" + PayAmount
+	Var showRemaining = charOfBaht + RemainAmountStr
 
 	
 </EventOpen>
@@ -135,12 +240,12 @@
 
 
 			Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + ExtendData
+			Var SessionID2 = SessionID2 + "00000"
 
 			Var CreditAmount1 = ""
 			Var ServiceAmountFlow = ""
 			Var TelephoneNumberQR = "0899999999"
-			Var ServiceType = "coffee"
+			Var ServiceType = "coffee-multi"
 			Var ECommerceQR = ""
 			Var ECommerceQR = ECommerceQR + PriceDrink
 			Var ECommerceQR =	ECommerceQR + "/"
@@ -195,41 +300,156 @@
 </Video>
 
 
+
 <Image>
-<X> 375 </X>
+<X> 0 </X>
-<Y> 623 </Y>
+<Y> 1172 </Y>
-<Width> 331 </Width>
+<Filename> Var( DirImage + "/Rectangle0.png" )</Filename>
-<Height> 435 </Height>
+</Image>
-<Filename> PictureDrink </Filename>
+
+<Image>
+<X> 0 </X>
+<Y> 1012 </Y>
+<Filename> Var( DirImage + "/Rectangle.png" )</Filename>
+</Image>
+
+
+<Image>
+<X> 60 </X>
+<Y> 412 </Y>
+<Width> 148 </Width>
+<Height> 200 </Height>
+<Filename> cart1_pic </Filename>
 </Image>
 
 <Text>
-<X> 0 </X>
+<X> 876 </X>
-<Y> 938 </Y>
+<Y> 467 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> cart1_price </Value>
+</Text>
+
+<Text>
+<X> 236 </X>
+<Y> 470 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> cart1_name </Value>
+</Text>
+
+<Button>
+<X> 1016 </X>
+<Y> 500 </Y>
+<State> cart1_en </State>
+<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
+<EventClick> 
+	
+
+</EventClick> 
+</Button>
+
+<Image>
+<X> 60 </X>
+<Y> 612 </Y>
+<Width> 148 </Width>
+<Height> 200 </Height>
+<Filename> cart2_pic </Filename>
+</Image>
+
+<Text>
+<X> 876 </X>
+<Y> 667 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> cart2_price </Value>
+</Text>
+
+<Text>
+<X> 236 </X>
+<Y> 670 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> cart2_name </Value>
+</Text>
+
+<Button>
+<X> 1016 </X>
+<Y> 700 </Y>
+<State> cart2_en </State>
+<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
+<EventClick> 
+	
+</EventClick> 
+</Button>
+
+<Image>
+<X> 60 </X>
+<Y> 812 </Y>
+<Width> 148 </Width>
+<Height> 200 </Height>
+<Filename> cart3_pic </Filename>
+</Image>
+
+<Text>
+<X> 876 </X>
+<Y> 872 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> cart3_price </Value>
+</Text>
+
+<Text>
+<X> 236 </X>
+<Y> 872 </Y>
+<Width> 1080</Width>
+<Size> 50 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> cart3_name </Value>
+</Text>
+
+
+<Button>
+<X> 1016 </X>
+<Y> 900 </Y>
+<State> cart3_en </State>
+<Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
+<EventClick> 
+	
+	
+</EventClick> 
+</Button>
+
+<Text>
+<X> 876 </X>
+<Y> 1038 </Y>
+<Width> 1080</Width>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> showRemaining </Value>
+</Text>
+
+<Text>
+<X> 80 </X>
+<Y> 1038 </Y>
 <Width> 1080</Width>
-<Align> Center </Align>
 <Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
-<Value> showname </Value>
+<Value> cartNumText </Value>
 </Text>
 
-<Text>
-<X> 0 </X>
-<Y> 1022 </Y>
-<Width> 1080</Width>
-<Align> Center </Align>
-<Size> 24 </Size>
-<Font> KanitLightTTF </Font>
-<Color> 0x6F5F51 </Color>
-<Value> showdesc </Value>
-</Text>
-
-<Image>
-<X> 144 </X>
-<Y> 413 </Y>
-<Filename> Var( DirImage + "/text_1.png" ) </Filename>
-</Image>
-
 
 </Popup>

xml/page_payment_storeCredit3.xml

@@ -49,12 +49,19 @@
 			
 		Else
 
-			
+			If CART_COUNT >= 1 Then 
-			;Var TNumberTaobinCredit = TelephoneNumber
-			;Var CoffeePinNumber = PinNumber
 
-			MakeDrinkV1  SelectDrink SelectSugarID
+				Cart "PreparID" 1
-			Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+				Var CART_INDEX = 1
+				Var PayReference = ""
+				GenHashWithTimeStamp PayReference
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			Else
+				Var CART_INDEX = 0
+
+				MakeDrinkV1  SelectDrink SelectSugarID
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			EndIf
 		EndIf
 
 	
@@ -116,7 +123,6 @@
 <Color> 0x513C2F </Color>
 <Refresh> "Enable" </Refresh>
 <Value> TNumberTaobinCredit </Value>
-<Format> Telnum </Format>
 <Format> Telnum-mask-1 </Format>
 </Text>
 

xml/page_thankyou.xml

@@ -7,7 +7,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var CountDownThankyou = 2
+	Var CountDownThankyou = 3
 	Var CountDownBrewing = BrewTime
 	Var CountUpBrewing = 0
 	SAVELOG BrewTime
@@ -21,6 +21,10 @@
 
 	Var GotoStoreCredit0 = 0
 	Var StoreCreditAmount = 0
+
+	Var MachineState_Result = 0
+
+	Var FailedCount = 0
 	
 
 	If show_eng = "true" Then 
@@ -54,7 +58,12 @@
 	Var CountDownThankyou = CountDownThankyou - 1
 
 	Var Timeout = Timeout + 1 
-	If Timeout = 2 Then
+	If Timeout = 3 Then
+
+		If 	CART_INDEX = 0  Then   
+		Else
+			Cart "MakeID" CART_INDEX
+		EndIf
 		
 		 If PayWithQR = 0 Then
             If FreeVendingCampaign = 0 Then
@@ -130,6 +139,10 @@
 
 				EndIf
 
+				If 	CART_INDEX >= 2  Then   
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+				EndIf
+
 				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 
 			Else
@@ -137,6 +150,10 @@
 					If FreeVendingCampaign = 1 Then
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 					Else
+						If 	CART_INDEX >= 2  Then   
+							Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+						EndIf
+
 						Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 					EndIf
 				Else
@@ -146,6 +163,9 @@
 						If FreeVendingCampaign = 1 Then
 							Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 						Else
+							If 	CART_INDEX >= 2  Then   
+								Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+							EndIf
 							Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 						EndIf
 					EndIf

xml/page_thankyouMore.xml

@@ -0,0 +1,148 @@
+<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 = 3
+	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 ChangeFlag2 = 0
+
+	Var GotoStoreCredit0 = 0
+	Var StoreCreditAmount = 0
+
+	Var MachineState_Result = 0
+	Var ChangeOK = 0
+	
+
+	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"
+
+	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"
+	EndIf
+
+	DEBUGVAR StarwState
+	DEBUGVAR LidState
+	
+	If StarwState = "Press" Then
+		Machine StrawWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+	If LidState = "Press" Then
+		Machine LidWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
+
+
+    	
+
+	If CART_INDEX = 2 Then
+        Var showname = CART2_NAME_THAI
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + CART2_PICTURE
+
+	EndIf
+
+	If CART_INDEX = 3 Then
+         Var showname = CART3_NAME_THAI
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + CART3_PICTURE
+
+	EndIf
+
+
+    
+	
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	Var CountDownBrewing = CountDownBrewing - 1
+	Var CountDownThankyou = CountDownThankyou - 1
+
+	Var Timeout = Timeout + 1 
+	If Timeout = 3 Then
+
+		If 	CART_INDEX = 0  Then   
+		Else
+			Cart "MakeID" CART_INDEX
+		EndIf
+		
+	EndIf
+
+
+	; run test;
+	If CountDownThankyou = 0 Then 
+	
+		Var CountDownBrewing = BrewTime
+		Var CountUpBrewing = 0
+		SAVELOG BrewTime
+		Var ShowCountDownBrewing = CountDownBrewing
+
+		Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"  
+		 
+	EndIf
+
+	Var ShowCountDownBrewing = CountDownBrewing
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </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> 375 </X>
+<Y> 623 </Y>
+<Width> 331 </Width>
+<Height> 435 </Height>
+<Filename> 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> showname </Value>
+</Text>
+
+
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+	
+	EndIf
+</EventChangeStatus>
+
+
+</Popup>

xml/page_topping_select2.xml

@@ -143,6 +143,8 @@
 			Var btnAddCart = "Invisible" 
 		EndIf
 	EndIf
+
+	Var NextButton = "false"
 </EventOpen>
 <Timeout> 2000 </Timeout>
 <EventTimeout> 
@@ -586,7 +588,11 @@
 		If CART_COUNT = 3 Then
 			Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_catalog.xml" 
+			If NextButton = "true" Then
+				Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_catalog.xml" 
+			EndIf
 		EndIf
 	EndIf
 
@@ -1526,8 +1532,24 @@
 	; Pack
 	Topping "Pack" ExtendData
 
-
+	If CART_COUNT  = 0 Then
-	Open "ROOT/taobin_project/xml/page_payment.xml" 
+		Open "ROOT/taobin_project/xml/page_payment.xml" 
+	Else
+		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 NextButton = "true"
+	EndIf
 </EventClick>
 </Button>