From 7f17b1e81b968882bf9db6d6ba33c8398e2d6e38 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 12 Jan 2024 10:44:48 +0700 Subject: [PATCH] update flow payment --- xml/page_brewing3.xml | 4 ++-- xml/page_brewing3Conti.xml | 2 +- xml/page_payment_credit.xml | 17 +---------------- xml/page_payment_credit2.xml | 26 +------------------------- xml/page_payment_credit3.xml | 2 ++ xml/page_payment_storeCredit3.xml | 8 +++++++- xml/page_thankyou.xml | 11 +++++++++++ 7 files changed, 25 insertions(+), 45 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 8b64ed6e..9c5f0c2a 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -22,7 +22,7 @@ Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" Else Var PayReference = "" - Var PayType = "" + Var PayType = "newpay" EndIf Var SelectDrink = Seeker.selected_a_drink @@ -1147,7 +1147,7 @@ Var PayDetail = PayDetail + Seeker.OrderChanel - ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" If GetFreeFromError = 1 Then Var Seeker.CodeChannel = 1 diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index d80fbf28..a4a1b2fa 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -56,7 +56,7 @@ Var TimeoutWaitPay = 10 Var PayReference = "" - Var PayType = "" + Var PayType = "newpay" Var MachineState_Result = 0 If LastMakeDrinkResult = "success" Then diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 77e1850e..a33be64d 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -127,21 +127,6 @@ DEBUGVAR PinNumberUser - - If Seeker = "next" Then - Var Curr = "curr" - - DEBUGVAR CoffeeCredit - DEBUGVAR Curr.CurrCreditUse - - If TelephoneNumber = Curr.CurrCreditTelNum Then - - Var CoffeeCredit = CoffeeCredit - Curr.CurrCreditUse - If CoffeeCredit < 0 Then - Var CoffeeCredit = 0 - EndIf - EndIf - EndIf Open "ROOT/taobin_project/xml/page_payment_credit2.xml" Else @@ -151,7 +136,7 @@ DEBUGVAR Curr.CurrCreditTelNum If Seeker = "next" Then - If Ext1a = "new customer" Then + If Ext1a = "new customer" Then Var Curr = "curr" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 91996ffc..c66f2287 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -960,31 +960,7 @@ Else - If Seeker = "next" Then - Var Curr = "curr" - If TelephoneNumber = Curr.CurrCreditTelNum Then - - Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount - If SumCreditAmount >= PayAmountSubDiscount Then - If ReqAdddata22 = 0 Then - - Var useCreditTemp = PayAmountSubDiscount - CoffeeCredit - - Var useCreditAmount = CoffeeCredit - Var BmiYear = useCreditAmount - 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 - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - EndIf - Else - Open "ROOT/taobin_project/xml/page_payment_credit3.xml" - EndIf + Open "ROOT/taobin_project/xml/page_payment_credit3.xml" EndIf Else diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index e068b777..797cefa5 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -64,6 +64,7 @@ Var ShowLoadingText = "Invisible" Var ShowErrorText = "Invisible" + Var Seeker.CreditNotEnoughRefID = "" If show_eng = "true" Then @@ -215,6 +216,7 @@ Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + Var Seeker.CreditNotEnoughRefID = PointCrm Var Seeker.StoreCreditFlag = 1 diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 51b3608b..9fc72712 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -58,7 +58,13 @@ Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber DEBUGVAR Seeker.CurrCreditAmount - + + Var CurrAmount = Seeker.CurrCreditAmount + Var CurrTelePhoneNum = Seeker.CurrCreditTelNum + Var CurrPinNum = Seeker.CurrCreditPinNum + Var RefID = "" + + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 698ecfb6..04dfce4b 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -360,6 +360,17 @@ DEBUGVAR Seeker.CurrCreditAmount + If Seeker.CreditNotEnoughRefID = "" Then + + Else + Var CurrAmount = Seeker.CurrCreditAmount + Var CurrTelePhoneNum = Seeker.CurrCreditTelNum + Var CurrPinNum = Seeker.CurrCreditPinNum + Var RefID = Seeker.CreditNotEnoughRefID + + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + EndIf + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else