After merge

This commit is contained in:
kong 2022-05-20 10:44:46 +07:00
commit 25b5303a05
25 changed files with 88 additions and 61 deletions

View file

@ -947,7 +947,10 @@
If ToppingGotoPayment = "true" Then
Topping "Select" SelectDrink
; Pack
Topping "Pack" ExtendData
Topping "Pack" ExtendDataCurr
Var Seeker.ExtendDataCurr = ExtendDataCurr
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
@ -2090,6 +2093,8 @@
; Pack
Topping "Pack" ExtendData
Var Seeker.ExtendData = ExtendData
If CART1_STATUS = "EMPTY" Then
Cart "AddMenuID" 1
Else
@ -2269,7 +2274,6 @@
; Pack
Topping "Pack" ExtendDataCurr
Else
Topping "SetNextOrder" UserSelectProductCode
@ -2282,8 +2286,9 @@
; Pack
Topping "__pack" ExtendDataNext
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
Var Seeker.PictureDrink = PictureDrink
Var Seeker.showname = showname