From 20b4aefe7fb5c6b8ebd183e9023067a947689155 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Mon, 29 Oct 2018 17:53:46 +0530
Subject: [PATCH] viewcompany

---
 app/partials/enterFuelOrder/enterFuelOrder.controller.js | 9 ++++++++-
 app/partials/viewCompany/viewCompany.controller.js       | 1 +
 app/partials/viewCompany/viewCompany.html                | 1 +
 app/partials/viewCompany/viewCompany.service.js          | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
index 3a5f8bc..aa40790 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -38,20 +38,27 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 					$scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
 
 				if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
+					console.log("1====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
 					enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
+						console.log("===margins===",margins);
 					})
 				} else if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS == null) {
+					console.log("2====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
 					enterFuelOrderService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
-			        })
+						console.log("===margins===",margins);			        })
 				} else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS != null) {
+					console.log("3====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
 					enterFuelOrderService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 			        	$scope.marginList = margins;
+			        	console.log("===margins===",margins);
 			        })
 				} else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS == null) {
+					console.log("4====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
 					enterFuelOrderService.getPapFuelPricing($scope.companyList[i].id).then(function(margins) {
 			        	$scope.marginList = margins;
+			        	console.log("===margins===",margins);
 			        })
 				}
 				$scope.selectedCompanyId = $scope.companyList[i].id;
diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js
index 4a9975e..6e36703 100644
--- a/app/partials/viewCompany/viewCompany.controller.js
+++ b/app/partials/viewCompany/viewCompany.controller.js
@@ -815,6 +815,7 @@ angular.module('acufuel')
             if($scope.fuelData.omit == true)
             {
                 var customData = "companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId;
+             //   console.log(".")
                  ViewCompanyService.omitAddCompanyFuel(customData).then(function(result) {
                     if (result.success) {
                         toastr.success('' + result.success + '', {
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html
index 13b05b8..e1a0df5 100644
--- a/app/partials/viewCompany/viewCompany.html
+++ b/app/partials/viewCompany/viewCompany.html
@@ -132,6 +132,7 @@
                <h3>{{companyData.companyName}} <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteComp(companyData.id)" aria-hidden="true" ng-show="!fboPreffered"></i></h3>
                <i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
             </div>
+            
             <!-- /widget-header -->
             <div class="widget-content">
                <div class="row" style="margin-left:0px">
diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js
index 6e175fd..58f5388 100644
--- a/app/partials/viewCompany/viewCompany.service.js
+++ b/app/partials/viewCompany/viewCompany.service.js
@@ -313,7 +313,7 @@
           return deferred.promise;
         } 
 
-        /* Omit Delete and Insert company fuel api */
+        /*  Omit Delete and Insert company fuel api */
 
           this.getOmitCompany = function(id) {
 
-- 
2.0.0