yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
808e0b0be5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
febc6bc5b1
|
adjust merchant QR code
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
yuan
|
19ebddcfe2
|
fix bug
|
7 years ago |
Tayl0r
|
a82412eae7
|
Revert "[Y] 暂时关闭活动"
This reverts commit 021386f
|
7 years ago |
|
Tayl0r
|
021386fd5c
|
[Y] 暂时关闭活动
|
7 years ago |
yixian
|
28933de278
|
代码优化
|
7 years ago |
eason.qian
|
1c3ace6ffd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
yuan
|
6dbad697c4
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
wangning
|
43ed9074c1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1f112c19f7
|
fixbug
|
7 years ago |
|
eason.qian
|
6125d8b0f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
wangning
|
9bc84b33a8
|
fixbug
|
7 years ago |
|
yuan
|
9ffb7c4bd1
|
显示规则
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
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
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
b7459efc5b
|
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 |
|
eason.qian
|
a887493153
|
fix
|
7 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
wangning
|
6c201c3e18
|
rollbakc conrtract
|
7 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
wangning
|
e99dbd910a
|
update
|
7 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
7 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
7 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
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
|
6df34df759
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
c4324f1407
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
e234e5745f
|
fix 关闭合同提醒
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
950459e621
|
fix
|
7 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
7 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cc94c56c5b
|
update
|
7 years ago |
|
wangning
|
92d2273f16
|
update
|
7 years ago |
|
yixian
|
39faf54c55
|
document update
|
7 years ago |
|
yixian
|
34d5e0121c
|
folder name update
|
7 years ago |
|
wangning
|
ab995db58f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5779c9c1d6
|
Merge branch 'mail' into develop
|
7 years ago |
|
wangning
|
2e4bf7f332
|
init mail add short_name
|
7 years ago |
|
yixian
|
7d7ef6f2e6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
aa70140535
|
nap
|
7 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
7 years ago |
|
eason.qian
|
7f4f195fee
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
7 years ago |
|
wangning
|
8d08151728
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
98843f0513
|
fixbug download contract
|
7 years ago |
|
wangning
|
5589d83f0d
|
add exchange rate cache
|
7 years ago |
|
yuan
|
9992cc0294
|
fix~
|
7 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
|
wangning
|
3358eb269c
|
update
|
7 years ago |
|
wangning
|
8943d91097
|
fixbug contract greenchannel
|
7 years ago |
|
wangning
|
1fe41d5421
|
update
|
7 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
7 years ago |
|
yuan
|
df99ae3218
|
add title
|
7 years ago |
|
wangning
|
198b60e0d9
|
Merge branch 'develop_device_offline' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
|
wangning
|
3321310500
|
update
|
7 years ago |
|
wangning
|
7c760fe803
|
update
|
7 years ago |
|
wangning
|
e023b105e9
|
update
|
7 years ago |
|
wangning
|
3b056b4092
|
update
|
7 years ago |
|
wangning
|
bcaa7a85ff
|
update
|
7 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
|
eason.qian
|
bce1995633
|
fix
|
7 years ago |
|
wangning
|
ab94d60512
|
update
|
7 years ago |
|
wangning
|
7ab8a06feb
|
updateupdate
|
7 years ago |
|
wangning
|
81fb75377f
|
update
|
7 years ago |
|
wangning
|
b10606486b
|
update sql
|
7 years ago |
|
wangning
|
c2b9fc6424
|
update
|
7 years ago |
|
wangning
|
f79085be54
|
update
|
7 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
7 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
7 years ago |
|
wangning
|
55bad532b4
|
sign channel
|
7 years ago |
|
wangning
|
ff32f2cad2
|
update
|
7 years ago |
|
wangning
|
900f31a2c6
|
update
|
7 years ago |
|
wangning
|
8f5e2db5a5
|
update
|
7 years ago |
|
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 |
|
yuan
|
2e3ab4a7f0
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
|
eason.qian
|
0be0167cc2
|
new act
|
7 years ago |
|
wangning
|
8127076865
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
yuan
|
f278517d63
|
add html
|
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 |
|
eason.qian
|
93b4ac57b2
|
new act
|
7 years ago |
|
wangning
|
29d7835400
|
update
|
7 years ago |
|
eason.qian
|
92a9fb7482
|
new act
|
7 years ago |
|
wangning
|
206106caac
|
update
|
7 years ago |
|
wangning
|
25d6d34a3f
|
update
|
7 years ago |
|
wangning
|
115e2ffbee
|
contract
|
7 years ago |
|
eason.qian
|
5d79371788
|
new act
|
7 years ago |
|
eason.qian
|
cf805e51b8
|
new act
|
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 |
