Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java

@@ -49,6 +49,7 @@ public class PartnerQuery {
     private boolean apply_to_back = false;
     private boolean bd_upload_material = false;
     private boolean is_valid = false;
+    private String merchant_id;
 
     public String getClient_moniker() {
         return StringUtils.isEmpty(client_moniker) ? null : client_moniker;
@@ -208,6 +209,9 @@ public class PartnerQuery {
         if (bd_upload_material){
             param.put("bd_upload_material",true);
         }
+        if (merchant_id != null){
+            param.put("merchant_id",merchant_id);
+        }
         return param;
     }
 
@@ -448,4 +452,12 @@ public class PartnerQuery {
     public void setBd(String bd) {
         this.bd = bd;
     }
+
+    public String getMerchant_id() {
+        return merchant_id;
+    }
+
+    public void setMerchant_id(String merchant_id) {
+        this.merchant_id = merchant_id;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2766,16 +2766,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        if (client.getIntValue("approve_result") < 3) {
-            throw new ForbiddenException();
-        }
         int open_status = client.getIntValue("open_status");
         if (open_status == 1) {
             client.put("open_status", null);
         } else {
             client.put("open_status", open_status - 1);
         }
-        client.put("approve_result", 5);
+        if(client.getInteger("approve_result")==null || client.getIntValue("approve_result")==4){
+            client.put("approve_result", 5);
+        }
         client.put("approver", manager.getString("manager_id"));
         client.put("approve_time", new Date());
         if (refuse_remark != null && !refuse_remark.isEmpty()) {

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -106,6 +106,9 @@
             <if test="state!=null">
                 and c.state=#{state}
             </if>
+            <if test="merchant_id!=null">
+                and c.merchant_id=#{merchant_id}
+            </if>
             <if test="temp_mch_id!=null">
                 and locate(c.sub_merchant_id,#{temp_mch_id})&gt;0 and c.skip_clearing=0 and
                 locate(c.client_moniker,#{temp_mch_id_source})&lt;=0

src/main/ui/static/payment/invoice/templates/invoice.html

@@ -141,7 +141,7 @@
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">Total Surcharge</span>
                                         <span class="info-box-number box-number_font"
-                                              ng-bind="analysis.total_surcharge|currency:'AUD '"></span>
+                                              ng-bind="analysis.total_fee|currency:'AUD '"></span>
                                     </div>
                                 </div>
                             </div>

src/main/ui/static/payment/partner/partner-manage.js

@@ -2772,6 +2772,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         }
     });
 
+    app.filter('choose_merchant_id', function () {
+        return function (value) {
+            switch (value + '') {
+                case '1307485301':
+                    return '1307485301(Tunnel Show1)';
+                case '1431999902':
+                    return '1431999902(Tunnel Show2)';
+                case '1487387142':
+                    return '1487387142(NAP)';
+                case '':
+                    return ''
+            }
+        }
+    });
+
     app.filter('cut', function () {
         return function (value, wordwise, max, tail) {
             if (!value) return '';

src/main/ui/static/payment/partner/templates/partner_payment_info.html

@@ -11,6 +11,7 @@
                                 {{paymentInfo.sub_merchant_id||'Not Configure'}}
                                 <a role="button" ng-click="ctrl.editSubMerchant=true" ng-if="'011'|withRole"><i class="fa fa-edit"></i></a>
                                 <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="paymentInfo.temp_sub_merchant"></i>
+                                &nbsp;&nbsp;<span class="small" ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.merchant_id"><b>Merchant ID</b>:{{paymentInfo.merchant_id | choose_merchant_id}}</span>
                             </p>
                             <div class="input-group" ng-if="ctrl.editSubMerchant">
                                 <input type="text" class="form-control" ng-model="paymentInfo.sub_merchant_id"

src/main/ui/static/payment/partner/templates/partners.html

@@ -113,6 +113,18 @@
                                                        ng-model="params.sub_merchant_id">
                                             </div>
                                         </div>
+
+                                        <div class="form-group col-sm-6" ng-if="('10'|withRole)">
+                                            <label class="control-label col-xs-4 col-sm-4">Merchant ID</label>
+                                            <div class="col-xs-6">
+                                                <select ng-model="params.merchant_id" id="merchant-select" class="form-control">
+                                                    <option value="">All</option>
+                                                    <option value="1307485301">1307485301(Tunnel Show1)</option>
+                                                    <option value="1431999902">1431999902(Tunnel Show2)</option>
+                                                    <option value="1487387142">1487387142(NAP)</option>
+                                                </select>
+                                            </div>
+                                        </div>
                                         <!--BD City-->
                                         <div class="form-group col-sm-6">
                                             <label class="control-label col-xs-4 col-sm-4"