Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d422d55733
70 changed files with 16954 additions and 10157 deletions
|
|
@ -2609,6 +2609,10 @@
|
|||
Var showShotEnable = "Invisible"
|
||||
Var ShotCoffeePremium = "Invisible"
|
||||
Var ExtraTopping = "Invisible"
|
||||
|
||||
Var CustomCoffeeEnable = "False"
|
||||
Var showCustomCoffee = "Invisible"
|
||||
var showCoffeeLevel = "Invisible"
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
|
|
@ -2619,24 +2623,6 @@
|
|||
</EventMachine>
|
||||
|
||||
<EventCart>
|
||||
;Var BugFlag = 1
|
||||
If CartUpdate = "true" Then
|
||||
Var CartUpdate = "-"
|
||||
|
||||
|
||||
If CART_COUNT = 3 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
If ButtonNext = "true" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
</EventCart>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue