From b03370aeb55432e0fe0cb66eb91503b59070d9bf Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 1 Feb 2022 18:20:36 +0700 Subject: [PATCH] tao master --- xml/page_check_member2.xml | 8 +++---- xml/page_collect_point_3.xml | 8 +++---- xml/page_payment.xml | 6 ++++- xml/page_payment_credit.xml | 25 ++++++++++++++++++++ xml/page_payment_credit2.xml | 46 ++++++++++++++++++++++++++---------- 5 files changed, 72 insertions(+), 21 deletions(-) diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 3173302f..d245fe8d 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -230,14 +230,14 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - Var PointDiff = 350 - CoffeePointRank + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" Var TaobinLeveImg = "/taoLevel3.png" - If CoffeePointRank > 349 Then + If CoffeePointRank > 199 Then ;Var TaobinLeveImg = "/taoLevel4.png" ;Var TaobinLevelDesc1 = "Master turtle level " @@ -290,7 +290,7 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp - Var PointDiff = 350 - CoffeePointRank + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า" @@ -298,7 +298,7 @@ Var TaobinLeveImg = "/taoLevel3.png" - If CoffeePointRank > 349 Then + If CoffeePointRank > 199 Then ;Var TaobinLeveImg = "/taoLevel4.png" ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index f44298b3..2d2a8224 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -259,14 +259,14 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - Var PointDiff = 350 - CoffeePointRank + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" Var TaobinLeveImg = "/taoLevel3.png" - If CoffeePointRank > 349 Then + If CoffeePointRank > 199 Then ;Var TaobinLeveImg = "/taoLevel4.png" ;Var TaobinLevelDesc1 = "Master turtle level " @@ -323,14 +323,14 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp - Var PointDiff = 350 - CoffeePointRank + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า" Var TaobinLeveImg = "/taoLevel3.png" - If CoffeePointRank > 349 Then + If CoffeePointRank > 199 Then ;Var TaobinLeveImg = "/taoLevel4.png" ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " diff --git a/xml/page_payment.xml b/xml/page_payment.xml index fc75eb73..9670720e 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -191,12 +191,16 @@ If web_readyOK = "true" Then + + Var Seeker.selected_a_drink = SelectDrink + Var Seeker.ServiceAmount2 = PayAmount + If web_payment = "CODE" Then Open "ROOT/taobin_project/xml/page_payment_code.xml" EndIf If web_payment = "CREDIT" Then - Open "ROOT/taobin_project/xml/page_payment_credit2.xml" + Open "ROOT/taobin_project/xml/page_payment_credit.xml" EndIf EndIf diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index d2701c58..7d1f8c06 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -37,6 +37,28 @@ Var GetAccFlag = 0 + Var AcceptAuto = "false" + + If web_readyOK = "true" Then + Var web_readyOK = "false" + Var AcceptAuto = "true" + Var ShowTextNumber = "Invisible" + + + + Var PinNumber = "" + Var TelephoneNumber = web_telnum + + Var DataTmp = TelephoneNumber + "/" + Var DataTmp = DataTmp + PinNumber + + GETACCEXT DataTmp 19 + Var GetAccFlag = 1 + + EndIf + + + 1000 @@ -79,6 +101,9 @@ INT CoffeeCredit ;Var CoffeeCredit = 5 + + + DEBUGVAR PinNumberUser Open "ROOT/taobin_project/xml/page_payment_credit2.xml" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index f63c5e87..0aada21c 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -41,13 +41,13 @@ Var Ext1a = "" - Var AcceptAuto = "false" - - - If web_readyOK = "true" Then - Var web_readyOK = "false" - Var AcceptAuto = "true" + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 + GenHashWithTimeStamp PointCrm + + If AcceptAuto = "true" Then + Var AcceptAuto = "false" Var Tel_Confirm_State = "Enable" @@ -59,16 +59,38 @@ Var PinNumber = web_pin Var TelephoneNumber = web_telnum - Var DataTmp = TelephoneNumber + "/" - Var DataTmp = DataTmp + PinNumber + If PinNumberUser = PinNumber Then - GETACCEXT DataTmp 19 + Var SumCreditAmount = CoffeeCredit + + If SumCreditAmount >= PayAmount Then + + If ReqAdddata22 = 0 Then + Var BmiYear = PayAmount + Var GetScore = "useCredit" + AddData 22 TelephoneNumber BmiYear PointCrm GetScore + Var ReqAdddata22 = 1 + EndIf + + + Else + Open "ROOT/taobin_project/xml/page_payment_credit3.xml" + EndIf + + Else + + Var ShowErrorText = "Enable" + Var PinNumber = "" + Var ShowTextNumber1 = "Invisible" + Var ShowTextNumber2 = "Invisible" + Var ShowTextNumber3 = "Invisible" + Var ShowTextNumber4 = "Invisible" + + EndIf EndIf - Var ReqAdddata22 = 0 - Var timeout_Adddata22 = 0 - GenHashWithTimeStamp PointCrm + 1000