diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index 59b87d0..1d1542c 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -79,6 +79,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	function getAllCompanies() {
 		CustomersService.getAllCompanies().then(function(result) {
 			$scope.companyList = result;
+			console.log("result",result)
 			for (var i = 0; i < $scope.companyList.length; i++) {
 				if ($scope.companyList[i].companyContact != null) {
 					if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) {
@@ -376,7 +377,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	/*add a fuel order*/
 	$scope.getOrders = function() {
 		fuelOrdersService.getOrders().then(function(result) {
-			//console.log("==get orders===",result)
 			$scope.orderdata = result;
 			for (var i = 0; i < $scope.orderdata.length; i++) {
 				$scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
@@ -438,7 +438,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	        $scope.fuelData.aircraftName = aircraftObj.tail;
 	        $scope.fuelData.make = aircraftObj.make;
 	        $scope.fuelData.model = aircraftObj.model;
-	        $scope.fuelData.fuelOn = $scope.order.fuelOn;
+	        //$scope.fuelData.fuelOn = $scope.order.fuelOn;
 	        $scope.fuelData.invoiced = $scope.order.invoiced;
 	        $scope.fuelData.volume = $scope.order.volume; 
 	       // $scope.fuelData.source = $scope.order.source; 
@@ -480,7 +480,11 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	            
 	             $scope.fuelData.status = $scope.order.status;
 	          } 
-          		
+          	if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
+                  $scope.fuelData.fuelOn = "Arrival"; //default fuelon
+                }else {
+                  $scope.fuelData.fuelOn = $scope.order.fuelOn ;
+                }	
           	 if($scope.baseTenant && $scope.contractFuelVendor ){
                 $scope.fuelData.source = "Tenant/CAA" ;
               }else if($scope.baseTenant)
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index a3a298d..2f12e6f 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -113,6 +113,9 @@
                              <td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.newContactNumber}}
                              </td>
+                              <td data-title="'Tail'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ui-sref="app.viewCompany({id : row.id})">
+                              {{row.aircraftName}}
+                             </td>
                              <td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.primaryContactName}}
                              </td>
@@ -723,7 +726,7 @@
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="order.fuelOn"  style="width: 100%;">
-                                            <option value="" disabled selected hidden>Select...</option>
+                                            <option value="" disabled selected hidden>Arrival</option>
                                             <option value="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
index b4c8ca1..7929c0f 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -120,7 +120,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 		$scope.order.aircraftName = aircraftObj.tail;
 		$scope.order.make = aircraftObj.make;
 		$scope.order.model = aircraftObj.model;
-		$scope.order.fuelOn = $scope.order.fuelOn;
+		//$scope.order.fuelOn = $scope.order.fuelOn;
 
 		$scope.order.invoiced = $scope.order.invoiced;
 		$scope.order.volume = $scope.order.volume; 
@@ -161,6 +161,11 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 			
 			$scope.order.status = $scope.order.status;
 		}
+		if($scope.order.fuelOn === null || $scope.order.fuelOn ===undefined){
+			$scope.order.fuelOn = "Arrival"; //default fuelon
+		}else {
+			$scope.order.fuelOn = $scope.order.fuelOn ;
+		}
 
 		if($scope.baseTenant && $scope.contractFuelVendor ){
 			$scope.order.source = "Tenant/CAA" ;
@@ -171,7 +176,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 			$scope.order.source = "CAA Member";
 		}
 
-		//console.log("===order====",$scope.order);
+		 console.log("===order====",$scope.order);
 		
 		$scope.dispatchOrder.fuelOrderList.push($scope.order);
 		
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html
index 75f0341..df798dc 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.html
+++ b/app/partials/enterFuelOrder/enterFuelOrder.html
@@ -164,7 +164,7 @@
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="order.fuelOn"  style="width: 100%;">
-                                            <option value="" disabled selected hidden>Select...</option>
+                                            <option value="" disabled selected hidden>Arrival</option>
                                             <option value="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index ecb8a19..f7bc6bc 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -116,24 +116,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             for(var i=0 ; i < $scope.orderdata.length ; i++){
                 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
                 $scope.orderdata[i].departingDateS = new Date($scope.orderdata[i].departingDate);
+                $scope.orderdata[i].fuelingDate = new Date($scope.orderdata[i].fuelingDate);
 
                 var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear();
                 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
+                var fuelingDateStr = "" + ($scope.orderdata[i].fuelingDate.getMonth() + 1) + "/" + $scope.orderdata[i].fuelingDate.getDate() + "/" + $scope.orderdata[i].fuelingDate.getFullYear();
                 $scope.orderdata[i].upliftDateString = str;
                 $scope.orderdata[i].departingDateString = departingStr;
-                //not working in input type Time
-                /*if ($scope.orderdata[i].etaTime != null) {
-                  var now = new Date();
-                  
-                  var hr = $scope.orderdata[i].etaTime.slice(0, 2);
-                  var mm = $scope.orderdata[i].etaTime.slice(3, 5);
-                  now.setHours(hr);
-                  now.setMinutes(mm);
-                  $scope.orderdata[i].etaTime = now;
-                  console.log("===eta====", now, hr, mm);
-                }*/
+                $scope.orderdata[i].fuelingDate = fuelingDateStr;
+               //
                 
             }
+            console.log("==result===",$scope.orderdata)
            
              $scope.displayFuelOrderList = new NgTableParams({
               page: 1,
@@ -292,7 +286,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             $scope.fuelData.aircraftName = aircraftObj.tail;
             $scope.fuelData.make = aircraftObj.make;
             $scope.fuelData.model = aircraftObj.model;
-            $scope.fuelData.fuelOn = $scope.order.fuelOn;
+           // $scope.fuelData.fuelOn = $scope.order.fuelOn;
             $scope.fuelData.invoiced = $scope.order.invoiced;
             $scope.fuelData.volume = $scope.order.volume; 
            // $scope.fuelData.source = $scope.order.source; 
@@ -334,6 +328,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                 
                  $scope.fuelData.status = $scope.order.status;
               } 
+
+              if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
+                  $scope.fuelData.fuelOn = "Arrival"; //default fuelon
+                }else {
+                  $scope.fuelData.fuelOn = $scope.order.fuelOn ;
+                }
             
             if($scope.baseTenant && $scope.contractFuelVendor ){
                 $scope.fuelData.source = "Tenant/CAA" ;
@@ -395,7 +395,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
       $scope.fuelData = {}; 
       $scope.updateData = function() {
           if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){
-                if($scope.editdata.fuelOn != null || $scope.editdata.fuelOn != undefined) {
                         $scope.showLoader = true;
                         $scope.fuelData.aircraftName = $scope.editdata.aircraftName; 
                         $scope.fuelData.companyName = $scope.editdata.companyName;
@@ -429,8 +428,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                         $scope.fuelData.etaTime = $scope.editdata.etaTime;
                         $scope.fuelData.etdTime = $scope.editdata.etdTime;
                         $scope.fuelData.certificateType = $scope.editdata.certificateType;
-                        $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
-
+                       // $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
+                        if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
+                          $scope.fuelData.fuelOn = "Arrival"; //default fuelon
+                        }else {
+                          $scope.fuelData.fuelOn = $scope.editdata.fuelOn ;
+                        }
                         $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
                       fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
                         $scope.showLoader = false;
@@ -443,13 +446,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                       })
                  
 
-                } else{
-                        {
-                              toastr.error('Please select fuelOn.', {
-                              closeButton: true
-                            })     
-                        }
-                }           
+                        
              
           }else
             {
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 78c2077..b01fd16 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -95,8 +95,8 @@
                              <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
                               {{row.companyName}}
                              </td>
-                             <td data-title="'Fueling date'" filter="{upliftDateString: 'text'}" sortable="'upliftDateString'" ng-click="editTableRow(row)">
-                              {{row.upliftDateString}}
+                             <td data-title="'Fueling date'" filter="{fuelingDate: 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
+                              {{row.fuelingDate}}
                              </td>
                              <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
                               {{row.aircraftName}}
@@ -682,7 +682,7 @@
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="order.fuelOn"  style="width: 100%;">
-                                            <option value="" disabled selected hidden>Select...</option>
+                                            <option value="" disabled selected hidden>Arrival</option>
                                             <option value="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
@@ -851,7 +851,7 @@
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="editdata.fuelOn"  style="width: 100%;">
-                                            <option value="" disabled selected hidden>Select...</option>
+                                            <option value="" disabled selected hidden>Arrival</option>
                                             <option value="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>