taylor.dang
|
ae8b33e7d3
|
Merge branch 'develop'
|
8 years ago |
|
taylor.dang
|
5718465f3f
|
rpay
|
8 years ago |
|
taylor.dang
|
f16c47d122
|
Merge branch 'develop'
|
8 years ago |
|
taylor.dang
|
66ead63d38
|
rpay
|
8 years ago |
luoyang
|
661df49a2c
|
fix rpay+ icon
|
8 years ago |
yangkai
|
c90d1e2c5a
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yangkai
|
e9173949e1
|
修改支付完成弹窗
|
8 years ago |
|
luoyang
|
348dd76fd6
|
fix rpay+ icon
|
8 years ago |
|
luoyang
|
ffa22ee192
|
fix rpay+ icon
|
8 years ago |
|
luoyang
|
f6ebe3f6ad
|
fix rpay+ icon
|
8 years ago |
|
luoyang
|
27343d11b5
|
fix rpay+ icon
|
8 years ago |
|
luoyang
|
f7d1ffb837
|
fix rpay+ icon
|
8 years ago |
kira
|
a512a449fa
|
rpay payment success page
|
8 years ago |
|
taylor.dang
|
c91a0bf684
|
Merge branch 'develop'
|
8 years ago |
|
taylor.dang
|
7c073d79b9
|
rpay
|
8 years ago |
|
taylor.dang
|
cd3644d312
|
Merge branch 'develop'
|
8 years ago |
|
taylor.dang
|
7ac83ccf01
|
rpay
|
8 years ago |
hellolujian
|
dca2b18ea0
|
[fix]添加Rpay+图标
|
8 years ago |
|
hellolujian
|
535267fa96
|
[fix]添加Rpay+图标
|
8 years ago |
|
taylor.dang
|
014fb0a369
|
[Y] dashboard展示所有商户
|
8 years ago |
|
hellolujian
|
5b26497cd8
|
[fix]
|
8 years ago |
|
hellolujian
|
2dbe7e3b69
|
[fix]添加rpay+图标
|
8 years ago |
|
kira
|
aa5df412f0
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
kira
|
939e29a952
|
update
|
8 years ago |
|
kira
|
03818e25ee
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
hellolujian
|
158276ecff
|
[fix]显示总商户数，包括禁用的
|
8 years ago |
|
kira
|
2478d14b6e
|
rpay js check order status
|
8 years ago |
|
hellolujian
|
7ff09c78cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
hellolujian
|
f1ea323c28
|
[fix]channel添加Rpay
|
8 years ago |
|
luoyang
|
4d39963f98
|
fix merchant
|
8 years ago |
|
luoyang
|
6e60424265
|
fix merchant_id
|
8 years ago |
|
luoyang
|
71daf269e4
|
fix pom.xml
|
8 years ago |
|
luoyang
|
9c2ee829d6
|
fix pom.xml
|
8 years ago |
|
luoyang
|
3831ea17ae
|
fix pom.xml
|
8 years ago |
|
luoyang
|
163c8e1976
|
0.2.0 -dev
|
8 years ago |
|
yangkai
|
a075614c7b
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yangkai
|
ba41845c03
|
加@Resource引入RoyalPayCMSSupport
|
8 years ago |
|
luoyang
|
c722acd720
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
luoyang
|
f72b439353
|
change Rpay merchant
|
8 years ago |
|
luoyang
|
3ff88287bf
|
Merge branch 'rpay_merchant_change' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
|
8 years ago |
|
kira
|
2436757e1d
|
update
|
8 years ago |
|
luoyang
|
93a4ff7bed
|
add 100%
|
8 years ago |
|
kira
|
d327dce76c
|
update
|
8 years ago |
|
kira
|
8f9954f2ee
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/partner/templates/partner_new_rate.html
# src/main/ui/static/templates/rpay/v1/payment.js
|
8 years ago |
yixian
|
7f8b16cd29
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
|
yixian
|
4398264977
|
image
|
8 years ago |
|
yixian
|
aa1b7ae21f
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yixian
|
f3bfd8d0ec
|
img
|
8 years ago |
|
taylor.dang
|
92dd21c447
|
fix
|
8 years ago |
|
taylor.dang
|
90b71373d6
|
fix
|
8 years ago |
