Merge branch 'smoothie_tbp' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into smoothie_tbp
This commit is contained in:
commit
15975276a0
2 changed files with 12 additions and 4 deletions
|
|
@ -17,7 +17,7 @@
|
||||||
SPIRAL_SELL ServiceCredit SpiralRef
|
SPIRAL_SELL ServiceCredit SpiralRef
|
||||||
|
|
||||||
Var TimeOutSmoothiesProcess = 120
|
Var TimeOutSmoothiesProcess = 120
|
||||||
DEBUGVAR SmoothieToPayment
|
DEBUGVAR Seeker.SmoothieToPayment
|
||||||
|
|
||||||
</EventOpen>
|
</EventOpen>
|
||||||
<Timeout> 1000 </Timeout>
|
<Timeout> 1000 </Timeout>
|
||||||
|
|
@ -46,10 +46,12 @@
|
||||||
Var SessionID4 = SessionID4 + ":"
|
Var SessionID4 = SessionID4 + ":"
|
||||||
Var SessionID4 = SessionID4 + MachineSpiralRemaining
|
Var SessionID4 = SessionID4 + MachineSpiralRemaining
|
||||||
|
|
||||||
Var PayDetail="locker:S:0:"
|
Var SpiralPayDetail="locker:S:0:"
|
||||||
Var PayDetail = PayDetail + SessionID4
|
Var SpiralPayDetail = SpiralPayDetail + SessionID4
|
||||||
|
|
||||||
|
DEBUGVAR SpiralPayDetail
|
||||||
|
Seeker.sprial_pay_detail = SpiralPayDetail
|
||||||
|
|
||||||
__CMD "SprialPayDetail" PayDetail "-" "-"
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -24,3 +24,9 @@ EndIf
|
||||||
__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
|
__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
|
||||||
Var payOrderChannel = "/XML|" + Seeker.OrderChanel
|
Var payOrderChannel = "/XML|" + Seeker.OrderChanel
|
||||||
__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""
|
__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""
|
||||||
|
|
||||||
|
If Seeker.SmoothieToPayment = 1 Then
|
||||||
|
SAVELOG "[FROZEN-FRUIT] Set spiral pay detail"
|
||||||
|
Var SpiralPayDetail = Seeker.sprial_pay_detail
|
||||||
|
__CMD "SprialPayDetail" SpiralPayDetail "-" "-"
|
||||||
|
EndIf
|
||||||
Loading…
Add table
Add a link
Reference in a new issue