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

src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java

@@ -117,4 +117,5 @@ public interface RetailAppService {
 
     void changeManualSettle(JSONObject device,boolean manual_settle);
 
+    JSONObject getTradeCommonDateNew(JSONObject device, AppQueryBean appQueryBean);
 }

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -205,13 +205,29 @@ public class RetailAppServiceImp implements RetailAppService {
         setAllClientIds(params, client_id);
         params.put("client_id", client_id);
         JSONObject res = transactionAnalysisMapper.getClientTransaction(params);
-
         // res.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
         // res.put("trade_count", transactionAnalysisMapper.analysisTotalCount(params));
         res.put("not_settled", transactionAnalysisMapper.analysisNotSettled(params));
         return res;
     }
 
+    @Override
+    public JSONObject getTradeCommonDateNew(JSONObject device, AppQueryBean appQueryBean) {
+        String clientType = device.getString("client_type");
+        deviceSupport.findRegister(clientType);
+        int client_id = device.getIntValue("client_id");
+        JSONObject client = clientManager.getClientInfo(client_id);
+        String timezone = client.getString("timezone");
+        if (timezone != null && !timezone.isEmpty()) {
+            appQueryBean.setTimezone(timezone);
+        }
+        JSONObject params = appQueryBean.toParams();
+        setAllClientIds(params, client_id);
+        params.put("client_id", client_id);
+        JSONObject res = transactionMapper.analysisTransFlow(params);
+        return res;
+    }
+
     @Override
     public void updateClient(JSONObject device, AppClientBean appClientBean) {
         String clientType = device.getString("client_type");
@@ -1390,6 +1406,7 @@ public class RetailAppServiceImp implements RetailAppService {
         clientManager.changeManualSettle(device.getIntValue("client_id"),manual_settle,device.getString("account_id"),1,"商户修改手动清算配置");
     }
 
+
     private static boolean mathchLetterorNum(String str) {
         String regex = "[A-Za-z0-9]{8}";
         return str.matches(regex);

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

@@ -94,6 +94,11 @@ public class RetailAppController {
         return retailAppService.getTradeCommonDate(device, appQueryBean);
     }
 
+    @RequestMapping(value = "/trade_common_new", method = RequestMethod.GET)
+    public JSONObject getTradeCommonDataNew(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean appQueryBean) {
+        return retailAppService.getTradeCommonDateNew(device, appQueryBean);
+    }
+
     @RequestMapping("/transactions_customers")
     public List<JSONObject> getOrdersAndCustomersInDays(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, AppQueryBean appQueryBean) {
         return retailAppService.getCustomersAndOrdersInDays(device, appQueryBean);

src/main/ui/static/payment/tradelog/templates/balance_report.html

@@ -242,10 +242,10 @@
                                 <div class="info-box info_box_bottom">
                                     <span class="info-box-icon bg-yellow box-icon_small"><i class="ion ion-android-done"></i></span>
                                     <div class="info-box-content box-content_left">
-                                        <span class="info-box-text">clearing amount</span>
+                                        <span class="info-box-text">Settlement Amount</span>
                                         <span class="info-box-number box-number_font"
                                               ng-bind="analysis.total_settle_amount|currency:'AUD '"></span>
-                                        <span class="small">( clearing fee: {{analysis.total_surcharge + analysis.tax_amount|currency:'AUD '}} )</span>
+                                        <span class="small">( surcharge: {{analysis.total_surcharge + analysis.tax_amount|currency:'AUD '}} )</span>
                                     </div>
                                 </div>
                             </div>