merge from masterpiece
This commit is contained in:
parent
845c5f1637
commit
736af0e6dc
65 changed files with 481100 additions and 1087 deletions
|
|
@ -307,6 +307,12 @@
|
|||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
|
||||
If New_PaymentInter = 1 Then
|
||||
Var Seeker.ORDER_ID = ""
|
||||
GenHashWithTimeStamp Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
|
||||
|
||||
|
|
@ -356,6 +362,32 @@
|
|||
|
||||
EndIf
|
||||
|
||||
If New_PaymentInter = 1 Then
|
||||
Var Seeker.ORDER_ID = ""
|
||||
GenHashWithTimeStamp Seeker.ORDER_ID
|
||||
|
||||
DEBUGVAR Seeker.NameDrinkTH
|
||||
DEBUGVAR Seeker.NameDrinkEN
|
||||
|
||||
Var param1 = Seeker.ORDER_ID
|
||||
Var param2 = Seeker.NameDrinkEN
|
||||
Var param3 = DiscountCampaignCode
|
||||
|
||||
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
|
||||
If SizeFromSheet = "true" Then
|
||||
SPLIT Seeker.NameDrinkEN "###" 1 PureName
|
||||
Var param2 = PureName
|
||||
EndIf
|
||||
|
||||
If ConnectWithPOSMachine = 1 Then
|
||||
Var WaitPOSStatus = 1
|
||||
Var TimeWaitPOSStatus = 0
|
||||
Var POS_SELL_STATUS = "-"
|
||||
GetPOSStatus param1 param2 param3
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 900 </Timeout>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue