From 9af1015a1b9b610515946c80530283c290f94475 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Thu, 12 Apr 2018 19:50:09 +0800
Subject: [PATCH 1/9] fix ~

---
 src/main/ui/index.html                              | 12 ++++++++----
 src/main/ui/static/css/style.css                    | 13 ++++++++++++-
 .../dashboard/templates/partner_dashboard.html      |  8 ++++----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index 3f7b55aa6..2bcc76f7a 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -517,6 +517,9 @@ margin-bottom: 10%;"/>
         .ng-cloak, [ng-cloak] {
             display: none !important;
         }
+        .ng-show{
+            display: block !important;
+        }
 
         @keyframes myfirst {
             0% {
@@ -743,7 +746,7 @@ margin-bottom: 10%;"/>
             <!--顶部导航栏-->
             <nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
                  <!--Sidebar toggle button-->
-                <a class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
+                <a id="toggle" class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
                    ng-click="hideSideBar=!hideSideBar">
                     <span class="sr-only">Toggle navigation</span>
                 </a>
@@ -773,12 +776,12 @@ margin-bottom: 10%;"/>
                         </li>
                         <li class="user-menu">
                             <a role="button" ng-click="userCheckIn()">
-                                <i class="fa fa-wechat"></i> Bind WeChat
+                                <i class="fa fa-wechat"></i> <font class="sm_hid">Bind WeChat</font>
                             </a>
                         </li>
                         <li id="help" class="dropdown user user-menu" uib-dropdown>
                             <a href class="dropdown-toggle" uib-dropdown-toggle>
-                                <i class="fa fa-question-circle-o" aria-hidden="true"></i> Support
+                                <i class="fa fa-question-circle-o" aria-hidden="true"></i> <font class="sm_hid">Support</font>
                             </a>
                             <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
                                 <!-- User image -->
@@ -837,6 +840,7 @@ margin-bottom: 10%;"/>
                         </li>
                         <!-- Control Sidebar Toggle Button -->
                     </ul>
+
                 </div>
             </nav>
         </div>
@@ -845,7 +849,7 @@ margin-bottom: 10%;"/>
         <!-- MENU Start -->
         <!-- end navbar-custom -->
     </header>
-    <div id="topnav" class="navbar-custom active" ng-class="{'ng-cloak':hideSideBar}">
+    <div id="topnav" class="navbar-custom active" ng-class="{'ng-show':hideSideBar}">
         <div class="container-fluid">
             <div id="navigation" class="active" style="display: block;">
                 <!-- Navigation Menu-->
diff --git a/src/main/ui/static/css/style.css b/src/main/ui/static/css/style.css
index d6716370e..0e1be58c1 100644
--- a/src/main/ui/static/css/style.css
+++ b/src/main/ui/static/css/style.css
@@ -2819,13 +2819,24 @@ label {
     #topnav #navigation {
         display: block
     }
+    #topnav{
+        display: block;
+    }
+    #toggle{
+        display: none;
+    }
 }
 
 @media (max-width: 991px) {
     .container-fluid {
         width: 100%
     }
-
+    #topnav{
+        display: none;
+    }
+    .sm_hid{
+        display: none;
+    }
     #topnav .navigation-menu {
         float: none;
         max-height: 400px;
diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html
index b988db557..999479e12 100644
--- a/src/main/ui/static/dashboard/templates/partner_dashboard.html
+++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html
@@ -299,11 +299,11 @@
                             <p class="text-muted m-b-0"><b>{{time_range}}</b></p>
                         </li>
                         <li>
-                            <h6 class="">{{avgOrderAndCustomer.old_customers.toFixed(0)||0}}</h6>
+                            <h6 class=""><b>{{avgOrderAndCustomer.old_customers.toFixed(0)||0}}</b></h6>
                             <p class="text-muted m-b-0"><b>Avg Old Customers</b></p>
                         </li>
                         <li>
-                            <h6 class="">{{avgOrderAndCustomer.new_customers.toFixed(0)||0}}</h6>
+                            <h6 class=""><b>{{avgOrderAndCustomer.new_customers.toFixed(0)||0}}</b></h6>
                             <p class="text-muted m-b-0"><b>Avg New Customers</b></p>
                         </li>
                     </ul>
@@ -334,7 +334,7 @@
     </div>-->
     <div class="row">
         <div class="col-md-8 col-sm-8 col-xs-12" >
-            <div class="card m-b-30">
+            <div class="card m-b-30" style="height: 480px">
                 <div class="card-body">
                     <h4 class="mt-0 m-b-15 header-title">
                         Settlement Logs
@@ -378,7 +378,7 @@
                 <div class="card-body">
                     <h4 class="mt-0 header-title">交易类型分布-交易量</h4>
 
-                    <div class="chart" style="height: 400px" echarts="trade_type_chart"
+                    <div class="chart" style="height: 385px" echarts="trade_type_chart"
                          ng-class="{nodata:trade_type_chart.nodata}"></div>
                 </div>
             </div>

From 0f045d65fe1cf73608a55f8c89922e47fbd3bfdf Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 12 Apr 2018 19:50:18 +0800
Subject: [PATCH 2/9] fix

---
 .../templates/partner_payment_info.html       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 5a7da8d2f..3af8a276a 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -196,18 +196,18 @@
                         <p>
                             <a ng-href="{{qrcode.qrcode}}" download><i class="fa fa-download"></i> Download QR Code Image (支付二维码)</a>
                         </p>
-                        <p>
-                            <a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"
-                               download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>
-                        </p>
-                        <p>
-                            <a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>
-                        </p>
-                        <p>
-                            <a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">
-                                <i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)
-                            </a>
-                        </p>
+                        <!--<p>-->
+                            <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"-->
+                               <!--download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>-->
+                        <!--</p>-->
+                        <!--<p>-->
+                            <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>-->
+                        <!--</p>-->
+                        <!--<p>-->
+                            <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">-->
+                                <!--<i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)-->
+                            <!--</a>-->
+                        <!--</p>-->
                         <p>
                             <a ng-href="/sys/partners/{{partner.client_moniker}}/poster/aggregate" target="_blank"><i class="fa fa-download"></i> Download Aggregate Poster (聚合支付海报)</a>
                         </p>

From e3ff27b07b3c7709a41b1fa6fedccedcf6f1c6ca Mon Sep 17 00:00:00 2001
From: Tayl0r <519104047@qq.com>
Date: Fri, 13 Apr 2018 10:21:52 +0800
Subject: [PATCH 3/9] =?UTF-8?q?[Y]=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E5=8F=B7=E7=9A=84=E6=B5=8B=E8=AF=95=E5=95=86=E6=88=B7?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/config/devtools/templates/wx_settlements.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html
index 69fe2924b..db21c791d 100644
--- a/src/main/ui/static/config/devtools/templates/wx_settlements.html
+++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html
@@ -26,6 +26,7 @@
                     <select ng-model="params.merchant" id="merchant-select" class="form-control">
                         <option value="1307485301">1307485301</option>
                         <option value="1431999902">1431999902</option>
+                        <option value="1487387142">1487387142</option>
                     </select>
                 </div>
                 <button class="btn btn-primary" ng-click="loadSettlements()">

From 8e06058e43320fc1a02ab14fc4c01071d7aba6ff Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Fri, 13 Apr 2018 13:28:00 +0800
Subject: [PATCH 4/9] fix

---
 .../resources/apple_message_cert_product.p12  | Bin 3325 -> 3313 bytes
 .../apple_message_cert_product20180413.p12    | Bin 0 -> 3325 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/apple_message_cert_product20180413.p12

diff --git a/src/main/resources/apple_message_cert_product.p12 b/src/main/resources/apple_message_cert_product.p12
index 58c694512551af6a89e5da57a0a8b813564227e9..205da3527cb39cd520134bd4bc63ec204b397cb8 100644
GIT binary patch
delta 3253
zcmV;m3`+C;8Sxn+FoF#20s#Xsf(*0<2`Yw2hW8Bt2LYgh45b8u452WB44si8JAbl=
zfX`tI+2R5M2mpYB2KetZAB;<ME=gVBoqM}eyjxK*zv|L9L>;*5s#g$RX0f-fzIMaP
z!2AWS@7t^YO<k)W1{zRdkheGDsL^ucrB=lPHLkeAqFUQ;Q!t(nZJ>@QUjWU4Ea4Ty
z5?a?AzU<N`^yld7A*X1|Qxr61y?+QOf{rRYm410Bn|DG{>Uv!ty)%V?j~ze(CZHL>
z@JQi5f)*{$y^#rj){%et9Xic8TgD({n+Jr31fTZ$NKNauM?EJ17nolVzAPv?06?PY
zsW7k3k8OWa>~Iva`HnUUIEp*(MYaX1l$MxgBR94tbcu+LK8{)m0fBxwW`Fn(7f^;`
zu@v7PpVpbIyTicI^*GBYh!2L>QEconwP7(;E?rVyg*7&LklrpbvL4_D$NG_hvL79R
zaw84FZRVSW$6vci7uw58%8BT}r}mW4tTiGKYm|*V1lLQ>O7x<_%5E0HcD%BY#UFIn
zzXClTf~{(348N&i@ty_^k$)hLR`*xA!|E=3aP4qiQ!@s9$_~w=o`lzkmi2+pq-gH(
zmZ<FO(Tx1KzQfnn+@>laAf7a4gi-KhXk%G5lK>CaewelO<fH9IRmt<HUx?p_6l2xU
zz06)H_y~+>KMqj3_`twvp;elwjq)th&%7tYq>(~io}2Y0j*6|!D}T2|x+dkYSgF*j
z0aaToYYzodBiXm=aV%YKVHBo+LkK&i>Tg#;M^+i#<l3b>>b<wluP>5GCFOkC^R83I
z%r``)GaE1~t4gKjwz^H^=}@m&fo~bg^fYbLn`$|P!5Oz3$G-K&_#4F**wLEn47*_T
zUMeP=Ke%Lm1GV>k7Jph<cq}@qj_ZToXQQW@9B*tfk?TjM>=arzwA!u0{mQ({j)>kt
zgM~J(+rMY)BhKl1Q?~5?d}~x(Q(2Krxx5Rg(`XA4JmGlyN#l2>kltFWvRG2QIr6v0
zU6=`Sb8mMIw?lR&OXR*~laD3sTePhp1v(F0t1z<;t~z5Nv42|{@E!139<25mCY0}f
zLqk0+s?2!>6DYEMau3BuS5Vr2gSNlGrS(s|8!1GlG#Q#xE$bM8(87c^K2rQTc?9l*
zPV_rrW(aISu<`YWJD6H?UYE@ix36J!!7w0QbjXiNgFZ2f9KZnJC6zt+*)xDmeMKUm
zG$}(&XoAoge}4}xR|S>0dV=nrRG$;yOBra?z$3-K%2$yo;t-ln!3R&&{lc%0m8R=~
za?HdlW37W=1@j;jGI(OX4+`d782l7c-O7LA23ciFs&|i|98r}0TWoYMcoUtfvr+8{
zal9Fey5G$Kw)wO8EMMbVjD0s%qmbV9+%myl;d=A7^?zw&xR|o7^fYE%5<L?Lr&a9F
z6L(I@txB9P8g6sIbda@!R@J7CS00~qvavQgV8s!W?vR#g5TD8|CzMW4#o3CY?EGzI
z_ZV2S#i=d0$-@){uH%Vo|FLYc!aHn|I4Zx>&5K#EztDnbE*d>{+Y+v*%|_h|c@$MD
zm{;{#Sbrq{vC)P`PS;|wWC<2LDvn8fpxaofT-~=Jgo8F5B?PtIO<{&=$|_C6l>F+i
zEh@007_URV$#|~{SGq`Q?`?j?<Ohxfr*zxDB42Rza<`a#HJ^l``LH;>H0Uy<hY0$-
z5t%0tP@1d|fD-jq*O^SCG6cCh2&vnPTgm}V2!8@1#ArLO1N1*Fr8ya{-i6rajocK`
zt!r2$^mvn+A+4g@B_bf3OT(?IT*RtT(<0ru<2_pU9dN#L;fjX&K7Zp1p#>_{A6hZ!
zh-y-^PKlVa*|(*Kil5{6_MANjWJP#dw-6bQ$q9-syTtUzG#f&GOavp&92uwi-XcpH
z<9`UGO@;C(NdNN{OQMcK8tO6|SH8;n5#3CNrI+?CgZtOmhkfF6WU8o{+p<5*G;{U&
zV)DB;5aJhrYlLurxHAEm85zFTLY)i-_gm5YGWgEk`;fpQ#)+#IQOQcQey;f^JaZ3V
z2$LQwE|oBzoc5>w(@OkotpIl<|79hw*ngzML@#<Oe*H7DOw8TJG-=yi^b;oOM$fIV
zzl2R$U-fynE7E#UP^tg6-#=VN1`->l`P9--m7##N@N`Sk-k_7k)61iG^wm9eGJxm>
z{ZF)gk&c(a2hAdX;*oT9M-cFdOu-1}>R5oGn#v4<!RhmOa_c$LyUa<fmud|T3V+U7
z;sQDK)aLXk@pXH~xb+a`cG1t!#zcdI(=cmx`~oA|1v+Ju7dF`?OtDrV;#=)k(0cmG
z9s=w^x0ip;ep~5Uyv)Pn0)+p-y|HD<Yvc-8h;wD{_2l?|{Bq8M4#h)cY3aNe9a+S)
zzM2payJ#^mUALqte==8+nX>?|8a2nVRWsbt!SDvryaA@YfRLx4hVwI{FoFeE1_>&L
zNQU<f0S5t~f(1tef(1h`f(1V?f(1L1ga;>o)^J!xY@4Jb0s;sC1cC&}k&7@bJCt4)
z76-O)2;0up8n~UEmzM>_ap2`m%|wLm^x4SBnSe-nVUvy+%dDTCReRJUe(fWYNM5kW
zjVE#Nc$g9IL1Q`*&lLguF}u1~MVtVgF*i>FA{tr!k|r`4k5U+z1*TF~gMCVx<AB0{
z5J~05r~P08zy}TV=RqKOeR2HE4_z1cbMS{nKvC_dXaG}-;IxzdBGGW3U6?({?<F=b
z;ooIV%RNKD*v41GubR~%<U~u`6bMZ-AcK{rKUNs<s6-UaMI&KuzglyA!N&`&lcn)?
zj%SfF-epCG4VY1_L}>}O6I2{K#)z_i%B`NY*if;09R0+~%AVp7%9SufM6t+v5usD8
zFgR%>%YS5PpnqB7O-F8ik)~Yd%EiOvxw@a|>!q6a(^h{I`*B28dS!9Os<|b74Y$YA
zukLM+lOX#M+J6X0LkAC@e@79D0UU}NsU2yOkkXu}tel?((hLapW(836{f*myn3}qf
zl_aA)e)S>~4XI_akn#DM>j{#9Qn(0==?8pmDtx1BXDCq!jYo}=A>McX-f~zviu!r2
zR9dLuBASM#_#u6<TX3QV&T;F<X!}YOk`mG$iR<^qZ2{rNCE<&~ulglbUsY^2jz^}q
z7vFyvGl@qHosRIC_NRX|M{1mZHE@+!MX{!+f+Mb^aUi|r5a{P@wtJY!R{c6{R)FtQ
z(vRcOj60KJf2etLS|{+5N!c4BAxutkq7lm!;LSFQ^?EpRrv&qQ&?ADICcKJWGBy6y
zg{6~AS}*iLeG%v6Hf;Yl&(IYn7<Cf*h@ek2_Cpn)6*%Is1^D}eTEDA*VXoX{ee+`|
zJoR^@i%v2M%xu3szoAaN$ZdoOo-Jv{gHXQ7BRVeJ8zTVf`XTB;Hws_*8ZGv~l0Nn7
zQT@QL<h^I^TtMJ}W86A)Ku5uuy{gR4uFZQI!Hsm{vo<>n5+p>tYC4lF5@q~9Ni%Qp
z*^5eLJwfJirag@PEKfy$uJ94Q(l+lM6@rY2T1nkU{(2pIhjZuE5+{zO-9FF}(IU;Y
z<dLPAp(S3O-gqK6lluOnl;5A3tYNy<Rf|d12Bn+eGj1EHD_SK<bW&4vPjkn+i!EN0
zn`7#ztYgVrq5Dm8UZPfn7Zv2iE2uy}UE2pck9H{uUG0pKY$mCHTGUo?&yk$m9-@zc
zb}}J&G;iq{daEfrnMnYWRiyZJ#vEH_t(B~5hNE`jK+e0!_GVR$wKw+ewI@&w<#pzD
z<i!rXBU-;KybkgsWN4`+_T<WIaZyi7c9ZykTE{srNe!2-#{d@82^!zlcZT`~LEsPB
z#e8NhE~U~UVO!yUijJbF{wVS;C|;OWZXa)gGUffnfKi<I+dyJF?#~_34-|Zm?H&#)
z^gy~gmbFsw>yF{D9+&EV8-u@g5~m^|jyC>f*@x8P%6W)Uu8=4(uSGq*{UmJJpDJBz
zIX_CMEIiXixriGpts63CLs*+#OI5Yck!uu@wA~47sP3SDvJ;4?mxF;La^I11Xl|Wp
z70)%QGt`>$l?t8Ls6k3{1HZuI-F&98I*pWg$5{18(_=(t+l0KVZ+xpE&R7pvE-3qB
zFFABihJMUg0r|%r9z`NQTNgutDd%>=kF;)iR53a*69x$?hDe6@4FL%hF$Nw4p2Uya
zFe3&DDuzf<hW8Bt2^BFG1QZ2YbHJKfLQ(@b-1^6uwC#7&BDOFvFd;Ar1_dh)0|FWa
n00b2A<x3<ds%rP{8GY-hna-C=`f1Pv2x@=DeF<xAJpus%4+=JX

delta 3265
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

diff --git a/src/main/resources/apple_message_cert_product20180413.p12 b/src/main/resources/apple_message_cert_product20180413.p12
new file mode 100644
index 0000000000000000000000000000000000000000..58c694512551af6a89e5da57a0a8b813564227e9
GIT binary patch
literal 3325
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

literal 0
HcmV?d00001


From e3d138c490e15e944f508ef569d402696c57ddf0 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Fri, 13 Apr 2018 15:36:47 +0800
Subject: [PATCH 5/9] fix

---
 .../payment/manage/mappers/payment/TransactionMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index b672d6c17..854a53509 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -210,7 +210,7 @@
                   max(t.transaction_time)                                                            transation_time,
                   c.client_moniker                                                                   client_moniker
               FROM pmt_transactions t INNER JOIN sys_clients c
-                      ON t.client_id = c.client_id AND c.enable_refund_auth = 0
+                      ON t.client_id = c.client_id AND c.enable_pre_refund = 1
               GROUP BY c.client_id) a
         WHERE a.amount &lt; 0
     </select>

From a288696a6141e2046becfa20622018c48cd5646c Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 13 Apr 2018 15:47:57 +0800
Subject: [PATCH 6/9] fix~

---
 src/main/ui/static/payment/partner/partner-manage.js          | 4 ++++
 src/main/ui/static/payment/partner/templates/add_partner.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 4474a573b..6df1ad0f9 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -381,6 +381,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     return;
                 }
             }
+            if (!$scope.partner.logo_url) {
+                alert("Logo is necessary!");
+                return;
+            }
             if ($scope.partner.referrer_id) {
                 $scope.referrers.forEach(function (e) {
                     if ($scope.partner.referrer_id == e.org_id) {
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index eaeb79dd6..9dbb2a3fd 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -116,7 +116,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label class="control-label col-sm-2">Logo</label>
+                                <label class="control-label col-sm-2">* Logo</label>
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button"

From ace0dcb97093975a4f6fe1642198c171c1ef04db Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Fri, 13 Apr 2018 16:43:58 +0800
Subject: [PATCH 7/9] fix

---
 src/main/ui/static/commons/templates/ag_detail.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/commons/templates/ag_detail.html b/src/main/ui/static/commons/templates/ag_detail.html
index 35667dcb2..81ce84ca7 100644
--- a/src/main/ui/static/commons/templates/ag_detail.html
+++ b/src/main/ui/static/commons/templates/ag_detail.html
@@ -11,7 +11,7 @@
 </div>
 <div class="modal-footer">
     <div class="form-inline">
-
-    <button class="btn btn-success" type="button" ng-click="agree()">我知道了 | I Know</button>
+        <small class="pull-left form-control-static" style="color: grey">I Agree 代表同意GST条款，协议立即生效。</small>
+    <button class="btn btn-success" type="button" ng-click="agree()">I Agree</button>
     </div>
 </div>
\ No newline at end of file

From 210408268e7a53ad4bb5cf1e3fe7eabb98076706 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Mon, 16 Apr 2018 09:16:55 +0800
Subject: [PATCH 8/9] fix

---
 .../static/analysis/templates/settle_estimate_analysis.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
index 64a08240e..e2eb2bed8 100644
--- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
+++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
@@ -43,12 +43,13 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_0||fut.aliSettleFee_0">
+                                        <div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
                                             <span class="text-bold">到账金额详情:</span>
                                         </div>
-                                        <div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_0||fut.aliSettleFee_0">
+                                        <div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1307485301"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1307485301" />(1307485301)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1431999902"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
+                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1487387142"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay" alt="Alipay"/>  到账金额:<a class="text-green" ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee" style="color: #f06010"> <img src="/static/images/r_logo.svg" style="width: 20px;height: 20px;" uib-tooltip="RoyalPay" alt="RoyalPay"/>  总到账金额:<a class="text-green" ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
                                         </div>

From 7f40f73ad6f33b0fca8a2fc406c908660e88611f Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Mon, 16 Apr 2018 14:02:07 +0800
Subject: [PATCH 9/9] fix

---
 .../jasper/partner_invoice_gst.jasper         | Bin 80864 -> 80864 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/jasper/partner_invoice_gst.jasper b/src/main/resources/jasper/partner_invoice_gst.jasper
index 9f8703f187a548ee98a6c9ebf0e1de45199d7f95..a5111a4faf1648300d179f1fecb47806aacba7f3 100644
GIT binary patch
delta 139
zcmaFxo#nxImJRziF)>PPKDcQXzkr3Qg@Lh!p|MH4rMan@k<s*eK}M6!AKpr`Zr*YH
siz-g}dSwi$?Le(ET7u{%mP}4GmYbY&kdxOdu`Ds!IX|}`GbgnO01!1S`v3p{

delta 139
zcmaFxo#nxImJRziF)`fRd~nk&egRVhV`C#DBU9seBMV~_OOxsKf{Z4cKfIM>-Mr)Y
s7ge0{^~xAh+kskTv;@&jESa2WEH^plASbU^Vp(FcbAE0?W=?7m0AFY=fB*mh