From 8df1425bd2625b23b4dacbf7df59af2df5eac92d Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 6 Mar 2018 15:24:07 +0800
Subject: [PATCH] client support multiple settles in one day

---
 src/main/ui/static/analysis/templates/partner_card.html       | 2 +-
 .../payment/tradelog/templates/partner_settlement_logs.html   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/partner_card.html b/src/main/ui/static/analysis/templates/partner_card.html
index 91311cb0f..eb3c5d342 100644
--- a/src/main/ui/static/analysis/templates/partner_card.html
+++ b/src/main/ui/static/analysis/templates/partner_card.html
@@ -310,7 +310,7 @@
                                 <td ng-bind="log.fee"></td>
 
                                 <td>
-                                    <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,(log.clearing_time|limitTo:10))" title="Detail">
+                                    <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)" title="Detail">
                                         <i class="fa fa-list-alt"></i>
                                     </a>
                                 </td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
index 0782f9762..8f2d25c00 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
@@ -126,10 +126,10 @@
                                 <td ng-bind="log.fee"></td>
                                 <!--<td ng-bind="log.rate"></td>-->
                                 <td>
-                                    <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,(log.clearing_time|limitTo:10))" title="Detail">
+                                    <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)" title="Detail">
                                         <i class="fa fa-list-alt"></i>
                                     </a>
-                                    <a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" title="Download">
+                                    <a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/settlement_logs/{{log.clear_detail_id}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" title="Download">
                                         <i class="fa fa-download"></i>
                                     </a>
                                 </td>