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

xml/page_board.xml

@@ -641,7 +641,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-
+	Var PayDetail=""
 	Open "ROOT/xml/service_menu.xml" 
 </EventClick>
 </Button>

xml/page_brewing3.xml

@@ -40,9 +40,12 @@
 	Var VendingTSIDTmp = ""
 	Var VendingTSIDProblem = ""
 	Var CreditReference = ""
+	Var PayCredit = 0
+
+	
 
 	If Seeker.PayWithQR = 1 Then
-		Var VendingTSIDTmp = VendingTSID
+		Var VendingTSIDTmp = Seeker.VendingTSID
 
 		If Seeker.TNumberTaobinCredit = "" Then
 			Var TelephoneNumber = "0899999999"
@@ -62,6 +65,7 @@
 					Var SessionID2 = SelectDrink
 					Var ServiceCredit = "coffee"
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					
 		Else
 
 					If Seeker.StoreCreditFlag = 1 Then
@@ -71,6 +75,7 @@
 						Var SessionID2 = SelectDrink
 						Var ServiceCredit = "coffee"
 						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+						
 
 					EndIf
 		EndIf
@@ -157,6 +162,23 @@
 	Var next_pic_bg = DirImage + "/bn_add_order.png"
 
 
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+
+	DEBUGVAR VendingCampaign
+
+
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
+
 </EventOpen>
 
 
@@ -280,6 +302,7 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 
+	
 	Var Timeout = Timeout + 1
 
 	If MOVE_CUP_TO_DOOR = "true" Then
@@ -515,6 +538,10 @@
 		EndIf
 	EndIf
 
+	If MachineState_Result = 1 Then
+		;Var MachineState_Result = 2
+	EndIf
+
 	If MachineState_Result = 1 Then
 		If  waitAckPay = 0 Then 
 
@@ -554,7 +581,7 @@
 			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"
+ 			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 Seeker.CodeChannel = 1 
@@ -737,6 +764,10 @@
 		EndIf
 	EndIf
 
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
 	DEBUGVAR CountUpBrewing
 	; animation video loop
 	If AnimationOn = "true" Then
@@ -996,14 +1027,16 @@
 <State>EnableSelectMenuBetweenBrew</State>
 <Filename> next_pic_bg </Filename>
 <EventClick> 
+	If MachineState_Result = 0 Then
 	
-	SAVELOG "User click next button"
+		SAVELOG "User click next button"
 
-	Var Seeker = "next"
+		Var Seeker = "next"
-	Var MultiPayEnable = "false"
+		Var MultiPayEnable = "false"
-	CoinPause
+		CoinPause
 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
 </EventClick> 
 </Button>
 

xml/page_brewing3Conti.xml

@@ -8,9 +8,15 @@
 
 	Var ActionOKCase = 0
 	Var Seeker = "curr"
+
+	If  PayCredit = 0 Then
+		CoinBack
+	EndIf
+
+
 	
 
-
+	Var TimeoutWaitPay = 10 
 	
     Var PayReference = ""
 	Var PayType = ""
@@ -270,7 +276,7 @@
 	EndIf
 
 	If  waitAckPay = 2 Then  
-		If Timeout > 10 Then
+		If Timeout > TimeoutWaitPay Then
 
 			If Seeker.CodeChannel = 1 Then 
 				Var SessionID2 = SelectSlot + ":"
@@ -356,6 +362,7 @@
 			;EndIf
 
 			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
 			Var Timeout = 5
 			Var ActionOKCase = 1
 
@@ -400,6 +407,7 @@
 			;EndIf
 
 			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
 			Var Timeout = 5
 			Var ActionOKCase = 1
 
@@ -429,6 +437,9 @@
 			Var DEE = PayDetail
 
 			PAYEXT SVT ACC VendingTSIDTmp DEE
+			
+			CoinBack
+			
 		
 			Var ActionOKCase = 1
 			If Seeker.CodeChannel = 0 Then 
@@ -437,6 +448,7 @@
 			EndIf
 
 			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45 
 			Var Timeout = 5
 
 
@@ -445,6 +457,12 @@
 		EndIf
 	EndIf
 
+	If MachineState_Result = 1 Then
+
+		;Var MachineState_Result = 2
+
+	EndIf
+
 	If MachineState_Result = 1 Then
 		If  waitAckPay = 0 Then 
 
@@ -481,7 +499,7 @@
 			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"
+ 			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 Seeker.CodeChannel = 1 
@@ -547,6 +565,9 @@
 				EndIf
 
 				PAYEXT SVT ACC VendingTSIDTmp DEE
+				
+				CoinBack
+				
 
 			EndIf
 			

xml/page_catalog.xml

@@ -124,6 +124,10 @@
 
     EndIf
 
+	If Seeker = "next" Then
+		Var ShowButtonClick2 = "Invisible"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -135,7 +139,11 @@
 	EndIf
 
 	If countDownRetrun = 0 Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		 If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
 	EndIf
 
 	
@@ -345,6 +353,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
+	Var PayDetail=""
 	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
 	
 </EventClick>

xml/page_collect_point_1.xml

@@ -12,6 +12,7 @@
 	Var ShowTextNumber = "Enable"
 	Var Timeout = 0
 	Var TelephoneNumber = ""
+	Var TelephoneNumberX = ""
 
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
@@ -51,6 +52,8 @@
 
 			SAVELOG "collect_point1-p52."
 
+
+			Var TelephoneNumberX = TelephoneNumber
 			GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 
@@ -69,7 +72,7 @@
 		Var AccountType = ""
 
 		SAVELOG "collect_point1-p71."
-
+		Var TelephoneNumberX = TelephoneNumber
 		GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 
@@ -614,7 +617,7 @@
 		Var AccountType = ""
 
 		SAVELOG "collect_point1-p583."
-
+		Var TelephoneNumberX = TelephoneNumber
 		GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 

xml/page_collect_point_2.xml

@@ -49,6 +49,9 @@
 			Var TaobinErrorNetwork = 1
 			Var Seeker.PointTaobinStr = "" + PayAmount
 			Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
+			If TelephoneNumber = "" Then
+				Var TelephoneNumber = TelephoneNumberX
+			EndIf
 			Var Seeker.TNumberTaobinMember= TelephoneNumber
 			Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 		EndIf
@@ -74,6 +77,9 @@
 			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		Else
 			Var StepGetPoint = 1
+			If TelephoneNumber = "" Then
+				Var TelephoneNumber = TelephoneNumberX
+			EndIf
     		GETACCEXT TelephoneNumber 14
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 		EndIf

xml/page_drinkfail2Multi.xml

@@ -257,6 +257,9 @@
 							
 						SAVELOG PayO2
 						Var VendingCampaign = Seeker.IntVendingCampaign
+						If ServiceAmountSum = 0 Then
+							Var VendingCampaign = 0
+						EndIf
 						Var CreditReference = CreditReferenceTmp
 
 						Var PayType = ""
@@ -274,6 +277,7 @@
 
 				Var CART_INDEX = CART_INDEX + 1
 				Cart "PreparID" CART_INDEX
+				Cart "MakeID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
 
 			Else

xml/page_drinkok.xml

@@ -217,6 +217,7 @@
 
 				Var CART_INDEX = CART_INDEX + 1
 				Cart "PreparID" CART_INDEX
+				Cart "MakeID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
 			Else
 
@@ -236,8 +237,14 @@
 				Else
 					If  NextOrder = "true" Then
 						; next order set. Havecup and checkup value must false. Certain cup not on any arm.
+
+
+						DEBUGVAR HaveCup
+						DEBUGVAR CHECKCUP
 						If HaveCup = "false" Then 
-							If CHECKCUP = "false" Then
+							If CHECKCUP = "true" Then
+								
+							Else
 								Var NextOrder = "false"
 
 								TransferVar "next" "curr"

xml/page_lid_straw.xml

@@ -79,7 +79,7 @@
 	;	Var lidAndStrawOldPageIgnore = "false"
 	
 	If Seeker = "next" Then
-		CoinBack
+		;CoinBack
 		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
 	Else
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  

xml/page_payment.xml

@@ -46,7 +46,10 @@
 	Var Seeker.TNumberTaobinCredit = ""
 	Var Seeker.TNumberTaobinMember = ""
 	Var Seeker.CoffeePinNumber = ""
-	;Var VendingTSIDTmp = ""
+	
+	Var Seeker.VendingDiscount = 0
+	Var Seeker.VendingCampaign = 0
+	Var Seeker.VendingTSID = ""
 
 	
 	Var PayType = ""

xml/page_payment_cash.xml

@@ -28,6 +28,7 @@
 	Var PayInfoCFlag = 0
     Var ActionOKCase = 0
 	Var VendingCampaign = Seeker.IntVendingCampaign 
+	Var Seeker.VendingCampaign = Seeker.IntVendingCampaign 
 
 	Var PayAmount = PriceDrink
 	
@@ -393,6 +394,7 @@
 				MakeDrinkV1  SelectDrink SelectSugarID
 			EndIf
 			Var Seeker.PayWithQR = 1
+			Var Seeker.VendingTSID = VendingTSID
 			
 
 			Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
@@ -463,6 +465,8 @@
 				Var LOADING_STATE = "Invisible"
 			EndIf
 		EndIf
+	Else
+		Var PayInfoCFlag = 1
 	EndIf
 
 	Refresh
@@ -666,18 +670,20 @@
 				Var SessionID2 = SelectDrink
 				Var ServiceCredit = "coffee"
 				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-				;If NoGotoMenupage = "false" Then
+				Var PayCredit = 1
-				;
+				
-				;	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-				;EndIf
 				Var ActionOKCase = 1
-				If Seeker.IntVendingCampaign = 0 Then
+				If Seeker = "curr" Then 
-						If Seeker = "curr" Then
+					If Seeker.IntVendingCampaign = 0 Then
-							Open "ROOT/taobin_project/xml/page_catalog.xml"  
+							If Seeker = "curr" Then
-						Else
+								Open "ROOT/taobin_project/xml/page_catalog.xml"  
-							
+							Else
-							Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+								
-						EndIf
+								Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+							EndIf
+					EndIf
+				Else
+					;wait ack
 				EndIf
 			EndIf
 		EndIf

xml/page_payment_cashMore.xml

@@ -23,6 +23,7 @@
 	Var PayInfoCFlag = 0
     Var ActionOKCase = 0
 	Var VendingCampaign = Seeker.IntVendingCampaign 
+	Var Seeker.VendingCampaign = Seeker.IntVendingCampaign 
 
 	Var PayAmount = PriceDrink
 
@@ -375,8 +376,11 @@
 			Var PayReference = MultiTSID
 			;GenHashWithTimeStamp PayReference
 			Var Seeker.PayWithQR = 1
+			Var Seeker.VendingTSID = VendingTSID
+			
 			Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
 			Var BrewingTextThai = "เตรียมแก้ว"
+			Cart "MakeID" CART_INDEX
 			Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 				
 		EndIf
@@ -550,6 +554,7 @@
 				Var CART_INDEX = 1
 				Var PayReference = ""
 				GenHashWithTimeStamp PayReference
+				Cart "MakeID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 
 			EndIf
@@ -1174,6 +1179,8 @@
 					Var ECommerceQR =	ECommerceQR + Seeker.TNumberTaobinCredit
 					Var ECommerceQR =	ECommerceQR + ":"
 					Var ECommerceQR = 	ECommerceQR + Seeker.IntVendingCredit
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR = 	ECommerceQR + PointCrm
 				EndIf
 
 				Var ServiceParameter = "max"

xml/page_payment_code.xml

@@ -198,6 +198,7 @@
 						Var CART_INDEX = 1
 						Var PayReference = ""
 						GenHashWithTimeStamp PayReference
+						Cart "MakeID" CART_INDEX
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					Else
 						Var CART_INDEX = 0

xml/page_payment_credit3.xml

@@ -145,6 +145,7 @@
 				Var CART_INDEX = 1
 				Var PayReference = ""
 				GenHashWithTimeStamp PayReference
+				Cart "MakeID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			Else
 				Var CART_INDEX = 0

xml/page_payment_multi.xml

@@ -159,6 +159,9 @@
 	Var Seeker.TNumberTaobinCredit = ""
 	Var Seeker.TNumberTaobinMember = ""
 	;Var VendingTSIDTmp = ""
+	Var Seeker.VendingDiscount = 0
+	Var Seeker.VendingCampaign = 0
+	Var Seeker.VendingTSID = ""
 
 	
 	Var MultiTSID = ""

xml/page_payment_storeCredit3.xml

@@ -55,6 +55,7 @@
 				Var CART_INDEX = 1
 				Var PayReference = ""
 				GenHashWithTimeStamp PayReference
+				Cart "MakeID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			Else
 				Var CART_INDEX = 0

xml/page_thankyou.xml

@@ -85,7 +85,7 @@
 
 		If 	CART_INDEX = 0  Then   
 		Else
-			Cart "MakeID" CART_INDEX
+			;Cart "MakeID" CART_INDEX
 		EndIf
 		
 		 If Seeker.PayWithQR = 0 Then

xml/page_thankyouConti.xml

@@ -17,6 +17,7 @@
 	Var ErrTimeout = 0
 	Var ActionOKCase = 0
 	Var ChangeTimeout = 0
+	Var ChangeOK = 0
 	
 	Var MachineState_Result = 0
 
@@ -26,8 +27,12 @@
 	Var Tel_Confirm_Flag = 0
 	Var LastMakeDrinkResult = "-"
 	
+	DEBUGVAR MIGGAZE2
+	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"
@@ -85,13 +90,18 @@
 		Topping "Pack" ExtendData
 
 		Var MachineStage = "NextOrder"
+
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + ExtendData
 	
 
 
 	EndIf
 
 
-	
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineStage
+	DEBUGVAR NextOrderStatus
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -115,7 +125,12 @@
 
 		If 	CART_INDEX = 0  Then   
 			DEBUGVAR Seeker.selected_a_drink
-            MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
+			If NextOrderStatus = "fail" Then
+				Var LastMakeDrinkResult = "fail"
+			Else
+				
+            	MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
+			EndIf
 		Else
 			;Cart "MakeID" CART_INDEX
 		EndIf

xml/page_thankyouMore.xml

@@ -84,7 +84,7 @@
 
 		If 	CART_INDEX = 0  Then   
 		Else
-			Cart "MakeID" CART_INDEX
+			;Cart "MakeID" CART_INDEX
 			
 			Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
 			Var VideoFileBegin = "TaoBin2_draft02_art"