From cdf775224389a0de18162c35ed9ee5995291143b Mon Sep 17 00:00:00 2001 From: anchit Date: Tue, 13 Jun 2017 17:17:28 +0530 Subject: [PATCH] fixed company and vendor detail page issues --- app/partials/ContactView/ContactView.controller.js | 2 +- app/partials/FuelVendors/FuelVendors.controller.js | 4 +-- app/partials/customers/customers.controller.js | 37 ++++++++++------------ app/partials/viewCompany/viewCompany.controller.js | 30 ++++++++++++++++-- app/partials/viewCompany/viewCompany.html | 16 +++++----- app/partials/viewCompany/viewCompany.service.js | 2 +- .../viewFuelVendor/viewFuelVendor.controller.js | 25 +++++++++++++-- app/partials/viewFuelVendor/viewFuelVendor.html | 4 +-- .../viewFuelVendor/viewFuelVendor.service.js | 17 ++++++++++ 9 files changed, 96 insertions(+), 41 deletions(-) diff --git a/app/partials/ContactView/ContactView.controller.js b/app/partials/ContactView/ContactView.controller.js index 560d73d..dd7c7a6 100644 --- a/app/partials/ContactView/ContactView.controller.js +++ b/app/partials/ContactView/ContactView.controller.js @@ -83,7 +83,7 @@ data: $scope.contactList }); }) - } + } ContactViewService.getCompanies().then(function(result) { diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js index f555fcf..6ad076b 100644 --- a/app/partials/FuelVendors/FuelVendors.controller.js +++ b/app/partials/FuelVendors/FuelVendors.controller.js @@ -53,7 +53,6 @@ } $scope.editMargin = function(vendor){ - console.log(vendor.masterMargin) $scope.showLoader = true; var companyMargin = "vendorName=" + vendor.vendorName + "&masterMargin=" + vendor.masterMargin + "&addressOne=" + vendor.addressOne + "&addressTwo=" + vendor.addressTwo + "&city=" + vendor.city + "&state=" @@ -132,8 +131,7 @@ + "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao; - FuelVendorsService.addVendor(vendorData).then(function(result) { - console.log("result",result) + FuelVendorsService.addVendor($scope.data).then(function(result) { $scope.accountId = result; $('#vendor-modal-3').modal('hide'); getAllVendor(); diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index c8a539c..8e4f60b 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -102,7 +102,7 @@ + "&fuelerlinxCustomer=" + customer.fuelerlinxCustomer + "&contractFuelVendor=" + customer.contractFuelVendor + "&activate=" + customer.activate + "&baseIcao=" + customer.baseIcao + "&companyId=" + customer.id; - ViewCompanyService.updateContact(companyMargin).then(function(result) { + ViewCompanyService.updateCompany(companyMargin).then(function(result) { if(result != null && result.success){ $scope.showLoader = false; toastr.success(''+result.success+'', { @@ -169,29 +169,19 @@ $scope.showMarginError = true; $('.marginSelectBox').addClass('customErrorInput'); }else{ - console.log($scope.data); - companyData = "companyName=" + $scope.data.companyName + "&masterMargin=" + $scope.data.masterMargin - + "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state=" - + $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote=" - + $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant - + "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor - + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao + "&avgasMargin=" + $scope.data.avgasMargin; - - + $scope.aircraftDetails = [{ + 'tail':'', + 'make': '', + 'model': '', + 'sizeId' : '', + 'marginId': $scope.data.masterMargin, + 'avgasMarginId': $scope.data.avgasMargin + }]; + $(sel).trigger('next.m.' + step); getData(); } } - - $scope.aircraftDetails = [{ - 'tail':'', - 'make': '', - 'model': '', - 'sizeId' : '', - 'marginId': $scope.data.masterMargin, - 'avgasMarginId': $scope.data.avgasMargin - }]; - $scope.addNew = function(){ $scope.aircraftDetails.push({ 'tail':'', @@ -226,7 +216,7 @@ $scope.aircraftListData = {}; $scope.addData = []; $scope.saveCompanyData = function(){ - CustomersService.addCompany(companyData).then(function(result) { + CustomersService.addCompany($scope.data).then(function(result) { $scope.accountId = result; $scope.aircraft.accountId = $scope.accountId; @@ -243,6 +233,10 @@ $scope.aircraftListData.aircraftList = $scope.addData; $scope.aircraftListData.accountId = $scope.aircraft.accountId; + if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){ + $scope.aircraftListData.aircraftList = []; + } + CustomersService.addAircraft($scope.aircraftListData).then(function(result) { if(result != null && result.success){ @@ -257,6 +251,7 @@ }) } }); + }) diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index f0893b3..b167880 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -4,7 +4,7 @@ //Load controller angular.module('acufuel') - .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', 'updateFuelManagerService', 'ViewcontactService', function($scope , $uibModal, $stateParams, ViewCompanyService, CustomersService, updateFuelManagerService, ViewcontactService) { + .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', 'updateFuelManagerService', 'ViewFuelVendorService', 'ViewcontactService', function($scope , $uibModal, $stateParams, ViewCompanyService, CustomersService, updateFuelManagerService, ViewFuelVendorService, ViewcontactService) { $scope.data = {}; $scope.data.priceEmail = true; $scope.aircraft = {}; @@ -255,12 +255,13 @@ + "&fuelerlinxCustomer=" + $scope.companyData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.companyData.contractFuelVendor + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId; - ViewCompanyService.updateContact(companyData).then(function(result) { + ViewCompanyService.updateCompany(companyData).then(function(result) { if(result != null && result.success){ toastr.success(''+result.success+'', { closeButton: true }) $scope.showUpdateBtn = false; + getCompanyDetail(); }else{ toastr.error(''+result.statusText+'', { closeButton: true @@ -505,6 +506,8 @@ } $scope.fuelerAcceptStatus = function(){ + $('#fuelerchange').css('display', 'none'); + $scope.showLoader = true; var statusData; if($scope.companyData.fuelerlinxCustomer == false){ statusData = "status=true"; @@ -513,7 +516,7 @@ } ViewCompanyService.fuelerPricingChange(companyId, statusData).then(function(result) { if(result.success){ - $('#fuelerchange').css('display', 'none'); + $scope.showLoader = false; $scope.editData(); getContactList(); @@ -522,4 +525,25 @@ }) } + $scope.updateOmit = function(fuel, omit) { + $scope.fuelData = {}; + $scope.fuelData.expirationDate = new Date(fuel.expirationDate); + $scope.fuelData.id = fuel.id; + $scope.fuelData.omit = fuel.omit; + $scope.fuelData.papMargin = fuel.papMargin; + $scope.fuelData.papTotal = fuel.papTotal; + $scope.fuelData.cost = fuel.cost; + ViewFuelVendorService.omitFuelPricing($scope.fuelData).then(function(result) { + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }) + } + }]); \ No newline at end of file diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 045fb3d..b7d7edb 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -354,14 +354,14 @@ - - - {{fuel.name}} - ${{fuel.fuelPricing.cost}} - ${{fuel.fuelPricing.papMargin}} - ${{fuel.fuelPricing.papTotal}} - {{fuel.fuelPricing.expirationDate}} - + + + {{fuel.name}} + ${{fuel.fuelPricing.cost}} + ${{fuel.fuelPricing.papMargin}} + ${{fuel.fuelPricing.papTotal}} + {{fuel.fuelPricing.expirationDate}} + diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index 8b0246f..739033f 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -150,7 +150,7 @@ return deferred.promise; } - this.updateContact = function(data) { + this.updateCompany = function(data) { var deferred = $q.defer(); $http({ diff --git a/app/partials/viewFuelVendor/viewFuelVendor.controller.js b/app/partials/viewFuelVendor/viewFuelVendor.controller.js index 07df2a3..5deeade 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.controller.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.controller.js @@ -38,9 +38,9 @@ $scope.changeCompanyStatus = function(){ $('#deleteVendor').css('display', 'block'); if($scope.vendorData.activate == true){ - $scope.statusMessage = 'Please confirm! Are you sure you want to ACTIVATE this company?' + $scope.statusMessage = 'Please confirm! Are you sure you want to ACTIVATE this Vendor?' }else{ - $scope.statusMessage = 'Please confirm! Are you sure you want to DEACTIVATE this company?' + $scope.statusMessage = 'Please confirm! Are you sure you want to DEACTIVATE this Vendor?' } } @@ -334,5 +334,26 @@ $scope.cancelToogle = function(){ $('#toogleMail').css('display', 'none'); } + + $scope.updateOmit = function(fuel, omit) { + $scope.fuelData = {}; + $scope.fuelData.expirationDate = new Date(fuel.expirationDate); + $scope.fuelData.id = fuel.id; + $scope.fuelData.omit = fuel.omit; + $scope.fuelData.papMargin = fuel.papMargin; + $scope.fuelData.papTotal = fuel.papTotal; + $scope.fuelData.cost = fuel.cost; + ViewFuelVendorService.omitFuelPricing($scope.fuelData).then(function(result) { + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }) + } }]); \ No newline at end of file diff --git a/app/partials/viewFuelVendor/viewFuelVendor.html b/app/partials/viewFuelVendor/viewFuelVendor.html index 357bdc7..6d351c3 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.html +++ b/app/partials/viewFuelVendor/viewFuelVendor.html @@ -129,7 +129,7 @@

{{vendorData.vendorName}}

- +
@@ -232,7 +232,7 @@ - + {{fuel.name}} ${{fuel.fuelPricing.cost}} ${{fuel.fuelPricing.papMargin}} diff --git a/app/partials/viewFuelVendor/viewFuelVendor.service.js b/app/partials/viewFuelVendor/viewFuelVendor.service.js index 634c028..4cbde4d 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.service.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.service.js @@ -198,6 +198,23 @@ return deferred.promise; } + this.omitFuelPricing = function(data) { + + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/fuelPricing/omitFuelPricing', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + } })(); \ No newline at end of file -- 2.0.0