From 6400c8742270d984551cec923c5189e0b7e58f8e Mon Sep 17 00:00:00 2001 From: kenta-work Date: Fri, 1 Sep 2023 09:05:10 +0700 Subject: [PATCH] move toggle invisible custom coffee condition from button to function 2 --- xml/page_topping_select8.xml | 60 +++++++++++++----------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index e3d07f8f..720d16fe 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -3369,28 +3369,8 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - - If TOPPING7 = "water-level" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING8 = "coffee-quantity" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING9 = "single-shot-espv2" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING10 = "tampping-espv2" Then - Var showCustomCoffee = "Enable" - EndIf - Else Var showShotEnable = "Press" - - ; Invisible showCustomCoffee - Var showCustomCoffee = "Invisible" EndIf Function 2 @@ -3422,27 +3402,8 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - If TOPPING7 = "water-level" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING8 = "coffee-quantity" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING9 = "single-shot-espv2" Then - Var showCustomCoffee = "Enable" - EndIf - - If TOPPING10 = "tampping-espv2" Then - Var showCustomCoffee = "Enable" - EndIf - Else Var showShotEnable = "Press" - - ; Invisible showCustomCoffee - Var showCustomCoffee = "Invisible" EndIf Function 2 @@ -5392,6 +5353,27 @@ DEBUGVAR showCustomCoffee DEBUGVAR CustomCoffeeDefault + If showShotEnable = "Press" Then + ; Invisible showCustomCoffee + Var showCustomCoffee = "Invisible" + Else + If TOPPING7 = "water-level" Then + Var showCustomCoffee = "Enable" + EndIf + + If TOPPING8 = "coffee-quantity" Then + Var showCustomCoffee = "Enable" + EndIf + + If TOPPING9 = "single-shot-espv2" Then + Var showCustomCoffee = "Enable" + EndIf + + If TOPPING10 = "tampping-espv2" Then + Var showCustomCoffee = "Enable" + EndIf + EndIf + If showCustomCoffee = "Enable" Then If showCoffeeWater = "Enable" Then