diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml index 6a45a404..c454fcdc 100644 --- a/inter/tha/xml/page_topping_frozen_fruit_select.lxml +++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml @@ -717,9 +717,7 @@ If SelectDrinkType = 1 Then Var SmoothieToPayment = 1 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - ;Open "ROOT/taobin_project/spiral/xml/page_spiral_payment.xml" Open "ROOT/taobin_project/xml/page_payment.xml" - ;Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" EndIf EndIf diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index e4622cc0..574569e3 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -284,13 +284,8 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Else - If SmoothieToPayment = 1 Then - Var SelectMenuBetweenBrewEnable1 = "Invisible" - Var SmoothieToPayment = 0 - Else - Var SelectMenuBetweenBrewEnable1 = "Enable" - Var EnableTopupCreditBetweenBrew = "Enable" - EndIf + Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" EndIf If GetFreeFromError = 1 Then @@ -1145,7 +1140,6 @@ Else Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf DEBUGVAR CountUpBrewing diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index cd3711a9..23ffbe6d 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -384,13 +384,8 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Else - If SmoothieToPayment = 1 Then - Var SelectMenuBetweenBrewEnable1 = "Invisible" - Var SmoothieToPayment = 0 - Else - Var SelectMenuBetweenBrewEnable1 = "Enable" - Var EnableTopupCreditBetweenBrew = "Enable" - EndIf + Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" EndIf If GetFreeFromError = 1 Then @@ -1510,7 +1505,6 @@ Else Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf DEBUGVAR CountUpBrewing