diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 447419470..b2fc46451 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -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); } } } diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 196ccd952..6431ae5e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/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++); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 28b1d03c2..efbba73e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -319,4 +319,5 @@ public interface ClientManager { void removeSub(String client_moniker, JSONObject manager); + String getShortLink(String client_moniker); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index a47653f6c..59268e5e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -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); + } } diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 1eb5e5a0c..944faa786 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/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 [ diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 44c02d21a..51d386d05 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -70,7 +70,8 @@ - @@ -137,22 +138,6 @@ - -
-
- -
-
-
-
T+{{group.settleDays}}: Clients:{{group.clients}} +
+ T+{{group.settleDays}}: Clients:{{group.clients}} Amount:{{group.settleAmount|currency:''}} + Click to hide
-
- +
+
- @@ -193,8 +179,10 @@ - - +
Source Bank Client Moniker Transaction Date Gross Amount
+ + + {{settleItem.settle_date_from|limitTo:10}} ~ diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css index 327a7e4e8..b88c7fdef 100644 --- a/src/main/ui/static/css/common.css +++ b/src/main/ui/static/css/common.css @@ -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{ - max-width: 600px; - } +.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; } \ No newline at end of file diff --git a/src/main/ui/static/images/bank/ANZ.png b/src/main/ui/static/images/bank/ANZ.png new file mode 100644 index 000000000..661d0e6d0 Binary files /dev/null and b/src/main/ui/static/images/bank/ANZ.png differ diff --git a/src/main/ui/static/images/bank/CBA.png b/src/main/ui/static/images/bank/CBA.png new file mode 100644 index 000000000..733de6180 Binary files /dev/null and b/src/main/ui/static/images/bank/CBA.png differ