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

Merge

Browse source
This commit is contained in:
miggaze 2021-12-09 15:33:02 +07:00
commit ff2c8e7b49
7 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xml/page_payment_cash.xml
View file

@ -530,7 +530,11 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0
EndIf
<<<<<<< HEAD
If Seeker = "curr" Then
=======
If PauseOrder = "false" Then
>>>>>>> 0479282586527f47f0f2821824b32af59e613c53
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
@ -582,6 +586,16 @@
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
If IntVendingCampaign = 0 Then
VendingQR OFF
If Seeker = "curr" Then