Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -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++);

src/main/ui/static/analysis/clearing-log.js

@@ -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 [

src/main/ui/static/analysis/templates/settlement_detail.html

@@ -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">
+            <div class="box-body table-responsive" ng-hide="pageCtrl.visible[group.settleDays]">
-                <table class="table table-bordered table-striped table-hover">
+                <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>
-                        <td ng-bind="settleItem.client_moniker"></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}}
                             ~

src/main/ui/static/css/common.css

@@ -599,7 +599,6 @@
     background-color: #E0EEE0;
 }
 
-
 .fountainGBox {
     position: relative;
     width: 108px;
@@ -717,8 +716,6 @@
     -moz-animation-delay: 1.64s;
 }
 
-
-
 @keyframes bounce_fountainG {
     0% {
         transform: scale(1);
@@ -779,12 +776,12 @@
     }
 }
 
-
 .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 {
     background-color: #f06101;
     border-top-color: #f06101;
@@ -794,10 +791,12 @@
     width: 16px;
     height: 16px;
 }
+
 .channel-icon-lg {
     width: 48px;
     height: 48px;
 }
+
 .settle-forecast .rc-box .week .day {
     height: 120px;
 }
@@ -829,3 +828,12 @@
     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;
+}