viithiisys / Acufuel

Download as
Browse Code ยป

Commit 20b4aefe7fb5c6b8ebd183e9023067a947689155

Authored by Kuldeep Arora
1 parent 6d8b1f26ce
Exists in master

viewcompany

Showing 4 changed files with 11 additions and 2 deletions   Show diff stats
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @20b4aef
... ... @@ -38,20 +38,27 @@ 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);
41 42 enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
42 43 $scope.marginList = margins;
  44 + console.log("===margins===",margins);
43 45 })
44 46 } else if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS == null) {
  47 + console.log("2====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
45 48 enterFuelOrderService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
46 49 $scope.marginList = margins;
47   - })
  50 + console.log("===margins===",margins); })
48 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);
49 53 enterFuelOrderService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
50 54 $scope.marginList = margins;
  55 + console.log("===margins===",margins);
51 56 })
52 57 } else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS == null) {
  58 + console.log("4====",$scope.companyList[i].margin,"===",$scope.companyList[i].marginAVGAS);
53 59 enterFuelOrderService.getPapFuelPricing($scope.companyList[i].id).then(function(margins) {
54 60 $scope.marginList = margins;
  61 + console.log("===margins===",margins);
55 62 })
56 63 }
57 64 $scope.selectedCompanyId = $scope.companyList[i].id;
... ...
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @20b4aef
... ... @@ -815,6 +815,7 @@ angular.module('acufuel')
815 815 if($scope.fuelData.omit == true)
816 816 {
817 817 var customData = "companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId;
  818 + // console.log(".")
818 819 ViewCompanyService.omitAddCompanyFuel(customData).then(function(result) {
819 820 if (result.success) {
820 821 toastr.success('' + result.success + '', {
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @20b4aef
... ... @@ -132,6 +132,7 @@
132 132 <h3>{{companyData.companyName}} <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteComp(companyData.id)" aria-hidden="true" ng-show="!fboPreffered"></i></h3>
133 133 <i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
134 134 </div>
  135 +
135 136 <!-- /widget-header -->
136 137 <div class="widget-content">
137 138 <div class="row" style="margin-left:0px">
... ...
app/partials/viewCompany/viewCompany.service.js
Diff comments   View file @20b4aef
... ... @@ -313,7 +313,7 @@
313 313 return deferred.promise;
314 314 }
315 315  
316   - /* Omit Delete and Insert company fuel api */
  316 + /* Omit Delete and Insert company fuel api */
317 317  
318 318 this.getOmitCompany = function(id) {
319 319  
... ...