total calculation

Kuldeep Arora
1 parent 10e8f79f84
Showing 3 changed files with 4 additions and 10 deletions Show diff stats
app/partials/customers/customers.controller.js
app/partials/enterFuelOrder/enterFuelOrder.controller.js
app/partials/fuelOrders/fuelOrders.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; 
 		}
 	}
  
@@ -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; 
 		}
 	}
  
@@ -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; 
     }
   }
...	...	@@ -507,7 +507,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
507	507	$scope.addTotal = function(value, valueOf) {
508	508	if (value != undefined && valueOf != undefined) {
509	509	value = JSON.parse(value)
510		- $scope.order.total = value.cost * valueOf;
	510	+ $scope.order.total = Math.abs(value.papTotal) * valueOf;
511	511	}
512	512	}
513	513
...	...
...	...	@@ -103,17 +103,11 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
103	103	}
104	104	}
105	105
106		- /*$scope.addTotal = function(value, valueOf){
107		- if(valueOf == 'v'){
108		- $scope.order.total = value * $scope.order.invoiced
109		- }else if(valueOf == 'i'){
110		- $scope.order.total = $scope.order.volume * value
111		- }
112		- } */
	106	+
113	107	$scope.addTotal = function(value, valueOf) {
114	108	if (value != undefined && valueOf != undefined) {
115	109	value = JSON.parse(value)
116		- $scope.order.total = value.cost * valueOf;
	110	+ $scope.order.total = Math.abs(value.papTotal) * valueOf;
117	111	}
118	112	}
119	113
...	...
...	...	@@ -277,7 +277,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
277	277	$scope.addTotal = function(value, valueOf) {
278	278	if (value != undefined && valueOf != undefined) {
279	279	value = JSON.parse(value)
280		- $scope.order.total = value.cost * valueOf;
	280	+ $scope.order.total = Math.abs(value.papTotal) * valueOf;
281	281	}
282	282	}
283	283
...	...