yixian
|
b05de3e6ef
|
Merge branch 'hotfix20180306transdownload'
# Conflicts:
# src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
|
7 years ago |
|
yixian
|
b93660ca9e
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
8df1425bd2
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
3e13c03215
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
wangning
|
0bcce4efbc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
3b7ff0c889
|
app udpate
|
7 years ago |
eason.qian
|
cfb3070c49
|
fix
|
7 years ago |
|
wangning
|
1c471262e4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7df8eff2fd
|
fixbug
|
7 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
349416eda6
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
cdb23f746b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
yixian
|
d273b75fbc
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
9f70551e39
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
138820f1bd
|
gst in surcharge config
|
7 years ago |
|
wangning
|
e363faba95
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
464fc1b474
|
update
|
7 years ago |
|
eason.qian
|
106ca85bfb
|
fix
|
7 years ago |
|
eason.qian
|
636ab2cf01
|
fix
|
7 years ago |
|
eason.qian
|
9b7c6ab014
|
fix
|
7 years ago |
|
wangning
|
e8478bb641
|
update
|
7 years ago |
|
eason.qian
|
4d2e010ed7
|
fix
|
7 years ago |
|
wangning
|
4eb69c41a0
|
update
|
7 years ago |
|
wangning
|
1fb82e3521
|
settlement add Tax amount
|
7 years ago |
|
wangning
|
2a9bf2e1db
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
548efd07fd
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
d5acfc2bbd
|
remove unnecessary code
|
7 years ago |
|
eason.qian
|
b0ca17b063
|
orderDetail add tax_amount
|
7 years ago |
|
wangning
|
15f8023802
|
Merge branch 'master_hotfix' into develop
|
7 years ago |
|
wangning
|
950fdc67e4
|
update
|
7 years ago |
|
wangning
|
df89d30232
|
update
|
7 years ago |
|
wangning
|
56335ed7f8
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
eeef7df77c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7c0b958fee
|
bill Order Check Task
|
7 years ago |
Tayl0r
|
ee3e2605a3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
0e864e89a9
|
fix
|
7 years ago |
yuan
|
33e3ef225f
|
fix~
|
7 years ago |
|
Tayl0r
|
7a714d4862
|
fix
|
7 years ago |
|
eason.qian
|
d0b08c60fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
f1dcefc6ed
|
fix bd String
|
7 years ago |
|
Tayl0r
|
7f0c42f3b9
|
[Y] 支付宝线上清算预估
|
7 years ago |
|
Tayl0r
|
000ba24c1b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
1c538488b9
|
retail query daily transactions can choose dev only transactions
|
7 years ago |
|
wangning
|
82707c9d85
|
update
|
7 years ago |
|
eason.qian
|
ef2e90efbe
|
fix bd String
|
7 years ago |
|
eason.qian
|
f385c488a0
|
fix bd String
|
7 years ago |
|
Tayl0r
|
354b6b6595
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
dcd9c55f52
|
fix manager_id String
|
7 years ago |
