diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index eb1e510..f7a174d 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -62,7 +62,13 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.deleteAttachment = function() { fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { console.log(result, $scope.attachmentrowid) - }) + + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + } + }) $('#delete1').css('display', ''); } @@ -70,8 +76,15 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.data.media = attachmentData $scope.data.id = $scope.attachmentrowid fuelOrdersService.uploadAttachment($scope.data).then(function(result) { + console.log(result) + if(result){ + // console.log(result.success) + toastr.success(''+"Upload Successful"+'', { + closeButton: true + }) + } - }) + }) $('#demo-modal-6').css('display', 'none'); } diff --git a/app/partials/viewcontact/viewcontact.controller.js b/app/partials/viewcontact/viewcontact.controller.js index b2396c4..3597445 100644 --- a/app/partials/viewcontact/viewcontact.controller.js +++ b/app/partials/viewcontact/viewcontact.controller.js @@ -240,5 +240,25 @@ $scope.cancelDelete = function(){ $('#delete2').css('display', 'none'); } + + $scope.confirmMail = function(){ + + $('#confirm1').css('display', 'block'); + + } + + $scope.saveAndCloseConfirm = function(){ + $('#confirm1').css('display', 'none'); + ViewcontactService.sendMailTo(contactId).then(function(result) { + toastr.success(''+result.success+'', { + closeButton: true + }) + }) + } + $scope.cancelAndCloseConfirm = function(){ + $scope.sendEmail = {}; + $scope.sendEmail.pricing = ''; + $('#confirm1').css('display', 'none'); + } }]); diff --git a/app/partials/viewcontact/viewcontact.html b/app/partials/viewcontact/viewcontact.html index 3e7e2be..4fea0b0 100644 --- a/app/partials/viewcontact/viewcontact.html +++ b/app/partials/viewcontact/viewcontact.html @@ -104,7 +104,7 @@
- +
@@ -181,4 +181,25 @@ + + + \ No newline at end of file diff --git a/app/partials/viewcontact/viewcontact.service.js b/app/partials/viewcontact/viewcontact.service.js index 7f99d5b..8a36a2f 100644 --- a/app/partials/viewcontact/viewcontact.service.js +++ b/app/partials/viewcontact/viewcontact.service.js @@ -83,6 +83,21 @@ }) return deferred.promise; } + + this.sendMailTo = function(contactid){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/company/contact/mailPriceToContacts/'+contactid, + headers : {'Content-Type': 'application/json'} + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } }