From 169fc146e9143f76fb1e5b4720f7642e76a98eb8 Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Tue, 30 Oct 2018 15:05:01 +0530 Subject: [PATCH] final omit ui --- app/partials/viewCompany/viewCompany.controller.js | 6 +++--- app/partials/viewCompany/viewCompany.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index 9ed8a46..9bb7467 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -683,16 +683,16 @@ angular.module('acufuel') /* omit strike out*/ updateFuelManagerService.getFuelPricingNew().then(function(result) { $scope.fuelPricing = result; - console.log("==fuel pricing==",result) + //console.log("==fuel pricing==",result) $scope.omitData; ViewCompanyService.getOmitCompany($scope.compId).then(function(result){ $scope.omitData = result; - console.log("omit data===", $scope.omitData); + // console.log("omit data===", $scope.omitData); for(var i = 0 ; i< $scope.fuelPricing.length; i++){ for(var j = 0; j<$scope.omitData.length; j++){ if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){ $scope.fuelPricing[i].fuelPricing.omit = $scope.omitData[j].omit; - console.log("fuel.pricing.omit",$scope.fuelPricing[i].fuelPricing.omit) + // console.log("fuel.pricing.omit",$scope.fuelPricing[i].fuelPricing.omit) } } } diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 79798b0..e1a0df5 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -526,7 +526,7 @@ - {{fuel.fuelPricing.omit}} + {{fuel.name}} ${{fuel.fuelPricing.cost | number :4}} ${{fuel.fuelPricing.papMargin | number :4}} -- 2.0.0