diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js index 1a7affd..d7d7131 100644 --- a/app/partials/FuelVendors/FuelVendors.controller.js +++ b/app/partials/FuelVendors/FuelVendors.controller.js @@ -26,7 +26,7 @@ function getAllVendor(){ $scope.showLoader = true; FuelVendorsService.getAllVendor().then(function(result) { - console.log(result) + //console.log(result) $scope.companyList = result; for (var i = 0; i < $scope.companyList.length; i++) { if ($scope.companyList[i].companyContact != null) { diff --git a/app/partials/viewFuelVendor/viewFuelVendor.controller.js b/app/partials/viewFuelVendor/viewFuelVendor.controller.js index cb32501..1ee9c03 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.controller.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.controller.js @@ -4,7 +4,7 @@ //Load controller angular.module('acufuel') - .controller('ViewFuelVendorController', ['$scope','$uibModal', '$stateParams', 'ViewFuelVendorService', 'CustomersService', 'ViewCompanyService', 'updateFuelManagerService', function($scope , $uibModal, $stateParams, ViewFuelVendorService, CustomersService, ViewCompanyService, updateFuelManagerService) { + .controller('ViewFuelVendorController', ['$scope','$uibModal', '$stateParams', 'ViewFuelVendorService', 'CustomersService', 'ViewCompanyService', 'updateFuelManagerService','$state', function($scope , $uibModal, $stateParams, ViewFuelVendorService, CustomersService, ViewCompanyService, updateFuelManagerService,$state) { $scope.data = {}; $scope.data.priceEmail = true; $scope.primayData = {}; @@ -81,6 +81,7 @@ $scope.sendPrimaryContact(); $scope.contactData.contactList = []; $scope.data = {}; + $scope.data.priceEmail = true; getContactList(); }else{ toastr.error(''+result.statusText+'', { @@ -109,7 +110,7 @@ } $scope.editData = function(inputName) { - console.log($scope.vendorData) + //console.log($scope.vendorData) $scope.showLoader = true; // if(inputName == 'showNoteData'){ // $scope.showNoteData = true; @@ -187,7 +188,7 @@ if($scope.primaryContact == true){ $scope.primaryContact = true; ViewFuelVendorService.checkPrimaryContact(vendorId).then(function(result) { - console.log(result) + //console.log(result) if(result.status == 422){ $('#primaryContact').css('display', 'block'); } @@ -201,7 +202,7 @@ var priamryContactData = "vendorContactId=" + $scope.primayData.id + "&primary=" + $scope.primaryContact; ViewFuelVendorService.addPrimaryContact(priamryContactData).then(function(result) { - console.log(result) + // console.log(result) }) } @@ -213,7 +214,7 @@ $('#updateContact').css('display', 'block'); $scope.updateData = data; newContactName = value; - console.log($scope.updateData) + // console.log($scope.updateData) if($scope.updateData.email == null){ $scope.updateData.content = data.contactNumber; }else{ @@ -222,7 +223,7 @@ } $scope.acceptUpdateField = function(){ - console.log($scope.updateData) + // console.log($scope.updateData) if($scope.updateData.content == undefined){ toastr.error('Please add some content', { closeButton: true @@ -236,7 +237,7 @@ + "&title=" + $scope.updateData.title; } ViewFuelVendorService.updateCustomField(updateCustomData).then(function(result) { - console.log(result) + // console.log(result) if(result != null && result.success){ $('#updateContact').css('display', 'none'); getVendorDetail(); @@ -250,7 +251,7 @@ } $scope.showEditTier2 = function(number){ - console.log(number) + // console.log(number) $scope.contactNumber = number; } @@ -258,7 +259,7 @@ var contactName = ''; $scope.addCustom = function(value){ - console.log(value) + // console.log(value) if(value != null){ contactName = value; $('#customField').css('display', 'block'); @@ -284,7 +285,7 @@ + "&title=" + $scope.custom.title; } ViewFuelVendorService.addCustomField(customData).then(function(result) { - console.log(result) + // console.log(result) if(result.status == 200){ $('#customField').css('display', 'none'); getVendorDetail(); @@ -357,4 +358,34 @@ }) } + var deleteVendorId = ""; + $scope.deleteVendor = function(vendorDataid){ + $('#delete2').css('display', 'block'); + // console.log("asda",vendorDataid) + deleteVendorId = vendorDataid; + } + + $scope.deleteVendorData = function(){ + ViewFuelVendorService.deleteFuelVendor(deleteVendorId).then(function(result) { + + $('#delete2').css('display', 'none'); + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + + }) + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + + }) + } + $state.go('app.FuelVendors') + }) + } + $scope.cancelDelete = function(){ + $('#delete2').css('display', 'none'); + } + + }]); \ No newline at end of file diff --git a/app/partials/viewFuelVendor/viewFuelVendor.html b/app/partials/viewFuelVendor/viewFuelVendor.html index f2ebfc6..807efb1 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.html +++ b/app/partials/viewFuelVendor/viewFuelVendor.html @@ -122,6 +122,30 @@ + +
+
+
+ + + + + +
+ + +

Please confirm! Are you sure you want to DELETE this Fuel Vendor & its related data?

+
+
+
+ + +
+
+
+ + +
diff --git a/app/partials/viewFuelVendor/viewFuelVendor.service.js b/app/partials/viewFuelVendor/viewFuelVendor.service.js index 4cbde4d..e3f9e2f 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.service.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.service.js @@ -215,6 +215,24 @@ return deferred.promise; } + + this.deleteFuelVendor = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'DELETE', + url : BASE_URL.url +'/vendor/vendorid/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + } })(); \ No newline at end of file