From 83b0297b85adad4c38e1cdb75527dff9ceb5ec1c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 7 Apr 2020 15:24:50 +0800
Subject: [PATCH] fix incremental surcharge rate

---
 .../tradelog/templates/partner_settlement_dialog.html     | 8 ++++----
 .../templates/partner_settlement_merge_settle_dialog.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index bf1ba8a6f..16f3195f7 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -190,10 +190,10 @@
                         <span ng-if="tr.surcharge_rate">%</span>
                     </td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
-                    <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
-                    <td ng-if="source!='RP跨境商城'">0.00%</td>
-                    <td ng-if="source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
-                    <td ng-if="source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
+                    <td ng-if="tr.source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">0.00%</td>
+                    <td ng-if="tr.source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
                     <td ng-bind="tr.tax_amount"></td>
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
index 45e02e6f1..fdf8621c0 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
@@ -192,10 +192,10 @@
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
                     <td>{{(((tr.surcharge_rate * 100) > tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):tr.surcharge_rate)| number : 2}}<span ng-if="tr.surcharge_rate">%</span></td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
-                    <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
-                    <td ng-if="source!='RP跨境商城'">0.00%</td>
-                    <td ng-if="source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
-                    <td ng-if="source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
+                    <td ng-if="tr.source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">0.00%</td>
+                    <td ng-if="tr.source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
                     <td ng-bind="tr.tax_amount"></td>
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>