Fix

inter/tha/hardware/exhaust_fan_schedule.ev

@@ -20,10 +20,6 @@ DEBUGVAR AirHumidity
 
 DEBUGVAR ExhaustFanTime1Hour
 If ExhaustFanAuto = "2" Then
-    If SystemTimeHourInt > ExhaustFanTime1Hour Then
-        SAVELOG " Exhaust Fan mode 2 come back to mode auto1 "
-        __CMD "CLI" "set-fan-mode=Fan_Auto" "-" "-"
-    EndIf
     If SystemTimeHourInt = 4 Then
         SAVELOG " Exhaust Fan mode 2 come back to mode auto2 "
         __CMD "CLI" "set-fan-mode=Fan_Auto" "-" "-"

inter/tha/xml/multi/control_and_lang_swith.ev

@@ -72,7 +72,10 @@ Else
     OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_health.lxml"
-EndIf
+EndIfi
+
+
+DEBUGVAR Catalog20BahtEnable
 
 If Catalog20BahtEnable = 1 Then
     OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
@@ -80,7 +83,6 @@ If Catalog20BahtEnable = 1 Then
     Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_20_baht.lxml"
 
-    ;tha/xml/multi/v3/page_catalog_group_20_baht.lxml
 Else
 
     OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
@@ -115,6 +117,8 @@ DEBUGVAR InstanceTabOpenFile4
 DEBUGVAR InstanceTabOpenFile5
 DEBUGVAR InstanceTabOpenFile6
 DEBUGVAR InstanceTabOpenFile7
+DEBUGVAR InstanceTabOpenFile8
+DEBUGVAR InstanceTabOpenFile9
 
 DEBUGVAR InstanceTabOpenFile10
 

inter/tha/xml/multi/menu_catalog_default_init.lxml

@@ -184,3 +184,11 @@
 
     Var ButtonLanguageListXPosition = 990
     Var ButtonLanguageListYPosition = 450 - 38
+
+    If Catalog20BahtEnable = 1 Then
+		Var Menu61Selected = "Invisible"
+		Var Menu63Selected = "Enable"
+	Else
+		Var Menu61Selected = "Enable"
+		Var Menu63Selected = "Invisible"
+	EndIf

inter/tha/xml/multi/page_catalog.lxml

@@ -924,10 +924,11 @@
 <Width> 296 </Width>
 <Height> 344 </Height>
 <MarginLeft> 42 </MarginLeft>
-<Button>
 <State> Menu20BahtStage </State>
-<Filename> Var(DirImage + "/bn_soda_20B.png") </Filename>
+
-<FilenamePress> Var(DirImage + "/bp_soda_20B.png") </FilenamePress>
+<Button>
+<Filename> Var(DirImage + "/bn_soda_20B_EN.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_soda_20B_EN.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>

inter/tha/xml/multi/pepsi7up.ev

@@ -1,3 +1,3 @@
-SAVELOG "Call other other"
+SAVELOG "Call pepsi"
 TabMenuVisibleInst 9
 Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

inter/tha/xml/multi/tab_menu.lxml

@@ -50,13 +50,7 @@
         EndIf
     EndIf
 
-    If Catalog20BahtEnable = 1 Then
+
-		Var Menu61Selected = "Invisible"
-		Var Menu63Selected = "Enable"
-	Else
-		Var Menu61Selected = "Enable"
-		Var Menu63Selected = "Invisible"
-	EndIf
 
     DEBUGVAR Menu0Selected
     DEBUGVAR NextPage
@@ -281,13 +275,14 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu63Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_20_baht.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_20_baht.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
            Var NextPage = "-"
-            TabMenuVisibleInst 7
+            TabMenuVisibleInst 8
             OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 
         </EventClick>

inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml

@@ -15,6 +15,7 @@
 
     SAVELOG "Onshow 1"
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
     Var Menu63Selected = "PressForever"
 
     SAVELOG "Onshow 2"
@@ -27,7 +28,6 @@
 
     SetInstanceIgnoreTouch
 
-    Var inst_show_coffee_counter = 4
 	DEBUGVAR SlientRefreshIndex
 
     RefreshAll
@@ -37,7 +37,31 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+
+    ; setvarint RefreshPepsiMenu 1
+    If RefreshPepsiMenu = 1 Then
+        Var RefreshPepsiMenu = 0
+        SAVELOG "OPEN FROM 7"
+        Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml"
+    EndIf
+
+    GetVisible inst_show_pepsi_7up
+
+
+    If inst_show_pepsi_7up = 1 Then
+        If inst_show_pepsi_7up_counter > 0 Then
+            DEBUGVAR inst_show_pepsi_7up_counter
+
+            Var inst_show_pepsi_7up_counter = inst_show_pepsi_7up_counter - 1
+
+            If inst_show_pepsi_7up_counter = 0 Then
+                RefreshAll
+                Var inst_show_pepsi_7up_counter = 4
+            EndIf
+        EndIf
+    EndIf
 
 
     TimerReset

inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt

@@ -17,6 +17,7 @@
 
     SAVELOG "Onshow 1"
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
     Var Menu63Selected = "PressForever"
 
     SAVELOG "Onshow 2"
@@ -29,7 +30,6 @@
 
     SetInstanceIgnoreTouch
 
-    Var inst_show_coffee_counter = 4
 	DEBUGVAR SlientRefreshIndex
 
     RefreshAll
@@ -39,7 +39,31 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+
+    ; setvarint RefreshPepsiMenu 1
+    If RefreshPepsiMenu = 1 Then
+        Var RefreshPepsiMenu = 0
+        SAVELOG "OPEN FROM 7"
+        Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml"
+    EndIf
+
+    GetVisible inst_show_pepsi_7up
+
+
+    If inst_show_pepsi_7up = 1 Then
+        If inst_show_pepsi_7up_counter > 0 Then
+            DEBUGVAR inst_show_pepsi_7up_counter
+
+            Var inst_show_pepsi_7up_counter = inst_show_pepsi_7up_counter - 1
+
+            If inst_show_pepsi_7up_counter = 0 Then
+                RefreshAll
+                Var inst_show_pepsi_7up_counter = 4
+            EndIf
+        EndIf
+    EndIf
 
 
     TimerReset