master
wangning 7 years ago
commit 5e4e794d6d

@ -243,7 +243,6 @@
<th>Currency</th> <th>Currency</th>
<th>Input Amount</th> <th>Input Amount</th>
<th>Total Amount</th> <th>Total Amount</th>
<th>Clearing Amount</th>
<th>Surcharge Rate</th> <th>Surcharge Rate</th>
<th>Surcharge Amount</th> <th>Surcharge Amount</th>
<th>Settle Amount</th> <th>Settle Amount</th>
@ -260,7 +259,6 @@
<td ng-bind="tr.transaction_currency"></td> <td ng-bind="tr.transaction_currency"></td>
<td ng-bind="tr.display_amount|currency:''"></td> <td ng-bind="tr.display_amount|currency:''"></td>
<td ng-bind="tr.transaction_amount|currency:''"></td> <td ng-bind="tr.transaction_amount|currency:''"></td>
<td ng-bind="tr.clearing_amount|currency:''"></td>
<td ng-bind="tr.surcharge_rate|percentage:1"></td> <td ng-bind="tr.surcharge_rate|percentage:1"></td>
<td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td> <td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
<td ng-bind="tr.settle_amount|currency:''"></td> <td ng-bind="tr.settle_amount|currency:''"></td>
@ -281,7 +279,6 @@
<th>Transaction Time</th> <th>Transaction Time</th>
<th>Currency</th> <th>Currency</th>
<th>Total Amount</th> <th>Total Amount</th>
<th>Clearing Amount</th>
<th>Surcharge Rate</th> <th>Surcharge Rate</th>
<th>Surcharge Amount</th> <th>Surcharge Amount</th>
<th>Settle Amount</th> <th>Settle Amount</th>
@ -297,7 +294,6 @@
<td ng-bind="tr.transaction_time"></td> <td ng-bind="tr.transaction_time"></td>
<td ng-bind="tr.transaction_currency"></td> <td ng-bind="tr.transaction_currency"></td>
<td ng-bind="tr.transaction_amount|currency:''"></td> <td ng-bind="tr.transaction_amount|currency:''"></td>
<td ng-bind="tr.clearing_amount|currency:''"></td>
<td ng-bind="tr.surcharge_rate|percentage:1"></td> <td ng-bind="tr.surcharge_rate|percentage:1"></td>
<td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td> <td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
<td ng-bind="tr.settle_amount|currency:''"></td> <td ng-bind="tr.settle_amount|currency:''"></td>

@ -185,7 +185,6 @@
<th>Currency</th> <th>Currency</th>
<th>Input Amount</th> <th>Input Amount</th>
<th>Total Amount</th> <th>Total Amount</th>
<th>Clearing Amount</th>
<th>Surcharge Rate</th> <th>Surcharge Rate</th>
<th>Surcharge Amount</th> <th>Surcharge Amount</th>
<th>Tax Amount</th> <th>Tax Amount</th>
@ -202,7 +201,6 @@
<td ng-bind="tr.transaction_currency"></td> <td ng-bind="tr.transaction_currency"></td>
<td ng-bind="tr.display_amount"></td> <td ng-bind="tr.display_amount"></td>
<td ng-bind="tr.transaction_amount"></td> <td ng-bind="tr.transaction_amount"></td>
<td ng-bind="tr.clearing_amount"></td>
<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></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 ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
<td ng-bind="tr.tax_amount"></td> <td ng-bind="tr.tax_amount"></td>
@ -225,7 +223,7 @@
<th>Transaction Time</th> <th>Transaction Time</th>
<th>Currency</th> <th>Currency</th>
<th>Total Amount</th> <th>Total Amount</th>
<th>Clearing Amount</th> <th>Settle Amount</th>
<th>Remark</th> <th>Remark</th>
</tr> </tr>
</thead> </thead>
@ -235,7 +233,7 @@
<td ng-bind="tr.transaction_time"></td> <td ng-bind="tr.transaction_time"></td>
<td ng-bind="tr.transaction_currency"></td> <td ng-bind="tr.transaction_currency"></td>
<td ng-bind="tr.transaction_amount"></td> <td ng-bind="tr.transaction_amount"></td>
<td ng-bind="tr.clearing_amount"></td> <td ng-bind="tr.settle_amount"></td>
<td ng-bind="tr.remark"></td> <td ng-bind="tr.remark"></td>
</tr> </tr>
</tbody> </tbody>

Loading…
Cancel
Save