pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

after merge Release taobin 1.24

Browse source
This commit is contained in:
kong 2021-02-05 15:40:53 +07:00
parent 36ceee08bc
commit 944a206b77
3 changed files with 2 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xml/page_brewing3.xml
View file

@ -97,10 +97,6 @@
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
<<<<<<< HEAD
=======
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
</EventActionOk>
<EventActionError>
@ -348,27 +344,7 @@
Else
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
<<<<<<< HEAD
EndIf
Else
If ChangeFlag2 = 1 Then
Var TelephoneNumber = "0899999999"
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
;no wait ack pay
Var waitAckPay = 0
EndIf
EndIf
=======
EndIf
@ -405,7 +381,7 @@
EndIf
EndIf
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
EndIf
Var ServiceSuccess = "yes"