From 27dc3645a5707d614cb015db355c8d52ce04739d Mon Sep 17 00:00:00 2001 From: miggaze Date: Fri, 2 Jul 2021 14:33:06 +0700 Subject: [PATCH 1/2] fix problem page --- xml/page_brewing3.xml | 21 +++++++++++++++++++++ xml/page_drinkfail2.xml | 21 +++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index cc9883f3..36f131da 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -63,6 +63,27 @@ EndIf EndIf + If TNumberTaobinCredit = "" Then + + If TNumberTaobinMember = "" Then + Var TelephoneNumberProblem = "" + Else + Var TelephoneNumberProblem = TNumberTaobinMember + EndIf + + Else + Var TelephoneNumberProblem = TNumberTaobinCredit + EndIf + + If TelephoneNumberProblem = "" Then + ;Var TelephoneNumberProblem = "" + Var ShowTextNumber = "Enable" + Var Tel_Confirm_State = "Disable" + Else + Var ShowTextNumber = "Invisible" + Var Tel_Confirm_State = "Enable" + EndIf + If TNumberTaobinMember = "" Then diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 68a669de..428c9aab 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -48,9 +48,10 @@ StopLongPlay - Var TelephoneNumberProblem = "" - Var ShowTextNumber = "Enable" - Var Tel_Confirm_State = "Disable" + + + + Var MachineErrorDetailAll = MachineErrorDetail + " / " Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng @@ -116,7 +117,19 @@ Var Timeout = Timeout + 1 - If Timeout > 120 Then + If Timeout > 60 Then + + StrLen TelephoneNumberProblem TelNumLen + If TelNumLen >= 10 Then + + Var ChooseProblem = "taobin purchasing problems" + PROBLEM TelephoneNumberProblem ChooseProblem + + EndIf + + + + If MachineStage = "remove-cup" Then Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Else From 0104f25902bfd8b63b011f67995e93b2f81b613a Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 5 Jul 2021 12:41:47 +0700 Subject: [PATCH 2/2] taobin purchasing problems (No Call) --- xml/page_drinkfail2.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 428c9aab..d91790c9 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -122,7 +122,7 @@ StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then - Var ChooseProblem = "taobin purchasing problems" + Var ChooseProblem = "taobin purchasing problems (No Call)" PROBLEM TelephoneNumberProblem ChooseProblem EndIf @@ -440,6 +440,14 @@ SoundVolume + StrLen TelephoneNumberProblem TelNumLen + If TelNumLen >= 10 Then + + Var ChooseProblem = "taobin purchasing problems (No Call)" + PROBLEM TelephoneNumberProblem ChooseProblem + + EndIf + @@ -477,7 +485,6 @@ If MachineStage = "remove-cup" Then Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Else - ;Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf