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 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 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