From 3fa856fc079862f1cd794c8bcc6117c234431f05 Mon Sep 17 00:00:00 2001 From: thanawat saiyota Date: Thu, 27 Mar 2025 11:35:31 +0700 Subject: [PATCH] THAI: clear var topping12 --- inc/button_topping_select_confirm_order.inc | 50 ++++++++++++++------- xml/page_topping_select8.xml | 17 ++++++- 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc index 4654d5b3..dc6d8970 100644 --- a/inc/button_topping_select_confirm_order.inc +++ b/inc/button_topping_select_confirm_order.inc @@ -89,27 +89,45 @@ EndIf - If showShotNormalSoda = "Press" Then - Var topping13 = toppingID13index1 - EndIf + - If showShotEnableSoda = "Press" Then - Var topping13 = toppingID13index2 - Var topping12 = toppingID12index1 - Else - Var topping13 = toppingID13index1 - Var topping12 = toppingID12index1 - EndIf - - - If CustomEnergyState[0] = "Press" Then - Var topping12 = toppingID12index2 + If showShotSodaEnable = "Enable" Then + If showShotNormalSoda = "Press" Then + Var topping13 = toppingID13index1 + EndIf + If showShotEnableSoda = "Press" Then + Var topping13 = toppingID13index2 + Else + Var topping13 = toppingID13index1 + EndIf + Else + Var topping13 = 0 EndIf - If CustomEnergyState[1] = "Press" Then - Var topping12 = toppingID12index3 + If showEnergyEnable = "Enable" Then + If CustomEnergyState[0] = "Press" Then + Var topping12 = toppingID12index2 + Else + If CustomEnergyState[1] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf + EndIf + + If CustomEnergyState[1] = "Press" Then + Var topping12 = toppingID12index3 + Else + If CustomEnergyState[0] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf + EndIf + Else + Var topping12 = 0 EndIf diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 28f9ded4..7f2625da 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -2640,7 +2640,7 @@ If showShotNormalSoda = "Press" Then Var showShotNormalSoda = "Disable" - Endif + EndIf If TOPPING11 = "milk-level" Then @@ -10951,10 +10951,25 @@ If CustomEnergyState[0] = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1 + Var topping12 = toppingID12index2 + Else + If CustomEnergyState[1] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf EndIf + If CustomEnergyState[1] = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel2 + Var topping12 = toppingID12index3 + Else + If CustomEnergyState[0] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf EndIf If showShotEnableSoda = "Press" Then