msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

Browse Source
master
wangning 6 years ago
parent 9ddfe7ef1f 48d2d7b58e
commit 42b242b8de
9 changed files with 210 additions and 204 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -554,6 +554,7 @@ public class RetailAppServiceImp implements RetailAppService {
JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id"));
if(clearingLog.getBooleanValue("editable")){
result.put("padding", true);
logs.get(0).put("padding",true);
}
}
}

2
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
Unescape View File

@ -404,7 +404,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) {
continue;
}
if (bank != null && Objects.equals(settle.getString("settle_bank"), bank)) {
if (bank != null && !Objects.equals(settle.getString("settle_bank"), bank)) {
continue;
}
Row row = sheet.createRow(rowNum++);

1
src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
Unescape View File

@ -319,4 +319,5 @@ public interface ClientManager {
void removeSub(String client_moniker, JSONObject manager);
String getShortLink(String client_moniker);
}

7
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -3663,4 +3663,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
mailService.removeUnsub(sub.getLong("id"));
}
@Override
public String getShortLink(String client_moniker){
String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/"+client_moniker+"/jump");
MpWechatApi api = mpWechatApiProvider.getNewPaymentApi();
return api.registerShortUrl(longUrl);
}
}

1
src/main/ui/static/analysis/clearing-log.js
Unescape View File

@ -249,6 +249,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
$scope.noticeResend = false;
$scope.analysisFilter = {};
$scope.currentAnalysis = $scope.detail;
$scope.pageCtrl = {visible:{}};
function getAnalysisTemplate() {
return [

36
src/main/ui/static/analysis/templates/settlement_detail.html
Unescape View File

@ -70,7 +70,8 @@
<button class="btn btn-primary" ng-click="distributeBankDialog()">
Distribute Bank
</button>
<button class="btn btn-primary" ng-if="'undo_settle'|withFunc" ng-click="rollbackSettlement()">
<button class="btn btn-primary pull-right" ng-if="'undo_settle'|withFunc"
ng-click="rollbackSettlement()">
Undo Settlement
</button>
</div>
@ -137,22 +138,6 @@
</div>
</div>
<div class="row">
<div class="col-xs-12">
<ul class="list-group">
<li class="list-group-item"
ng-repeat="group in batchAnalysis[analysisFilter.clearing_id==null?'All':analysisFilter.clearing_id+'']">
<div class="row">
<span class="col-sm-2 col-xs-4 text-center">T+{{group.settleDays}}</span>
<span class="col-sm-10 col-xs-8 text-right">
Clients:{{group.clients}}, Amount:{{group.settleAmount|currency:''}}
</span>
</div>
</li>
</ul>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<ul class="list-group">
@ -170,16 +155,17 @@
</div>
</div>
<div class="box box-default"
<div class="box box-success settle-result-box"
ng-repeat="group in batchAnalysis[analysisFilter.clearing_id==null?'All':analysisFilter.clearing_id+'']">
<div class="box-header">T+{{group.settleDays}}: Clients:{{group.clients}}
<div class="box-header" ng-click="pageCtrl.visible[group.settleDays]=!pageCtrl.visible[group.settleDays]">
T+{{group.settleDays}}: Clients:{{group.clients}}
Amount:{{group.settleAmount|currency:''}}
<span class="pull-right">Click to hide</span>
</div>
<div class="box-body table-responsive">
<table class="table table-bordered table-striped table-hover">
<div class="box-body table-responsive" ng-hide="pageCtrl.visible[group.settleDays]">
<table class="table table-bordered table-striped table-hover settle-result-table">
<thead>
<tr>
<th>Source Bank</th>
<th>Client Moniker</th>
<th>Transaction Date</th>
<th>Gross Amount</th>
@ -193,8 +179,10 @@
</thead>
<tbody>
<tr ng-repeat="settleItem in group.settles">
<td ng-bind="settleItem.settle_bank"></td>
<td ng-bind="settleItem.client_moniker"></td>
<td>
<img ng-src="/static/images/bank/{{settleItem.settle_bank|uppercase}}.png" class="bank-logo" title="{{settleItem.settle_bank}}">
<span ng-bind="settleItem.client_moniker"></span>
</td>
<td>
{{settleItem.settle_date_from|limitTo:10}}
~

364
src/main/ui/static/css/common.css
Unescape View File

@ -549,21 +549,21 @@
position: relative;
}
.active-rate-view:after{
content:'';
clear:both;
display:block;
.active-rate-view:after {
content: '';
clear: both;
display: block;
}
.active-rate-view .client-names {
width:100px;
width: 100px;
overflow-x: hidden;
float: left;
border-right: 2px solid #bbb;
display: block;
}
.active-rate-view .client-name{
.active-rate-view .client-name {
width: 100%;
text-align: left;
font-weight: bold;
@ -571,245 +571,244 @@
border-bottom: 1px solid #bbb;
}
.active-rate-view .client-row{
.active-rate-view .client-row {
height: 30px;
line-height: 30px;
white-space: nowrap;
}
.active-rate-view .analysis-box{
.active-rate-view .analysis-box {
overflow-x: auto;
display: block;
float: left;
padding-bottom: 5px;
}
.active-rate-view .analysis-item{
.active-rate-view .analysis-item {
width: 35px;
height: 100%;
display: inline-block;
text-align:center;
line-height:30px;
text-align: center;
line-height: 30px;
overflow: hidden;
border-right:1px solid #bbb;
border-bottom:1px solid #bbb;
border-right: 1px solid #bbb;
border-bottom: 1px solid #bbb;
}
.selectRow,.table-striped>tbody>tr.selectRow:nth-of-type(odd){
.selectRow, .table-striped > tbody > tr.selectRow:nth-of-type(odd) {
background-color: #E0EEE0;
}
.fountainGBox{
position:relative;
width:108px;
height:13px;
.fountainGBox {
position: relative;
width: 108px;
height: 13px;
margin: auto auto 20px;
}
.fountainG{
position:absolute;
top:0;
background-color:rgb(0,0,0);
width:13px;
height:13px;
animation-name:bounce_fountainG;
-o-animation-name:bounce_fountainG;
-ms-animation-name:bounce_fountainG;
-webkit-animation-name:bounce_fountainG;
-moz-animation-name:bounce_fountainG;
animation-duration:1.5s;
-o-animation-duration:1.5s;
-ms-animation-duration:1.5s;
-webkit-animation-duration:1.5s;
-moz-animation-duration:1.5s;
animation-iteration-count:infinite;
-o-animation-iteration-count:infinite;
-ms-animation-iteration-count:infinite;
-webkit-animation-iteration-count:infinite;
-moz-animation-iteration-count:infinite;
animation-direction:normal;
-o-animation-direction:normal;
-ms-animation-direction:normal;
-webkit-animation-direction:normal;
-moz-animation-direction:normal;
transform:scale(.3);
-o-transform:scale(.3);
-ms-transform:scale(.3);
-webkit-transform:scale(.3);
-moz-transform:scale(.3);
border-radius:9px;
-o-border-radius:9px;
-ms-border-radius:9px;
-webkit-border-radius:9px;
-moz-border-radius:9px;
}
.fountainG.fountainG_1{
left:0;
animation-delay:0.6s;
-o-animation-delay:0.6s;
-ms-animation-delay:0.6s;
-webkit-animation-delay:0.6s;
-moz-animation-delay:0.6s;
}
.fountainG.fountainG_2{
left:13px;
animation-delay:0.75s;
-o-animation-delay:0.75s;
-ms-animation-delay:0.75s;
-webkit-animation-delay:0.75s;
-moz-animation-delay:0.75s;
}
.fountainG.fountainG_3{
left:27px;
animation-delay:0.9s;
-o-animation-delay:0.9s;
-ms-animation-delay:0.9s;
-webkit-animation-delay:0.9s;
-moz-animation-delay:0.9s;
}
.fountainG.fountainG_4{
left:40px;
animation-delay:1.05s;
-o-animation-delay:1.05s;
-ms-animation-delay:1.05s;
-webkit-animation-delay:1.05s;
-moz-animation-delay:1.05s;
}
.fountainG.fountainG_5{
left:54px;
animation-delay:1.2s;
-o-animation-delay:1.2s;
-ms-animation-delay:1.2s;
-webkit-animation-delay:1.2s;
-moz-animation-delay:1.2s;
}
.fountainG.fountainG_6{
left:67px;
animation-delay:1.35s;
-o-animation-delay:1.35s;
-ms-animation-delay:1.35s;
-webkit-animation-delay:1.35s;
-moz-animation-delay:1.35s;
}
.fountainG.fountainG_7{
left:81px;
animation-delay:1.5s;
-o-animation-delay:1.5s;
-ms-animation-delay:1.5s;
-webkit-animation-delay:1.5s;
-moz-animation-delay:1.5s;
}
.fountainG.fountainG_8{
left:94px;
animation-delay:1.64s;
-o-animation-delay:1.64s;
-ms-animation-delay:1.64s;
-webkit-animation-delay:1.64s;
-moz-animation-delay:1.64s;
}
@keyframes bounce_fountainG{
0%{
transform:scale(1);
background-color:rgb(0,0,0);
.fountainG {
position: absolute;
top: 0;
background-color: rgb(0, 0, 0);
width: 13px;
height: 13px;
animation-name: bounce_fountainG;
-o-animation-name: bounce_fountainG;
-ms-animation-name: bounce_fountainG;
-webkit-animation-name: bounce_fountainG;
-moz-animation-name: bounce_fountainG;
animation-duration: 1.5s;
-o-animation-duration: 1.5s;
-ms-animation-duration: 1.5s;
-webkit-animation-duration: 1.5s;
-moz-animation-duration: 1.5s;
animation-iteration-count: infinite;
-o-animation-iteration-count: infinite;
-ms-animation-iteration-count: infinite;
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-direction: normal;
-o-animation-direction: normal;
-ms-animation-direction: normal;
-webkit-animation-direction: normal;
-moz-animation-direction: normal;
transform: scale(.3);
-o-transform: scale(.3);
-ms-transform: scale(.3);
-webkit-transform: scale(.3);
-moz-transform: scale(.3);
border-radius: 9px;
-o-border-radius: 9px;
-ms-border-radius: 9px;
-webkit-border-radius: 9px;
-moz-border-radius: 9px;
}
.fountainG.fountainG_1 {
left: 0;
animation-delay: 0.6s;
-o-animation-delay: 0.6s;
-ms-animation-delay: 0.6s;
-webkit-animation-delay: 0.6s;
-moz-animation-delay: 0.6s;
}
.fountainG.fountainG_2 {
left: 13px;
animation-delay: 0.75s;
-o-animation-delay: 0.75s;
-ms-animation-delay: 0.75s;
-webkit-animation-delay: 0.75s;
-moz-animation-delay: 0.75s;
}
.fountainG.fountainG_3 {
left: 27px;
animation-delay: 0.9s;
-o-animation-delay: 0.9s;
-ms-animation-delay: 0.9s;
-webkit-animation-delay: 0.9s;
-moz-animation-delay: 0.9s;
}
.fountainG.fountainG_4 {
left: 40px;
animation-delay: 1.05s;
-o-animation-delay: 1.05s;
-ms-animation-delay: 1.05s;
-webkit-animation-delay: 1.05s;
-moz-animation-delay: 1.05s;
}
.fountainG.fountainG_5 {
left: 54px;
animation-delay: 1.2s;
-o-animation-delay: 1.2s;
-ms-animation-delay: 1.2s;
-webkit-animation-delay: 1.2s;
-moz-animation-delay: 1.2s;
}
.fountainG.fountainG_6 {
left: 67px;
animation-delay: 1.35s;
-o-animation-delay: 1.35s;
-ms-animation-delay: 1.35s;
-webkit-animation-delay: 1.35s;
-moz-animation-delay: 1.35s;
}
.fountainG.fountainG_7 {
left: 81px;
animation-delay: 1.5s;
-o-animation-delay: 1.5s;
-ms-animation-delay: 1.5s;
-webkit-animation-delay: 1.5s;
-moz-animation-delay: 1.5s;
}
.fountainG.fountainG_8 {
left: 94px;
animation-delay: 1.64s;
-o-animation-delay: 1.64s;
-ms-animation-delay: 1.64s;
-webkit-animation-delay: 1.64s;
-moz-animation-delay: 1.64s;
}
@keyframes bounce_fountainG {
0% {
transform: scale(1);
background-color: rgb(0, 0, 0);
}
100%{
transform:scale(.3);
background-color:rgb(255,255,255);
100% {
transform: scale(.3);
background-color: rgb(255, 255, 255);
}
}
@-o-keyframes bounce_fountainG{
0%{
-o-transform:scale(1);
background-color:rgb(0,0,0);
@-o-keyframes bounce_fountainG {
0% {
-o-transform: scale(1);
background-color: rgb(0, 0, 0);
}
100%{
-o-transform:scale(.3);
background-color:rgb(255,255,255);
100% {
-o-transform: scale(.3);
background-color: rgb(255, 255, 255);
}
}
@-ms-keyframes bounce_fountainG{
0%{
-ms-transform:scale(1);
background-color:rgb(0,0,0);
@-ms-keyframes bounce_fountainG {
0% {
-ms-transform: scale(1);
background-color: rgb(0, 0, 0);
}
100%{
-ms-transform:scale(.3);
background-color:rgb(255,255,255);
100% {
-ms-transform: scale(.3);
background-color: rgb(255, 255, 255);
}
}
@-webkit-keyframes bounce_fountainG{
0%{
-webkit-transform:scale(1);
background-color:rgb(0,0,0);
@-webkit-keyframes bounce_fountainG {
0% {
-webkit-transform: scale(1);
background-color: rgb(0, 0, 0);
}
100%{
-webkit-transform:scale(.3);
background-color:rgb(255,255,255);
100% {
-webkit-transform: scale(.3);
background-color: rgb(255, 255, 255);
}
}
@-moz-keyframes bounce_fountainG{
0%{
-moz-transform:scale(1);
background-color:rgb(0,0,0);
@-moz-keyframes bounce_fountainG {
0% {
-moz-transform: scale(1);
background-color: rgb(0, 0, 0);
}
100%{
-moz-transform:scale(.3);
background-color:rgb(255,255,255);
100% {
-moz-transform: scale(.3);
background-color: rgb(255, 255, 255);
}
}
.analysis-nav ul li{
.analysis-nav ul li {
margin-right: 10px;
margin-bottom: 10px;
background-color: white;
}
.analysis-nav .nav-pills li a:hover,.analysis-nav .nav-pills li a:focus,.analysis-nav .nav-pills li.active a{
.analysis-nav .nav-pills li a:hover, .analysis-nav .nav-pills li a:focus, .analysis-nav .nav-pills li.active a {
background-color: #f06101;
border-top-color:#f06101;
border-top-color: #f06101;
}
.channel-icon{
.channel-icon {
width: 16px;
height: 16px;
}
.channel-icon-lg{
.channel-icon-lg {
width: 48px;
height: 48px;
}
.settle-forecast .rc-box .week .day{
height:120px;
.settle-forecast .rc-box .week .day {
height: 120px;
}
.dashboard-page .tooltip .tooltip-inner{
.dashboard-page .tooltip .tooltip-inner {
max-width: 600px;
text-align: center;
}
.partner-settlement_page .tooltip .tooltip-inner{
.partner-settlement_page .tooltip .tooltip-inner {
max-width: 600px;
}
}
.partner_list_style {
position: relative;
@ -824,8 +823,17 @@
color: #ffffff;
}
.check-i{
.check-i {
color: #00a65a;
float: right;
margin-top: 8px;
}
.settle-result-box .box-header {
cursor: pointer;
}
.settle-result-box .settle-result-table .bank-logo {
width: 24px;
vertical-align: middle;
}

BIN
src/main/ui/static/images/bank/ANZ.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
src/main/ui/static/images/bank/CBA.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

Write Preview
Loading…
Cancel
Save