Merge branch 'develop'

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 < 0
     </select>

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>

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>

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) {

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"