From 39a850f316df3606b429c81de5a69a62180ad48d Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Tue, 16 Oct 2018 12:06:07 +0530 Subject: [PATCH] total calculation --- app/partials/customers/customers.controller.js | 2 +- app/partials/enterFuelOrder/enterFuelOrder.controller.js | 10 ++-------- app/partials/fuelOrders/fuelOrders.controller.js | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 4594ab4..59b87d0 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -507,7 +507,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta $scope.addTotal = function(value, valueOf) { if (value != undefined && valueOf != undefined) { value = JSON.parse(value) - $scope.order.total = value.cost * valueOf; + $scope.order.total = Math.abs(value.papTotal) * valueOf; } } diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js index 5b88a45..b4c8ca1 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js +++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js @@ -103,17 +103,11 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, } } - /*$scope.addTotal = function(value, valueOf){ - if(valueOf == 'v'){ - $scope.order.total = value * $scope.order.invoiced - }else if(valueOf == 'i'){ - $scope.order.total = $scope.order.volume * value - } - } */ + $scope.addTotal = function(value, valueOf) { if (value != undefined && valueOf != undefined) { value = JSON.parse(value) - $scope.order.total = value.cost * valueOf; + $scope.order.total = Math.abs(value.papTotal) * valueOf; } } diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 67c5c18..6e91eac 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -277,7 +277,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.addTotal = function(value, valueOf) { if (value != undefined && valueOf != undefined) { value = JSON.parse(value) - $scope.order.total = value.cost * valueOf; + $scope.order.total = Math.abs(value.papTotal) * valueOf; } } -- 2.0.0