viithiisys / adminAcufuel

Download as
Browse Code ยป

Commit a4d4a8320a63ee28ae5fad123d1265e13776533b

Authored by Rishav
1 parent 47e72f4190
Exists in master

update FBO code according to response

Showing 2 changed files with 19 additions and 9 deletions   Show diff stats
app/views/updateAllFBO/updateAllFBO.controller.js
Diff comments   View file @a4d4a83
... ... @@ -11,22 +11,26 @@
11 11 });
12 12  
13 13 });
14   -
  14 + $scope.feature = {};
15 15 var userProfileID = $stateParams.id;
16 16 UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {
17 17 console.log(result)
18 18 $scope.user = result;
19 19 $scope.user.userTypeId = result.userType.id;
20   - $scope.feature = result.accountFeatureControl;
21 20 $scope.feature.accountId = result.account.id;
22   - if($scope.feature.essintaPosSystem == true){
23   - $scope.essAccountId = false;
24   - $("#esAccId").css({ opacity: 1 });
25   - }else{
26   - $scope.essAccountId = true;
27   - delete $scope.feature.essintaAccountUid;
28   - $("#esAccId").css({ opacity: 0.5 });
  21 + if(result.accountFeatureControl != null){
  22 + $scope.feature = result.accountFeatureControl;
  23 + console.log($scope.feature)
  24 + if($scope.feature.essintaPosSystem == true){
  25 + $scope.essAccountId = false;
  26 + $("#esAccId").css({ opacity: 1 });
  27 + }else{
  28 + $scope.essAccountId = true;
  29 + delete $scope.feature.essintaAccountUid;
  30 + $("#esAccId").css({ opacity: 0.5 });
  31 + }
29 32 }
  33 +
30 34 UpdateAllFBO.getNotes(userProfileID).then(function(response) {
31 35 $scope.user.clientNote = response[0].notes
32 36 $scope.user.userNoteId = response[0].id;
... ... @@ -61,6 +65,9 @@
61 65 $scope.user.username = $scope.user.email;
62 66 $scope.user.userType = 'fbo';
63 67 console.log($scope.user)
  68 + // if($scope.user.userNoteId == undefined){
  69 + // $scope.user.userNoteId = null;
  70 + // }
64 71 var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;
65 72 UpdateAllFBO.updateUser(updateData).then(function(result) {
66 73 toastr.success(''+result.success+'', {
... ...
app/views/updateFBODept/updateFBODept.controller.js
Diff comments   View file @a4d4a83
... ... @@ -80,6 +80,9 @@
80 80 $scope.user.username = $scope.user.email;
81 81 $scope.user.userType = 'flightDetp';
82 82 console.log($scope.user)
  83 + // if($scope.user.userNoteId == undefined){
  84 + // $scope.user.userNoteId = null;
  85 + // }
83 86 var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;
84 87 UpdateAllFBO.updateUser(updateData).then(function(result) {
85 88 toastr.success(''+result.success+'', {
... ...