9.01

inc/remove_cup_button.inc

@@ -6,4 +6,5 @@ Var buttonRemoveCup = "Invisible"
 Var DoorCupPosition = "-"
 
 Var CheckCupStateDoorCupClose = "reset"
-Var CheckCupStateDoorCupCloseCnt = 30
+Var CheckCupStateDoorCupCloseCnt = 30
+Var TimeoutForProtectButtonHideLongTime = 0

inc/remove_cup_event_open.inc

@@ -4,7 +4,9 @@
     Var CheckCupStateDoorCupCloseCnt = 0
     Var CoundUpDelayCertainStage = 0
     Var TimeoutForProtectButtonHideLongTime = 0
+    Var TiemoutForDoorCupOpenLongTime = 0
     Var Timeout = 0
+    
 
 
     If show_eng = "true" Then 

inc/remove_cup_step.inc

@@ -1,9 +1,10 @@
 
 
 DEBUGVAR TimeoutForProtectButtonHideLongTime
+DEBUGVAR TiemoutForDoorCupOpenLongTime
 
 Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
-If TimeoutForProtectButtonHideLongTime > 60 Then
+If TimeoutForProtectButtonHideLongTime > 45 Then
     Var TimeoutForProtectButtonHideLongTime = 0
 
     If buttonRemoveCup = "Enable" Then
@@ -17,6 +18,18 @@ If TimeoutForProtectButtonHideLongTime > 60 Then
 EndIf
 
 
+Var TiemoutForDoorCupOpenLongTime = TiemoutForDoorCupOpenLongTime + 1
+If TiemoutForDoorCupOpenLongTime > 120 Then
+    Var TiemoutForDoorCupOpenLongTime = 0
+
+    If DoorCupPosition = "bottom" Then
+        Var TiemoutForDoorCupOpenLongTime = 0
+    Else
+        Machine DoorClose
+    EndIf
+EndIf
+
+
 If show_eng = "true" Then 
 
 Else
@@ -31,6 +44,15 @@ Else
                     EndIf
                 EndIf
             EndIf
+            If CupArmMove = "false" Then
+                If DoorCupPosition = "bottom" Then
+                    If InternationalEnable = 1 Then
+                        
+                    Else
+                        Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
+                    EndIf
+                EndIf
+            EndIf
         EndIf
     EndIf
 EndIf
@@ -50,7 +72,7 @@ Var Timeout = Timeout + 1
 
 Var TimeoutInstance0 = TimeoutInstance0 + 1
 
-If TimeoutInstance0 > 600 Then
+If TimeoutInstance0 > 360 Then
     Var TimeoutInstance0 = 0
     SAVELOG "Check Cup all"
     Machine CheckCupAll
@@ -69,6 +91,11 @@ If CheckCupStateDoorCupCloseCnt > 0 Then
     EndIf
     
 EndIf
+
+
+
+
+
 If HaveCup = "true" Then
 
     If CheckCupStateDoorCupClose = "" Then

inc/select_drink_current.inc

@@ -18,6 +18,8 @@
     ; Pack
     Topping "Pack" ExtendDataCurr
 
-    ;Menu "set-name" Seeker.showname
-    ;Menu "set-image" Seeker.PictureDrink
+    If SaveOrderNameAndPictureEnable = 1 Then
+        Menu "set-name" Seeker.showname
+        Menu "set-image" Seeker.PictureDrink
+    EndIf
 

inc/video.inc

@@ -238,6 +238,10 @@
             DEBUGVAR a_video_menu[ads_idx]
             Var ads_idx = 0
         EndIf
+              
+        ; Default. Do not edit here.
+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
 
         If CountryName = "Singapore" Then
             DEBUGVAR CountryName
@@ -270,8 +274,6 @@
 
             EndIf
         Else
-            Var AdvTaobinMenu = DefaultNormBanner
-            Var DisplayAds = AdvTaobinMenu + ".mp4"
 
             If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
                 Var AdvTaobinMenu = DefaultLargeBanner