From 731c6ae3349f89cd8dc02109689875ab771c2023 Mon Sep 17 00:00:00 2001 From: miggaze Date: Thu, 20 Jan 2022 14:49:01 +0700 Subject: [PATCH] make drink when set pin --- image/page_thankyou_en/remainCredit.png | Bin 0 -> 3276 bytes xml/page_payment_credit.xml | 7 ++ xml/page_payment_credit2.xml | 105 ++++++++++++++++++++---- xml/page_payment_credit3.xml | 4 +- xml/page_thankyou.xml | 6 +- 5 files changed, 101 insertions(+), 21 deletions(-) create mode 100644 image/page_thankyou_en/remainCredit.png diff --git a/image/page_thankyou_en/remainCredit.png b/image/page_thankyou_en/remainCredit.png new file mode 100644 index 0000000000000000000000000000000000000000..cad7369f2fea4a0ed36f4222c2dc89745a4c9a95 GIT binary patch literal 3276 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 Y*5d^qCTFcM{wn}raMM&5tK$;$FG!37)&Kwi literal 0 HcmV?d00001 diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 1f1ab62f..d2701c58 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -74,6 +74,13 @@ ;Open "ROOT/taobin_project/xml/page_payment_credit2.xml" If GetAccFlag = 1 Then If Ext1a = "ok" Then + Var PinNumberUser = Ext1c + Var CoffeeCredit = Ext1b + INT CoffeeCredit + + ;Var CoffeeCredit = 5 + + Open "ROOT/taobin_project/xml/page_payment_credit2.xml" Else Var ShowErrorText = "Enable" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 069b197c..687ad3ae 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -65,6 +65,9 @@ GETACCEXT DataTmp 19 EndIf + + Var ReqAdddata22 = 0 + Var timeout_Adddata22 = 0 1000 @@ -121,26 +124,64 @@ If ReqFlag = 0 Then + + If ReqAdddata22 = 1 Then + Var Seeker.CreditReferenceTmp = "" + PayAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + + CoinVending OFF + + + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber + + Var Seeker.StoreCreditFlag = 1 + + Var SumCreditAmount = SumCreditAmount - PayAmount + + Var VendingCreditRemain = "" + SumCreditAmount + + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + EndIf - If Ext1a = "ok" Then + ;If Ext1a = "ok" Then - If Ext1c = "" Then - - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - Else + ; If Ext1c = "" Then + ; + ; Open "ROOT/taobin_project/xml/page_payment_credit3.xml" + ; Else - EndIf - Else - Var ShowErrorText = "Enable" - Var PinNumber = "" - Var ShowTextNumber1 = "Invisible" - Var ShowTextNumber2 = "Invisible" - Var ShowTextNumber3 = "Invisible" - Var ShowTextNumber4 = "Invisible" - EndIf + ; EndIf + ;Else + ; Var ShowErrorText = "Enable" + ; Var PinNumber = "" + ; Var ShowTextNumber1 = "Invisible" + ; Var ShowTextNumber2 = "Invisible" + ; Var ShowTextNumber3 = "Invisible" + ; Var ShowTextNumber4 = "Invisible" + ;EndIf Else EndIf @@ -720,13 +761,41 @@ Var ShowSentSmsText = "Invisible" + Var Timeout = 0 - Var DataTmp = TelephoneNumber + "/" - Var DataTmp = DataTmp + PinNumber + If PinNumberUser = PinNumber Then - GETACCEXT DataTmp 19 + Var SumCreditAmount = CoffeeCredit - Var ReqFlag = 0 + If SumCreditAmount >= PayAmount Then + + GenHashWithTimeStamp PointCrm + + Var BmiYear = PayAmount + Var GetScore = "useCredit" + AddData 22 TelephoneNumber BmiYear PointCrm GetScore + Var ReqAdddata22 = 1 + + + 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 + + ;Var DataTmp = TelephoneNumber + "/" + ;Var DataTmp = DataTmp + PinNumber + ;GETACCEXT DataTmp 19 + Var ReqFlag = 0 Refresh diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index e946897c..f4513764 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -15,8 +15,8 @@ Var Tel_Confirm_State = "Disable" Var ShowNotEnoughText = "Invisible" - Var CoffeeCredit = Ext1b - INT CoffeeCredit + ;Var CoffeeCredit = Ext1b + ;INT CoffeeCredit Var SumCreditAmount = CoffeeCredit ;Var SumCreditAmount = 5 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index a8aba0e4..616f06e7 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -43,11 +43,15 @@ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_en" Else Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var BottomText = PicturePath + "text_bottom_thai2.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf DEBUGVAR StarwState @@ -248,7 +252,7 @@ 760 413 RemainCreditST - "ROOT/taobin_project/image/page_thankyou/remainCredit.png" + Var( DirImage + "/remainCredit.png" )