Merge

inter/tha/xml/page_topping_frozen_fruit_select.lxml

@@ -13,6 +13,12 @@
 
 	CRLFToSpace showname
 	CRLFToSpace showdesc
+<<<<<<< HEAD
+=======
+
+	Var MachineEvent = 0
+	Var MatchineSpiralStage = "-"
+>>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
 
 	;- Begin
 	Var PriceDrinkNoTop = PriceDrink
@@ -173,15 +179,18 @@
 		EndIf
 	EndIf
 
+
 	DEBUGVAR MatchineSpiralStage
 
-	If MatchineSpiralStage = "spiral-valid" Then
-  		Function 2
-    Else
-        ; Verify error
-        DEBUGVAR MachineSpiralErrorCode
-		Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
-	EndIf
+	If MachineEvent = 1 Then
+    	If MatchineSpiralStage = "spiral-valid" Then
+      		Function 2
+        Else
+            ; Verify error
+            DEBUGVAR MachineSpiralErrorCode
+    		Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
+    	EndIf
+    EndIf
 
 	Refresh
 	TimerReset
@@ -324,12 +333,19 @@
 
 	Else
 
+        Var MachineEvent = 1
         DEBUGVAR LinkProductCodeAnotherMachine[0]
         DEBUGVAR LinkProductCodeAnotherMachine[1]
         DEBUGVAR LinkProductCodeAnotherMachine[2]
+<<<<<<< HEAD
 
         Var MatchinePrialStage = "-"
 
+=======
+
+        Var MatchineSpiralStage = "-"
+
+>>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
         GenHashWithTimeStamp SpiralRef
         SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef