Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

This commit is contained in:
kong 2021-09-25 22:28:02 +07:00
commit a55c085dfd

View file

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