diff --git a/image/display_point/bn_checkKradong.png b/image/display_point/bn_checkKradong.png new file mode 100644 index 00000000..78cfab62 Binary files /dev/null and b/image/display_point/bn_checkKradong.png differ diff --git a/image/display_point/bp_checkKradong.png b/image/display_point/bp_checkKradong.png new file mode 100644 index 00000000..a24d410d Binary files /dev/null and b/image/display_point/bp_checkKradong.png differ diff --git a/image/display_point_en/bn_checkKradong.png b/image/display_point_en/bn_checkKradong.png new file mode 100644 index 00000000..2b598771 Binary files /dev/null and b/image/display_point_en/bn_checkKradong.png differ diff --git a/image/display_point_en/bp_checkKradong.png b/image/display_point_en/bp_checkKradong.png new file mode 100644 index 00000000..ae842753 Binary files /dev/null and b/image/display_point_en/bp_checkKradong.png differ diff --git a/xml/page_check_member1.xml b/xml/page_check_member1.xml index 8e6b9b89..306b84dc 100644 --- a/xml/page_check_member1.xml +++ b/xml/page_check_member1.xml @@ -71,7 +71,11 @@ If StepX = 1 Then If Ext1a = "ok" Then - + + Var CoffeePoint1 = Ext1c + INT CoffeePoint1 + Var CoffeePointOld = CoffeePoint1 + Var TaobinName = Ext1d Var TaobinCoupons = Ext1g Var TaobinExpire = Ext1f diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 84805138..7616668f 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -1132,9 +1132,22 @@ +; + + + + + +; +; 420 +; 638 +; 56 +; KanitBoldTTF +; 0x513C2F +; TelephoneNumber +; Telnum +; +; +; +; +; 323 +; 865 +; 434 +; Center +; 64 +; KanitSemiBoldTTF +; 0xDE794E +; CoffeePoint +; + +; +; 250 +; 1241 +; 434 +; 64 +; KanitSemiBoldTTF +; 0xDE794E +; pointStr +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 250 + 745 + 35 + 1000 + KanitRegularTTF + 0x513C2F + TaobinName + + + + 250 + 790 + 20 + 1000 + KanitRegularTTF + 0x746253 + TNumberTaobinMemberXXX + Telnum-mask-1 + + + + 250 + 890 + 50 + 120 + KanitRegularTTF + 0xDE794E + CoffeePointRank + + + + + + 250 + 990 + 25 + 1000 + KanitRegularTTF + 0xDE794E + TaobinLevelDesc1 + + + + 250 + 1020 + 20 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc2 + + + + 172 + 1570 + Var( DirImage + "/text8_28.png" ) + + + + xPointEndDate + yPointEndDate + 25 + 500 + KanitRegularTTF + 0xDE794E + PointEndDate + + + + 380 + 1621 + 25 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc3 + + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" + + + + If show_eng = "true" Then + Var show_eng = "false" + Else + Var show_eng = "true" + EndIf + Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" + + + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + + + + + + \ No newline at end of file diff --git a/xml/page_display_get_drink_5_baht.xml b/xml/page_display_get_drink_5_baht.xml index 55a627fc..0b69e965 100644 --- a/xml/page_display_get_drink_5_baht.xml +++ b/xml/page_display_get_drink_5_baht.xml @@ -42,7 +42,11 @@ Var PopUpState2 = "Invisible EndIf Else - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If FromCheckMemberPoint = 1 Then + Open "ROOT/taobin_project/xml/page_check_member3.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf EndIf @@ -134,7 +138,11 @@ Refresh Else - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If FromCheckMemberPoint = 1 Then + Open "ROOT/taobin_project/xml/page_check_member3.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf diff --git a/xml/page_payment_credit3-TopupCode.xml b/xml/page_payment_credit3-TopupCode.xml index 9050a3f9..d1818453 100644 --- a/xml/page_payment_credit3-TopupCode.xml +++ b/xml/page_payment_credit3-TopupCode.xml @@ -28,6 +28,10 @@ Var ShowErrorText = "Invisible" Var Tel_Confirm_State = "Invisible" Var ErrorCause = "" + Var TextWaiting = "" + Var ReqAdddata42 = 0 + Var ReqAdddata22 = 0 + Var goBackBtnState = "Enable" If show_eng = "true" Then @@ -42,7 +46,6 @@ ;Open "ROOT/xml/page_board.xml" - Var Timeout = Timeout + 1 If Timeout > 120 Then @@ -51,12 +54,33 @@ EndIf + If ReqAdddata42 = 1 Then + If Timeout = 3 Then + If ReqAdddata22 = 0 Then + GenHashWithTimeStamp PointCrm + Var useCreditAmount = PayAmountSubDiscount + Var BmiYear = useCreditAmount + Var GetScore = "useCredit" + AddData 22 TelephoneNumber BmiYear PointCrm GetScore + Var ReqAdddata22 = 1 + Var Timeout = 0 + EndIf + EndIf + EndIf + TimerReset Refresh - + If ReqAdddata22 = 1 Then + Var Seeker.CreditReferenceTmp = "" + useCreditAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + + CoinVending OFF + Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + EndIf If Seeker.CodeChannel = 1 Then @@ -82,9 +106,12 @@ AddData 42 TelephoneNumber CampaignCode CampaignID AmoutCoupon - Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + Var Timeout = 0 + Var ReqAdddata42 = 1 + Var ReqAdddata22 = 0 Else Var ShowErrorText = "Enable" + Var goBackBtnState = "Enable" Var text_show_error = DirImage + "/text_show_error.png" Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 @@ -97,6 +124,8 @@ If Seeker.CodeChannel = 1 Then Var CouponNumber = "" + Var TextWaiting = "" + Var goBackBtnState = "Enable" Var ShowErrorText = "Enable" @@ -507,11 +536,13 @@ 218 1607 Var( DirImage + "/bn_back.png") - Var( DirImage + "/bn_back.png") + Var( DirImage + "/bp_back.png") "ROOT/sounds/codebuttom.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" + If goBackBtnState = "Enable" Then + Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" + EndIf @@ -589,6 +620,14 @@ GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var Timeout = 0 + + If show_eng = "true" Then + Var TextWaiting = "Please wait..." + Else + Var TextWaiting = "กรุณารอซักครู่..." + EndIf + + Var goBackBtnState = "Disable" Var Seeker.CodeChannel = 1 EndIf @@ -645,6 +684,18 @@ text_show_error + + 5 + 940 + "Enable" + 30 + Center + 1080 + RobotoRegular + 0xFF0000 + TextWaiting + + ; ; 0