wangning
|
f4ee21ae6a
|
update
|
7 years ago |
|
wangning
|
b71cfdaa5c
|
update
|
7 years ago |
|
wangning
|
942acf08ba
|
update
|
7 years ago |
|
wangning
|
47df91b1c5
|
add manage web
|
7 years ago |
yuan
|
76d9b65b73
|
fix html
|
7 years ago |
|
yuan
|
6866c263ed
|
增加common_sub_merchant_id switch
|
7 years ago |
|
wangning
|
33db182dfb
|
tmp
|
7 years ago |
|
yuan
|
858494290f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
159a565889
|
fix html
|
7 years ago |
eason.qian
|
4291fd4ec3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
07f2474892
|
fix
|
7 years ago |
|
yuan
|
4b8ba85930
|
fix html
|
7 years ago |
|
yuan
|
3c79262ccd
|
fix html
|
7 years ago |
|
eason.qian
|
ae88cf1a10
|
fix
|
7 years ago |
|
eason.qian
|
bacde16fea
|
fix
|
7 years ago |
|
eason.qian
|
49ac845d23
|
fix
|
7 years ago |
|
wangning
|
51fdf932c1
|
tmp
|
7 years ago |
|
wangning
|
5e4e794d6d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1dfb71ab45
|
Merge branch 'fixbug' into develop
|
7 years ago |
|
wangning
|
a0c6ff984d
|
fixbug
|
7 years ago |
|
wangning
|
78688d7330
|
tmp
|
7 years ago |
|
yuan
|
da91e3cbb1
|
fix html
|
7 years ago |
|
wangning
|
97220886c5
|
tmp
|
7 years ago |
|
yuan
|
b87ea5e727
|
fix html
|
7 years ago |
|
wangning
|
c82400165e
|
tmp
|
7 years ago |
|
yuan
|
84c08eae1b
|
fix html
|
7 years ago |
|
yuan
|
fc65cfea0e
|
fix~
|
7 years ago |
|
yuan
|
6fae98440a
|
fix~
|
7 years ago |
|
yuan
|
a5a68fff2f
|
fix~
|
7 years ago |
|
yuan
|
03477c83f0
|
fix~
|
7 years ago |
|
yuan
|
417ce0a261
|
增加商户号管理页面
|
7 years ago |
|
eason.qian
|
227b712f8f
|
fix
|
7 years ago |
|
eason.qian
|
5f9b173fe6
|
add ip location
|
7 years ago |
|
eason.qian
|
4e3e87b460
|
fix
|
7 years ago |
|
wangning
|
edf02f8c23
|
update
|
7 years ago |
|
wangning
|
d188406122
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
f8b4cac8d2
|
update
|
7 years ago |
|
wangning
|
88021a718c
|
add common sub_merchant_id
|
7 years ago |
|
eason.qian
|
121950e4a7
|
update app statement detail api
|
7 years ago |
|
yuan
|
1ff7c46bc3
|
增加sub_merchant_id修改列表
|
7 years ago |
|
yuan
|
2e44dd4214
|
商户管理增加store_photo字段
|
7 years ago |
|
wangning
|
a74121cc62
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
7 years ago |
|
yuan
|
f44036b04c
|
fix`
|
7 years ago |
|
yuan
|
8fc003f87e
|
fix`
|
7 years ago |
|
yuan
|
d6de760fe0
|
fix bug
|
7 years ago |
|
yuan
|
cedbbfe97e
|
fix~
|
7 years ago |
|
yuan
|
ddb1ebd101
|
Merge branch 'settlement' into develop
|
7 years ago |
|
yuan
|
010586e3fd
|
add~
|
7 years ago |
|
yuan
|
071c05905a
|
fix~
|
7 years ago |
|
yuan
|
ae8ea53870
|
商户管理增加suburb筛选
|
7 years ago |
|
wangning
|
48e5624cb2
|
merge conflict
|
7 years ago |
|
wangning
|
f4345b7096
|
update
|
7 years ago |
|
wangning
|
2936b1072e
|
order bind qrcode version
|
7 years ago |
|
yuan
|
873ec92e6c
|
fix~
|
7 years ago |
|
yuan
|
e00d2bf155
|
fix ~
|
7 years ago |
|
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项，fix bug
|
7 years ago |
|
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
7 years ago |
|
wangning
|
264ec82506
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
2707c2b195
|
fix
|
7 years ago |
|
yuan
|
c72612110d
|
fix html
|
7 years ago |
|
yuan
|
580ea4ee05
|
商户管理增加merchant_id筛选
|
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
|
62a258ccfb
|
fix
|
7 years ago |
Tayl0r
|
e3ff27b07b
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
|
yuan
|
da999e6c85
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0f045d65fe
|
fix
|
7 years ago |
|
yuan
|
9af1015a1b
|
fix ~
|
7 years ago |
|
eason.qian
|
6ada3a95f7
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
db31a54f52
|
fix bug
|
7 years ago |
|
eason.qian
|
08f873e30a
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
c7fcb2c867
|
fix~
|
7 years ago |
|
yuan
|
ce29c7f86f
|
fix bug
|
7 years ago |
|
yuan
|
51dc7988f2
|
fix bug
|
7 years ago |
|
yuan
|
6aaa589ad2
|
修改html
|
7 years ago |
|
yuan
|
0a1feb9671
|
修改html
|
7 years ago |
|
wangning
|
2228a0cc45
|
bug fix
|
7 years ago |
|
yuan
|
025d24c358
|
fix bug
|
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 |
|
yuan
|
d367f9c615
|
fix bug
|
7 years ago |
|
yuan
|
33b3795a58
|
fix partner dashboard
|
7 years ago |
|
yuan
|
fbae009d06
|
modify html
|
7 years ago |
|
wangning
|
e746485938
|
update
|
7 years ago |
|
wangning
|
1655144454
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
1561c75e50
|
修改partner_dashboard.html
|
7 years ago |
|
wangning
|
4f780978dd
|
update
|
7 years ago |
|
wangning
|
9e788f0581
|
contract add query param
|
7 years ago |
|
yuan
|
0bef940daa
|
修改partner dashboard
|
7 years ago |
|
wangning
|
414c4a783d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
yixian
|
c6b7a5d2d4
|
error processing
|
7 years ago |
|
eason.qian
|
921936404b
|
fix
|
7 years ago |
|
eason.qian
|
4fbb104b7e
|
fix
|
7 years ago |
|
eason.qian
|
b9efe148ec
|
fix
|
7 years ago |
|
eason.qian
|
cb13558735
|
fix
|
7 years ago |
|
eason.qian
|
7e404d685f
|
fix
|
7 years ago |
|
eason.qian
|
c04d6d93c4
|
fix
|
7 years ago |
|
eason.qian
|
86bc87c381
|
fix
|
7 years ago |
|
eason.qian
|
90c13fc328
|
fix
|
7 years ago |
|
wangning
|
50eb0d8180
|
add contract analysis & pageable
|
7 years ago |
|
eason.qian
|
f31b05ca74
|
fix
|
7 years ago |
|
eason.qian
|
c1302de12a
|
fix
|
7 years ago |
|
wangning
|
3b53be6de3
|
update contract
|
7 years ago |
|
wangning
|
946b773031
|
update
|
7 years ago |
|
wangning
|
7dc7748f7e
|
update contract
|
7 years ago |
|
wangning
|
68c896aae2
|
update contract Abnormal process
|
7 years ago |
|
eason.qian
|
481fa42eb5
|
fix
|
7 years ago |
|
yuan
|
3d7bddfc92
|
modify html
|
7 years ago |
|
yuan
|
df901c8745
|
fix bug
|
7 years ago |
|
wangning
|
26e7eee4af
|
update aggregate QR board template
|
7 years ago |
|
eason.qian
|
df4c8f90d0
|
fix
|
7 years ago |
|
eason.qian
|
187298aad8
|
fix
|
7 years ago |
|
wangning
|
d84064a62b
|
fixbug tax_amount
|
7 years ago |
|
wangning
|
a40c046e41
|
fixbug
|
7 years ago |
|
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e4018d4939
|
update manual settle
|
7 years ago |
|
yuan
|
ed6aa9c00c
|
fix bug
|
7 years ago |
|
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
wangning
|
24510cf6e6
|
tmp
|
7 years ago |
|
yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
|
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
|
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
|
eason.qian
|
34605db062
|
fix
|
7 years ago |
|
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2287468292
|
fix
|
7 years ago |
|
wangning
|
e5a6813c91
|
update
|
7 years ago |
|
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
daee2f1a2e
|
update QR board
|
7 years ago |
|
yuan
|
3714c814c3
|
modify html
|
7 years ago |
|
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7e35483150
|
update
|
7 years ago |
|
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
|
yuan
|
8f14cb47a2
|
update
|
7 years ago |
|
wangning
|
0fea884bd1
|
update
|
7 years ago |
|
wangning
|
9bd674275f
|
update
|
7 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
|
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
|
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
|
yuan
|
41bdbdfe3c
|
fix bug
|
7 years ago |
|
wangning
|
4d2a27c2ca
|
update
|
7 years ago |
|
wangning
|
caadaa605d
|
update
|
7 years ago |
|
yuan
|
c6ba497390
|
活动管理增加字段
|
7 years ago |
|
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
7 years ago |
|
yuan
|
bc82d0f6b7
|
fix html
|
7 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
|
yuan
|
2bc68b8456
|
fix~
|
7 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
33a0a78bba
|
fix
|
7 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
7 years ago |
|
wangning
|
5be8e21b81
|
update
|
7 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
7 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
yuan
|
9992cc0294
|
fix~
|
7 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
|
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
|
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
|
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
|
yuan
|
f278517d63
|
add html
|
7 years ago |
|
eason.qian
|
585401834b
|
new act
|
7 years ago |
|
yixian
|
d778ad622c
|
web error
|
7 years ago |
|
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
|
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
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
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
|
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
ed810dcefa
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
069f409590
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
yixian
|
fa579346c5
|
Merge branch 'hotfix20180227gst' into develop
|
7 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
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
|
464fc1b474
|
update
|
7 years ago |
|
wangning
|
e8478bb641
|
update
|
7 years ago |
|
wangning
|
4eb69c41a0
|
update
|
7 years ago |
|
wangning
|
1fb82e3521
|
settlement add Tax amount
|
7 years ago |
|
yuan
|
33e3ef225f
|
fix~
|
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 |
|
Tayl0r
|
599864897f
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
dc0c2d9275
|
[Y] 修复支付模板页
|
7 years ago |
|
yuan
|
abce303d14
|
dashboard增加获取支付限额接口
|
7 years ago |
|
eason.qian
|
54e8c5bb6e
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
8e5e533678
|
账号修改，隐藏组织
|
7 years ago |
|
yuan
|
fea62f737f
|
fix 账号组织bug，过滤manangerList
|
7 years ago |
|
yuan
|
e968c49c2b
|
fix 账号组织bug
|
7 years ago |
yixian
|
c71e629188
|
gst support
|
7 years ago |
|
yuan
|
bf9a4f81e0
|
二级组织费率限制
|
7 years ago |
|
eason.qian
|
e53f2eab57
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
ce38db718d
|
ignore
|
7 years ago |
|
Tayl0r
|
25416d5478
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
eb5fdb48df
|
[Y] 新增AlipayOnline对账查询
|
7 years ago |
|
eason.qian
|
a9fdea18c2
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
16095a9122
|
fix
|
7 years ago |
|
yuan
|
d21d2210c6
|
修改一级组织显示，账号管理增加二级组织筛选
|
7 years ago |
|
yuan
|
7982c078cd
|
fix~
|
7 years ago |
|
yuan
|
8de1d7b688
|
修改页面年份显示
|
7 years ago |
|
yuan
|
345c48ca8c
|
修改‘合伙人提成’与‘BD提成’页面年份显示
|
7 years ago |
|
yuan
|
ed380d8f9f
|
fix~
|
7 years ago |
|
yixian
|
3407a0f9cf
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
|
yixian
|
afb9586017
|
asynchronize redirect after payment
|
7 years ago |
|
wangning
|
912c71f167
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c24f0a6cca
|
Merge branch 'updateOfei' into develop
|
7 years ago |
|
wangning
|
4550ed0958
|
update
|
7 years ago |
|
yuan
|
d78aea4331
|
fix~
|
7 years ago |
|
wangning
|
522857d479
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e322e6a631
|
Merge branch 'ofeiQB' into develop
|
7 years ago |
|
wangning
|
22d9738920
|
QB top up
|
7 years ago |
|
yuan
|
64d17e4027
|
Merge branch 'branch_v1' into develop
|
7 years ago |
|
yuan
|
86d07c5f69
|
fix~
|
7 years ago |
|
eason.qian
|
1bdcf5fa52
|
fix
|
7 years ago |
|
eason.qian
|
262ce70a7d
|
fix
|
7 years ago |
|
yuan
|
511faafdda
|
fix~
|
7 years ago |
|
yuan
|
7b563647f4
|
fix~
|
7 years ago |
|
wangning
|
da9edeb525
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
6512c4d249
|
Merge branch 'update1' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
12640d5d67
|
update
|
7 years ago |
|
yuan
|
653ee2c04f
|
fix~
|
7 years ago |
