From 3cb72f001c1f91b9631136fe61e857ce14b2c1ce Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Thu, 8 Dec 2022 17:22:58 +0700
Subject: [PATCH] Fix back to page_catalog

---
 spiral/xml/page_catalog_vending_machine.xml | 24 +++++++++++++++------
 xml/page_catalog.xml                        | 15 +++++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
index 9b9c62d1..5d99dfc0 100644
--- a/spiral/xml/page_catalog_vending_machine.xml
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -104,6 +104,12 @@
         ;Var Menu22Selected = "Enable"
         Var Menu22Selected = "Invisible"
 
+        If RecipeTag1 = "HealthTurnOn" Then
+            Var Menu22Selected = "Enable"
+        Else
+            Var Menu22Selected = "Invisible"
+        EndIf
+
     ; spiral
     Var MenuVSelected2 = "PressForever"
 
@@ -179,21 +185,25 @@
 </Image>
 
 
+
 ; back
 <Button>
 <X> 19 </X>
-<Y> 397 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Y> 381 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     If SpiralOnline = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
-    
+        If Seeker =  "curr" Then
+            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+        Else
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf 
     Else
-	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
+       Open "ROOT/taobin_project/xml/page_catalog.xml" 
+    EndIf
 
 </EventClick>
 </Button>
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index e74d7211..a7f5346e 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -6,12 +6,19 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
-	
-	DEBUGVAR RecipeTag1
-	If RecipeTag1 = "HealthTurnOn" Then
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+	If SpiralOnline = "true" Then
+
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+	Else
+
+		DEBUGVAR RecipeTag1
+		If RecipeTag1 = "HealthTurnOn" Then
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+		EndIf
+		
 	EndIf
 	
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	
 	TopView "show"