From 7a86a84e925652b7f1bfca01267603961efa7289 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Tue, 1 Jul 2025 11:10:09 +0700
Subject: [PATCH] THA: Changed get discount condition

---
 xml/event/7.7_up_to_35/can_get_code.ev | 41 ++++++++++++++++++++++++++
 xml/event/tricker.ev                   |  1 +
 xml/page_collect_point_1.xml           | 25 +++-------------
 3 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 xml/event/7.7_up_to_35/can_get_code.ev

diff --git a/xml/event/7.7_up_to_35/can_get_code.ev b/xml/event/7.7_up_to_35/can_get_code.ev
new file mode 100644
index 00000000..37da0c57
--- /dev/null
+++ b/xml/event/7.7_up_to_35/can_get_code.ev
@@ -0,0 +1,41 @@
+If Discount7_7Pro = 1 Then
+    SAVELOG "Discount7_7Pro"
+    Var canGetCode = 0
+
+    If Seeker.CodeChannel = 1 Then
+        If Seeker.VendingCode = "PX1" Then
+            Var canGetCode = 1
+        EndIf
+
+        If Seeker.VendingCode = "PX15" Then
+            Var canGetCode = 1
+        EndIf
+
+        If Seeker.VendingCode = "PX2" Then
+            Var canGetCode = 1
+        EndIf
+
+        If Seeker.VendingCode = "PX25" Then
+            Var canGetCode = 1
+        EndIf
+
+        If Seeker.VendingCode = "PX3" Then
+            Var canGetCode = 1
+        EndIf
+
+        If Seeker.VendingCode = "PX35" Then
+            Var canGetCode = 1
+        EndIf
+
+        DEBUGVAR Seeker.VendingCode
+        DEBUGVAR canGetCode
+    Else
+        Var canGetCode = 1
+    EndIf
+
+    If canGetCode = 1 Then
+        SAVELOG "7.7 Discount level collect point"
+        GETACCEXT TelephoneNumber 44
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
+    EndIf
+EndIf
\ No newline at end of file
diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index 80352d57..508fe9d9 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -305,6 +305,7 @@ STRCONTAIN "taobin_nopro" XMLProfile taobin_nopro
 If taobin_nopro = "true" Then
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
+	Var Discount7_7Pro = 0
 EndIf
 
 ;  zone block logic follow ingredent
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index 87c36d38..2a8a09c3 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -190,13 +190,8 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
-            If Seeker.CodeChannel = 0 Then
-                If Discount7_7Pro = 1 Then
-                    SAVELOG "7.7 Discount level collect point"
-                    GETACCEXT TelephoneNumber 44
-                    Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
-                EndIf
-            EndIf
+			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
+
 
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@@ -225,13 +220,7 @@
 		Var Param1 = TelephoneNumber + "/"
 		Var Param1 = Param1 + ParamCP
 
-		If Seeker.CodeChannel = 0 Then
-            If Discount7_7Pro = 1 Then
-                SAVELOG "7.7 Discount level collect point"
-                GETACCEXT TelephoneNumber 44
-                Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
-            EndIf
-        EndIf
+        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
 
 		GETACCEXT Param1 23
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@@ -692,13 +681,7 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
-            If Seeker.CodeChannel = 0 Then
-                If Discount7_7Pro = 1 Then
-                    SAVELOG "7.7 Discount level collect point"
-                    GETACCEXT TelephoneNumber 44
-                    Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
-                EndIf
-            EndIf
+            TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
 
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"