From 187739ff71b48b7fbc7533d68ab8cb870e1d2ad5 Mon Sep 17 00:00:00 2001
From: worawut <worawut@forth.co.th>
Date: Wed, 2 Oct 2024 11:12:45 +0700
Subject: [PATCH] spiralNow

---
 spiral/xml/page_catalog_vending_machine.xml | 3 ++-
 xml/page_back_to_main.xml                   | 2 +-
 xml/page_catalog.xml                        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
index 7b918758..a723648d 100644
--- a/spiral/xml/page_catalog_vending_machine.xml
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -150,6 +150,7 @@
 
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
+	DEBUGVAR SetSpiralOnline
     If NextPage = "-" Then
 
     Else
@@ -229,7 +230,7 @@
 			If SetSpiralOnline = 1 Then
 				Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 			Else
-          	  Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
+          	   Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml"
 			EndIf
         Else
             Open "ROOT/taobin_project/xml/page_catalog.xml" 
diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml
index e5ffcf3f..6bc53937 100644
--- a/xml/page_back_to_main.xml
+++ b/xml/page_back_to_main.xml
@@ -3,7 +3,7 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-		
+	Var SetSpiralOnline = 0
 	; Reset here
 	Var CheckCupStateDoorCupClose = ""
 
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 5c092411..dfd3f9d9 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -6,7 +6,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	If SetSpiralOnline = 1 Then
-		 Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 	EndIf
 	If InternationalEnable = 1 Then
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"