From 4b27c15d3cd5ff948d2496a9f394980ac9ae7762 Mon Sep 17 00:00:00 2001 From: Ittipat Lusuk Date: Fri, 27 Jun 2025 11:11:29 +0700 Subject: [PATCH 1/3] Topping8: Fixed coffee shot not refresh when change drink type --- xml/page_topping_select8.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 87e6ccc7..71f1cc27 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -1696,7 +1696,7 @@ - + If BugFlag = 1 Then @@ -2207,6 +2207,24 @@ EndIf EndIf + If TOPPING2 = "shot coffee" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + Var ExtraTopping = "Enable" + + Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID2price2Conv + Var text_shot_normal_add = toppingID2price2Conv + ")" + Var text_shot_normal_add = "(+" + text_shot_normal_add + + If showShotNormal = "Enable" Then + Var showShotNormal = "Press" + EndIf + + EndIf + If TOPPING13 = "shot coffee" Then Var showAdjust = "Enable" If toppingID13index2Status = "Enable" Then From ffea501a4c8f1544495374aa2a054d0fc819d964 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Thu, 26 Jun 2025 19:36:08 +0700 Subject: [PATCH 2/3] GBR: Changed for support Barcode format Code-128 --- xml/page_payment_cash-GBR.xml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml index f2db0a4b..a0a0428c 100644 --- a/xml/page_payment_cash-GBR.xml +++ b/xml/page_payment_cash-GBR.xml @@ -1451,20 +1451,36 @@ If scanresult = "true" Then TrimCRLF scanmsg + StrLen scanmsg textLen - DEBUGVAR textLen + Var memeberCode = scanmsg + + DEBUGVAR scanmsg + DEBUGVAR memeberCode + + STRCONTAIN "]C1" scanmsg code128Format + If code128Format = "true" Then + SAVELOG "Code-128 detected" + SUBSTRING scanmsg 3 textLen memeberCode + EndIf + + DEBUGVAR memeberCode + + StrLen memeberCode memberCodeLength + + DEBUGVAR memberCodeLength Var validTextLength = "false" - If textLen >= MIN_UKB_CODE Then - If textLen <= MAX_UKB_CODE Then + If memberCodeLength >= MIN_UKB_CODE Then + If memberCodeLength <= MAX_UKB_CODE Then Var validTextLength = "true" EndIf EndIf If validTextLength = "true" Then - Var UKBMemberID = scanmsg + Var UKBMemberID = memeberCode If Timeout < 120 Then If CoinInFlag = 0 Then From 8b7df5882d14642d9db473eb440d481d964144c3 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 27 Jun 2025 16:17:59 +0700 Subject: [PATCH 3/3] THA: Fixed cancel credit card before pay success --- xml/page_payment_cash.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index c62edb4f..766d4842 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1908,6 +1908,10 @@ If KBankCashlessMachine = "1" Then + If Seeker.ServiceCharge = 0 Then + Var Seeker.ServiceCharge = 3 + EndIf + Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber DEBUGVAR VendingTrackNumber