do cup on arm

inc/button_topping_select_confirm_order.inc

@@ -314,6 +314,11 @@ EndIf
     DEBUGVAR UserSelectProductCode
 
 
+    If Seeker.SmoothieToPayment = 1 Then
+        Var StrawState = "Press"
+        Var Seeker.thankStrawFlag = 1
+    EndIf
+    
     If StrawState = "Press" Then
         Machine StrawOrder
     EndIf
@@ -337,7 +342,7 @@ EndIf
         Var LidState = "Enable"
     EndIf
     ; 
-    
+    DEBUGVAR StrawState
 
     DEBUGVAR PromotionIDCurrentOrder
     

inc/remove_cup_on_arm_step.inc

@@ -75,7 +75,7 @@ If Seeker = "curr" Then
     If show_eng = "true" Then 
 
     Else
-        If Timeout = 14 Then
+        If TimeoutCupOnArm = 14 Then
             If buttonRemoveCupOnArm = "Enable" Then
                 If CupChecking = "false" Then
                     If DoorCupPosition = "bottom" Then
@@ -99,7 +99,7 @@ If Seeker = "curr" Then
         EndIf
     EndIf
 
-    Var Timeout = Timeout + 1
+    Var TimeoutCupOnArm = TimeoutCupOnArm + 1
 
 
 
@@ -120,6 +120,9 @@ If Seeker = "curr" Then
         
     EndIf
 
+    If CoundUpDelayCertainStage = "" Then
+        Var CoundUpDelayCertainStage = 0
+    EndIf
 
     If DoorCupPosition = "bottom" Then
         If CupOnArm = "true" Then
@@ -135,33 +138,46 @@ If Seeker = "curr" Then
         EndIf
     Else
         Var CoundUpDelayCertainStage = 0
+        
     EndIf
 
 
      ; zone cup on arm
     If buttonRemoveCupOnArm = "Enable" Then
-
-    Else
-        If CupOnArm = "true" Then
-
-            If CheckCupStateDoorCupClose = "" Then
-                Var buttonRemoveCupOnArm = "Enable"
-            EndIf
-
-            If CheckCupStateDoorCupClose = "done" Then
-                Var buttonRemoveCupOnArm = "Enable"
-            EndIf
-        Else
-
+        If DoorCupPosition = "top" Then
+            Var buttonRemoveCupOnArm = "Invisible"
         EndIf
+    Else
+        If DoorCupPosition = "top" Then
+            Var buttonRemoveCupOnArm = "Invisible"
+        Else
+            If CupOnArm = "true" Then   
+                If CheckCupStateDoorCupClose = "" Then
+                    Var buttonRemoveCupOnArm = "Enable"
+                EndIf
+
+                If CheckCupStateDoorCupClose = "done" Then
+                    Var buttonRemoveCupOnArm = "Enable"
+                EndIf
+            Else
+
+            EndIf
+        EndIf
+        
     EndIf
 
 
     
 Else
+    DEBUGVAR CH9991_Status
     DEBUGVAR CH9992_Status
+    DEBUGVAR CH9993_Status
     DEBUGVAR CH9994_Status
 
+
+
+
+
     ; Next hide away
     Var buttonRemoveCupOnArm = "Invisible"
 

inc/remove_cup_tag_on_arm.inc

@@ -12,14 +12,17 @@
 </EventMachineCupNotReady>
 
 <EventDrink>
-	SAVELOG "EventDrink"
+	SAVELOG "EVDrink"
 	DEBUGVAR HaveCup
 	DEBUGVAR CupOnArm
 	DEBUGVAR DoorCupPosition
 	DEBUGVAR CupChecking
 	DEBUGVAR CupArmMove
 	If CupOnArm = "false" Then
+		SAVELOG " button remove cup on arm hide "
 		Var buttonRemoveCupOnArm = "Invisible"
+	Else
+		Var buttonRemoveCupOnArm = "Enable"
 	EndIf
 	
 </EventDrink>