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-03-10 11:40:19 +07:00
commit 8f3fbe8bc6
690 changed files with 368926 additions and 12479 deletions
Download patch file Download diff file Expand all files Collapse all files

23
xml/page_board.xml
View file

@ -211,7 +211,8 @@
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
STRCONTAIN "1050" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1062" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
@ -519,6 +520,7 @@
DEBUGVAR LangProcess
Var CatalogLayoutV3 = 0
; Check POS machine flag
Var ConnectWithPOSMachine = 0
@ -1294,6 +1296,11 @@
Var bpRemoveCup = RootPath + "image/main_page/bp_remove_cup_beeg_af.png"
EndIf
If CountryName = "Australia" Then
Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
EndIf
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
@ -2134,12 +2141,16 @@ PRICE "Reset" "-"
If SpiralOnline = "true" Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
If CountryName = "Thailand" Then
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
If CatalogLayoutV3 = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
EndIf
EndIf
Else
If InternationalEnable = 1 Then
@ -2237,7 +2248,11 @@ PRICE "Reset" "-"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
If CatalogLayoutV3 = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
EndIf
EndIf
Else
If InternationalEnable = 1 Then