update

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

@@ -86,6 +86,12 @@
                     <span class="col-xs-6" ng-bind="report.clearing_amount|currency:''"></span>
                 </div>
             </div>
+            <div class="row">
+                <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.tax_amount|currency:''"></span>
+                </div>
+            </div>
         </div>
     </div>
     <div class="box box-warning" ng-if="ctrl.channel!=null">
@@ -128,6 +134,12 @@
                     <span class="col-xs-6" ng-bind="report.channels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge|currency:''"></span>
                 </div>
             </div>
+            <div class="row">
+                <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.tax_amount|currency:''"></span>
+                </div>
+            </div>
         </div>
     </div>
     <div class="box box-default">
@@ -143,7 +155,9 @@
                     <th>Total Amount</th>
                     <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
+                    <th>Surcharge Amount</th>
                     <th>Settle Amount</th>
+                    <th>Tax Amount</th>
                     <th>Remark</th>
                 </tr>
                 </thead>
@@ -158,7 +172,9 @@
                     <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.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
                     <td ng-bind="tr.settle_amount|currency:''"></td>
+                    <td ng-bind="tr.tax_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>
                 </tr>
                 </tbody>
@@ -177,7 +193,9 @@
                     <th>Total Amount</th>
                     <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
+                    <th>Surcharge Amount</th>
                     <th>Settle Amount</th>
+                    <th>Tax Amount</th>
                     <th>Remark</th>
                 </tr>
                 </thead>
@@ -191,7 +209,9 @@
                     <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.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
                     <td ng-bind="tr.settle_amount|currency:''"></td>
+                    <td ng-bind="tr.tax_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>
                 </tr>
                 </tbody>