...
This commit is contained in:
miggaze
parent
ae4a83278e
commit
286e101bfd
9 changed files with 469 additions and 274 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.6 KiB |
|
|
@ -15,6 +15,8 @@
|
|||
Var GetFreeFromError = 0
|
||||
Var taobin_version = "1.53"
|
||||
|
||||
Cart "DeleteMenuID" "ALL"
|
||||
|
||||
; On open
|
||||
Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
|
|
|
|||
|
|
@ -368,7 +368,13 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
|
||||
If CART_COUNT = 1 Then
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -42,6 +42,31 @@
|
|||
EndIf
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
Var showCart = "Invisible"
|
||||
If MultiPayEnable = "true" Then
|
||||
|
||||
If CART_COUNT = 1 Then
|
||||
Var showCart = "Enable"
|
||||
Var cart_image_bn = DirImageCart + "/bn_cart1.png"
|
||||
Var cart_image_bp = DirImageCart + "/bp_cart1.png"
|
||||
EndIf
|
||||
|
||||
If CART_COUNT = 2 Then
|
||||
Var showCart = "Enable"
|
||||
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
|
||||
Var cart_image_bp = DirImageCart + "/bp_cart2.png"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CART_COUNT = 3 Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
|
|
@ -3241,7 +3266,20 @@
|
|||
|
||||
|
||||
|
||||
; Cart
|
||||
<Button>
|
||||
<X> 915 </X>
|
||||
<Y> 1769 </Y>
|
||||
<State> showCart </State>
|
||||
<Filename> cart_image_bn </Filename>
|
||||
<FilenamePress> cart_image_bp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@
|
|||
|
||||
; Reset
|
||||
Var MachineState_Result = 0
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -110,6 +110,8 @@
|
|||
|
||||
Var ToppingGotoPayment = "true"
|
||||
|
||||
Var ButtonNext = "false"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 2000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -516,6 +518,22 @@
|
|||
|
||||
</EventMachine>
|
||||
|
||||
<EventCart>
|
||||
;Var BugFlag = 1
|
||||
If CartUpdate = "true" Then
|
||||
Var CartUpdate = "-"
|
||||
If CART_COUNT = 3 Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
If ButtonNext = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
</EventCart>
|
||||
|
||||
|
||||
|
||||
|
|
@ -569,8 +587,8 @@
|
|||
<Button>
|
||||
<X> 44 </X>
|
||||
<Y> 1785 </Y>
|
||||
<Filename> Var( DirImage + "/bn_cancel.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
|
||||
<Filename> Var( DirImage + "/bp_cancel.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bn_cancel.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -579,43 +597,50 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
; next
|
||||
|
||||
; add backet
|
||||
<Button>
|
||||
<X> 447 </X>
|
||||
<X> 285 </X>
|
||||
<Y> 1785 </Y>
|
||||
<Filename> Var( DirImage + "/bn_next.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
|
||||
<State> BBasketState </State>
|
||||
<Filename> Var( DirImage + "/bn_add.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var PriceDrink = PriceDrinkTmp
|
||||
SAVELOG "USER press next ( topping )"
|
||||
SAVELOG "USER press next ( topping ) - new"
|
||||
DEBUGVAR topping1
|
||||
DEBUGVAR topping2
|
||||
DEBUGVAR topping3
|
||||
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR UserSelectProductCode
|
||||
DEBUGVAR HAVE_UV_DOOR_LID
|
||||
|
||||
If HAVE_UV_DOOR_LID = "true" Then
|
||||
|
||||
If StarwState = "Press" Then
|
||||
Machine StrawOrder
|
||||
Var LedLidBlink = "true"
|
||||
EndIf
|
||||
|
||||
If LidState = "Press" Then
|
||||
Machine LidOrder
|
||||
Var LedLidBlink = "true"
|
||||
EndIf
|
||||
|
||||
Var StarwState = "Enable"
|
||||
Var LidState = "Enable"
|
||||
;
|
||||
|
||||
EndIf
|
||||
|
||||
Var SelectDrink = UserSelectProductCode
|
||||
; Set drink
|
||||
Topping "Select" SelectDrink
|
||||
Topping "Select" UserSelectProductCode
|
||||
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" topping1
|
||||
|
|
@ -625,8 +650,132 @@
|
|||
; Pack
|
||||
Topping "Pack" ExtendData
|
||||
|
||||
If CART1_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 1
|
||||
Else
|
||||
If CART2_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 2
|
||||
Else
|
||||
If CART3_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 3
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
Var CartUpdate = "true"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
; next
|
||||
<Button>
|
||||
<X> 673 </X>
|
||||
<Y> 1785 </Y>
|
||||
<Filename> Var( DirImage + "/bn_next.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If CART_COUNT = 0 Then
|
||||
|
||||
Var PriceDrink = PriceDrinkTmp
|
||||
SAVELOG "USER press next ( topping )"
|
||||
DEBUGVAR topping1
|
||||
DEBUGVAR topping2
|
||||
DEBUGVAR topping3
|
||||
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR HAVE_UV_DOOR_LID
|
||||
|
||||
If HAVE_UV_DOOR_LID = "true" Then
|
||||
|
||||
If StarwState = "Press" Then
|
||||
Machine StrawOrder
|
||||
EndIf
|
||||
|
||||
If LidState = "Press" Then
|
||||
Machine LidOrder
|
||||
EndIf
|
||||
|
||||
Var StarwState = "Enable"
|
||||
Var LidState = "Enable"
|
||||
|
||||
EndIf
|
||||
|
||||
; Set drink
|
||||
Topping "Select" SelectDrink
|
||||
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" topping1
|
||||
Topping "Select2-ID" topping2
|
||||
Topping "Select3-ID" topping3
|
||||
|
||||
; Pack
|
||||
Topping "Pack" ExtendData
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
|
||||
Else
|
||||
|
||||
Var PriceDrink = PriceDrinkTmp
|
||||
SAVELOG "USER press next ( topping ) - new"
|
||||
DEBUGVAR topping1
|
||||
DEBUGVAR topping2
|
||||
DEBUGVAR topping3
|
||||
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR UserSelectProductCode
|
||||
DEBUGVAR HAVE_UV_DOOR_LID
|
||||
|
||||
If HAVE_UV_DOOR_LID = "true" Then
|
||||
|
||||
If StarwState = "Press" Then
|
||||
Machine StrawOrder
|
||||
Var LedLidBlink = "true"
|
||||
EndIf
|
||||
|
||||
If LidState = "Press" Then
|
||||
Machine LidOrder
|
||||
Var LedLidBlink = "true"
|
||||
EndIf
|
||||
|
||||
Var StarwState = "Enable"
|
||||
Var LidState = "Enable"
|
||||
;
|
||||
|
||||
EndIf
|
||||
|
||||
Var SelectDrink = UserSelectProductCode
|
||||
; Set drink
|
||||
Topping "Select" UserSelectProductCode
|
||||
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" topping1
|
||||
Topping "Select2-ID" topping2
|
||||
Topping "Select3-ID" topping3
|
||||
|
||||
; Pack
|
||||
Topping "Pack" ExtendData
|
||||
|
||||
If CART1_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 1
|
||||
Else
|
||||
If CART2_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 2
|
||||
Else
|
||||
If CART3_STATUS = "EMPTY" Then
|
||||
Cart "AddMenuID" 3
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var CartUpdate = "true"
|
||||
Var ButtonNext = "true"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue