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

src/main/java/au/com/royalpay/payment/manage/task/DirectedBillCodeStatusDailyCheck.java

@@ -16,7 +16,7 @@ public class DirectedBillCodeStatusDailyCheck {
     @Resource
     private PartnerBillService partnerBillService;
 
-    @Scheduled(cron = "0 0 6 * * ?")
+    @Scheduled(cron = "0 30 5 * * ?")
     public void statusDailyCheck(){
         partnerBillService.dailyCheckDirectedBillCode();
     }

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

@@ -35,13 +35,13 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-xs-4 col-sm-3">* Expire</label>
+                                    <label class="control-label col-xs-4 col-sm-3">* Expire Date</label>
                                     <div class="col-xs-8 col-sm-6">
                                         <input class="form-control" ng-model="new_bill.cancle_time"
                                                uib-datepicker-popup size="10" is-open="ctrl.dateInput"
                                                ng-click="ctrl.dateInput=true"
                                                datepicker-options="{minDate:minDate,maxDate:maxDate}" name="cancle_time" required>
-                                        <p class="small text-info">Expire Date 不得超过十五天</p>
+                                        <p class="small text-info">The date of expiry should not exceed fifteen days</p>
                                     </div>
                                 </div>
 
@@ -49,14 +49,14 @@
                                     <label class="control-label col-xs-4 col-sm-3">Client Order Id</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">Client Order Id 为空时，系统自动生成</p>
+                                        <p class="small text-info"> System will automatically generated when the client order id is empty</p>
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-xs-4 col-sm-3">Remark</label>
                                     <div class="col-xs-8 col-sm-6">
                                         <textarea maxlength="100" class="form-control" ng-model="new_bill.remark"></textarea>
-                                        <p class="small text-info">Remark 不得超过100字符</p>
+                                        <p class="small text-info">within 100 characters</p>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -87,7 +87,10 @@
                                 <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>
+                                   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>
 
                             </h3>
                         </div>
@@ -118,7 +121,7 @@
                                     <td ng-bind="bill.remark|remarkCut:true:10:'...'"></td>
                                     <td ng-bind="bill.create_time"></td>
                                     <td>
-                                        <a ng-if="bill.order_id" class="text-primary" role="button" title="Detail"
+                                        <a ng-if="bill.order_id&&bill.status!=2" class="text-primary" role="button" title="Detail"
                                            ng-click="showTradeDetail(bill)">
                                             <i class="fa fa-search"></i>
                                         </a>