Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece

xml/page_topping_select8.xml

@@ -13,6 +13,9 @@
 	EndIf
 	Machine WakeUp
 
+	Var MachineEvent = 0
+	Var MachineSpiralStage = "-"
+
 	Var OverridePrice = 100
 
 	Var Seeker.orderFromNewTopping  = 1 
@@ -780,6 +783,8 @@
 	Var LidState = "Enable"
 	Var MAT_ID_9701 = StrawState
 
+
+
 	Var SubMenuGroupIDSlot6_1 = 0
 
 
@@ -886,6 +891,7 @@
 
 	Var MenuReasonStage = "Invisible"
 	Var AdvertOpened = "false"
+	Var SpiralReady = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -936,6 +942,14 @@
     DEBUGVAR Seeker
 
 	If SelectDrinkType = 1 Then
+		If Seeker.SmoothieToPayment = 1 Then
+			If SpiralReady = 1 Then
+
+			Else
+				Var MenuReady = "WaitSpiral"
+			EndIf
+		EndIf
+
         If MenuReady = "YES" Then
             DEBUGVAR ToppingDetail
 			DEBUGVAR SelectToppingType
@@ -1276,6 +1290,25 @@
 	Var bottom_y = 1060 + bottom_offset
 	Var accept_y = 1075 + bottom_offset
 
+	If Seeker.SmoothieToPayment = 1 Then
+		DEBUGVAR MachineSpiralStage 
+		If MachineEvent = 1 Then
+			If MachineSpiralStage = "-" Then
+
+			Else
+				If MachineSpiralStage = "spiral-valid" Then
+					Function 2
+					Var SpiralReady = 1
+				Else
+					; Verify error
+					DEBUGVAR MachineSpiralErrorCode
+					Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
 	Refresh
 	TimerReset
 </EventTimeout> 
@@ -2851,6 +2884,10 @@
 			DEBUGVAR MAT_ID_9701
 			DEBUGVAR StrawState
 
+			If Seeker.SmoothieToPayment = 1 Then
+				Var StrawState = "Press"
+			EndIf
+
 			If StrawState = "Press" Then
 				Var Seeker.thankStrawFlag = 1
 			Else
@@ -3871,6 +3908,19 @@
 		Var CustomCoffeeQuantityAdditionalPrice = "(25฿)"
 		TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
 
+
+		If Seeker.SmoothieToPayment = 1 Then
+	        Var MachineEvent = 1
+			DEBUGVAR LinkProductCodeAnotherMachine[0]
+
+			Var MachineSpiralStage = "-"
+
+			GenHashWithTimeStamp SpiralRef
+			SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef
+
+
+		EndIf
+
 		Function 2
 	EndIf
 
@@ -12255,4 +12305,20 @@
 
 </EventUnitTest4>
 
+<EventUnitTest7>
+    <Name> "MachineSpiralStage set spiral-valid" </Name>
+    <Script>
+	          Var MachineSpiralStage = "spiral-valid"
+	</Script>
+	
+</EventUnitTest7>
+
+
+<EventUnitTest8>
+	<Name> "MachineSpiralStage set error" </Name>
+    <Script>
+	    Var MachineSpiralStage = "Error"
+	</Script>
+</EventUnitTest8>
+
 </Popup>