wangning
|
31ee2f686f
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
bf3d6db0d0
|
fix apidoc
|
7 years ago |
yuan
|
873ec92e6c
|
fix~
|
7 years ago |
|
yuan
|
e00d2bf155
|
fix ~
|
7 years ago |
yixian
|
40a0078132
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
e2455be41c
|
ABA File Modify
|
7 years ago |
|
wangning
|
6931dcd1de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e0417057b5
|
copy switch surcharge interface
|
7 years ago |
|
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项，fix bug
|
7 years ago |
|
yuan
|
ceafd8b858
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
7 years ago |
eason.qian
|
49a9a2a5c1
|
fix
|
7 years ago |
|
wangning
|
95e0d8c2cb
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
0bc5ec040e
|
update
|
7 years ago |
|
wangning
|
39185f20d9
|
update
|
7 years ago |
|
wangning
|
c39bee44e6
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
264ec82506
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
492a4f3f06
|
Merge branch 'bugfix' into develop
|
7 years ago |
|
wangning
|
2ba62a83f1
|
bug fix
|
7 years ago |
|
wangning
|
e7f2bfb302
|
add app client QRcode
|
7 years ago |
|
eason.qian
|
2707c2b195
|
fix
|
7 years ago |
|
eason.qian
|
8f7125dae6
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
c72612110d
|
fix html
|
7 years ago |
|
yuan
|
580ea4ee05
|
商户管理增加merchant_id筛选
|
7 years ago |
|
eason.qian
|
e2b3d6c686
|
fix 最后一步打回
|
7 years ago |
|
eason.qian
|
77738cf8a5
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
7f40f73ad6
|
fix
|
7 years ago |
|
eason.qian
|
2b928e930d
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
210408268e
|
fix
|
7 years ago |
|
eason.qian
|
243de321e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
ace0dcb970
|
fix
|
7 years ago |
|
yuan
|
8d80e1ff97
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
a288696a61
|
fix~
|
7 years ago |
|
eason.qian
|
e3d138c490
|
fix
|
7 years ago |
|
eason.qian
|
62a258ccfb
|
fix
|
7 years ago |
|
eason.qian
|
467b840001
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
8e06058e43
|
fix
|
7 years ago |
Tayl0r
|
e3ff27b07b
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
|
Tayl0r
|
dea2d25dc4
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
|
yuan
|
da999e6c85
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
2b3343135d
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0f045d65fe
|
fix
|
7 years ago |
|
yuan
|
9af1015a1b
|
fix ~
|
7 years ago |
|
wangning
|
72e09ceb55
|
update
|
7 years ago |
|
wangning
|
9e97c10874
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
5b8bfad73d
|
bug fix
|
7 years ago |
|
eason.qian
|
6ada3a95f7
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
7abd5b8a6e
|
Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
|
7 years ago |
|
yuan
|
db31a54f52
|
fix bug
|
7 years ago |
|
eason.qian
|
5793bca24c
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
eason.qian
|
719c28acef
|
fix
|
7 years ago |
|
eason.qian
|
9aa7f66bc3
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
be4fa9b32c
|
fix bug
|
7 years ago |
|
eason.qian
|
08f873e30a
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
c7fcb2c867
|
fix~
|
7 years ago |
|
yixian
|
c9b7d470ba
|
update documents
|
7 years ago |
|
wangning
|
25e2467438
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c0d3e4a787
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
d930511e61
|
update
|
7 years ago |
|
eason.qian
|
df0341f6f6
|
fix
|
7 years ago |
|
wangning
|
1067641ec3
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
fa4182eb61
|
update
|
7 years ago |
|
wangning
|
8c78a671cf
|
add test
|
7 years ago |
|
yuan
|
ce29c7f86f
|
fix bug
|
7 years ago |
|
yuan
|
e27769b945
|
fix bug
|
7 years ago |
|
yuan
|
51dc7988f2
|
fix bug
|
7 years ago |
|
yuan
|
6aaa589ad2
|
修改html
|
7 years ago |
|
yuan
|
0a1feb9671
|
修改html
|
7 years ago |
|
eason.qian
|
75dd9b3896
|
fix
|
7 years ago |
|
wangning
|
2228a0cc45
|
bug fix
|
7 years ago |
|
wangning
|
53d001a965
|
update
|
7 years ago |
|
wangning
|
a1eb86e9ee
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
88308a3ee9
|
update
|
7 years ago |
|
wangning
|
5e15731509
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c38d906cea
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
c687dc2ebe
|
update
|
7 years ago |
|
yuan
|
025d24c358
|
fix bug
|
7 years ago |
|
eason.qian
|
1854088159
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
24fab32043
|
fix total_surcharge add tax_amount
|
7 years ago |
|
eason.qian
|
dba05af35c
|
fix
|
7 years ago |
|
wangning
|
74e955bca4
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
a4049f49e9
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
ffa553ca06
|
update
|
7 years ago |
|
eason.qian
|
f4ff5aa2b2
|
fix
|
7 years ago |
|
yuan
|
3fff080c23
|
fix bug
|
7 years ago |
|
yuan
|
1c77a938e2
|
Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
|
7 years ago |
|
yuan
|
e28adf6a23
|
fix bug
|
7 years ago |
|
eason.qian
|
bfc1617fcf
|
fix
|
7 years ago |
|
eason.qian
|
cec7be1bfa
|
fix 商户导出transaction pdf report 去除royalpay fee及相关渠道手续费显示
|
7 years ago |
|
yuan
|
d367f9c615
|
fix bug
|
7 years ago |
|
yuan
|
33b3795a58
|
fix partner dashboard
|
7 years ago |
|
wangning
|
caa60f6287
|
Modify BD Leader prize
|
7 years ago |
|
yuan
|
fbae009d06
|
modify html
|
7 years ago |
|
wangning
|
0a41d58e77
|
update
|
7 years ago |
|
wangning
|
e746485938
|
update
|
7 years ago |
|
wangning
|
1655144454
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
9c6f6db4bf
|
update
|
7 years ago |
|
wangning
|
4a9ea66407
|
update doc
|
7 years ago |
|
yuan
|
1561c75e50
|
修改partner_dashboard.html
|
7 years ago |
|
wangning
|
4f780978dd
|
update
|
7 years ago |
