From 7919444e55f91b217c8d34a3a0a7d24a7e342260 Mon Sep 17 00:00:00 2001
From: wanlop run <wanlop.r@forth.co.th>
Date: Tue, 21 May 2024 14:53:30 +0700
Subject: [PATCH] 8.50 promotion_energy_drink_1_bath.xml and deactive return

---
 ...on_when_deative.ev => return_condition.ev} |  0
 xml/event/promotion_energy_drink_1_bath.xml   | 37 +++++++++++++++++++
 xml/page_catalog2.xml                         |  5 ++-
 xml/page_topping_select7.xml                  |  9 +++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 rename inc/{return_condition_when_deative.ev => return_condition.ev} (100%)

diff --git a/inc/return_condition_when_deative.ev b/inc/return_condition.ev
similarity index 100%
rename from inc/return_condition_when_deative.ev
rename to inc/return_condition.ev
diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml
index 532d883b..8b4aca44 100644
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@@ -13050,6 +13050,43 @@ LIMENADE SODA" </Value>
 
 
 
+<Button>
+    <X> 42 </X>
+    <Y> 518 </Y>
+
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+        
+</EventOnClick>
+
 
 
 
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index 1a657a8a..d79753c6 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -109,8 +109,9 @@
 	EndIf
 
 	If SELLSTATUS = "DEACTIVE" Then
-	
-	;include="ROOT/taobin_project/inc/return_condition_when_deative.ev"
+		SAVELOG "DEACTIVE in catalog2.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
 	
 	EndIf
 
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 1727bb33..384d8353 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -509,6 +509,15 @@
 	DEBUGVAR MenuReady
 	DEBUGVAR CupRemain
 
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select7.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
+	
+	EndIf
+
+
+
 	If SelectDrinkType = 1 Then