settlement add Tax amount

src/main/ui/static/analysis/templates/settlement_detail.html

@@ -127,6 +127,7 @@
                         <th>Rate</th>
                         <th>Total Charge</th>
                         <th>Net Amount</th>
+                        <th>Tax Amount</th>
                         <th>Settle Days</th>
                         <th>Transactions</th>
                     </tr>
@@ -142,6 +143,7 @@
                         <td ng-bind="settleItem.gross_amount|currency:''"></td>
                         <td ng-bind="settleItem.rate"></td>
                         <td ng-bind="settleItem.total_charge|currency:''"></td>
+                        <td ng-bind="settleItem.tax_amount"></td>
                         <td ng-bind="settleItem.clearing_amount|currency:''"></td>
                         <td ng-bind="'T+'+settleItem.clear_days"></td>
                         <td>

src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html

@@ -77,6 +77,10 @@
                     <span class="col-xs-6 text-bold">Net Amount</span>
                     <span class="col-xs-6" ng-bind="report.clearing_amount|currency:''"></span>
                 </div>
+                <div class="col-xs-6 col-sm-3">
+                    <span class="col-xs-6 text-bold">Tax Amount</span>
+                    <span class="col-xs-6" ng-bind="report.clearing_amount|currency:''"></span>
+                </div>
             </div>
         </div>
     </div>
@@ -133,6 +137,8 @@
                     <th>Total Amount</th>
                     <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
+                    <th>Surcharge Amount</th>
+                    <th>Tax Amount</th>
                     <th ng-if="report.report[0].settle_amount!=null">Settle Amount</th>
                     <th>Remark</th>
                 </tr>
@@ -148,6 +154,10 @@
                     <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.clearing_amount"></td>
+                    <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></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>
                 </tr>