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

Merge branch 'topping_custom_coffee_new' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2023-09-08 17:34:40 +07:00
commit 2205adf48b
4 changed files with 6751 additions and 711 deletions
Download patch file Download diff file Expand all files Collapse all files

1414
xml/page_catalog_group_coffee.xml
View file

File diff suppressed because it is too large Load diff

5
xml/page_topping_select5.xml
View file

@ -46,6 +46,11 @@
DEBUGVAR JXMLVersionInt DEBUGVAR JXMLVersionInt
Var CHECK_EventOpen_Double = 0 Var CHECK_EventOpen_Double = 0
If RecipeTag3 = "CoffeePlay" Then
Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
If JXMLVersionInt > 448 Then If JXMLVersionInt > 448 Then
Open "ROOT/taobin_project/xml/page_topping_select7.xml" Open "ROOT/taobin_project/xml/page_topping_select7.xml"
Else Else

11
xml/page_topping_select7.xml
View file

@ -360,7 +360,9 @@
<EventTimeout> <EventTimeout>
DEBUGVAR Timeout DEBUGVAR Timeout
DEBUGVar MenuReady DEBUGVAR MenuReady
DEBUGVAR CupRemain
If SelectDrinkType = 1 Then If SelectDrinkType = 1 Then
If MenuReady = "YES" Then If MenuReady = "YES" Then
@ -380,9 +382,10 @@
EndIf EndIf
EndIf EndIf
If CupRemain > 0 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml" Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf EndIf
EndIf EndIf

6032
xml/page_topping_select8.xml Normal file
View file

File diff suppressed because it is too large Load diff