diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index 30da875..eb1e510 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -8,6 +8,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
 
     $scope.showFuelOrderModal = false;
     $scope.optionSelected;
+    $scope.orderdata = {}
 
      $scope.data = {};
      
@@ -37,14 +38,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
        $('#demo-modal-4').css('display', 'block');
       }
   }
-   $scope.attachmentid = ""
-   $scope.attachment = function(id, value) {
+   $scope.attachmentrowid = ""
+
+   
+   $scope.attachment = function(id, value, url) {
        console.log(id, value)
-       $scope.attachmentid = id
+       $scope.attachmentrowid = id
+      //  $scope.attachmentdeleteid = attachdeleteid
        if(value == 'uploadAttachment'){
        $('#demo-modal-6').css('display', 'block');
       }else if(value == 'viewAttachment'){
-       $('#demo-modal-7').css('display', 'block');
+       var win = window.open(url, '_blank');
+       win.focus();
       }else if(value == 'deleteAttachment'){
        $('#delete1').css('display', 'block');
       }
@@ -55,15 +60,15 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
   }
 
   $scope.deleteAttachment = function() {
-    fuelOrdersService.deleteAttachment($scope.data).then(function(result) {
-            console.log(result)
+    fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {
+            console.log(result, $scope.attachmentrowid)
           })
         $('#delete1').css('display', '');
   }
 
    $scope.saveUploadAttachment = function(attachmentData) {
 	   	$scope.data.media = attachmentData
-	   	$scope.data.id = $scope.attachmentid
+	   	$scope.data.id = $scope.attachmentrowid
 		fuelOrdersService.uploadAttachment($scope.data).then(function(result) {
 		
 		})
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index c425f72..9697043 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -118,7 +118,7 @@
                               {{row.status}}
                              </td>
                              <td data-title="'Attachments'" filter="{allIn: 'text'}" sortable="'allIn'">
-                                    <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected)" >
+                                    <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
                                         <option value="" disabled selected="selected" >Invoice</option>
                                         <option value="viewAttachment" >View</option>
                                         <option value="deleteAttachment" >Delete</option>
@@ -129,7 +129,7 @@
                            </tr>
                          </table>
 
-                                    <select class="btn btn-warning exportBtn" ng-model="optionSelected" ng-change="onDTSelect()">
+                                    <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onDTSelect()">
                                         <option value="" disabled selected="selected">Fuel Widget</option>
                                         <option value="dt" >Direct Transaction</option>
                                         <option value="efo" >Export Fuel Orders</option>
@@ -858,9 +858,11 @@
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Upload</b></label>
+                                       <br>
+                                       <br>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="file" file-model = "uploadFile.attachment">
+                                       <input type="file" accept=".pdf" file-model = "uploadFile.attachment">
                                        <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
                                     </div>
                                     <div class="clearfix"></div>
diff --git a/app/partials/fuelOrders/fuelOrders.service.js b/app/partials/fuelOrders/fuelOrders.service.js
index 145c7fc..0eeea4a 100644
--- a/app/partials/fuelOrders/fuelOrders.service.js
+++ b/app/partials/fuelOrders/fuelOrders.service.js
@@ -6,27 +6,83 @@
   function fuelOrdersService($q, $http, BASE_URL) {        
 
     this.getAllCompanies = function() {
-      var deferred = $q.defer();
-      $http({
-        method : 'GET',
-        url : BASE_URL.url +'/user/allCompanies',
-        headers : {'Content-Type': 'application/json'},
-      })
-      .then(function (result){
-        deferred.resolve(result.data);
-      },function (result){
-        deferred.resolve(result.data);
-      })
-      return deferred.promise;
-    }
+                      var deferred = $q.defer();
+                      $http({
+                        method : 'GET',
+                        url : BASE_URL.url +'/user/allCompanies',
+                        headers : {'Content-Type': 'application/json'},
+                      })
+                      .then(function (result){
+                        deferred.resolve(result.data);
+                      },function (result){
+                        deferred.resolve(result.data);
+                      })
+                      return deferred.promise;
+                    }
 
     
       this.getOrders = function() {
 
+                      var deferred = $q.defer();
+                      $http({
+                          method : 'GET',
+                          url : BASE_URL.url +'/user/orders',
+                          headers : {'Content-Type': 'application/json'},
+                      })
+                      .then(function (result){
+                          deferred.resolve(result.data);
+                      },function (result){
+                          deferred.resolve(result.data);
+                      })
+                      return deferred.promise;
+                    }
+
+        
+
+    this.dispathFuelOrder = function(data) {
+                      var deferred = $q.defer();
+                      $http({
+                          method : 'POST',
+                          url : BASE_URL.url +'/fuelOrder',
+                          headers : {'Content-Type': 'application/json'},
+                          data: data
+                      })
+                      .then(function (result){
+                          deferred.resolve(result.data);
+                      },function (result){
+                          deferred.resolve(result.data);
+                      })
+                      return deferred.promise;
+                    }
+
+    this.uploadAttachment = 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 : BASE_URL.url+'/fuelOrder/upload/invoice',
+                      data : fd
+                    })
+                    .then(function (result){
+                      deffered.resolve(result);
+                    },function (result){
+                      deffered.resolve(result);
+                  })
+                    return deffered.promise;
+                  }
+
+        this.deleteAttachment = function(id){
           var deferred = $q.defer();
           $http({
-              method : 'GET',
-              url : BASE_URL.url +'/user/orders',
+              method : 'DELETE',
+              url : BASE_URL.url +'/fuelOrder/invoice/'+id,
               headers : {'Content-Type': 'application/json'},
           })
           .then(function (result){
@@ -37,73 +93,6 @@
           return deferred.promise;
         }
 
-        
-
-    this.dispathFuelOrder = function(data) {
-      var deferred = $q.defer();
-      $http({
-          method : 'POST',
-          url : BASE_URL.url +'/fuelOrder',
-          headers : {'Content-Type': 'application/json'},
-          data: data
-      })
-      .then(function (result){
-          deferred.resolve(result.data);
-      },function (result){
-          deferred.resolve(result.data);
-      })
-      return deferred.promise;
-    }
-
-    this.uploadAttachment = 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 : BASE_URL.url+'/fuelOrder/upload/invoice',
-         data : fd
-       })
-       .then(function (result){
-	   		deffered.resolve(result);
-   		},function (result){
-   			deffered.resolve(result);
-		})
-       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;
-         }
-
 
 
   }