Merge branch 'develop'

# Conflicts:
#	src/main/ui/static/payment/billqrcode/templates/bill_qrcode.html

src/main/java/au/com/royalpay/payment/manage/billqrcode/bean/QueryBillBean.java

@@ -11,12 +11,16 @@ public class QueryBillBean {
     private int limit = 10;
     private int page = 1;
     private String status;
+    private String client_order_id;
 
     public  JSONObject toJson(){
         JSONObject jason = new JSONObject();
         if(StringUtils.isNotEmpty(status)){
             jason.put("status",status);
         }
+        if(StringUtils.isNotEmpty(client_order_id)){
+            jason.put("client_order_id",client_order_id);
+        }
         return jason;
     }
 
@@ -43,4 +47,12 @@ public class QueryBillBean {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getClient_order_id() {
+        return client_order_id;
+    }
+
+    public void setClient_order_id(String client_order_id) {
+        this.client_order_id = client_order_id;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/billqrcode/core/impl/PartnerBillServiceImpl.java

@@ -95,7 +95,7 @@ public class PartnerBillServiceImpl implements PartnerBillService {
         JSONObject params = queryBillBean.toJson();
         params.put("client_id",client_id);
         List<JSONObject> bills = directedBillCodeMapper.findByClientId(params,new PageBounds(queryBillBean.getPage(),queryBillBean.getLimit(), Order.formString("create_time.desc")));
-        bills.stream().filter(t->t.getString("code_url")!= null).forEach(t->t.put("code_url",QRCodeUtils.qrcodeImageCode(t.getString("code_url"), 250, false)));
+        bills.stream().filter(t->StringUtils.isNotEmpty(t.getString("code_url"))).forEach(t->t.put("code_url",QRCodeUtils.qrcodeImageCode(t.getString("code_url"), 250, false)));
         return bills;
     }
 

src/main/ui/static/payment/billqrcode/templates/bill_qrcode.html

@@ -46,10 +46,10 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label class="control-label col-xs-4 col-sm-3">Client Order Id</label>
+                                    <label class="control-label col-xs-4 col-sm-3">Reference NO</label>
                                     <div class="col-xs-8 col-sm-6">
                                         <input class="form-control" ng-model="new_bill.client_order_id">
-                                        <p class="small text-info"> System will automatically generate when the client order id is empty</p>
+                                        <p class="small text-info"> System will automatically generate when the Reference NO is empty</p>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -79,19 +79,38 @@
                             </div>
                         </div>
                     </div>
-                    <div class="box">
+                    <div class="box box-warning">
                         <div class="box-header">
-                            <h3 class="box-title">Bill List &nbsp;&nbsp;&nbsp;&nbsp;
-                                <a role="button" ng-class="{'bg-primary':params.status==null}"
-                                   ng-click="params.status=null;loadBills(1)">All</a> |
-                                <a role="button" ng-class="{'bg-primary':params.status==3}"
-                                   ng-click="params.status=3;loadBills(1)">Success</a> |
-                                <a role="button" ng-class="{'bg-primary':params.status==2}"
-                                   ng-click="params.status=2;loadBills(1)">Disabled</a> |
-                                <a role="button" class="btn btn-link btn-sm" title="refresh" ng-click="loadBills(1)">
-                                    <i class="glyphicon glyphicon-refresh" title="refresh"></i>
-                                </a>
+                            <div class="form-inline">
+                                <div class="form-group">
+                                    <label class="control-label">Bill Status</label>
+                                    &nbsp;
+                                    <a role="button" ng-class="{'bg-primary':params.status==null}"
+                                       ng-click="params.status=null;loadBills(1)">All</a> |
+                                    <a role="button" ng-class="{'bg-primary':params.status==3}"
+                                       ng-click="params.status=3;loadBills(1)">Success</a> |
+                                    <a role="button" ng-class="{'bg-primary':params.status==2}"
+                                       ng-click="params.status=2;loadBills(1)">Disabled</a>
+                                </div>
+                                &nbsp; &nbsp; &nbsp; &nbsp;
+                                <div class="form-group">
+                                    <label class="control-label" >Reference NO</label>
+                                    <input type="text" class="form-control"
+                                           ng-model="params.client_order_id"
+                                           ng-enter="loadBills(1)">
+                                </div>
+                                <div class="form-group">
+                                    <button class="btn btn-primary" type="button" ng-click="loadBills(1)"><i
+                                            class="fa fa-search"></i></button>
+                                </div>
+                            </div>
+                        </div>
 
+                    </div>
+                    <div class="box">
+                        <div class="box-header">
+                            <h3 class="box-title">
+                                Bill List
                             </h3>
                         </div>
                         <div class="box-body table-responsive">
@@ -99,7 +118,7 @@
                                 <thead>
                                 <tr>
                                     <th>Order Amount</th>
-                                    <th>Client Order Id</th>
+                                    <th>Reference NO</th>
                                     <th>Payer</th>
                                     <th>Order Status</th>
                                     <th>Bill Status</th>