From 916eb5879a0e822f3e2cc8570b65b4ece5a62b59 Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Mon, 11 Mar 2024 10:37:43 +0700
Subject: [PATCH] THAI: fix bug 1 baht on other menus

---
 xml/event/powerup_free_1/page_powerup_catalog.xml  |  1 +
 xml/event/powerup_free_1/page_powerup_identity.xml |  4 +++-
 xml/page_thankyou.xml                              |  1 +
 xml/page_topping_select7.xml                       | 12 ++++++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/xml/event/powerup_free_1/page_powerup_catalog.xml b/xml/event/powerup_free_1/page_powerup_catalog.xml
index 3aed045a..f70a4ed6 100644
--- a/xml/event/powerup_free_1/page_powerup_catalog.xml
+++ b/xml/event/powerup_free_1/page_powerup_catalog.xml
@@ -274,6 +274,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+    Var FromPowerUpPro = 0
     If SpiralOnline = "true" Then
         If Seeker =  "curr" Then
             Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
diff --git a/xml/event/powerup_free_1/page_powerup_identity.xml b/xml/event/powerup_free_1/page_powerup_identity.xml
index 38883fec..50d4e6ab 100644
--- a/xml/event/powerup_free_1/page_powerup_identity.xml
+++ b/xml/event/powerup_free_1/page_powerup_identity.xml
@@ -101,7 +101,6 @@
                 Var load_gif_stage = "Invisible"
                 Var FailState = "Enable"
             EndIf
-            Refresh
         Else
             ; Error
             Var FullQuotaState = "Enable"
@@ -109,6 +108,8 @@
 
     EndIf
 
+    Refresh
+
     ; If StepGetServer = 1 Then
 
     ;     If Ext1a = "ok" Then
@@ -144,6 +145,7 @@
     ; handle quota full
     ; response smth
     Var FullQuotaState = "Enable"
+    Refresh
 
 </EventActionError>
 
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 1e0a5722..e483d327 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -286,6 +286,7 @@
 				AddData 44 IDNum
 				; clear id
 				Var IDNum = ""
+				Var FromPowerUpPro = 0
 			EndIf
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		Else
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index ad83370e..7c66fb6a 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -892,7 +892,7 @@
 	;Open PreviseXMLFileName2
 	DEBUGVAR OpenFromXML
 
-	
+	Var FromPowerUpPro = 0
 	
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	
@@ -6432,6 +6432,8 @@
 		AddData Cid TelNumPromotion IDNum PointCrm GetScore
 	EndIf
 
+	Var FromPowerUpPro = 0
+
 	If  Seeker = "next" Then 
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
@@ -7657,7 +7659,13 @@
 <Button>
 <X> 673 </X>
 <Y> 1785 </Y>
-<State> FreePowerup </State>
+<State> eval(
+	If FromPowerUpPro = 1 Then
+		Var return = FreePowerup;
+	Else
+		Var return = "Invisible"
+	EndIf
+) </State>
 <Filename> Var( DirImage + "/bn_powerup1baht.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_powerup1baht.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>