viithiisys / Acufuel

Download as
Browse Code ยป

Commit 00d325f95252df4e44827b23c7ea8c5f2b2452c9

Authored by Kuldeep Arora
1 parent a858eca3e7
Exists in master

logs

Showing 2 changed files with 4 additions and 10 deletions   Show diff stats
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @00d325f
... ... @@ -38,27 +38,20 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
38 38 $scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
39 39  
40 40 if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
41   - console.log("1====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
42 41 enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
43 42 $scope.marginList = margins;
44   - console.log("===margins===",margins);
45 43 })
46 44 } else if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS == null) {
47   - console.log("2====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
48 45 enterFuelOrderService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
49 46 $scope.marginList = margins;
50   - console.log("===margins===",margins); })
51   - } else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS != null) {
52   - console.log("3====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
  47 + })
  48 + } else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS != null) {
53 49 enterFuelOrderService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
54 50 $scope.marginList = margins;
55   - console.log("===margins===",margins);
56 51 })
57 52 } else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS == null) {
58   - console.log("4====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
59 53 enterFuelOrderService.getPapFuelPricing($scope.companyList[i].id).then(function(margins) {
60 54 $scope.marginList = margins;
61   - console.log("===margins===",margins);
62 55 })
63 56 }
64 57 $scope.selectedCompanyId = $scope.companyList[i].id;
... ...
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @00d325f
... ... @@ -683,10 +683,11 @@ angular.module('acufuel')
683 683 /* omit strike out*/
684 684 updateFuelManagerService.getFuelPricingNew().then(function(result) {
685 685 $scope.fuelPricing = result;
  686 + console.log("==fuel pricing==",result)
686 687 $scope.omitData;
687 688 ViewCompanyService.getOmitCompany($scope.compId).then(function(result){
688 689 $scope.omitData = result;
689   - //console.log("omit data===", $scope.omitData);
  690 + console.log("omit data===", $scope.omitData);
690 691 for(var i = 0 ; i< $scope.fuelPricing.length; i++){
691 692 for(var j = 0; j<$scope.omitData.length; j++){
692 693 if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){
... ...