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

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -130,6 +130,9 @@ public class RetailAppController {
     @RequestMapping("/{client_id}/settlement_logs/{clearingDetailId}/analysis/{channel}")
     public Map<String,JSONObject> channelAndDayOfAnalysis(@PathVariable int client_id, @PathVariable String clearingDetailId,
                                                           @PathVariable String channel,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
+        if ("all".equals(channel)){
+            channel = "null";
+        }
         return retailAppService.channelAndDayOfAnalysis(client_id, clearingDetailId,channel,device);
     }
 

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

@@ -18,7 +18,7 @@
                                     <a class="text-primary" role="button" title="modify logs"
                                        ng-click="showSubMerchantLogs(sub_merchant_id_logs)">
                                            <span class="pull-right-container">
-                                               <span class="label label-primary">logs</span>
+                                               <span class="label label-primary">history</span>
                                            </span>
                                    </a>
                                  </span>