From ad93f5a88f70db2276789ca6045ea5249a600de6 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 7 Aug 2024 18:27:09 +0700
Subject: [PATCH] AUS: Update collect point

---
 inter/aus/xml/page_brewing3.lxml             | 16 +++---
 inter/aus/xml/page_brewing3Conti.xml         | 46 ++++++++++------
 inter/aus/xml/page_collect_point_2.lxml      | 18 -------
 inter/aus/xml/page_collect_point_3.lxml      | 56 ++++++++++++++++----
 inter/aus/xml/page_collect_point_redeem.lxml | 17 +++---
 xml/open_page_collect_point.ev               |  4 +-
 xml/page_check_member2_campaign.xml          |  2 +-
 7 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml
index 0cc3087e..937420d7 100644
--- a/inter/aus/xml/page_brewing3.lxml
+++ b/inter/aus/xml/page_brewing3.lxml
@@ -1110,16 +1110,18 @@
 				Var Cid = 26 
 
 				If NewCollectPointFlag = 1 Then
-					If Seeker.redeem2Dollar = 1 Then
+					If Seeker.redeemDiscount = "2_dollar" Then
 						Var Cid = 49
 					EndIf
 
-					If Seeker.redeem1Dollar = 1 Then
+					If Seeker.redeemDiscount = "1_dollar" Then
 						Var Cid = 48
 					EndIf
+
+					Var Seeker.redeemDiscount = ""
 				EndIf
  
-				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 			
 			Var ServiceType = "coffee"
@@ -1224,15 +1226,17 @@
 			If AddData = 1 Then
 				Var Cid = 26
 				If NewCollectPointFlag = 1 Then
-					If Seeker.redeem2Dollar = 1 Then
+					If Seeker.redeemDiscount = "2_dollar" Then
 						Var Cid = 49
 					EndIf
 
-					If Seeker.redeem1Dollar = 1 Then
+					If Seeker.redeemDiscount = "1_dollar" Then
 						Var Cid = 48
 					EndIf
+
+					Var Seeker.redeemDiscount = ""
 				EndIf
-				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 
 
diff --git a/inter/aus/xml/page_brewing3Conti.xml b/inter/aus/xml/page_brewing3Conti.xml
index 18bfd775..bdc5284f 100644
--- a/inter/aus/xml/page_brewing3Conti.xml
+++ b/inter/aus/xml/page_brewing3Conti.xml
@@ -614,18 +614,24 @@
 			If AddData = 1 Then
 				Var Cid = 26
 				DEBUGVAR "Brewing3Conti"
-				DEBUGVAR Seeker
-				DEBUGVAR Seeker.UseGet15Discount
-				If NewCollectPoint = 1 Then
-					If Seeker.UseGet15Discount = 1 Then
-						Var Cid = 39
-					Else
-						Var Cid = 40
-						Var PreviousSeeker.UseGetDrink5Bath = 0
+				If NewCollectPointFlag = 1 Then
+					If Seeker.redeemDiscount = "2_dollar" Then
+						Var Cid = 49
 					EndIf
+
+					If Seeker.redeemDiscount = "1_dollar" Then
+						Var Cid = 48
+					EndIf
+
+					DEBUGVAR Seeker.redeemDiscount
+					Var Seeker.redeemDiscount = ""
 				EndIf
 
-				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+				DEBUGVAR Cid
+				DEBUGVAR Seeker
+				DEBUGVAR Seeker.TNumberTaobinMember
+
+				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 
 			Var ServiceType = "coffee"
@@ -736,16 +742,24 @@
 			If AddData = 1 Then
 				Var Cid = 26
 
-				If NewCollectPoint = 1 Then
-					If Seeker.UseGet15Discount = 1 Then
-						Var Cid = 39
-					Else
-						Var Cid = 40
-						Var PreviousSeeker.UseGetDrink5Bath = 0
+				If NewCollectPointFlag = 1 Then
+					If Seeker.redeemDiscount = "2_dollar" Then
+						Var Cid = 49
 					EndIf
+
+					If Seeker.redeemDiscount = "1_dollar" Then
+						Var Cid = 48
+					EndIf
+
+					Var Seeker.redeemDiscount = ""
 				EndIf
 
-				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+				DEBUGVAR Cid
+				DEBUGVAR Seeker
+				DEBUGVAR Seeker.TNumberTaobinMember
+				DEBUGVAR Seeker.redeemDiscount
+
+				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 
 
diff --git a/inter/aus/xml/page_collect_point_2.lxml b/inter/aus/xml/page_collect_point_2.lxml
index ff8f74f0..493a33f1 100644
--- a/inter/aus/xml/page_collect_point_2.lxml
+++ b/inter/aus/xml/page_collect_point_2.lxml
@@ -153,24 +153,6 @@
 				Var CoffeePoint = PointTaobin + CoffeePoint1
 				Var CoffeePointOld = CoffeePoint1
 
-				If Seeker = "next" Then
-					Var CurrSeeker = "curr"
-					If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
-						Var CoffeePoint = Seeker.CurrentCoffeePoint + PointTaobin
-						If CurrSeeker.redeem1Dollar = 1 Then
-							Var CoffeePoint = CoffeePoint - 10
-							Var CoffeePointOld = Seeker.CurrentCoffeePoint - 10
-						EndIf
-
-						If CurrSeeker.redeem2Dollar = 1 Then
-							Var CoffeePoint = CoffeePoint - 20
-							Var CoffeePointOld = Seeker.CurrentCoffeePoint - 20
-						EndIf
-					EndIf
-				EndIf
-
-				Seeker.CurrentCoffeePoint = CoffeePoint
-
 				If TaobinLevel = 1 Then
 					Var CoffeePointRank = CoffeePointRank + 0
 				Else
diff --git a/inter/aus/xml/page_collect_point_3.lxml b/inter/aus/xml/page_collect_point_3.lxml
index 9c385d88..f2f13697 100644
--- a/inter/aus/xml/page_collect_point_3.lxml
+++ b/inter/aus/xml/page_collect_point_3.lxml
@@ -9,6 +9,7 @@
 	; On open
 
 	Var Timeout = 0
+	Var TargetTimeout = 5
 	;CoffeePoint
 	;Var CoffeePoint = 30
     Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
@@ -35,6 +36,7 @@
 	Var PointDiff = 0
 
 	Var redeemButtonState = "Disable"
+	Var closeButtonState = "Enable"
 	Var RedeemType = ""
 
 	Var TaobinExpireDay = ""
@@ -456,22 +458,44 @@
 	If CoffeePoint >= 30 Then
 		Var taobinP30 = "Enable"
 		Var taobinImgP30 = "/shell_get_free_active.png"
+		Var TargetTimeout = 2
+		Var redeemButtonState = "Invisible"
+		Var closeButtonState = "Invisible"
 	EndIf
 
 	;inter-from-consent
 	Var Seeker.FromConsent = 0
  
+	Var AlradyRedeem = 0
 
-	Var redeemSeeker = "curr-redeem"
-	If redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember Then
-		If redeemSeeker.redeem1Dollar = 1 Then
-			Var redeemButtonState = "Disable"
-		Else
-			If redeemSeeker.redeem2Dollar = 1 Then
-				Var redeemButtonState = "Disable"
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.redeemDiscount
+
+
+	If Seeker = "next" Then
+		Var Seeker.redeemDiscount = ""
+		Var CurrSeeker = "curr"
+
+		If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
+			DEBUGVAR CurrSeeker.redeemDiscount
+
+			If CurrSeeker.redeemDiscount = "" Then
+
+			Else
+				
+				If CurrSeeker.redeemDiscount = "get_free" Then
+					Var redeemButtonState = "Invisible"
+					Var closeButtonState = "Invisible"
+				Else
+					Var redeemButtonState = "Disable"
+				EndIf
+
+				Var AlradyRedeem = 1
 			EndIf
+
 		EndIf
 	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -482,13 +506,22 @@
 
 	
 
-	;Var Timeout = Timeout + 1
-	If Timeout > 5 Then
+	Var Timeout = Timeout + 1
+	If Timeout > TargetTimeout Then
     	; goto lid straw
 
     	If CoffeePoint >= 30 Then
-			Var RedeemType = "get_free"
-			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+			If Seeker = "next" Then
+				If AlradyRedeem = 1 Then
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				Else
+					Var RedeemType = "get_free"
+					Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+				EndIf
+			Else
+				Var RedeemType = "get_free"
+				Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
@@ -929,6 +962,7 @@
 <Button>
 <X> 212 </X>
 <Y> 1752 </Y>
+<State> closeButtonState </State>
 <Filename> Var( DirImage + "/close_btn.png" )</Filename>
 <FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
diff --git a/inter/aus/xml/page_collect_point_redeem.lxml b/inter/aus/xml/page_collect_point_redeem.lxml
index 1a6cca3b..a3188003 100644
--- a/inter/aus/xml/page_collect_point_redeem.lxml
+++ b/inter/aus/xml/page_collect_point_redeem.lxml
@@ -45,6 +45,8 @@
             Var TargetTimeout = 5
         EndIf
 
+         Var Seeker.redeemDiscount = RedeemType
+
 
 
     </EventOpen>
@@ -79,14 +81,14 @@
             
                     If SELLONLINE = 1 Then
                         Var headerBackground = "/success_header_bg.png"
-                        Var headerImage = "/redeem_success_header.png"
-                        Var contentImage = "/redeem_success_content.png"
+                        Var headerImage = DirImage + "/redeem_success_header.png"
+                        Var contentImage = DirImage +  "/redeem_success_content.png"
                         Var content_X = 308
                         Var content_Y = 1065
                     Else
                         Var headerBackground = "/fail_header_bg.png"
-                        Var headerImage = "/redeem_fail_header.png"
-                        Var contentImage = "/redeem_fail_content.png"
+                        Var headerImage = DirImage + "/redeem_fail_header.png"
+                        Var contentImage = DirImage + "/redeem_fail_content.png"
                         Var content_X = 243
                         Var content_Y = 1118
                     EndIf
@@ -203,13 +205,8 @@
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick> 
-            If RedeemType = "1_dollar" Then
-                Var Seeker.redeem1Dollar = 1
-            EndIf
 
-            If RedeemType = "2_dollar" Then
-                Var Seeker.redeem2Dollar = 1
-            EndIf
+            Var Seeker.redeemDiscount = RedeemType
 
             Var congratsState = "Invisible"
             Var sendCodeState = "Enable"
diff --git a/xml/open_page_collect_point.ev b/xml/open_page_collect_point.ev
index 2b5a65bc..88d4cab3 100644
--- a/xml/open_page_collect_point.ev
+++ b/xml/open_page_collect_point.ev
@@ -2,8 +2,8 @@
 ; default
 Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
 
-If Country = "Australia" Then
-    Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.xml"
+If CountryName = "Australia" Then
+    Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
 EndIf
 
 If CountryName = "Singapore" Then
diff --git a/xml/page_check_member2_campaign.xml b/xml/page_check_member2_campaign.xml
index b32c04f6..5114c6df 100644
--- a/xml/page_check_member2_campaign.xml
+++ b/xml/page_check_member2_campaign.xml
@@ -772,7 +772,7 @@
 
 	
 
-	;Var Timeout = Timeout + 1
+	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
 
         If MakeDrinkState = 1 Then