From 450e10f92fdd117858662ce289b9f50612a7e410 Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Wed, 9 Jul 2025 10:34:36 +0700
Subject: [PATCH] update json profile, extend blocks vending task pre main,
 MYS: handle case free coupon 30 shells for e-invoice & disable some wordings

---
 .../xml/e_receipt/page_prompt_e_receipt.lxml  |  17 ++-
 inter/mys/xml/page_collect_point_3.lxml       |  52 +++++---
 xml/vending_tasks_pre_main.xml                |   2 +-
 xmlprofile/y18IDCardCaffeine.json             | 112 +++++++++++++++++
 xmlprofile/y18IDCardExTeaMilk.json            | 118 +++++++++++++++++-
 xmlprofile/y18IDCardSoda.json                 | 112 +++++++++++++++++
 6 files changed, 391 insertions(+), 22 deletions(-)

diff --git a/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml b/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml
index 1afd8fe3..11a83ef2 100644
--- a/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml
+++ b/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml
@@ -41,6 +41,8 @@ DEBUGVAR bn_no
 DEBUGVAR bp_yes
 DEBUGVAR bp_no
 
+DEBUGVAR Seeker.TriggerGetFree
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -55,7 +57,12 @@ If Timeout > 15 Then
 
         Open "ROOT/taobin_project/xml/page_board.xml"
     Else
-        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        If Seeker.TriggerGetFree = 1 Then
+            Var Seeker.TriggerGetFree = 0
+            Open "ROOT/taobin_project/xml/page_display_get_free.xml"
+        Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
     EndIf
 
 EndIf
@@ -117,7 +124,13 @@ TimerReset
 <EventClick>
 
     Var Seeker.e_receipt = "false"
-    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    If Seeker.TriggerGetFree = 1 Then
+        Var Seeker.TriggerGetFree = 0
+        Open "ROOT/taobin_project/xml/page_display_get_free.xml"
+    Else
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    EndIf
+
 
 </EventClick>
 </Button>
diff --git a/inter/mys/xml/page_collect_point_3.lxml b/inter/mys/xml/page_collect_point_3.lxml
index 477b2ad0..833e59b7 100644
--- a/inter/mys/xml/page_collect_point_3.lxml
+++ b/inter/mys/xml/page_collect_point_3.lxml
@@ -269,7 +269,7 @@
         EndIf
 
         If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "Flying turtle level"
 
             Var PointDiff = 200 - CoffeePointRank
             Var TaobinLevelDesc2 = "Earn " + PointDiff
@@ -290,7 +290,7 @@
         EndIf
 
 		If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "Master turtle level"
 
             Var TaobinLevelDesc2 = ""
 
@@ -684,10 +684,30 @@
 	If Timeout > 5 Then
 
     	; goto lid straw
+        Var Seeker.TriggerGetFree = 0
     	If CoffeePoint > 29 Then
+            Var Seeker.TriggerGetFree = 1
+            If eReceiptFlag = 1 Then
+                If CountryName = "Malaysia" Then
+                    Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
+                    DEBUGVAR RecieptPromptPage
+                    Open RecieptPromptPage
+                EndIf
+            EndIf
+
 			Open "ROOT/taobin_project/xml/page_display_get_free.xml"
 		Else
 			If Seeker.FromConsent = 1 Then
+                Var Seeker.TriggerGetFree = 1
+			    If eReceiptFlag = 1 Then
+                    If CountryName = "Malaysia" Then
+                        Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
+                        DEBUGVAR RecieptPromptPage
+                        Open RecieptPromptPage
+                    EndIf
+                EndIf
+
+
 				Open "ROOT/taobin_project/xml/page_display_get_free.xml"
 			Else
 
@@ -821,11 +841,11 @@
 </Image>
 
 
-<Image>
-<X> 243 </X>
-<Y> 860 </Y>
-<Filename> Var( DirImage + "/text4.png" )</Filename>
-</Image>
+;<Image>
+;<X> 243 </X>
+;<Y> 860 </Y>
+;<Filename> Var( DirImage + "/text4.png" )</Filename>
+;</Image>
 
 
 
@@ -1171,15 +1191,15 @@
 <Format> Telnum-mask-1 </Format>
 </Text>
 
-<Text>
-<X> 250 </X>
-<Y> 890 </Y>
-<Size> 50 </Size>
-<Width> 120 </Width>
-<Font> KanitRegularTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> CoffeePointRank </Value>
-</Text>
+;<Text>
+;<X> 250 </X>
+;<Y> 890 </Y>
+;<Size> 50 </Size>
+;<Width> 120 </Width>
+;<Font> KanitRegularTTF </Font>
+;<Color> 0xDE794E </Color>
+;<Value> CoffeePointRank </Value>
+;</Text>
 
 <Button>
 <X> 230 </X>
diff --git a/xml/vending_tasks_pre_main.xml b/xml/vending_tasks_pre_main.xml
index 522c72f2..4ed8edb1 100644
--- a/xml/vending_tasks_pre_main.xml
+++ b/xml/vending_tasks_pre_main.xml
@@ -130,7 +130,7 @@
 
 <FrameScroll>
 
-<Max> 6 </Max>
+<Max> 10 </Max>
 <X> 280 </X>
 <Y> 200 </Y>
 <Width> 600 </Width>
diff --git a/xmlprofile/y18IDCardCaffeine.json b/xmlprofile/y18IDCardCaffeine.json
index 80eec087..c6c7bf99 100644
--- a/xmlprofile/y18IDCardCaffeine.json
+++ b/xmlprofile/y18IDCardCaffeine.json
@@ -5444,6 +5444,118 @@
     {
       "productCode": "T0068-15000",
       "enable": true
+    },
+    {
+      "productCode": "12-21-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-02-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0097",
+      "enable": true
     }
   ]
 }
\ No newline at end of file
diff --git a/xmlprofile/y18IDCardExTeaMilk.json b/xmlprofile/y18IDCardExTeaMilk.json
index b9c7546b..9cbd030e 100644
--- a/xmlprofile/y18IDCardExTeaMilk.json
+++ b/xmlprofile/y18IDCardExTeaMilk.json
@@ -5259,7 +5259,7 @@
     },
     {
       "productCode": "T0062-80000",
-      "enable": true
+      "enable": false
     },
     {
       "productCode": "12-02-02-0117",
@@ -5411,7 +5411,7 @@
     },
     {
       "productCode": "12-05-02-0134",
-      "enable": true
+      "enable": false
     },
     {
       "productCode": "12-02-01-0118",
@@ -5435,7 +5435,7 @@
     },
     {
       "productCode": "12-05-03-0134",
-      "enable": true
+      "enable": false
     },
     {
       "productCode": "12-02-02-0111",
@@ -5496,6 +5496,118 @@
     {
       "productCode": "T0068-15000",
       "enable": true
+    },
+    {
+      "productCode": "12-21-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-02-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0097",
+      "enable": true
     }
   ]
 }
\ No newline at end of file
diff --git a/xmlprofile/y18IDCardSoda.json b/xmlprofile/y18IDCardSoda.json
index 63e8c702..f635b9ef 100644
--- a/xmlprofile/y18IDCardSoda.json
+++ b/xmlprofile/y18IDCardSoda.json
@@ -5444,6 +5444,118 @@
     {
       "productCode": "T0068-15000",
       "enable": true
+    },
+    {
+      "productCode": "12-21-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-02-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-05-03-0160",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0093",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0097",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0068",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0098",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-01-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0096",
+      "enable": true
+    },
+    {
+      "productCode": "12-01-02-0095",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-02-0094",
+      "enable": true
+    },
+    {
+      "productCode": "12-21-01-0097",
+      "enable": true
     }
   ]
 }
\ No newline at end of file