pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2025-07-03 14:56:07 +07:00
commit 77244b2f81
271 changed files with 40761 additions and 20220 deletions
Download patch file Download diff file Expand all files Collapse all files

41
xml/event/7.7_up_to_35/can_get_code.ev Normal file
View file

@ -0,0 +1,41 @@
If Discount7_7Pro = 1 Then
SAVELOG "Discount7_7Pro"
Var canGetCode = 0
If Seeker.CodeChannel = 1 Then
If Seeker.VendingCode = "PX1" Then
Var canGetCode = 1
EndIf
If Seeker.VendingCode = "PX15" Then
Var canGetCode = 1
EndIf
If Seeker.VendingCode = "PX2" Then
Var canGetCode = 1
EndIf
If Seeker.VendingCode = "PX25" Then
Var canGetCode = 1
EndIf
If Seeker.VendingCode = "PX3" Then
Var canGetCode = 1
EndIf
If Seeker.VendingCode = "PX35" Then
Var canGetCode = 1
EndIf
DEBUGVAR Seeker.VendingCode
DEBUGVAR canGetCode
Else
Var canGetCode = 1
EndIf
If canGetCode = 1 Then
SAVELOG "7.7 Discount level collect point"
GETACCEXT TelephoneNumber 44
Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
EndIf
EndIf

21
xml/event/tricker.ev
View file

@ -224,6 +224,13 @@ EndIf
If BoxID = 201714 Then
Var AppleFarmFestivalPro = 0
Var HappyTriosPro = 0
Var SchoolOvaltinePro = 0
Var AmericanoPro = 1
Var TaiwaneseTeaPro = 1
EndIf
If BoxID = 201729 Then
@ -233,10 +240,9 @@ EndIf
If BoxID = 123456 Then
Var AppleFarmFestivalPro = 0
Var HappyTriosPro = 0
Var TaiwaneseTeaPro = 0
Var SchoolOvaltinePro = 0
Var AmericanoPro = 1
Var TaiwaneseTeaPro = 1
;Var AmericanoPro = 1
;Var TaiwaneseTeaPro = 1
EndIf
If BoxID = 173149 Then
@ -253,6 +259,14 @@ If BoxID = 200435 Then
Var SchoolOvaltinePro = 1
EndIf
If BoxID = 200001 Then
Var Discount7_7Pro = 1
EndIf
If BoxID = 201838 Then
Var Discount7_7Pro = 1
EndIf
DEBUGVAR ConfigNumer
; override again
@ -299,6 +313,7 @@ STRCONTAIN "taobin_nopro" XMLProfile taobin_nopro
If taobin_nopro = "true" Then
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var Discount7_7Pro = 0
EndIf
; zone block logic follow ingredent

2
xml/page_board.xml
View file

@ -2048,6 +2048,8 @@ PRICE "Reset" "-"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
DEBUGVAR XMLEngineFrontStage
If CNTDOWN_PROTECT_SCREEN_BLANK > 0 Then
Var CNTDOWN_PROTECT_SCREEN_BLANK = CNTDOWN_PROTECT_SCREEN_BLANK - 1
EndIf

25
xml/page_collect_point_1.xml
View file

@ -190,13 +190,8 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
If Seeker.CodeChannel = 0 Then
If Discount7_7Pro = 1 Then
SAVELOG "7.7 Discount level collect point"
GETACCEXT TelephoneNumber 44
Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
EndIf
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@ -225,13 +220,7 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
If Seeker.CodeChannel = 0 Then
If Discount7_7Pro = 1 Then
SAVELOG "7.7 Discount level collect point"
GETACCEXT TelephoneNumber 44
Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
EndIf
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@ -696,13 +685,7 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
If Seeker.CodeChannel = 0 Then
If Discount7_7Pro = 1 Then
SAVELOG "7.7 Discount level collect point"
GETACCEXT TelephoneNumber 44
Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
EndIf
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"

12
xml/page_drinkok.xml
View file

@ -317,6 +317,18 @@
Else
Var ShowNameMysteryName = Seeker.shownameMystery
EndIf
If CatalogLayoutV3 = 1 Then
SCROLL_TO_TOP "5"
SCROLL_TO_TOP "6"
SCROLL_TO_TOP "7"
SCROLL_TO_TOP "8"
SCROLL_TO_TOP "9"
SCROLL_TO_TOP "10"
SCROLL_TO_TOP "11"
SCROLL_TO_TOP "12"
SCROLL_TO_TOP "13"
EndIf
If FrontDoorVersionInt > 19999 Then
LEDv4Playlist "reset" "-" "-"

24
xml/page_payment_cash-GBR.xml
View file

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

17
xml/page_payment_cash.xml
View file

@ -1908,10 +1908,14 @@
If KBankCashlessMachine = "1" Then
If Seeker.ServiceCharge = 0 Then
Var Seeker.ServiceCharge = 3
EndIf
Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
DEBUGVAR VendingTrackNumber
DEBUGVAR Var Seeker.CashlessVendingTrackNumber
DEBUGVAR Seeker.CashlessVendingTrackNumber
EndIf
@ -2403,8 +2407,10 @@
EndIf
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF "" by user"
SAVELOG "CashlessReq OFF "" by user"
Var Seeker.ServiceCharge = 0
CashlessReq OFF Seeker.CashlessVendingTrackNumber
CoinVending XBILL
EndIf
If CashlessPayFlag = 1 Then
@ -3367,13 +3373,6 @@ eval(
Var CancelingPopupFlag = "Enable"
Var CancelingPopupCountDown = 0
If KBankCashlessMachine = "1" Then
If ReqPayInfoFromCashOther = 2 Then
Var Seeker.ServiceCharge = 0
CoinVending XBILL
EndIf
EndIf
Refresh
EndIf
</EventClick>

2051
xml/page_topping_select8.xml
View file

File diff suppressed because it is too large Load diff

3
xml/topview2.xml
View file

@ -243,6 +243,9 @@
Var ENABLE_MYANMAR = "Invisible"
TRY "ROOT/taobin_project/inter/hkg/xml/multi/control_and_lang_swith.ev"
EndIf
If CountryName = "Australia" Then
TRY "ROOT/taobin_project/inter/aus/xml/multi/control_and_lang_swith.ev"
EndIf
Else
EndIf