master
yuan 7 years ago
parent 3d0310cf02
commit 8f88d8084b

@ -1,7 +1,7 @@
/** /**
* Created by yixian on 2017-02-05. * Created by yixian on 2017-02-05.
*/ */
define(['angular'], function (angular) { define(['angular','decimal'], function (angular,decimal) {
'use strict'; 'use strict';
var app = angular.module('invoiceApp', ['ui.router']); var app = angular.module('invoiceApp', ['ui.router']);
app.config(['$stateProvider', function ($stateProvider) { app.config(['$stateProvider', function ($stateProvider) {
@ -67,6 +67,7 @@ define(['angular'], function (angular) {
$scope.tradeLogs = resp.data.data; $scope.tradeLogs = resp.data.data;
$scope.pagination = resp.data.pagination; $scope.pagination = resp.data.pagination;
$scope.analysis = resp.data.analysis; $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)); $scope.analysis.refund_fee = angular.copy(Math.abs($scope.analysis.refund_fee));
}, function (resp) { }, function (resp) {
commonDialog.alert({title: 'Search failed', content: resp.data.message, type: 'error'}); commonDialog.alert({title: 'Search failed', content: resp.data.message, type: 'error'});

@ -141,7 +141,7 @@
<div class="info-box-content box-content_left"> <div class="info-box-content box-content_left">
<span class="info-box-text">Total Surcharge</span> <span class="info-box-text">Total Surcharge</span>
<span class="info-box-number box-number_font" <span class="info-box-number box-number_font"
ng-bind="analysis.total_fee|currency:'AUD '"></span> ng-bind="total_surcharge|currency:'AUD '"></span>
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save