From 229b5ca3bdd1ce669f9b50f1821734ba21b8966b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 14 Apr 2020 10:13:00 +0800
Subject: [PATCH] fix partner invoice style

---
 .../templates/partner_settlement_dialog.html  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 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 16f3195f7..492a24bf1 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
@@ -162,13 +162,12 @@
                     <th>Currency</th>
                     <th>Input Amount</th>
                     <th>Total Amount</th>
-                    <!--<th>Surcharge Rate</th>-->
-                    <th>Surcharge Amount</th>
-                    <th>System Rate</th>
-                    <th>System Profit</th>
-                    <th>Incremental Rate</th>
-                    <th>Incremental Profit</th>
-                    <th>Tax Amount</th>
+                    <th>Surcharge rate for RoyalPay</th>
+                    <th>Surcharge Amount for RoyalPay</th>
+                    <th>GST Amount for RoyalPay</th>
+                    <th>Surcharge rate for Mini Program</th>
+                    <th>Surcharge Amount for Mini Program</th>
+                    <th>GST Amount for Mini Program </th>
                     <th ng-if="report.report[0].settle_amount!=null">Settle Amount</th>
                     <th>Remark</th>
                 </tr>
@@ -185,16 +184,14 @@
                     <td ng-bind="tr.display_amount"></td>
                     <td ng-bind="tr.transaction_amount"></td>
                     <!--<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>-->
-                    <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>
+                        {{(((tr.surcharge_rate * 100) > tr.rate_value)?((tr.surcharge_rate * 100-tr.rate_value)):(tr.surcharge_rate))|number:2}} %
                     </td>
-                    <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | 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-bind="(tr.real_royal_surcharge?tr.real_royal_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.royalpay_tax|currency:''"></td>
+                    <td ng-bind="(tr.rate_value/100)|percentage:2"></td>
+                    <td ng-bind="(tr.incremental_surcharge?tr.incremental_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.incremental_tax|currency:''"></td>
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>
                 </tr>