msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incremental surcharge rate

Browse Source
master
luoyang 5 years ago
parent c56245eac8
commit 9325ce6234
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
Unescape View File

@ -190,8 +190,10 @@
<span ng-if="tr.surcharge_rate">%</span> <span ng-if="tr.surcharge_rate">%</span>
</td> </td>
<td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td> <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
<td><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td> <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
<td>{{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%</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-bind="tr.tax_amount"></td> <td ng-bind="tr.tax_amount"></td>
<td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td> <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
<td ng-bind="tr.remark"></td> <td ng-bind="tr.remark"></td>

6
src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
Unescape View File

@ -192,8 +192,10 @@
<td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></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> <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>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
<td><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td> <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
<td>{{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%</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-bind="tr.tax_amount"></td> <td ng-bind="tr.tax_amount"></td>
<td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td> <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
<td ng-bind="tr.remark"></td> <td ng-bind="tr.remark"></td>

Write Preview
Loading…
Cancel
Save