diff --git a/src/main/ui/static/payment/invoice/invoice.js b/src/main/ui/static/payment/invoice/invoice.js index 3d485eeb2..f02fc73e7 100644 --- a/src/main/ui/static/payment/invoice/invoice.js +++ b/src/main/ui/static/payment/invoice/invoice.js @@ -1,7 +1,7 @@ /** * Created by yixian on 2017-02-05. */ -define(['angular'], function (angular) { +define(['angular','decimal'], function (angular,decimal) { 'use strict'; var app = angular.module('invoiceApp', ['ui.router']); app.config(['$stateProvider', function ($stateProvider) { @@ -67,6 +67,7 @@ define(['angular'], function (angular) { $scope.tradeLogs = resp.data.data; $scope.pagination = resp.data.pagination; $scope.analysis = resp.data.analysis; + $scope.total_surcharge = decimal.add($scope.analysis.total_surcharge,$scope.analysis.tax_amount).toFixed(2); $scope.analysis.refund_fee = angular.copy(Math.abs($scope.analysis.refund_fee)); }, function (resp) { commonDialog.alert({title: 'Search failed', content: resp.data.message, type: 'error'}); diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 9606c0804..81a760973 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -141,7 +141,7 @@
Total Surcharge + ng-bind="total_surcharge|currency:'AUD '">