From a779b081a6f8b13572998cd8b70ea2f408956358 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 11:35:16 +0800 Subject: [PATCH 1/3] ui update --- src/main/ui/static/analysis/clearing-log.js | 1 + .../analysis/templates/settlement_detail.html | 36 +- src/main/ui/static/css/common.css | 366 +++++++++--------- src/main/ui/static/images/bank/ANZ.png | Bin 0 -> 7342 bytes src/main/ui/static/images/bank/CBA.png | Bin 0 -> 1662 bytes 5 files changed, 200 insertions(+), 203 deletions(-) create mode 100644 src/main/ui/static/images/bank/ANZ.png create mode 100644 src/main/ui/static/images/bank/CBA.png 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..5157836b1 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}}, Amount:{{group.settleAmount|currency:''}} - -
    -
    • -
-
-
    @@ -170,16 +155,17 @@
-
-
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 0000000000000000000000000000000000000000..661d0e6d0903dc1567e089bb902f076c4f21f7a1 GIT binary patch literal 7342 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 Uc(`}8;s5{u07*qoM6N<$g7$vcEdT%j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..733de6180dd4ebb5adb8465765adeaa001177cd2 GIT binary patch literal 1662 zcmV-^27&pBP)>=E_jetq&Z9kWK&q1zSl(K~#90&72E+(>4@_6JH83NlA&yXx6%2!iJWuEZlZu zP+%Jy|NjpW+e%{Dy6YUt-w){XKIheuj%7Ea5m@Ha8QdR(OL3h}Phvy#Q!LVPdNDY# z*)koE$LTbW4Z^3Wu_~}ZRjiWOBwY*$Y&P9vRTUddSLRQSSUa%mNo=4d`7|51lRhe9 zBUPDS^H}3?wj6-U$&)Ttr80WOibWr509~0+Qvp`B#-c9%$x@6}Z5I($7LR0DQB_V9 zSP@m`Qi*$&QNUCZBdW}`SW#5!Bt}xHUh?gV1>G)8Bt}q~FGYt>bd~x}=0SxaDpIy6SA>Lh_ zI!oMxouXh}_+jn9E)c+Gp4Dn92Hus0;|9?M1Fo1)Cvsr0D*ZZ<1B2{J7>Ro@u!=!R zWMEJ#XMokJ!C+JtU~B6L25=<7N@QUED&6KSEtv1)+X=ufF9!3fnE#n51@lpfBawl* zkJeZc8JMd|j85dh+}^%H3^p1tm%9u3l`bHd{pGOT9fUKO?Zb%qMUp3&oyrgr8JLaA zQ{+zMz!t{a1@;Ef0lP4)nES)NTeAPZ8Jff@Wc~R+1F*0XcUgT-l7F>em`AlJyJ{tg z9xS}Xr%9p*iy~1E=6W0G8nXV79P;?Sv|52Th=W81CaKsYp2Q~K3BiJQ;_5@viAd#X z@D1W=7fYn_1ntR3l9d3fuW}N4$(KEeP0sEOP9g(qRSfU(RT8npuFBvNS1;vQNpkgo zRV(gx+Ryp@7!os;#3t1~Ci@}@D;kNcVwa=gbRq{fnhU;n!%Mb$XM&YnR_9_kFw#A$ z#c4LzJXpoZ+NfGLY|js+GBaCSmBc39FHn(E{$MVVf%U#YMF_dIkr+&6wlP{Nm~Wx~Ib0RSc&qH<~%(Mp>;I45MP?wYpqtiD)Xb zQawALX(VE)r0Nq}FA+&)sa#zq5}8Wa?SgLKD6n*$$W;tARu3hy ziHpiibUz3uk%8G)jL@G@B{s1idjuC=Zi9_Fwr3@|?Tydk7wf(e{SttxT+g~#S14GP zU74*ubtQVAiL%(7mAwluzrjWWX0EdATzFj}Vp*u9+fWjln5v}w_>3u$ff=bJ{FTHR zI+mHr&Jlzyv5A37{uR|jiyIp+Fx||bt^Nrtv58J4xqT5@A_G%bto=sM{5B9BtbJme zUFiaXDO9#j?2r-}n6zTq`cN+X?X(|hR~|3CWM5d~My9gdUwGjj)e10S#SR0`#EGwFN2ht6wWD_{UfKaBGZ? z>$MepmlvhI#_IRQ(0357nIBY=?epE470qy!&fl)vA(@-~RbWYzR^2zXMAA3LsE_4A?NRAOHXW07*qo IM6N<$f(<(q+5i9m literal 0 HcmV?d00001 From c30b9f0d728e59559088e5012f0bfb1d779e5695 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 12:01:47 +0800 Subject: [PATCH 2/3] ui update --- src/main/ui/static/analysis/templates/settlement_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 5157836b1..51d386d05 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -180,7 +180,7 @@
- + From f226209c9a080b3633db18c3d49a7ab1efac28b7 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 12:20:45 +0800 Subject: [PATCH 3/3] settle mail fix --- .../manage/management/clearing/core/impl/CleanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++);