diff --git a/app/index.html b/app/index.html
index a22d03c..9169df4 100644
--- a/app/index.html
+++ b/app/index.html
@@ -125,6 +125,7 @@
       <script src="partials/delselected/delselected.controller.js"></script>
       <script src="partials/pricingcontact/pricingcontact.controller.js"></script>
       <script src="partials/viewcontact/viewcontact.controller.js"></script>
+      <script src="partials/viewFuelOrder/viewFuelOrder.controller.js"></script>
 
       <script src="partials/main/main.controller.js"></script>
       <div ui-view></div>
@@ -158,6 +159,7 @@
       <script src="partials/delselected/delselected.service.js"></script>
       <script src="partials/pricingcontact/pricingcontact.service.js"></script>
       <script src="partials/viewcontact/viewcontact.service.js"></script>
+      <script src="partials/viewFuelOrder/viewFuelOrder.service.js"></script>
 
       <script src="partials/main/main.service.js"></script>
    </body>
diff --git a/app/js/app.js b/app/js/app.js
index 51b13d6..46eaafb 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -180,12 +180,18 @@
               // }
             })
 
-             .state("app.viewCompany", {
+            .state("app.viewCompany", {
               url: "/viewCompany/:id",
               templateUrl: "partials/viewCompany/viewCompany.html",
               controller: "viewCompanyController"
             }) 
 
+            .state("app.viewFuelOrder", {
+              url: "/viewFuelOrder/:id",
+              templateUrl: "partials/viewFuelOrder/viewFuelOrder.html",
+              controller: "ViewFuelOrderController"
+            }) 
+
             .state("app.fuelOrders", {
               url: "/fuelOrders",
               templateUrl: "partials/fuelOrders/fuelOrders.html",
diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js
index b8e222a..14ab258 100644
--- a/app/partials/FuelVendors/FuelVendors.controller.js
+++ b/app/partials/FuelVendors/FuelVendors.controller.js
@@ -7,47 +7,6 @@
 
 	function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService) {
 
-      $scope.vendorList = [{
-			"companyName": "Name and inc",
-		    "phone":"1010101010",
-		    "contact":"jimmy",
-		    "status":'Active',
-		    "source": "tenant",
-		    "allIn" : "$123"
-		},{
-			"companyName": "Name and inc",
-		    "phone":"1010101010",
-		    "contact":"jimmy",
-		    "status":'Active',
-		    "source": "tenant",
-		    "allIn" : "$123"
-		},{
-			"companyName": "Name and inc",
-		    "Fleet": 3,
-		    "phone":"1010101010",
-		    "contact":"jimmy",
-		    "Base":"Kiad",
-		    "status":'Inactive',
-		    "source": "tenant",
-		    "allIn" : "$123"
-		},{
-			"companyName": "Name and inc",
-		    "phone":"1010101010",
-		    "contact":"jimmy",
-		    "status":'Active',
-		    "source": "tenant",
-		    "allIn" : "$123"
-		},{
-			"companyName": "Name and inc",
-		    "phone":"1010101010",
-		    "contact":"kuldeep",
-		    "Base":"Kiad",
-		    "status":'Inactive',
-		    "source": "tenant",
-		    "allIn" : "$123"
-		}]
-
-
 		$(document).ready(function() {
 		    $('#example').DataTable();
 		});
@@ -55,10 +14,15 @@
 		$scope.aircraft = {};
 		$scope.data.activate = true;
 		
-		// FuelVendorsService.getAllVendor().then(function(result) {
-		// 	console.log(result)
-		// 	$scope.vendorList = result;
-		// })
+		getAllVendor();
+
+		function getAllVendor(){
+			FuelVendorsService.getAllVendor().then(function(result) {
+				console.log(result)
+				$scope.vendorList = result;
+			})
+		}
+		
 
         $(function() {
 	     	$('#vendor-toggle-one2').bootstrapToggle();
@@ -87,10 +51,8 @@
 
 	    	FuelVendorsService.addVendor(vendorData).then(function(result) {
             	console.log("result",result)
-            	$scope.vendorId = result;
-            	console.log("$scope.vendorId",$scope.vendorId)
-      			$scope.aircraft.vendorId = $scope.vendorId;
-      			console.log("$scope.aircraft.vendorId",$scope.aircraft.vendorId);
+            	$scope.accountId = result;
+      			$scope.aircraft.accountId = $scope.accountId;
           	})
     	 	$(sel).trigger('next.m.' + step);
     	 	getData();
@@ -143,15 +105,17 @@
 	            });
       		}
 	        $scope.aircraftListData.aircraftList = $scope.addData;
-	        $scope.aircraftListData.vendorId = $scope.aircraft.vendorId;
+	        $scope.aircraftListData.accountId = $scope.aircraft.accountId;
 	        
-	        CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
+	        FuelVendorsService.addVendorAicraft($scope.aircraftListData).then(function(result) {
 	        	console.log(result)
+
 	        	if(result != null && result.success){
 	        		toastr.success(''+result.success+'', {
 		            	closeButton: true
 		          	})
-		          	$('#demo-modal-3').modal('hide');
+		          	$('#vendor-modal-3').modal('hide');
+		          	getAllVendor();
 	        	}else{
 	        		toastr.error(''+result.statusText+'', {
 		            	closeButton: true
diff --git a/app/partials/FuelVendors/FuelVendors.html b/app/partials/FuelVendors/FuelVendors.html
index 4cd2bcb..a47df11 100644
--- a/app/partials/FuelVendors/FuelVendors.html
+++ b/app/partials/FuelVendors/FuelVendors.html
@@ -95,7 +95,7 @@
                         </li>
                         <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li>
                         <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
-                        <li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>
+                        <li style="float:right"><button type="submit" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>
                      </ul>
                      <br>  
                      <div class="tab-content customer-table" style="margin:0px">
@@ -105,7 +105,7 @@
                                  <tr>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                       <label class="font-company">Vendor Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     
                                     <th>
@@ -136,12 +136,14 @@
                               </thead>
                               <tbody>
                                  <tr ng-repeat="vendor in vendorList">
-                                    <td class="font-company">{{vendor.companyName}}</td>
+                                    <td class="font-company">
+                                      <a style="color: #333; text-decoration: none;" href="#!/viewFuelOrder/{{vendor.id}}">{{vendor.vendorName}}</a>
+                                    </td>
                                     <td class="font-company">{{vendor.phone}}</td>
                                     <td class="font-company">{{vendor.contact}}</td>
                                     <td class="font-company">
-                                       <button type="button" ng-if="vendor.status == 'Active'" class="btn btn-success btn-xs">{{vendor.status}}</button>
-                                       <button type="button" ng-if="vendor.status == 'Inactive'" class="btn btn-warning btn-xs">{{vendor.status}}</button>
+                                       <button type="button" ng-if="vendor.activate == true" class="btn btn-success btn-xs">Active</button>
+                                       <button type="button" ng-if="vendor.activate == false" class="btn btn-warning btn-xs">InActive</button>
                                     </td>
                                     <td class="font-company">{{vendor.source}}</td>
                                     <td class="font-company">
@@ -288,7 +290,7 @@
 </div>
 <!-- /main -->
 
-<form class="modal multi-step" id="demo-modal-3" name="vendorForm">
+<form class="modal multi-step" id="vendor-modal-3" name="vendorForm">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body step-1" data-step="1" style="padding: 0;">
@@ -598,9 +600,9 @@
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
-                <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
-                <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#vendor-modal-3', 2)">Next: Add Aircraft</button>
+                <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 1)">Go Back</button>
+                <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 3)">Continue</button> -->
                 <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveVendorData()">Save</button>
             </div>
         </div>
diff --git a/app/partials/FuelVendors/FuelVendors.service.js b/app/partials/FuelVendors/FuelVendors.service.js
index 2800779..ae87053 100644
--- a/app/partials/FuelVendors/FuelVendors.service.js
+++ b/app/partials/FuelVendors/FuelVendors.service.js
@@ -21,8 +21,25 @@
 		      return deferred.promise;
 		    }
 
+		    this.addVendor = function(data) {
+	      		console.log("data",data);
+
+	          var deferred = $q.defer();
+	          $http({
+	              method : 'POST',
+	              url : BASE_URL.url +'/vendor',
+	              headers : {'Content-Type': 'application/json'},
+	              data: data
+	          })
+	          .then(function (result){
+	              deferred.resolve(result.data);
+	          },function (result){
+	              deferred.resolve(result.data);
+	          })
+	          return deferred.promise;
+	        }
 
-	      	this.addVendor = function(data) {
+	      	this.addVendorAicraft = function(data) {
 	      		console.log("data",data);
 
 	          var deferred = $q.defer();
diff --git a/app/partials/viewFuelOrder/viewFuelOrder.controller.js b/app/partials/viewFuelOrder/viewFuelOrder.controller.js
new file mode 100644
index 0000000..6049ab4
--- /dev/null
+++ b/app/partials/viewFuelOrder/viewFuelOrder.controller.js
@@ -0,0 +1,225 @@
+
+'use strict';
+
+ //Load controller
+  angular.module('acufuel')
+
+	.controller('ViewFuelOrderController', ['$scope','$uibModal', '$stateParams', 'ViewFuelOrderService', 'CustomersService', function($scope , $uibModal, $stateParams, ViewFuelOrderService, CustomersService) {
+        $scope.data = {};
+        $scope.data.priceEmail = true;
+        $scope.aircraft = {};
+
+        $(function() {
+         $('#company-one2').bootstrapToggle();
+        })
+
+        $(function() {
+         $('#toggle-one1').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-two').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-three').bootstrapToggle();
+        })   
+        $(function() {
+         $('#toggle-four').bootstrapToggle();
+        })
+
+        $(function() {
+          $('#price-one2').bootstrapToggle();
+          $('#price-one2').change(function() {
+            $('#console-event').html('Toggle: ' + $(this).prop('checked'));
+            $scope.data.priceEmail = $(this).prop('checked');
+          })
+        })
+
+        var value = "";
+        var vendorId = $stateParams.id;
+        ViewFuelOrderService.getFuelOrder(vendorId).then(function(result) {
+          $scope.vendorData = result;
+          if($scope.vendorData.activate == true){
+            value = 'on';
+          }else{
+            value = 'off'
+          }
+          $('#company-one2').bootstrapToggle(value)
+        })
+
+        getContactList();
+        function getContactList(){
+          ViewFuelOrderService.getContact(vendorId).then(function(result) {
+            $scope.vendorContactList = result;
+            for(var i=0;i<$scope.vendorContactList.length; i++){
+              if($scope.vendorContactList[i].priceEmail == true){
+                $scope.vendorContactList[i].value1 = 'on';
+                console.log('aya')
+              }else{
+                $scope.vendorContactList[i].value1 = 'off';
+
+              }
+              console.log($scope.vendorContactList[i])
+              $('#'+$scope.vendorContactList[i].id).bootstrapToggle($scope.vendorContactList[i].value1)
+            }
+          })
+        }
+
+        getAircraftList();
+        function getAircraftList(){
+          ViewFuelOrderService.getAircraft(vendorId).then(function(result) {
+            $scope.contactAircraftList = result;
+          })
+        }
+        
+
+        $scope.contactData = {};
+        $scope.contactData.contactList = [];
+        $scope.addContact = function(){
+          $scope.data.vendorId = vendorId;
+          $scope.contactData.contactList.push($scope.data);
+          ViewFuelOrderService.addContact($scope.contactData).then(function(result) {
+            if(result.success){
+              toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+                $('#contact-modal-3').modal('hide');
+                getContactList();
+            }else{
+              toastr.error(''+result.statusText+'', {
+                  closeButton: true
+                })
+            }
+          })
+        }
+
+      getData();
+      function getData(){
+        CustomersService.getAircraftMake().then(function(result) {
+          $scope.aircraftMakeList = result;
+        })
+      }
+      
+      $scope.aircraftDetails = [{ 
+            'tail':'',
+            'make': '',
+            'model': '',
+            'sizeId' : ''
+        }];
+    
+        $scope.addNew = function(){
+            $scope.aircraftDetails.push({ 
+              'tail':'',
+              'make': '',
+              'model': '',
+              'sizeId' : ''
+            });
+            console.log($scope.aircraftDetails)
+        };
+
+        $scope.getModal = function(makeId, index){
+        $scope.aircraft.make = makeId;
+          //var makeId = makeId;
+          CustomersService.getModal($scope.aircraft.make).then(function(result) {
+            $scope.aircraftDetails[index].aircraftModalList = result;
+            //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
+          })
+        }
+
+        $scope.getSize = function(model, index){
+          CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
+            $scope.aircraftDetails[index].aircraftSizeList = result;
+            //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
+          })
+        }
+
+        $scope.aircraftListData = {};
+        $scope.addData = [];
+        $scope.saveVendorData = function(){
+          for(var i=0; i<$scope.aircraftDetails.length;i++){
+            $scope.addData.push({ 
+                'tail': $scope.aircraftDetails[i].tail,
+                'make': $scope.aircraftDetails[i].make,
+                'model': $scope.aircraftDetails[i].model,
+                'sizeId' : $scope.aircraftDetails[i].sizeId
+              });
+          }
+          console.log($scope.addData)
+          $scope.aircraftListData.aircraftList = $scope.addData;
+          $scope.aircraftListData.accountId = vendorId;
+          
+          CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
+            if(result != null && result.success){
+              toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+                $('#aircraft-modal-3').modal('hide');
+                getAircraftList();
+            }else{
+              toastr.error(''+result.statusText+'', {
+                  closeButton: true
+                })
+            }
+          });
+          
+        }
+        $scope.showNoteData = true;
+        $scope.showCompanyName = true;
+        $scope.showAddress = true;
+        $scope.showNote = function(){
+          $scope.showNoteData = false;
+        }
+
+        $scope.company = function(){
+          $scope.showCompanyName = false;
+        }
+
+        $scope.addressChange = function(){
+          $scope.showAddress = false;
+        }
+
+        $scope.editData = function(inputName) {
+            console.log($scope.vendorData)
+            if(inputName == 'showNoteData'){
+              $scope.showNoteData = true;
+            }else if(inputName == 'showCompanyName'){
+              $scope.showCompanyName = true;
+            }else if(inputName == 'showAddress'){
+              $scope.showAddress = true;              
+            }
+
+            var vendorData = "companyName=" + $scope.vendorData.companyName + "&masterMargin=" + $scope.vendorData.masterMargin 
+              + "&addressOne=" + $scope.vendorData.addressOne + "&addressTwo=" + $scope.vendorData.addressTwo + "&city=" + $scope.vendorData.city + "&state=" 
+              + $scope.vendorData.state + "&country=" + $scope.vendorData.country + "&zipcode=" + $scope.vendorData.zipcode + "&internalNote=" 
+              + $scope.vendorData.internalNote + "&certificateType=" + $scope.vendorData.certificateType + "&baseTenant=" + $scope.vendorData.baseTenant
+              + "&fuelerlinxCustomer=" + $scope.vendorData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.vendorData.contractFuelVendor 
+              + "&activate=" + $scope.vendorData.activate + "&baseIcao=" + $scope.vendorData.baseIcao + "&vendorId=" + vendorId;
+
+            ViewFuelOrderService.updateContact(vendorData).then(function(result) {
+              if(result != null && result.success){
+                toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+              }else{
+                toastr.error(''+result.statusText+'', {
+                  closeButton: true
+                })
+              }
+            })
+            
+        }
+
+        $scope.sendMail = function(){
+          ViewFuelOrderService.sendMail(vendorId).then(function(result) {
+              if(result != null && result.success){
+                toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+              }else{
+                toastr.error(''+result.statusText+'', {
+                  closeButton: true
+                })
+              }
+          })
+        }
+
+  }]);
\ No newline at end of file
diff --git a/app/partials/viewFuelOrder/viewFuelOrder.html b/app/partials/viewFuelOrder/viewFuelOrder.html
new file mode 100644
index 0000000..6c21797
--- /dev/null
+++ b/app/partials/viewFuelOrder/viewFuelOrder.html
@@ -0,0 +1,648 @@
+<style>
+   .subnavbar .mainnav > li:nth-child(3) > a{
+   color: #ff9900;
+   }
+   .widget-content{
+      padding: 10px !important;
+   }
+   .widget-content input[type="text"], .widget-content select{
+      height: 31px;
+      padding: 0;
+   }
+   .new-label span{
+      float: left;
+      line-height: 31px;
+   }
+   .new-label span:first-child{
+      margin-right: 5px;
+      font-weight: bold;
+   }
+   .new-label span:last-child{
+      margin-left: 5px;
+   }
+   .new-label select{
+      display: -webkit-inline-box;
+      display: inline-box;
+      float: left;
+   }
+   .new-address p{
+      margin-bottom: 0;
+   }
+   .new-add-select{
+      padding-left: 15px;
+      margin: 10px 0;
+   }
+   .new-add-select select{
+      width: 100px;
+   }
+   .widget{
+      -moz-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+      -webkit-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+      box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
+   }
+   .optionclass {
+      background: #fff;
+   }
+   .timess {
+      float: right !important;
+      margin-top: 10px !important;
+      margin-right: 10px !important;
+      color: #999 !important;
+      cursor: pointer !important;
+   }
+
+   .button1 {
+     display: inline-block;
+     height: 35px;
+     line-height: 35px;
+     padding-right: 15px;
+     padding-left: 50px;
+     position: relative;
+     background-color:rgb(41,127,184);
+     color:rgb(255,255,255);
+     text-decoration: none;
+     text-transform: uppercase;
+     letter-spacing: 1px;
+     margin-bottom: 15px;
+     border: 0;
+     
+     
+        border-radius: 5px;
+        -moz-border-radius: 5px;
+        -webkit-border-radius: 5px;
+        text-shadow:0px 1px 0px rgba(0,0,0,0.5);
+      -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
+      filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
+
+        -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        box-shadow:0px 2px 2px rgba(0,0,0,0.2);
+        -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
+      filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
+   }
+
+   .button1 span {
+     position: absolute;
+     left: 0;
+     top: 0;
+     width: 35px;
+     background-color:rgba(0,0,0,0.5);
+     
+     -webkit-border-top-left-radius: 5px;
+   -webkit-border-bottom-left-radius: 5px;
+   -moz-border-radius-topleft: 5px;
+   -moz-border-radius-bottomleft: 5px;
+   border-top-left-radius: 5px;
+   border-bottom-left-radius: 5px;
+   border-right: 1px solid  rgba(0,0,0,0.15);
+   }
+
+   .button1:hover span, .button1.active span {
+     background-color:rgb(0,102,26);
+     border-right: 1px solid  rgba(0,0,0,0.3);
+   }
+
+   .button1:active {
+     margin-top: 2px;
+     margin-bottom: 13px;
+
+     -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   box-shadow:0px 1px 0px rgba(255,255,255,0.5);
+   -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
+   filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
+   }
+
+   .button1.turquoise {
+     background: #449d44;
+   }
+
+</style>
+<div class="col-xs-12 col-md-11">
+   <div class="row" style="margin-left:0px">
+      <div class="col-md-12">
+         <div class="widget">
+            <div class="widget-header">
+               <i class="fa fa-building-o" aria-hidden="true"></i>
+               <h3>Antioch Flight Department</h3>
+               <i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
+            </div>
+            <!-- /widget-header -->
+            <div class="widget-content">
+               <div class="row" style="margin-left:0px">
+                  <div class="col-md-6">
+                     <div class="widget">
+                        <div class="widget-header">
+                           <i class="fa fa-building-o" aria-hidden="true"></i>
+                           <h3>Company Details</h3>
+                           <label>BASE ICAO</label>
+                           <input type="tel" ng-model="vendorData.baseIcao" style="line-height: 18px;width: 50px;padding: 0px 9px;" ng-blur="editData()"/>
+                           <div class="pull-right my-toggle-switch" style="margin-top: 10px; margin-right: 10px;">
+                              <div><input id="company-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="Active" data-off="Dactive">
+                              </div>
+                           </div>
+                        </div>
+                        <div class="widget-content">
+                           <div class="row" style="margin-left:0px;">
+                              <div class="col-md-7" style="padding-left: 0;">
+                                 <h4 ng-show="showCompanyName">
+                                    <b style="color:#F90;">{{vendorData.vendorName}}</b> &nbsp;<i class="fa fa-pencil-square-o" ng-click="company()" style="font-size: 14px;" aria-hidden="true"></i>
+                                 </h4>
+                                 <input type="tel" ng-hide="showCompanyName" ng-model="vendorData.vendorName" class="form-control" ng-blur="editData('showCompanyName')"/>
+                              </div>
+                              <div class="col-md-5">
+                                 <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="vendorData.certificateType" ng-click="editData()">
+                                    <option class="optionclass" disabled selected>Certificate Type</option>
+                                    <option class="optionclass" value="corporate">Part 91 (Corporate)</option>
+                                    <option class="optionclass" value="charter">Part 135 (Charter)</option>
+                                    <option class="optionclass" value="scheduled">Part 121 (Scheduled)</option>
+                                    <option class="optionclass" value="military">Military</option>
+                                    <option class="optionclass" value="government">Government</option>
+                                 </select>
+                              </div>
+                           </div>
+                           <div>
+                              <p class="new-label">
+                                 <span>Master Margin Setting </span> 
+                                 <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="vendorData.masterMargin" ng-click="editData()">
+                                    <option value="margin1">Margin1</option>
+                                    <option value="margin2">Margin2</option>
+                                    <option value="vendorsonly">Vendors Only</option>
+                                    <option value="margintenants">Margin Tenants</option>
+                                 </select>
+                                 <span>&nbsp;See Aircrart List</span>
+                                 <div class="clearfix"></div>
+                              </p>
+                           </div>
+                           <div class="row"  style="margin-left:0px;"> 
+                              <div class="col-md-5" style="padding-left: 0;">
+                                 <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.baseTenant"> Tenant/Base Customer
+                              </div>
+                              <div class="col-md-5" style="padding-left: 0;">
+                                 <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.fuelerlinxCustomer"> FuelerLinx Customer
+                              </div>
+                           </div>
+                           <div>
+                              <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.contractFuelVendor"> CAA Member
+                           </div>
+                           </br>
+                           <div class="new-address">
+                              <p ng-show="showAddress"><i class="fa fa-map-marker"></i> {{vendorData.addressOne}} {{vendorData.addressTwo}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="addressChange()" aria-hidden="true"></i> </p>
+                              
+                              <div ng-hide="showAddress">
+                                 <label>Address1</label>
+                                 <input type="tel" ng-hide="showAddress" ng-model="vendorData.addressOne" class="form-control" ng-blur="editData('showAddress')"/>
+                                 <label>Address2</label>
+                                 <input type="tel" ng-hide="showAddress" ng-model="vendorData.addressTwo" class="form-control" ng-blur="editData('showAddress')"/>
+                              </div>
+                              
+                              <p><i class="fa fa-phone"></i> (310) 2342-3433 &nbsp;<i class="fa fa-pencil-square-o" aria-hidden="true"></i></p>
+                              <p><i class="fa fa-envelope"></i> freed@gmail.com &nbsp;<i class="fa fa-pencil-square-o" aria-hidden="true"></i></p>
+                           </div>
+                           <div class="new-add-select">
+                              <select class="form-control" style="background: #ebebeb;padding: 4px 8px;width: 115px;">
+                                 <option disabled selected>Add Field</option>
+                                 <option class="optionclass">Add Phone</option>
+                                 <option class="optionclass">Add Email</option>
+                              </select>
+                           </div>
+                           <div>
+                              <p style="margin-bottom: 0;"><b>Company Notes</b> &nbsp;<i class="fa fa-pencil-square-o" ng-click="showNote()" aria-hidden="true"></i></p>
+                              <p ng-show="showNoteData">{{vendorData.internalNote}}</p>
+                              <textarea  name="message" ng-hide="showNoteData" style="margin-bottom: 6px;" class="form-control" ng-model="vendorData.internalNote" ng-blur="editData('showNoteData')" rows="4" cols="34"></textarea>
+                           </div>
+                           <div class="dis">
+                              <button type="button" data-toggle="modal" data-target="#distribute-modal-3" class="btn btn-primary">Distribute Price to Company Contacts</button>
+                           </div>
+                           <div><button type="button" class="btn btn-info">Setup Fuel</button></div>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="col-md-6">
+                     <div class="widget">
+                        <div class="widget-header">
+                           <i class="fa fa-plane"></i>
+                           <h3>Aircraft List</h3>
+                           <div class="pull-right">
+                              <button type="submit" class="btn btn-success btn-sm" data-toggle="modal" data-target="#aircraft-modal-3" style="margin-top: 4px; margin-right: 9px;"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp; Add Aircraft</button>
+                           </div>
+                        </div>
+                        <div class="widget-content" style="padding:0px">
+                           <div class="table-responsive">
+                              <table class="table table-bordered table-hover table-striped">
+                                 <thead>
+                                    <tr>
+                                       <th>Tail #</th>
+                                       <th>Make</th>
+                                       <th>Model</th>
+                                       <th>JET-A</th>
+                                       <th>All in</th>
+                                       <th>AVGAS</th>
+                                       <th>All in</th>
+                                       <th></th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <tr ng-repeat="aircraft in contactAircraftList">
+                                       <td>{{aircraft.tail}}</td>
+                                       <td>{{aircraft.make}}</td>
+                                       <td>{{aircraft.model}}</td>
+                                       <td>
+                                          <select class="form-control" style="height:31px;">
+                                             <option>Margin1</option>
+                                             <option>Margin2</option>
+                                          </select>
+                                       </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td>
+                                          <select class="form-control" style="height:31px;">
+                                             <option>Margin1</option>
+                                             <option>Margin2</option>
+                                          </select>
+                                       </td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td></td>
+                                    </tr>
+                                 </tbody>
+                              </table>
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+               <div class="row" style="margin-left:0px">
+                  <div class="col-md-6">
+                     <div class="widget">
+                        <div class="widget-header">
+                           <i class="fa fa-user"></i>
+                           <h3>Contact List</h3>
+                           <div class="pull-right">
+                              <button type="submit" data-toggle="modal" data-target="#contact-modal-3" class="btn btn-success btn-sm" style="margin-top: 4px; margin-right: 9px;"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp; Add Contact</button>
+                           </div>
+                        </div>
+                        <div class="widget-content" style="padding:0px">
+                           <div class="table-responsive">
+                              <table class="table table-bordered table-hover table-striped">
+                                 <thead>
+                                    <tr>
+                                       <th>Price Email</th>
+                                       <th>First Name</th>
+                                       <th>Last Name</th>
+                                       <th>Title</th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <tr ng-repeat="contact in vendorContactList">
+                                       <td class="my-toggle-switch"><input id="{{contact.id}}" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
+                                       <td>
+                                          <a href="#!/viewContact/{{contact.id}}">
+                                            {{contact.firstName}}
+                                          </a>
+                                        </td>
+                                       <td>{{contact.lastName}}</td>
+                                       <td>{{contact.title}}</td>
+                                    </tr>
+                                 </tbody>
+                              </table>
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="col-md-6">
+                     <div class="widget">
+                        <div class="widget-header">
+                           <i class="fa fa-pencil"></i>
+                           <h3>Price Manager Reference</h3>
+                        </div>
+                        <div class="widget-content">
+                           <div class="table-responsive">
+                              <table class="table table-hover table-striped">
+                                 <thead>
+                                    <tr>
+                                       <th>Omit</th>
+                                       <th>Product</th>
+                                       <th>Cost</th>
+                                       <th>PAP (Margin)</th>
+                                       <th>PAP (Total)</th>
+                                       <th style="color:#F90">Expires</th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <tr>
+                                       <td><input type="checkbox"></td>
+                                       <td>Jet-A Full Service</td>
+                                       <td>$2.123</td>
+                                       <td>$23000</td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td style="color:#F90">3/15/2017</td>
+                                    </tr>
+                                    <tr>
+                                       <td><input type="checkbox"></td>
+                                       <td>Jet-A Full Service</td>
+                                       <td>$2.123</td>
+                                       <td>$23000</td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td style="color:#F90">3/15/2017</td>
+                                    </tr>
+                                    <tr>
+                                    <tr>
+                                       <td><input type="checkbox"></td>
+                                       <td>Jet-A Full Service</td>
+                                       <td>$2.123</td>
+                                       <td>$23000</td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td style="color:#F90">3/15/2017</td>
+                                    </tr>
+                                    <tr>
+                                       <td><input type="checkbox"></td>
+                                       <td>Jet-A Full Service</td>
+                                       <td>$2.123</td>
+                                       <td>$23000</td>
+                                       <td style="color:#55AF8B;">$3659</td>
+                                       <td style="color:#F90">3/15/2017</td>
+                                    </tr>
+                                 </tbody>
+                              </table>
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <!-- /widget-content -->
+         </div>
+         <!-- /widget -->
+      </div>
+      <!-- /span6 -->
+   </div>
+   <!-- /widget -->
+</div>
+<!-- /container -->
+<form class="modal multi-step" id="contact-modal-3" name="companyForm">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body step-1" data-step="1" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <div>
+                        <div class="widget" style="margin-bottom: 0; box-shadow: none;">
+                           <div class="widget-header">
+                              <i class="icon-pencil"></i>
+                              <i class="fa fa-tasks" aria-hidden="true"></i>
+                              <h3>Add a New Contact</h3>
+                              <div class="clearfix"></div>
+                           </div>
+                           <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
+                              <div class="col-xs-12">
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>First Name</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.firstName" class="form-control" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Last Name</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.lastName" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                              <div class="col-xs-12">
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Title</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.title" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Email</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="email" ng-model="data.email" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                              <div class="col-xs-12">
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Username</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.userName" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Password</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="password" ng-model="data.password" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                              <div class="col-xs-12">
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Work Phone</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.workPhone" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Mobile Phone</b></label>
+                                    </div>
+                                    <div class="pull-left" style="margin-left: 15px;">
+                                       <input type="tel" ng-model="data.mobilePhone" class="form-control" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                              <div class="col-xs-12">
+                                  <div class="col-md-12">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Address</b></label>
+                                    </div>
+                                    <div class="pull-right" style="width: calc(100% - 123px);">
+                                       <input type="tel" class="form-control" ng-model="data.address" id="Address" placeholder="">
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+                                 <div class="col-md-3">
+                                    <div class="pull-left my-toggle-switch">
+                                       <div style="color: #ff9a01;">Price Email &nbsp &nbsp
+                                          <input id="price-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="On" data-off="Off">
+                                       </div>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-3">
+                                    <div class="pull-left my-toggle-switch">
+                                       <div style="color: #ff9a01;">Primary Contact &nbsp &nbsp
+                                          <input type="checkbox" ng-model="data.primaryContact">
+                                       </div>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Internal Note</b></label>
+                                    </div>
+                                    <div class="pull-left" style="width: calc(100% - 110px);">
+                                       <textarea  name="message" ng-model="data.note" rows="4" cols="34"></textarea>
+                                    </div>
+                                 </div>
+                                 <div class="clearfix"></div>
+                              </div>
+                              <div class="clearfix"></div><br>
+                           </div>
+                        </div>
+                        <div class="clearfix"></div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0;">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button>
+            </div>
+        </div>
+    </div>
+</form>
+<div class="clearfix"></div>
+
+<form class="modal multi-step" id="aircraft-modal-3" name="aircraftForm">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body step-2" data-step="2" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <div>
+                        <div class="widget" style="margin-bottom: 0;box-shadow: none;">
+                           <div class="widget-header">
+                              <i class="icon-pencil"></i>
+                              <i class="fa fa-tasks" aria-hidden="true"></i>
+                              <h3>Add a New Aircraft</h3>
+                              <div class="clearfix"></div>
+                           </div>
+                           <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
+                              <div class="col-xs-12">
+                                 <div class="widget-header">
+                                    <i class="fa fa-list"></i>
+                                    <h3>Aircraft List</h3>
+                                 </div>
+                                 <div class="widget-content" style="padding:0px;border: 0px; padding: 0px !important;">
+                                    <div class="table-responsive">
+                                       <table class="table table-striped table-bordered">
+                                          <thead>
+                                             <tr>
+                                                <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
+                                                <th>Tail</th>
+                                                <th>Make</th>
+                                                <th>Model</th>
+                                                <th>Size</th>
+                                             </tr>
+                                          </thead>
+                                          <tbody>
+                                             <tr ng-repeat="aircraftData in aircraftDetails track by $index">
+                                                <!-- <td>
+                                                   <input type="checkbox" ng-model="aircraftData.selected"/>
+                                                   </td> -->
+                                                <td style="width: 20%">
+                                                   <input type="tel" class="form-control" ng-model="aircraftData.tail" required/>
+                                                </td>
+                                                <td style="width: 20%">
+                                                   <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
+                                                      <option ng-repeat="make in aircraftMakeList">{{make}}</option>
+                                                   </select>
+                                                </td>
+                                                <td style="width: 20%">
+                                                   <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
+                                                      <option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
+                                                   </select>
+                                                </td>
+                                                <td style="width: 20%">
+                                                  <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select>
+                                                   <!-- <select class="form-control" ng-model="aircraftData.size">
+                                                      <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
+                                                   </select> -->
+                                                </td>
+                                             </tr>
+                                          </tbody>
+                                       </table>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
+                                 <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="clearfix"></div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0;">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveVendorData()">Save</button>
+            </div>
+        </div>
+    </div>
+</form>
+
+<form class="modal multi-step" id="distribute-modal-3" name="aircraftForm">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body step-2" data-step="2" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <p>Are you sure that you want to email pricing to everyone in your contact list</p>
+                  </div>
+               </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0;">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="sendMail()">Save</button>
+            </div>
+        </div>
+    </div>
+</form>
+<!-- Le javascript
+   ================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!-- <script
+   CKEDITOR.replace( 'editor2', {
+      height: 250,
+      extraPlugins: 'divarea'
+   } );
+   </script> -->
diff --git a/app/partials/viewFuelOrder/viewFuelOrder.service.js b/app/partials/viewFuelOrder/viewFuelOrder.service.js
new file mode 100644
index 0000000..1cb1655
--- /dev/null
+++ b/app/partials/viewFuelOrder/viewFuelOrder.service.js
@@ -0,0 +1,108 @@
+(function(){
+ 'use strict';    
+    angular.module('acufuel')
+      .service('ViewFuelOrderService', ['$q', '$http', 'BASE_URL', ViewFuelOrderService]);
+
+      function ViewFuelOrderService($q, $http, BASE_URL) {        
+        
+      	this.getFuelOrder = function(id) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/vendor/'+id,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getContact = function(id) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/vendor/contacts/'+id,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.addContact = function(data) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'POST',
+              url : BASE_URL.url +'/vendor/add/contact',
+              data : data,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.sendMail = function(id) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'POST',
+              url : BASE_URL.url +'/mailPriceToContacts/'+id,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.updateContact = function(data) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'PUT',
+              url : BASE_URL.url +'/vendor',
+              data : data,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getAircraft = function(id) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/vendor/aircrafts/'+id,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+        
+      }
+      
+})();
\ No newline at end of file