diff --git a/app/js/app.js b/app/js/app.js
index 281f99e..e167e2b 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -364,7 +364,11 @@
               $state.go('app.dashboard');
             }
           }else{
-              $state.go('app.flightDepDashboard');
+            // if (next.name == 'login') {
+            //   event.preventDefault();
+            //   $state.go('app.flightDepDashboard');
+            // }
+              
             
           }
       });
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index 5bf8fec..79c2ad5 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -43,9 +43,24 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
        $scope.attachmentid = id
        if(value == 'uploadAttachment'){
        $('#demo-modal-6').css('display', 'block');
+      }else if(value == 'viewAttachment'){
+       $('#demo-modal-7').css('display', 'block');
+      }else if(value == 'deleteAttachment'){
+       $('#delete1').css('display', 'block');
       }
   }
 
+  $scope.cancelDeleteAttachment = function() {
+        $('#delete1').css('display', '');
+  }
+
+  $scope.deleteAttachment = function() {
+    fuelOrdersService.deleteAttachment($scope.data).then(function(result) {
+            console.log(result)
+          })
+        $('#delete1').css('display', '');
+  }
+
    $scope.saveUploadAttachment = function(attachmentData) {
             $scope.data.media = attachmentData
             $scope.data.id = $scope.attachmentid
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 42c4287..7ac4ab5 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -885,6 +885,27 @@
 </div>
 </form>
 
+<div class="customConfirmPopBackdrop" id="delete1">
+   <div class="customModalInner" style="max-width: 400px;">
+      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
+         <table>
+            <tr>
+               <td>
+                  <img src="img/info.png" style="width: 50px;">
+               </td>
+               <td>
+                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to delete the attachment?</p>
+               </td>
+            </tr>
+         </table>
+      </div>
+      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
+         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="deleteAttachment()">Yes</button>
+         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDeleteAttachment()">No</button>
+      </div>
+   </div>
+</div>
+
 
 
 <div class="myLoader" ng-show="showLoader">
diff --git a/app/partials/fuelOrders/fuelOrders.service.js b/app/partials/fuelOrders/fuelOrders.service.js
index 93403e6..6206e1f 100644
--- a/app/partials/fuelOrders/fuelOrders.service.js
+++ b/app/partials/fuelOrders/fuelOrders.service.js
@@ -81,6 +81,32 @@
            return deffered.promise;
          }
 
+         this.deleteAttachment = function (data) {
+           var fd = new FormData();
+           
+           angular.forEach(data, function(value, key) {
+             fd.append(key, value);
+           })
+
+           var deffered = $q.defer();
+           $http({
+             method : 'POST',
+             transformRequest: angular.identity,
+             headers: {'Content-Type': undefined},
+             url : BE+'/fuelOrder/upload/invoice',
+             data : fd
+           })
+           .success(function (data, status, headers, config) {
+             //console.log(data);
+             deffered.resolve(status);
+           })
+           .error(function (data, status, headers, config) {
+             //console.log(data);
+             deffered.reject(status);
+           });
+           return deffered.promise;
+         }
+
 
 
   }
diff --git a/app/partials/login/login.controller.js b/app/partials/login/login.controller.js
index ca9fe08..79fe048 100644
--- a/app/partials/login/login.controller.js
+++ b/app/partials/login/login.controller.js
@@ -11,6 +11,7 @@
           var loginData = "username=" + $scope.data.username + "&password=" + $scope.data.password;
           LoginService.loginUser(loginData).then(function(result) {
                 LoginService.authenticate();
+                console.log("result is " ,result)
                 //LoginService.setAuth(true);
                 
           })
diff --git a/app/partials/login/login.service.js b/app/partials/login/login.service.js
index 48cd373..411001d 100644
--- a/app/partials/login/login.service.js
+++ b/app/partials/login/login.service.js
@@ -47,9 +47,12 @@
                url : BASE_URL.url+'/user/authenticate',
                headers : {'Content-Type': 'application/x-www-form-urlencoded'}
             }).then(function (result){
-                if(result.data.userProfile.userType.type == 'ADMIN' || result.data.userProfile.userType.type == 'FBO' || result.data.userProfile.userType.type == 'FLIGHT_DEPT'){
+                if(result.data.userProfile.userType.type == 'ADMIN' || result.data.userProfile.userType.type == 'FBO'){
                   authService.setUser(result.data);
                   $state.go('app.dashboard')
+                }else if(result.data.userProfile.userType.type == 'FLIGHT_DEPT'){
+                    authService.setUser(result.data);
+                    $state.go('app.flightDepDashboard')
                 }else{
                   localStorage.clear();
                   toastr.info("Please check username and password");