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

This commit is contained in:
Ittipat Lusuk 2025-05-23 15:28:30 +07:00
commit 15033893a3
104 changed files with 38486 additions and 31490 deletions

View file

@ -1391,10 +1391,14 @@
If BoxID = 123456 Then
Var SpiralOnline = "true"
Var SpiralOnline = "false"
Var InternationalShow = 0
EndIf
If BoxID = 201193 Then
Var InternationalShow = 1
EndIf
If BoxID = 210699 Then
Var SpiralOnline = "true"
@ -1402,11 +1406,13 @@
Var InternationalShow = 1
EndIf
If BoxID = 105005 Then
Var SpiralOnline = "true"
Var SpiralModeFrozenFruit = 1
Var InternationalShow = 1
EndIf
; test payment
Var New_Payment = 1
@ -1753,7 +1759,7 @@
EndIf
Var CountDownFailErrorHappendClear = 8
</EventOpen>
<EventActionOk>
@ -1936,6 +1942,17 @@ PRICE "Reset" "-"
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
EndIf
DEBUGVAR FailErrorHappend
If FailErrorHappend = 1 Then
If CountDownFailErrorHappendClear > 0 Then
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
If CountDownFailErrorHappendClear = 1 Then
__CMD "error-code-clear-all" "-" "-" "-"
EndIf
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
@ -2166,6 +2183,11 @@ PRICE "Reset" "-"
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
Machine DoorClose
TopView "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
@ -2189,10 +2211,7 @@ PRICE "Reset" "-"
EndIf
EndIf
Machine DoorClose
TopView "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
EndIf
EndIf
@ -2599,6 +2618,9 @@ PRICE "Reset" "-"
Var NextPage = "-"
Var BaseOnPageBoard = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;inter-xml-open BEGIN
If SpiralOnline = "true" Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
@ -2624,6 +2646,8 @@ PRICE "Reset" "-"
OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"
EndIf
;inter-xml-open END
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
</EventClick>