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 af3dcc95c..4751c0ca1 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 @@ -186,7 +186,9 @@ - {{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}% + {{(((tr.surcharge_rate * 100) < tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):0.00)| number : 2}} + % + {{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}} {{tr.source}}:{{(tr.rate_value) | number : 2}}% {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}} 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 d3bb5a488..a6c5ef153 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 @@ -190,7 +190,7 @@ - {{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}% + {{(((tr.surcharge_rate * 100) < tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):0.00)| number : 2}}% {{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}} {{tr.source}}:{{(tr.rate_value) | number : 2}}% {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}}