From a8eb4cd58c7559b054dafe9deb6582193bc656cb Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Fri, 24 Sep 2021 12:16:56 +0700
Subject: [PATCH] add expires date coupon

---
 xml/page_check_member2.xml | 48 ++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml
index 01648e2f..8361f804 100644
--- a/xml/page_check_member2.xml
+++ b/xml/page_check_member2.xml
@@ -469,6 +469,8 @@
             Var CouponExpireA = CouponExpireA + "  "
             Var CouponExpireA = CouponExpireA + CouponExireA_Y
 
+            Var CouponExpireA = "Expires " +  CouponExpireA
+
 
         EndIf
 
@@ -566,6 +568,8 @@
             Var CouponExpireB = CouponExpireB + "  " 
             Var CouponExpireB = CouponExpireB + CouponExireB_Y
 
+            Var CouponExpireB = "Expires " +  CouponExpireB
+
         EndIf
 
         Var CouponText = "Coupons (" + CouponNum
@@ -669,6 +673,8 @@
             Var CouponExpireA = CouponExpireA + "  "
             Var CouponExpireA = CouponExpireA + CouponExireA_Y
 
+            Var CouponExpireA = "หมดอายุ " +  CouponExpireA
+
 
         EndIf
 
@@ -765,6 +771,8 @@
             Var CouponExpireB = CouponExpireB + "  " 
             Var CouponExpireB = CouponExpireB + CouponExireB_Y
 
+            Var CouponExpireB = "หมดอายุ " +  CouponExpireB
+
         EndIf
 
         Var CouponText = "คูปอง (" + CouponNum
@@ -1020,7 +1028,7 @@
 	; goto lid straw
 	
     Var CouponSendSms = CouponIDA
-    Var CouponExpireDate = "Expires  " +  CouponExpireA
+    Var CouponExpireDate = CouponExpireA
     Var CouponName = CouponNameA
     Var BmiYear = CouponSendSms
 	Var PointCrm = ""
@@ -1030,15 +1038,15 @@
 </EventClick>
 </Button>
 
-;<Text>
-;<X> 480 </X>
-;<Y> 1287 </Y>
-;<Size> 15 </Size>
-;<Width> 120 </Width>
-;<Font> KanitRegularTTF </Font>
-;<Color> 0x746253 </Color>
-;<Value> CouponTypeA </Value>
-;</Text>
+<Text>
+<X> 410 </X>
+<Y> 1297 </Y>
+<Size> 15 </Size>
+<Width> 600 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> CouponExpireA </Value>
+</Text>
 
 
 <Button>
@@ -1053,7 +1061,7 @@
 	; goto lid straw
 	
     Var CouponSendSms = CouponIDB
-    Var CouponExpireDate = "Expires  " + CouponExpireB
+    Var CouponExpireDate = CouponExpireB
     Var CouponName = CouponNameB
     Var BmiYear = CouponSendSms
 	Var PointCrm = ""
@@ -1063,15 +1071,15 @@
 </EventClick>
 </Button>
 
-;<Text>
-;<X> 480 </X>
-;<Y> 1511 </Y>
-;<Size> 15 </Size>
-;<Width> 120 </Width>
-;<Font> KanitRegularTTF </Font>
-;<Color> 0x746253 </Color>
-;<Value> CouponExpireB </Value>
-;</Text>
+<Text>
+<X> 410 </X>
+<Y> 1521 </Y>
+<Size> 15 </Size>
+<Width> 600 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> CouponExpireB </Value>
+</Text>
 
 
 <Button>