diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index 6c7ac6ac..154b4bbd 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -356,7 +356,7 @@ Mango Lychee Tao Pun - มะม่่วงลิ้นจี่เต่าปั่น + มะม่วงลิ้นจี่เต่าปั่น - - - @@ -438,7 +438,7 @@ ; begin lang Var aliasName[0] = "Mango Lychee Tao Pun" Var aliasDesc[0] = "Real Mango Lychee" - Var aliasName[1] = "มะม่่วงลิ้นจี่เต่าปั่น" + Var aliasName[1] = "มะม่วงลิ้นจี่เต่าปั่น" Var aliasDesc[1] = "มะม่วง ลิ้นจี่" Var aliasName[2] = "-" Var aliasDesc[2] = "-" diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 4cd8e886..aa4da506 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -8,20 +8,9 @@ ; This page Seeker must curr ; On open - - ; smoothie next - If NextSmoothie = 1 Then - DEBUGVAR Seeker - DEBUGVAR Seeker.SmoothieToPayment - Var NextSmoothie = 0 - If Seeker.SmoothieToPayment = 1 Then - Var TimeOutSmoothiesProcess = 120 - Var Seeker.SmoothieToPayment = 0 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" - EndIf - EndIf - + + + Var CountDownThankyou = 4 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 @@ -159,7 +148,11 @@ Var buttonRemoveCup = "Invisible" - SAVELOG "Thank you conti version TCT6" + SAVELOG "Thank you conti version TCT7" + SAVELOG "Support NextSmoothie" + + DEBUGVAR NextSmoothie + DEBUGVAR Seeker.SmoothieToPayment ;PendingFlag InternationalEnable ;PendingFlag New_Payment @@ -290,8 +283,8 @@ DEBUGVAR CountDownThankyou - ; run test; - If CountDownThankyou = 0 Then + ; obsolete + If CountDownThankyou = 99 Then ; reset all var DEBUGVAR MachineStage @@ -306,6 +299,7 @@ If MachineStage = "show-menu" Then If HaveCup = "false" Then + Var LastMakeDrinkResult = "-" If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID @@ -353,6 +347,20 @@ Var MachineState_Result = 0 If MenuReadyForCup = "YES" Then + + ; smoothie next + If NextSmoothie = 1 Then + DEBUGVAR Seeker + DEBUGVAR Seeker.SmoothieToPayment + Var NextSmoothie = 0 + If Seeker.SmoothieToPayment = 1 Then + Var TimeOutSmoothiesProcess = 120 + Var Seeker.SmoothieToPayment = 0 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + EndIf + EndIf + Var LastMakeDrinkResult = "-" If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID diff --git a/xml/sometime/script_open_page_show_error.ev b/xml/sometime/script_open_page_show_error.ev index 5b6c9779..a5e714a5 100644 --- a/xml/sometime/script_open_page_show_error.ev +++ b/xml/sometime/script_open_page_show_error.ev @@ -17,7 +17,7 @@ If InternationalEnable = 1 Then If CountryName = "United Kingdom" Then Open "ROOT/taobin_project/inter/gbr/xml/page_show_error.lxml" - Else + EndIf OpenInst 0 "ROOT/taobin_project/xml/page_show_error.lxml"