From 507d819b903f4ad85f7d19102a8d0ee72c832086 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 24 Apr 2024 18:00:42 +0700
Subject: [PATCH] THAI: update collect point even discount is = drink price

---
 xml/page_collect_point_1.xml |  7 +++++++
 xml/page_payment_code.xml    | 32 ++++++++++----------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index 2b95b37e..ecb22b84 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -14,6 +14,13 @@
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"	
 	EndIf 
 
+	If Seeker.CodeChannel = 1 Then
+		If Seeker.CollectPointMain = 0 Then
+			SAVELOG "Seeker.CollectPointMain = 0 Jump!!!"
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		EndIf
+	EndIf
+
 	Var ShowErrorText = "Invisible"
 
 	Var Tel_Confirm_State = "Invisible"
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index bad6224d..4dc6d43f 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -169,8 +169,9 @@
 		SAVELOG ECommerce
 
         SPLIT  ECommerce "/"  5  Seeker.VendingCode
-	    SPLIT  ECommerce "/"  7   Seeker.VendingCampaignRI3
+	    SPLIT  ECommerce "/"  7  Seeker.VendingCampaignRI3
 	    SPLIT  ECommerce "/"  8  VendingCampaign1
+		SPLIT  ECommerce "/"  9  ShouldCollectPoint
 
 		If Seeker.VendingCode = "" Then
 			Var Seeker.VendingCode = "C00" 
@@ -190,7 +191,9 @@
 
 		SAVELOG Seeker.VendingCode
 		SAVELOG  Seeker.VendingCampaignRI3
-
+		
+		SAVELOG ShouldCollectPoint
+		INT ShouldCollectPoint
 
 		If Seeker.VendingCode = "C00" Then
 
@@ -226,24 +229,8 @@
 
 				If Seeker.IntVendingCampaign >= PayAmount Then 
 
-					If IntVendingCampaign1 >= 0  Then
-						If Seeker.VendingCode = "FFR50" Then
-							Var Seeker.CollectPointMain = 0
-							Var Seeker.CollectPointPromotion = 0
-						Else
-							Var Seeker.CollectPointMain = 1
-							Var Seeker.CollectPointPromotion = 1
-						EndIf
-					EndIf
-
-					If Seeker.VendingCode = "MKF" Then
-						Var Seeker.CollectPointMain = 0
-						Var Seeker.CollectPointPromotion = 1
-					EndIf
-
-					If Seeker.VendingCode = "AFR" Then
-						Var Seeker.CollectPointMain = 0
-						Var Seeker.CollectPointPromotion = 1
+					If ShouldCollectPoint = 1 Then
+						Var Seeker.CollectPointMain = 1
 					EndIf
 
 					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
@@ -277,8 +264,9 @@
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf
 				Else
-					Var Seeker.CollectPointMain = 1
-					Var Seeker.CollectPointPromotion = 1
+					If ShouldCollectPoint = 1 Then
+						Var Seeker.CollectPointMain = 1
+					EndIf
 				EndIf