Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
wangning
|
e7785b4699
|
update
|
7 years ago |
wangning
|
3f604e71ac
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
eason.qian
|
d35b6af86d
|
Merge remote-tracking branch 'origin/agreement' into agreement
|
7 years ago |
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
wangning
|
65975c4f6e
|
update
|
7 years ago |
wangning
|
15fd0edfc5
|
update
|
7 years ago |
Tayl0r
|
be9380de3d
|
[Y] 合同测试生成
|
7 years ago |
wangning
|
7de1eed456
|
update
|
7 years ago |
wangning
|
759c752455
|
update
|
7 years ago |
wangning
|
1e380cc65a
|
update
|
7 years ago |
wangning
|
81ecb15c05
|
update
|
7 years ago |
wangning
|
7ee91fb885
|
update
|
7 years ago |
wangning
|
1731d9e973
|
update
|
7 years ago |
wangning
|
8127076865
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
wangning
|
fef08a3f58
|
update
|
7 years ago |
eason.qian
|
585401834b
|
new act
|
7 years ago |
wangning
|
1019f2ef9f
|
Merge branch 'develop_contract' into agreement
|
7 years ago |
wangning
|
863b7794e3
|
update
|
7 years ago |
yixian
|
b1bebb8d0f
|
web error
|
7 years ago |
yixian
|
d778ad622c
|
web error
|
7 years ago |
wangning
|
5db7294880
|
update
|
7 years ago |
wangning
|
29d7835400
|
update
|
7 years ago |
wangning
|
206106caac
|
update
|
7 years ago |
wangning
|
25d6d34a3f
|
update
|
7 years ago |
wangning
|
115e2ffbee
|
contract
|
7 years ago |
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
yixian
|
11a81ba7b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
7 years ago |
yixian
|
5c57271ea9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yixian
|
715f718092
|
export error
|
7 years ago |
eason.qian
|
a0df3ab9ee
|
Merge branch 'develop'
|
7 years ago |
eason.qian
|
b9c4d60607
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
188ee72cd0
|
fix
|
7 years ago |
yixian
|
7aae1e7c6b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
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
|
daae66eb96
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
3b7ff0c889
|
app udpate
|
7 years ago |
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
wangning
|
6b20fe43d6
|
device off line
|
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
|
58f40e8248
|
device offline
|
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
|
d5acfc2bbd
|
remove unnecessary code
|
7 years ago |
eason.qian
|
b0ca17b063
|
orderDetail add tax_amount
|
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
|
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 |
eason.qian
|
68b42a4f85
|
fix bd_id String
|
7 years ago |
eason.qian
|
d1ec5620d5
|
fix
|
7 years ago |
Tayl0r
|
3d86ba8a9b
|
[Y] 修复清算预估
|
7 years ago |
eason.qian
|
6e9c1bbc4c
|
fix
|
7 years ago |
eason.qian
|
16282c0cab
|
Merge remote-tracking branch 'origin/transaction-up'
|
7 years ago |
macminiuser
|
e160be4afd
|
fix
|
7 years ago |
wangning
|
90baf73d49
|
update
|
7 years ago |
wangning
|
5148f6c15a
|
update
|
7 years ago |
wangning
|
c80e8689b0
|
Merge branch 'develop'
|
7 years ago |
wangning
|
f67edfcaf2
|
update
|
7 years ago |
wangning
|
308eca2a06
|
Merge branch 'develop_bill' into develop
|
7 years ago |
Tayl0r
|
599864897f
|
Merge branch 'develop'
|
7 years ago |
Tayl0r
|
dc0c2d9275
|
[Y] 修复支付模板页
|
7 years ago |
wangning
|
52802a008a
|
update
|
7 years ago |