wangning
|
fd74bf0e22
|
update
|
6 years ago |
|
wangning
|
687c8b10e7
|
Merge branch 'test' into develop
# Conflicts:
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
|
wangning
|
57b3a77fbd
|
update
|
6 years ago |
eason.qian
|
23258a78bb
|
Merge branch 'mailgun' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
|
wangning
|
6ab808a45f
|
update
|
6 years ago |
|
wangning
|
2e01748e11
|
add maven test
|
6 years ago |
|
wangning
|
63a22cd783
|
update
|
6 years ago |
|
wangning
|
8f38a3f2c4
|
fix customer_order statics
|
6 years ago |
|
wangning
|
58b12d66b3
|
modify mail gun properties
|
6 years ago |
|
wangning
|
b55f8e3f9d
|
update
|
6 years ago |
|
wangning
|
b34e6b8f3c
|
update
|
6 years ago |
|
wangning
|
a46cfe5444
|
modify mail send
|
6 years ago |
|
wangning
|
f9f58012e4
|
add mailgun interface
|
6 years ago |
|
wangning
|
dc1f20c838
|
add mail test
|
6 years ago |
|
wangning
|
a5f97c0fa0
|
roll back
|
6 years ago |
|
wangning
|
0bdb01445b
|
roll back
|
6 years ago |
|
wangning
|
ddee63590f
|
alsjd
|
6 years ago |
|
wangning
|
ca23d42860
|
merge conflicts
|
7 years ago |
yixian
|
bca940a8c5
|
document update, php demo update
|
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 |
|
wangning
|
baec160c2d
|
Merge branch 'develop_postpone' into develop
|
7 years ago |
|
wangning
|
8c5b02fc92
|
client postpone
|
7 years ago |
|
eason.qian
|
3f4a2cf9a6
|
fix partner invoice + settlement log tip
|
7 years ago |
|
wangning
|
2f1abf902a
|
add mongo
|
7 years ago |
|
wangning
|
fa4182eb61
|
update
|
7 years ago |
|
wangning
|
8c78a671cf
|
add test
|
7 years ago |
|
yixian
|
5db4a09b92
|
manual settle
|
7 years ago |
|
yixian
|
f11ccbc7cd
|
details
|
7 years ago |
|
wangning
|
22d9738920
|
QB top up
|
7 years ago |
|
wangning
|
9c567a6e98
|
update
|
7 years ago |
|
wangning
|
9d9b5d2527
|
customer impression
|
7 years ago |
|
wangning
|
24b76d3fd5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1316ee44fb
|
Merge branch 'companyAddress' into develop
|
7 years ago |
yixian
|
785c182691
|
Merge branch 'hotfix20180115_cashbackdelaysettle' into develop
|
7 years ago |
|
yixian
|
4901bd8b1c
|
settle delay cashback
|
7 years ago |
|
wangning
|
f14b7c10b9
|
Merge branch 'partnerCommission' into develop
|
7 years ago |
|
wangning
|
ea18e38234
|
tmp
|
7 years ago |
|
wangning
|
b4fa4057b5
|
update
|
7 years ago |
|
wangning
|
cbe7a26bc6
|
Merge branch 'customerImpression' into develop
|
7 years ago |
|
wangning
|
a5ca5655a0
|
update
|
7 years ago |
|
wangning
|
74eca570af
|
Merge branch 'agent' into develop
|
7 years ago |
|
wangning
|
52140edce6
|
update
|
7 years ago |
|
wangning
|
690c25e399
|
update
|
7 years ago |
|
wangning
|
974d1e09ea
|
Customer impression task
|
7 years ago |
|
wangning
|
9df05a5ee1
|
update
|
7 years ago |
|
wangning
|
d28313c06a
|
agentCommission
|
7 years ago |
|
wangning
|
5597444015
|
update
|
7 years ago |
|
wangning
|
3e5c785433
|
Merge branch 'costomerImpression' into develop
|
7 years ago |
|
wangning
|
3738ebb1c4
|
customer impression
|
7 years ago |
|
wangning
|
4eec126f95
|
test
|
7 years ago |
|
eason.qian
|
4644f30cad
|
fix
|
7 years ago |
