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:40:11 +07:00
parent ff2c8e7b49
commit 256eb9e6d0
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_payment_cash.xml
View file

@ -530,11 +530,7 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0 ;Var Timeout = 0
EndIf EndIf
<<<<<<< HEAD
If Seeker = "curr" Then If Seeker = "curr" Then
=======
If PauseOrder = "false" Then
>>>>>>> 0479282586527f47f0f2821824b32af59e613c53
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
Else Else
Open "ROOT/taobin_project/xml/page_brewing3.xml" Open "ROOT/taobin_project/xml/page_brewing3.xml"