diff --git a/app/partials/accountSetting/accountSetting.Controller.js b/app/partials/accountSetting/accountSetting.Controller.js index c4bc996..04215d1 100644 --- a/app/partials/accountSetting/accountSetting.Controller.js +++ b/app/partials/accountSetting/accountSetting.Controller.js @@ -46,7 +46,7 @@ $scope.addArray[index].name = productlist[index].name; $scope.addArray[index].status = productlist[index].status; $scope.productData.productList = $scope.addArray; - // console.log($scope.productData) + console.log($scope.productData) } $scope.updateUser = function(){ @@ -93,6 +93,8 @@ }) }else{ if (validateEmail($scope.accountdata.userName)) { + console.log("checkbox",$scope.accountdata.allowEpd ,$scope.accountdata.allowFma +) AccountSettingService.addAdditionalAccount($scope.accountdata).then(function(result) { getAdditionalAccounts(); $scope.accountdata = {}; diff --git a/app/partials/accountSetting/accountSetting.Service.js b/app/partials/accountSetting/accountSetting.Service.js index 52ec4e9..31f6e8f 100644 --- a/app/partials/accountSetting/accountSetting.Service.js +++ b/app/partials/accountSetting/accountSetting.Service.js @@ -94,7 +94,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; diff --git a/app/partials/login/login.service.js b/app/partials/login/login.service.js index 6001632..9cb6eb6 100644 --- a/app/partials/login/login.service.js +++ b/app/partials/login/login.service.js @@ -45,8 +45,9 @@ url : BASE_URL.url+'/user/authenticate', headers : {'Content-Type': 'application/x-www-form-urlencoded'} }).then(function (result){ + console.log("kd",result.data.userProfile.userType.type) if(result.data.userProfile.userType.type == 'ADMIN' || result.data.userProfile.userType.type == 'FBO' || result.data.userProfile.userType.type == 'ADDITIONAL'){ - + console.log("usertype",result.data.userProfile.userType.type) authService.setUser(result.data); $state.go('app.dashboard') }else if(result.data.userProfile.userType.type == 'FLIGHT_DEPT' ){ @@ -100,6 +101,7 @@ window.localStorage.setItem('currentUserName', JSON.stringify(authData.userProfile.firstName +' '+ authData.userProfile.lastName)); window.localStorage.setItem('companyName', JSON.stringify(authData.userProfile.companyName)); if(authData.userProfile.userType.type == 'ADMIN' || authData.userProfile.userType.type == 'FBO' || authData.userProfile.userType.type == 'ADDITIONAL'){ + console.log("setUser",authData.userProfile.userType.type) role = USER_ROLES.admin; $rootScope.isAuthenticated = true; }else if(authData.userProfile.userType.type == 'FLIGHT_DEPT'){ diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js index 145c06d..3514f8b 100644 --- a/app/partials/updateFuelManager/updateFuelManager.controller.js +++ b/app/partials/updateFuelManager/updateFuelManager.controller.js @@ -393,16 +393,17 @@ } - $scope.emailForMargin; - $scope.emailPricingForMargin = function(value){ + /*Jet A Margin Email Send */ + $scope.emailForJetMargin; + $scope.emailPricingForJetAMargin = function(value){ $('#confirm2').css('display', 'block'); - $scope.emailForMargin = value; + $scope.emailForJetMargin = value; } $scope.saveAndCloseForMarginConfirm = function(){ $('#confirm2').css('display', 'none'); - updateFuelManagerService.sendMailToMargin($scope.emailForMargin).then(function(result) { - console.log() + updateFuelManagerService.sendMailToJetAMargin($scope.emailForJetMargin).then(function(result) { + console.log("email margin jeta",$scope.emailForJetMargin) toastr.success(''+result.success+'', { closeButton: true }) @@ -412,17 +413,45 @@ $('#confirm2').css('display', 'none'); } + /*AVGAS Margin Email Send */ + + $scope.emailForAVGASMargin; + $scope.emailPricingForAVGASMargin = function(value){ + $('#confirm3').css('display', 'block'); + $scope.emailForAVGASMargin = value; + + } + $scope.saveAndCloseForAVGASMarginConfirm = function(){ + $('#confirm3').css('display', 'none'); + updateFuelManagerService.sendMailToAVGASMargin($scope.emailForAVGASMargin).then(function(result) { + console.log("email margin avgas",$scope.emailForAVGASMargin) + toastr.success(''+result.success+'', { + closeButton: true + }) + }) + } + $scope.cancelAndCloseForAVGASMarginConfirm = function(){ + $('#confirm3').css('display', 'none'); + } + + + + + $scope.sendEmail = {}; $scope.confirmMail = function(){ if ($scope.sendEmail.pricing != '' && $scope.sendEmail.pricing != null && $scope.sendEmail.pricing != undefined) { $('#confirm1').css('display', 'block'); + } } $scope.saveAndCloseConfirm = function(){ $('#confirm1').css('display', 'none'); updateFuelManagerService.sendMailToGroupMargin($scope.sendEmail.pricing).then(function(result) { + console.log("emails",$scope.sendEmail.pricing) + $scope.sendEmail = {}; toastr.success(''+result.success+'', { closeButton: true }) diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html index 7ef0452..4ddc520 100644 --- a/app/partials/updateFuelManager/updateFuelManager.html +++ b/app/partials/updateFuelManager/updateFuelManager.html @@ -167,7 +167,7 @@ - +
@@ -273,7 +273,7 @@ - +
@@ -476,6 +476,27 @@ + +