From f2b50376f7f33ab6a8e87a9b007094d6114c8fda Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 1 Jul 2024 13:26:39 +0700 Subject: [PATCH] THAI: Update reset phone number when cancel & invisible topup credit when have lid/straw issue --- xml/page_brewing3.xml | 290 +++------------------------------ xml/page_payment_credit3-1.xml | 2 + 2 files changed, 29 insertions(+), 263 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 922319ce..5b115128 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -433,59 +433,14 @@ DEBUGVAR NeedUpgrade DEBUGVAR NeedReboot DEBUGVAR SELLSTATUS - - ; copy stage - Var bg_lidProblem_ST2 = bg_lidProblem_ST - DEBUGVAR bg_lidProblem_ST2 - ; zone Language - If LanguageObjectShow = "Enable" Then - Var XStraw = 350 - Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1 - Var SelectMenuBetweenBrewEnable1 = "Invisible" + DEBUGVAR bg_lidProblem_ST - Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png" - - Var bg_lidProblem_ST = "Invisible" - Var GetLidButtonState = "Invisible" - Var bg_strawProblem_ST = "Invisible" - var EnableGetMoreStrawFileName = "Invisible" - var EnableGetMoreStrawFileName2 = "Enable" - - Var bg_strawProblem_ST2 = "Invisible" - - If bg_lidProblem_ST2 = "Invisible" Then - Var GetLidButtonState2 = "Enable" - Else - Var GetLidButtonState2 = "Invisible" - EndIf + If bg_lidProblem_ST = "Invisible" Then + Var GetLidButtonState = "Enable" + ;Var XStraw = 265 EndIf - - - - If NoLangObjectShow = "Enable" Then - Var SelectMenuBetweenBrewEnable2 = "Invisible" - - Var bg_lidProblem_ST2 = "Invisible" - Var GetLidButtonState2 = "Invisible" - Var bg_strawProblem_ST2 = "Invisible" - var EnableGetMoreStrawFileName2 = "Invisible" - - - DEBUGVAR bg_lidProblem_ST - - - If bg_lidProblem_ST = "Invisible" Then - Var GetLidButtonState = "Enable" - ;Var XStraw = 265 - EndIf - - - EndIf - - DEBUGVAR LanguageObjectShow - DEBUGVAR NoLangObjectShow Var CreditCardVoid = 0 @@ -509,10 +464,17 @@ ; language instance + If bg_lidProblem_ST = "Enable" Then + Var EnableTopupCreditBetweenBrew = "Invisible" + Var EnableGetMore + End + If bg_strawProblem_ST = "Enable" Then + Var EnableGetMoreStrawFileName = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf DEBUGVAR SelectMenuBetweenBrewEnable1 - DEBUGVAR SelectMenuBetweenBrewEnable2 Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1 @@ -1459,7 +1421,6 @@ If CLOSE_ORDER_NOW = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" - Var SelectMenuBetweenBrewEnable2 = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible" EndIf @@ -1478,16 +1439,7 @@ EndIf Else - If SelectMenuBetweenBrewEnable2 = "Enable" Then - If SelectMenuBetweenBrewEnable1Blink = "Enable" Then - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Else - Var SelectMenuBetweenBrewEnable1Blink = "Enable" - EndIf - - Else - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - EndIf + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf DEBUGVAR CountUpBrewing @@ -1676,34 +1628,17 @@ EndIf EndIf - - If EnableGetMoreStrawFileName2 = "PressForever" Then - DEBUGVAR GetMoreStrawCount - If GetMoreStrawCount > 0 Then - If EnableGetMoreStrawFileNameCountDown > 0 Then - Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1 - - If EnableGetMoreStrawFileNameCountDown = 0 Then - Var EnableGetMoreStrawFileName2 = "Enable" - EndIf - EndIf - - EndIf - EndIf If GetMoreStrawCount <= 0 Then If StrawProblemStatus = 1 Then Var StrawProblemStatus = 2 - If NoLangObjectShow = "Enable" Then - Var bg_strawProblem_ST = "Enable" - Else - Var bg_strawProblem_ST2 = "Enable" - EndIf + Var bg_strawProblem_ST = "Enable" + Var EnableTopupCreditBetweenBrew = "Invisible" + Var EnableGetMoreStrawFileName = "Invisible" EndIf EndIf - DEBUGVAR bg_lidProblem_ST2 If GetLidButtonCountDown > 0 Then @@ -1718,26 +1653,16 @@ Var GetLidButtonCountDown = 0 EndIf - If NoLangObjectShow = "Enable" Then - - If GetLidButtonCountDown = 1 Then - Var GetLidButtonState = "Invisible" - Var bg_lidProblem_ST = "Enable" - ;Var XStraw = 356 + If GetLidButtonCountDown = 1 Then + Var GetLidButtonState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var EnableTopupCreditBetweenBrew = "Invisible" + ;Var XStraw = 356 + If EnableGetMoreStrawFileName = "Enable" Then + Var XStraw = 280 EndIf - EndIf - Var bg_lidProblem_ST = "Invisible" - - If LanguageObjectShow = "Enable" Then - - If GetLidButtonCountDown = 1 Then - Var GetLidButtonState2 = "Invisible" - Var bg_lidProblem_ST2 = "Enable" - Var XStraw = 365 - - EndIf EndIf If ButtonGameCountDown > 0 Then @@ -1843,16 +1768,6 @@ text_next_order - - 0 - 1655 - 1080 - SelectMenuBetweenBrewEnable2 - - 000408 - - - 835 @@ -1881,23 +1796,6 @@ ShowCountDownBrewing - - 816 - 429 - LanguageObjectShow - - 000405 - - - - 941 - 518 - LanguageObjectShow - - 000406 - - - Var BREW_COUNT_DOWN_FROM_APP = "off" Var CountDownBrewing = 121 @@ -1962,32 +1860,6 @@ - ; ; @@ -2018,8 +1890,8 @@ -;==================================================================== - - - -;------------------------- - - - ; test drinkfail with phone number diff --git a/xml/page_payment_credit3-1.xml b/xml/page_payment_credit3-1.xml index b7ced0b2..4da5da6f 100644 --- a/xml/page_payment_credit3-1.xml +++ b/xml/page_payment_credit3-1.xml @@ -56,6 +56,7 @@ Var PayState2 = "Enable" Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 + Seeker.TNumberTaobinCredit = "" If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else @@ -182,6 +183,7 @@ Var QRChannel = 0 ;Var Seeker.CodeChannel = 0 SAVELOG "payment_credit3-p121." + Var Seeker.TNumberTaobinCredit = "" If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else