Merge branch 'masterpiece' into feat/sgp-new-payment
This commit is contained in:
commit
e6703097f2
1117 changed files with 200327 additions and 141852 deletions
|
|
@ -209,6 +209,7 @@
|
|||
If Seeker.PayWithQR = 0 Then
|
||||
DEBUGVAR TxRef1
|
||||
Var PayDetail2 = ToppingDetail
|
||||
Var ServiceCharge = Seeker.ServiceCharge
|
||||
DEBUGVAR PayDetail
|
||||
DEBUGVAR PayDetail2
|
||||
|
||||
|
|
@ -225,6 +226,10 @@
|
|||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
|
||||
EndIf
|
||||
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -244,7 +249,7 @@
|
|||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
; seeker currr
|
||||
|
||||
|
||||
DEBUGVAR ChangeFlag2
|
||||
|
|
@ -253,6 +258,7 @@
|
|||
If Seeker.PayWithQR = 0 Then
|
||||
DEBUGVAR TxRef1
|
||||
Var PayDetail2 = ToppingDetail
|
||||
Var ServiceCharge = Seeker.ServiceCharge
|
||||
DEBUGVAR PayDetail
|
||||
DEBUGVAR PayDetail2
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue