diff --git a/inter/mys/image/collectiing/QR_MALAYSIA_UI 1.png b/inter/mys/image/collectiing/QR_contract.png similarity index 100% rename from inter/mys/image/collectiing/QR_MALAYSIA_UI 1.png rename to inter/mys/image/collectiing/QR_contract.png diff --git a/inter/mys/image/collectiing/bn_close.png b/inter/mys/image/collectiing/bn_close.png new file mode 100644 index 00000000..74a26717 Binary files /dev/null and b/inter/mys/image/collectiing/bn_close.png differ diff --git a/inter/mys/image/collectiing/bp_close.png b/inter/mys/image/collectiing/bp_close.png new file mode 100644 index 00000000..60a3529a Binary files /dev/null and b/inter/mys/image/collectiing/bp_close.png differ diff --git a/inter/mys/image/collectiing/text11.png b/inter/mys/image/collectiing/text11.png new file mode 100644 index 00000000..fd7b58f9 Binary files /dev/null and b/inter/mys/image/collectiing/text11.png differ diff --git a/inter/mys/image/collectiing/text_11.png b/inter/mys/image/collectiing/text_11.png deleted file mode 100644 index 38c46414..00000000 Binary files a/inter/mys/image/collectiing/text_11.png and /dev/null differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 28cc813e..1b88e4d3 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -2047,6 +2047,10 @@ - + + ; test drinkfail with phone number + Var TelephoneNumberProblem = "1234567890" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 129fdddf..bbfc015d 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -19,7 +19,6 @@ - If TelephoneNumberProblem = "" Then Else @@ -64,11 +63,18 @@ EndIf - Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" - + If CountryName = "Malaysia" Then + Open "ROOT/taobin_project/xml/page_drinkfail5.xml" + Else + Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" + EndIf Else - Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" + If CountryName = "Malaysia" Then + Open "ROOT/taobin_project/xml/page_drinkfail5.xml" + Else + Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" + EndIf EndIf @@ -588,15 +594,19 @@ If MachineStage = "remove-cup" Then Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Else - If NextOrder = "true" Then - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + If CountryName = "Malaysia" Then + Open "ROOT/taobin_project/xml/page_drinkfail5.xml" Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf EndIf EndIf diff --git a/xml/page_drinkfail5.xml b/xml/page_drinkfail5.xml new file mode 100644 index 00000000..d16efea7 --- /dev/null +++ b/xml/page_drinkfail5.xml @@ -0,0 +1,182 @@ + + "Enable" + 1080 + 1920 + "0xEFEDEA" + SoundVolume + "Partial" + + ; On open + + Var DirImage = CountryRootPath + "/image/collectiing/" + + + Var Timeout = 0 + StopLongPlay + + Var MachineErrorDetailAll = MachineErrorDetail + " / " + Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng + + + + DEBUGVAR TelephoneNumberProblem + + + 1000 + + + + + Var Timeout = Timeout + 1 + + If Timeout > 30 Then + + DEBUGVAR TelephoneNumberProblem + + StrLen TelephoneNumberProblem TelNumLen + If TelNumLen >= 10 Then + + Var ProblemID = 7 + + Var ChooseProblem = "taobin purchasing problems" + + If Seeker.PayWithQR = 1 Then + Var VendingTSIDProblem = VendingTSIDTmp + If Seeker.CampaignPayChanel = "promptpay" Then + Var ProblemID = 8 + Var ChooseProblem = "taobin purchasing problems(Void Failed)" + EndIf + Else + Var VendingTSIDProblem = VendingTSID + EndIf + + + PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem + + EndIf + + + + + If MachineStage = "remove-cup" Then + Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + EndIf + + + + TimerReset + + + + + + + + + + + 43 + 428 + Var( DirImage + "/text11.png" ) + + + + 429 + 1301 + Var( DirImage + "/QR_contract.png" ) + + + + 190 + 1548 + Var( DirImage + "/text13.png" ) + + + + + + + 5 + 1868 + 24 + Center + 1080 + RobotoRegular + 0xDE794E + MachineErrorDetailAll + + + +