From 198324a79d22ecf30fb01a5644aefd63096374ec Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 12 Jul 2021 12:44:16 +0700 Subject: [PATCH 1/3] fix problemf --- xml/page_brewing3.xml | 20 ++++++++++---------- xml/page_drinkfail2-2.xml | 20 ++++++++++++++++++-- xml/page_drinkfail2.xml | 40 ++++++++++++--------------------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index b75bb6ae..e0ce0f2b 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -24,6 +24,7 @@ Var waitAckPay = 0 Var VendingTSIDTmp = "" + Var VendingTSIDProblem = "" @@ -286,7 +287,7 @@ EndIf If waitAckPay = 2 Then - If Timeout > 60 Then + If Timeout > 10 Then If CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" @@ -365,10 +366,10 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - If CodeChannel = 0 Then - SAVELOG "back_to_main from line > 315." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - EndIf + ;If CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 315." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf Var waitAckPay = 2 Var Timeout = 5 @@ -409,10 +410,10 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - If CodeChannel = 0 Then - SAVELOG "back_to_main from line > 357." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - EndIf + ;If CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 357." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf Var waitAckPay = 2 Var Timeout = 5 @@ -562,7 +563,6 @@ Var ServiceSuccess = "yes" If waitAckPay = 0 Then - ;Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf diff --git a/xml/page_drinkfail2-2.xml b/xml/page_drinkfail2-2.xml index 62a3c047..19bfc6dd 100644 --- a/xml/page_drinkfail2-2.xml +++ b/xml/page_drinkfail2-2.xml @@ -46,8 +46,16 @@ StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then + If PayWithQR = 1 Then + Var VendingTSIDProblem = VendingTSIDTmp + Else + Var VendingTSIDProblem = VendingTSID + EndIf + + Var ProblemID = 7 + Var ChooseProblem = "taobin purchasing problems" - PROBLEM TelephoneNumberProblem ChooseProblem + PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem EndIf @@ -95,8 +103,16 @@ StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then + If PayWithQR = 1 Then + Var VendingTSIDProblem = VendingTSIDTmp + Else + Var VendingTSIDProblem = VendingTSID + EndIf + + Var ProblemID = 7 + Var ChooseProblem = "taobin purchasing problems" - PROBLEM TelephoneNumberProblem ChooseProblem + PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem EndIf diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index d585a7e9..a9e3a7d2 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -8,7 +8,8 @@ ; On open - + Var TNumberTaobinMember = "" + If TelephoneNumberProblem = "" Then Else @@ -30,32 +31,7 @@ Var Timeout = 0 - Var TNumberTaobinMember = "" - - If TNumberTaobinMember = "" Then - - Else - If PayWithQR = 1 Then - Var VendingTSID = VendingTSIDTmp - EndIf - - - Var BmiYear = PointTaobinStr - Var PointCrm = "" - If FromConsent = 1 Then - Var PointCrm = "pdpa1" - EndIf - Var GetScore = VendingTSID - If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore - Else - Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore - EndIf - Var TNumberTaobinMember = "" - Var VendingTSID = "" - EndIf - + StopLongPlay @@ -474,8 +450,16 @@ StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then + If PayWithQR = 1 Then + Var VendingTSIDProblem = VendingTSIDTmp + Else + Var VendingTSIDProblem = VendingTSID + EndIf + + Var ProblemID = 7 + Var ChooseProblem = "taobin purchasing problems" - PROBLEM TelephoneNumberProblem ChooseProblem + PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem If MachineStage = "remove-cup" Then From 41758e8ee335abf81fbd87264f49f161f888b3fc Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 13 Jul 2021 13:58:44 +0700 Subject: [PATCH 2/3] fix bug reply TelephoneNumber crushed --- xml/page_payment.xml | 24 ++++++++++++------------ xml/page_payment_code.xml | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 97c89135..a9d2b2f1 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -108,18 +108,18 @@ Var CreditAmount1 = "" Var ServiceAmountFlow = "" - Var TelephoneNumber = "0899999999" + Var TelephoneNumberQR = "0899999999" Var ServiceType = "coffee" - Var ECommerce = "" - Var ECommerce = ECommerce + PriceDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "KBA:2" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "KBA:2" Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -130,7 +130,7 @@ Var SessionID = "" - GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var Timeout = 0 Var GetPayInfoFlag = 1 Var ReqPayInfoFlag = 1 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 3ef7e165..ec7e383a 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -89,6 +89,8 @@ SAVELOG "CodeChannel 1 > ActOK." + SAVELOG ECommerce + SPLIT ECommerce "/" 5 VendingCode SPLIT ECommerce "/" 7 VendingCampaignRI3 SPLIT ECommerce "/" 8 VendingCampaign1 From 6c68e86ca15392a0907dc6befb4f8bae3ccc50ba Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 13 Jul 2021 14:02:42 +0700 Subject: [PATCH 3/3] fix bug reply TelephoneNumber crushed2 --- xml/page_payment_code.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index ec7e383a..97961a2d 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -9,6 +9,7 @@ "Partial" ; On open + Var ECommerce = "" Var FreeVendingCampaign = 0 Var Timeout = 0