viithiisys / Acufuel

Browse Code »

Commit 0173d74ad393b69b7f4dfbe43c818c5a6717b19d

Authored by Kuldeep Arora 2018-10-11 08:18:54 -0400

1 parent 0a364e561c

Exists in master

source autopopulate in fuel order screens

Showing 8 changed files with 77 additions and 23 deletions Show diff stats

app/partials/customers/customers.controller.js

Diff comments View file @0173d74

 'use strict';
 //Load controller
 angular.module('acufuel')
 	.controller('customersController', [ '$scope', '$rootScope', '$uibModal', '$filter', '$http', '$state', 'CustomersService', 'ViewCompanyService', 'NgTableParams', 'fuelOrdersService', 'enterFuelOrderService', customersController ]);
 function customersController($scope, $rootScope, $uibModal, $filter, $http, $state, CustomersService, ViewCompanyService, NgTableParams, fuelOrdersService, enterFuelOrderService) {
 	$(document).ready(function() {
 		// $('#example').DataTable();
 	});
 	$scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
 	$scope.reset2 = function() {
 		$("input").val("");
 		$scope.removeMarginValidation();
 	}
 	$scope.order = {};
 	$scope.order.upliftDate = '';
 	$scope.data = {};
 	$scope.aircraft = {};
 	$scope.data.activate = true;
 	$scope.showLoader = true;
 	$scope.jetShow = [];
 	$scope.marginShow = [];
 	$scope.jetShow[0] = true;
 	$scope.marginShow[0] = true;
 	$scope.dispatchOrder = {};
 	$scope.dispatchOrder.fuelOrderList = [];
 	$scope.statusFilterOptions = [];
 	$scope.companyList = {};
 	$scope.statusFilterOptions.push({
 		'id' : '',
 		'title' : 'Show All'
 	}, {
 		'id' : 'pending',
 		'title' : 'Pending'
 	}, {
 		'id' : 'invoiced',
 		'title' : 'Invoiced'
 	}, {
 		'id' : 'paid',
 		'title' : 'Paid'
 	}, {
 		'id' : 'cancelled',
 		'title' : 'Cancelled'
 	}, {
 		'id' : 'archived',
 		'title' : 'Archived'
 	}
 	);
 	/*function getAllCompanies(){
 	  CustomersService.getAllCompanies().then(function(result) {
 	    $scope.companyList = result;
 	    for(var i=0; i<$scope.companyList.length; i++){
 	      $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
 	    }
 	  })
 	}*/
 	$scope.statusFilter = [
 		{
 			id : "",
 			title : "Show All"
 		},
 		{
 			id : "true",
 			title : "Active"
 		},
 		{
 			id : "false",
 			title : "Inactive"
 		}
 	]
 	function getAllCompanies() {
 		CustomersService.getAllCompanies().then(function(result) {
 			$scope.companyList = 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) {
 						$scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber;
 					}
 				}
 				if ($scope.companyList[i].primaryContact != null) {
 					if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) {
 						$scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName;
 					}
 				}
 				if ($scope.companyList[i].margin != null) {
 					if ($scope.companyList[i].margin.marginName != null) {
 						$scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
 					}
 				}
 			}
 			$scope.displayCompanyList = new NgTableParams({
 				page : 1,
 				count : 10,
 			}, {
 				data : $scope.companyList
 			});
 			$scope.showLoader = false;
 		})
 	}
 	getAllCompanies();
 	$scope.editMargin = function(customer) {
 		//console.log('customer', customer);
 		$scope.showLoader = true;
 		event.stopPropagation();
 		var companyMargin = "companyName=" + customer.companyName + "&masterMargin=" + customer.masterMargin
 		+ "&addressOne=" + customer.addressOne + "&addressTwo=" + customer.addressTwo + "&city=" + customer.city + "&state="
 		+ customer.state + "&country=" + customer.country + "&zipcode=" + customer.zipcode + "&internalNote="
 		+ customer.internalNote + "&certificateType=" + customer.certificateType + "&baseTenant=" + customer.baseTenant
 		+ "&fuelerlinxCustomer=" + customer.fuelerlinxCustomer + "&contractFuelVendor=" + customer.contractFuelVendor
 		+ "&activate=" + customer.activate + "&baseIcao=" + customer.baseIcao + "&companyId=" + customer.id;
 		ViewCompanyService.updateCompany(companyMargin).then(function(result) {
 			if (result != null && result.success) {
 				$scope.showLoader = false;
 				toastr.success('' + result.success + '', {
 					closeButton : true
 				})
 				getAllCompanies();
 			} else {
 				$scope.showLoader = false;
 				toastr.error('' + result.statusText + '', {
 					closeButton : true
 				})
 			}
 		})
 	}
 	getData();
 	function getData() {
 		$scope.showLoader = true;
 		CustomersService.getAircraftMake().then(function(result) {
 			//console.log("==aircrafts===",result)
 			$scope.aircraftMakeList = result;
 			$scope.showLoader = false;
 		})
 	}
 	// CustomersService.getMargin().then(function(result) {
 	//   $scope.marginList = result;
 	// })
 	$scope.marginFilterOptions = [];
 	CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
 		$scope.showLoader = true;
 		$scope.jetMarginList = result;
 		//console.log("jet margin",result,$scope.userProfileId)
 		$scope.marginFilterOptions.push({
 			'id' : '',
 			'title' : 'Show All'
 		});
 		for (var i = 0; i < result.length; i++) {
 			$scope.marginFilterOptions.push({
 				'id' : result[i].id,
 				'title' : result[i].marginName
 			})
 		}
 		$scope.showLoader = false;
 	})
 	CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
 		$scope.avgsMarginList = result;
 	// console.log('avgsMarginList',result)
 	})
 	$scope.showCompanyError = false;
 	$scope.showMarginError = false;
 	$scope.removeValidation = function() {
 		$scope.showCompanyError = false;
 		$('.companyNameInput').removeClass('customErrorInput');
 		if ($scope.data.companyName == 'undefined' || $scope.data.companyName == '') {
 			$('.companyNameInput').addClass('customErrorInput');
 			$scope.showCompanyError = true;
 		}
 	}
 	$scope.removeMarginValidation = function() {
 		$scope.showMarginError = false;
 		$('.marginSelectBox').removeClass('customErrorInput');
 	}
 	var companyData;
 	$scope.addFirstData = function(sel, step) {
 		$scope.showLoader = true;
 		if ($scope.data.companyName == undefined) {
 			$scope.showCompanyError = true;
 			$('.companyNameInput').addClass('customErrorInput');
 		} else if ($scope.data.masterMargin == undefined) {
 			$scope.showMarginError = true;
 			$('.marginSelectBox').addClass('customErrorInput');
 		} else {
 			$scope.aircraftDetails = [ {
 				'tail' : '',
 				'make' : '',
 				'model' : '',
 				'sizeId' : '',
 				'marginId' : $scope.data.masterMargin,
 				'avgasMarginId' : $scope.data.avgasMargin
 			} ];
 			$(sel).trigger('next.m.' + step);
 			getData();
 		}
 		$scope.showLoader = false;
 	}
 	$scope.addNew = function() {
 		$scope.showLoader = true;
 		$scope.aircraftDetails.push({
 			'tail' : '',
 			'make' : '',
 			'model' : '',
 			'sizeId' : '',
 			'marginId' : $scope.data.masterMargin,
 			'avgasMarginId' : $scope.data.avgasMargin
 		});
 		$scope.showLoader = false;
 	};
 		$scope.aircraftIdx = '';
         $scope.checkTail = function(tail, idx){
         	var data = "tail=" + tail;
         	$scope.aircraftIdx = idx;
         	CustomersService.checkTailRegistration(data).then(function(result) {
                 if(result.error) {
                 	$scope.aircraftMessage = result.error;
                 	$scope.openAddAirCraftError();
                 } else if(result.warning) {
                 	$scope.aircraftMessage = result.warning;
                 	$scope.openAddAirCraftWarning();
                 }
             })
         }
     $scope.openAddAirCraftError = function() {
     	$('#addAirCraftError').css('display', 'block');
     }
     $scope.openAddAirCraftWarning = function() {
    	 	$('#addAirCraftWarning').css('display', 'block');
     }
 	 $scope.acceptAirCraftError = function() {
     	$('#addAirCraftWarning').css('display', 'none');
     }
     $scope.cancelAirCraftError = function() {
     	$scope.aircraftDetails[$scope.aircraftIdx].tail = '';
     	$('#addAirCraftWarning').css('display', 'none');
     	$('#addAirCraftError').css('display', 'none');
     }
 	/*$scope.getModal = function(makeId, index) {
 		$scope.showLoader = true;
 		CustomersService.getModal($scope.aircraft.make).then(function(result) {
 			$scope.showLoader = false;
 			$scope.aircraftDetails[index].aircraftModalList = result;
 		})
 	}*/
 	 $scope.getModal = function(makeId, index) {
             $scope.showLoader = true;
             $scope.aircraft.make = makeId;
             CustomersService.getModal($scope.aircraft.make).then(function(result) {
                 $scope.showLoader = false;
                 $scope.aircraftDetails[index].aircraftModalList = result;
             })
         }
     	 $scope.selectedOption = '';
 	    $scope.getSize = function(model, index) {
 	        $scope.showLoader = true;
 	        $scope.aircraft.model = model;
 	        CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
 	            $scope.showLoader = false;
 	            $scope.aircraftDetails[index].aircraftSizeList = result;
 	            $scope.getFuelType($scope.aircraftDetails[index].aircraftSizeList[0].aircraftSize.id,index);
 	        })
 	    }
 	/*$scope.getSize = function(model, index) {
 		$scope.showLoader = true;
 		CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
 			$scope.showLoader = false;
 			$scope.aircraftDetails[index].aircraftSizeList = result;
 		})
 	}*/
 	 $scope.getFuelType = function(size, index) {
         	$scope.showLoader = true;
         	var data = "model="+$scope.aircraft.model+"&make="+$scope.aircraft.make+"&sizeId="+size;
         	ViewCompanyService.checkFuelType(data).then(function(result){
               $scope.showLoader = false;
               if (result.type == "JetA") {
                   $scope.jetShow[index] = false;
                   $scope.marginShow[index] = true;
               } else if (result.type == "Avgas")   {
                   $scope.jetShow[index] = true;
                   $scope.marginShow[index] = false;
               }else {
                   $scope.jetShow[index] = true;
                   $scope.marginShow[index] = true;
               }
         	})
         }
 	$scope.aircraftListData = {};
 	$scope.addData = [];
 	 $scope.tailArray = [];
     function check(array){
         return (new Set(array)).size !== array.length;
     }
 	$scope.saveCompanyData = function() {
 	//	console.log("company data --",$scope.data)
 		CustomersService.addCompany($scope.data).then(function(result) {
 			$scope.tailArray = [];
 			$scope.addData =[];
 			$scope.accountId = result;
 			$scope.aircraft.accountId = $scope.accountId;
 			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,
 					'marginId' : $scope.aircraftDetails[i].marginId,
 					'avgasMarginId' : $scope.aircraftDetails[i].avgasMarginId
 				});
 				 $scope.tailArray.push($scope.aircraftDetails[i].tail);
 			}
 			 if (check($scope.tailArray)) {
                     toastr.error('Duplicate Tail Added.', {
                                 closeButton: true
                             })
                 }else{
 					$scope.aircraftListData.aircraftList = $scope.addData;
 					$scope.aircraftListData.accountId = $scope.aircraft.accountId;
 					/*if ($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null) {
 						$scope.aircraftListData.aircraftList = [];
 					}*/
 					CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
 						if (result != null && result.success) {
 							toastr.success('' + result.success + '', {
 								closeButton : true
 							})
 							 $('#demo-modal-3').css('display', 'none');
 		                     $('.modal-backdrop').css('display', 'none');
 							getAllCompanies();
 							location.reload();
 						} else {
 							toastr.error('' + result.statusText + '', {
 								closeButton : true
 							})
 						}
 					});
 				}
 		})
 	}
 	/*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);
 				// var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
 				var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
 				//  str = str.slice(4,16)
 				$scope.orderdata[i].upliftDateString = str
 				// console.log(str);
 			}
 			$scope.displayFuelOrderList = new NgTableParams({
 				page : 1,
 				count : 10,
 			}, {
 				data : $scope.orderdata
 			});
 			$(document).ready(function() {
 				var myselect = document.getElementsByClassName('colorfulSelectbox');
 				for (var i = 0; i < myselect.length; i++) {
 					var colourIndex = $(myselect[i]).prop('selectedIndex');
 					colourIndex = colourIndex + 1;
 					// console.log(colourIndex);
 					var getColor = $('.colorfulSelectbox option:nth-child(' + colourIndex + ')').css('color');
 					$(myselect[i]).css('background-color', getColor);
 					// console.log('colour', getColor);
 					myselect[i].blur();
 				}
 			})
 		})
 	}
 	$scope.getOrders();
 	$scope.tiervalue=function(){
 		$scope.order.tierBreak=$scope.selectedTier.minTierBreak+'-'+$scope.selectedTier.maxTierBreak;
 	}
 	$scope.setCost = function(cost){
 		if(cost != null) {
 			var obj =JSON.parse(cost);
 			$scope.order.fboCost = obj.cost;
 		}
 	}
 	$scope.cancelOrder = function() {
 		$scope.order = {};
 	}
 	$scope.dispatchFuel = function(){
 		    $scope.showLoader = true;
 	        $scope.fuelData = {};
 	        $scope.fuelData.companyId = $scope.selectedCompanyId;
 	        $scope.fuelData.companyName =$scope.order.defaultCompanyName;
 	        var aircraftObj =JSON.parse($scope.order.aircraftName);
 	        $scope.fuelData.aircraftName = aircraftObj.tail;
 	        $scope.fuelData.make = aircraftObj.make;
 	        $scope.fuelData.model = aircraftObj.model;
 	        $scope.fuelData.fuelOn = $scope.order.fuelOn;
 	        $scope.fuelData.invoiced = $scope.order.invoiced;
 	        $scope.fuelData.volume = $scope.order.volume;
-	        $scope.fuelData.source = $scope.order.source;
+	       // $scope.fuelData.source = $scope.order.source;
 	        $scope.fuelData.total = $scope.order.total;
 	        //tier no use
 	        $scope.fuelData.tierBreak = $scope.order.tierBreak;
 	        var obj =JSON.parse($scope.order.priceQuote);
 	        $scope.fuelData.priceQuote = obj.papTotal;
 	        $scope.fuelData.fboCost = obj.cost;
 	        $scope.fuelData.productName = obj.productName;
 	        $scope.fuelData.etaTime = $scope.order.etaTime;
 	        $scope.fuelData.etdTime = $scope.order.etdTime;
 	        $scope.fuelData.certificateType = $scope.order.certificateType;
 	        var currentDate = new Date();
 	        var hours = currentDate.getHours();
 	        var min = currentDate.getMinutes();
 	        var sec = currentDate.getSeconds();
 	        if ($scope.order.upliftDate != '') {
 	                $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
 	          $scope.order.upliftDate = new Date($scope.order.upliftDate);
 	          $scope.fuelData.upliftDate = $scope.order.upliftDate.getTime();
 	        }
 	        if ($scope.order.departingDate != '') {
 	          $scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec;
 	          $scope.order.departingDate = new Date($scope.order.departingDate);
 	          $scope.fuelData.departingDate = $scope.order.departingDate.getTime();
 	        }
 	        if($scope.order.status === null || $scope.order.status === undefined){
 	            $scope.fuelData.status = "pending"; //default status
 	          }else {
 	             $scope.fuelData.status = $scope.order.status;
 	          }
+          	 if($scope.baseTenant && $scope.contractFuelVendor ){
+                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+              }else if($scope.baseTenant)
+              {
+                $scope.fuelData.source = "Tenant/Base Customer";
+              }else if($scope.contractFuelVendor){
+                $scope.fuelData.source = "CAA Member";
+              }
             $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-            // console.log("=====$scope.fueldata======",$scope.fuelData)
+             //console.log("=====$scope.fueldata======",$scope.fuelData)
             fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
                 $scope.showLoader = false;
                 $scope.order = {};
                 $scope.dispatchOrder.fuelOrderList = [];
                 $('#demo-modal-4').css('display', '');
                 $scope.getOrders();
                 toastr.success('Fuel Order Dispatched Successfully', {
                         closeButton: true
                       })
           })
 	}
 	$scope.addTotal = function(value, valueOf) {
 		if (value != undefined && valueOf != undefined) {
 			value = JSON.parse(value)
 			$scope.order.total = value.cost * valueOf;
 		}
 	}
 	$scope.getAircraft = function(company) {
 		$scope.selectedCompanyName = company;
 		//$scope.showLoader = true;
 		//  console.log("id",company)
 		for (var i = 0; i < $scope.companyList.length; i++) {
 			if ($scope.companyList[i].companyName == company) {
 				if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null) {
 					fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
 					//console.log('$scope.marginList', $scope.marginList);
 					})
 				} else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) {
 					fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
 					})
 				} else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) {
 					fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
 					})
 				}
 				$scope.selectedCompanyId = $scope.companyList[i].id;
 				$scope.marginId = $scope.companyList[i].margin.id;
 				if ($scope.selectedCompanyId != '') {
 					fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
 						$scope.aircraftList = aircraft;
 						//console.log("===tail search====",aircraft);
 					})
 				}
 				if ($scope.marginId != '') {
 					fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {
 						$scope.tierList = tiers;
 					//              $scope.showLoader = false;
 					})
 				} else {
 					//  $scope.showLoader = false;
 				}
 			}
 		}
 	}
 	$scope.sourceList = [ {
 		source : "Direct Jet-A"
 	}, {
 		source : "Direct AVGAS 100LL"
 	} ];
 	$scope.cancelData = function() {
 		$scope.order = {};
 		$('#demo-modal-4').css('display', '');
 	}
-	$scope.setFuel = function(companyName,certificateType) {
+	$scope.setFuel = function(companyName,baseTenant,contractFuelVendor,fuelerlinxCustomer,certificateType) {
 		$('#demo-modal-4').css('display', 'block');
 		$scope.order.defaultCompanyName = companyName;
 		$scope.order.certificateType = certificateType;
+		$scope.baseTenant = baseTenant;
+		$scope.contractFuelVendor = contractFuelVendor;
+		$scope.fuelerlinxCustomer = fuelerlinxCustomer;
+		//console.log("===values of checkbox===",baseTenant,contractFuelVendor,fuelerlinxCustomer)
 		$scope.getAircraft(companyName);
 	//  event.stopPropagation();
 	//  $state.go('app.updateFuelManager');
 	}
 	/*  ng table  */
 	$scope.exportCompany = function() {
 		$scope.showLoader = true;
 		var fileName = "companies.csv";
 		var a = document.createElement("a");
 		document.body.appendChild(a);
 		CustomersService.exportCompany().then(function(result) {
 			var file = new Blob([ result ], {
 				type : 'application/csv'
 			});
 			var fileURL = URL.createObjectURL(file);
 			a.href = fileURL;
 			a.download = fileName;
 			a.click();
 			$scope.showLoader = false;
 		})
 	}
 	getCompanyName();
 	function getCompanyName() {
 		CustomersService.getCompanyName().then(function(result) {
 			$scope.compNameList = result;
 		//console.log("kd",result)
 		})
 	}
 	// old api not use
 	/*$scope.checkJetWithTail = function(tail, index) {
 		ViewCompanyService.checkJetType(tail).then(function(result) {
 			if (result.jetA == "true") {
 				$scope.jetShow[index] = false;
 				$scope.marginShow[index] = true;
 			} else {
 				$scope.jetShow[index] = true;
 				$scope.marginShow[index] = false;
 			}
 		})
 	}*/
  $scope.etaTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
   $scope.etdTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
 }

app/partials/customers/customers.html

Diff comments View file @0173d74

 <style>
    .subnavbar .mainnav > li:nth-child(2) > a{
    color: #ca5c6a;
    }
    .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="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-md-12">
             <div class="widget stacked ">
                <div class="widget-content">
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li class="active">
                            <a ui-sref="app.customers">Customer View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.ContactView">Contact View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.FuelVendors">Fuel Vendors
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" ng-model="searchText" placeholder="Search In Table"></li>
                         <li><button type="button" class="btn btn-default btn-sm" ng-click="displayCompanyList.filter({}); searchText=null">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 Company</button></li>
                      </ul>
                      <br>
                      <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
                           <table ng-table="displayCompanyList" class="table table-striped table-condensed" show-filter="true">
                            <tr style="text-align: center;" ng-repeat="row in $data | filter:searchText:strict"" style="cursor: pointer;">
                              <td style="text-align: left;" data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.companyName}}
                              </td>
                              <td data-title="'Fleet'" filter="{companyAircraftSize: 'text'}" sortable="'companyAircraftSize'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.companyAircraftSize}}
                              </td>
                              <td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.newContactNumber}}
                              </td>
                              <td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.primaryContactName}}
                              </td>
                              <td data-title="'Base'" filter="{baseIcao: 'text'}" sortable="'baseIcao'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.baseIcao}}
                              </td>
                              <td data-title="'Status'" filter="{activate: 'select'}" filter-data="statusFilter" sortable="'activate'" ui-sref="app.viewCompany({id : row.id})">
                               <button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>
                               <button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>
                              </td>
                              <td style="width: 130px;" class="margin-media"  data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
                               <select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select>
                              </td>
                              <td data-title="'All In'" filter="{marginAllIn: 'text'}" sortable="'marginAllIn'" ui-sref="app.viewCompany({id : row.id})">
                               {{row.marginAllIn | number : 4}}
                              </td>
                              <td data-title="''">
-                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.certificateType)">Setup Fuel</button>
+                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.baseTenant,row.contractFuelVendor,row.fuelerlinxCustomer,row.certificateType)">Setup Fuel</button>
                              </td>
                            </tr>
                          </table>
                          <button type="button" ng-click="exportCompany()" class="btn btn-warning exportBtn">Export CSV</button>
                         </div>
                      </div>
                   </div>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->
          </div>
          <!-- /span8 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
 <form class="modal multi-step" id="demo-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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</h3>
                               <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
                                  <div style="color: #ff9a01;">Activate &nbsp &nbsp
                                     <toggle ng-model="data.activate" size="customToogle"></toggle>
                                  </div>
                               </div>
                               <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-8">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Company Name *</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="text" ng-keyup="removeValidation()" ng-model="data.companyName" uib-typeahead="company.companyName for company in compNameList | filter:$viewValue | limitTo:8" class="form-control companyNameInput">
                                        <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-4">
                                     <div class="pull-right">
                                        <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control"  placeholder="">
                                     </div>
                                     <div class="pull-right">
                                        <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-7">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Relationship&nbsp;</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 32px;">
                                        <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
                                        <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
                                        <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-2 Airport" style="text-align: right;">
                                     <b>Certificate Type</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select required class="form-control" ng-model="data.certificateType">
                                        <option value="" disabled selected hidden>Select...</option>
                                        <option value="corporate">Part 91 (Corporate)</option>
                                        <option value="charter">Part 135 (Charter)</option>
                                        <option value="scheduled">Part 121 (Scheduled)</option>
                                        <option value="military">Military</option>
                                        <option value="government">Government</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <b>JET A Margin *</b>
                                     </div>
                                     <div class="pull-left">
                                       <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
                                        <option value="" disabled>Select...</option>
                                       </select>
                                       <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
                                       <div class="clearfix"></div>
                                     </div>
                                   </div>
                                  <div class="col-md-3 Airport" style="text-align: right;">
                                     <b>AVGAS 100LL Margin</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
                                     <option value="" disabled>Select...</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></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-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" ng-model="data.addressOne"  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>Address2</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.addressTwo" class="form-control"  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>City</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.city" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left" style="width: 40px;">
                                        <label class="new-input-label"><b>State</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.state" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Zip Code</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 60px);">
                                        <input type="tel" ng-model="data.zipcode" class="form-control"  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>Country</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.country" 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>Internal Note</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <textarea  name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                              <!--  <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-2 Airport"></div>
                                  <div class="col-md-10 Airport">
                                     <div class="pull-right">
                                        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
                                        <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
                                     </div>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</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; ">
                                     <div class="table-responsive">
                                      <!--  <table class="table table-striped table-bordered">
                                         <thead>
                                             <tr>
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                                 <th>JET A Margin</th>
                                                 <th>AVGS 100LL Margin</th>
                                             </tr>
                                         </thead>
                                         <tbody>
                                             <tr ng-repeat="aircraftData in aircraftDetails track by $index">
                                                 <td style="width: 15%">
                                                     <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
                                                       <option ng-repeat="make in aircraftMakeList | orderBy ">{{make}}</option>
                                                       <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                         <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
                                                         <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.sizeId">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
                                                   </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                                   </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</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> -->
                                <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>
                                                 <th>JET A Margin</th>
                                                 <th>AVGS 100LL Margin</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: 15%">
                                                    <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
                                                 </td> -->
                                                 <td style="width: 15%">
                                                    <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                    <select class="form-control" style="width: fit-content;" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                    <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.size" ng-change="getFuelType(aircraftData.size, $index)">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}" ng-selected="aircraftData.size = aircraftData.aircraftSizeList[0].aircraftSize.id">{{size.aircraftSize.size}}</option>
                                                   </select>
                                                   <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select> -->
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                                   </select>
                                                   <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList" ng-disabled="jetShow[$index]">
                                                     <option value="" disabled>Select...</option>
                                                   </select> -->
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
                                                   </select>
                                                  <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList" ng-disabled="marginShow[$index]">
                                                     <option value="" disabled>Select...</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-body step-3" data-step="3">
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" ng-click="reset2()" 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-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <div class="customConfirmPopBackdrop" id="addAirCraftError">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</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="cancelAirCraftError()">ok</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="addAirCraftWarning">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</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="acceptAirCraftError()">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
       </div>
    </div>
 </div>
 <!-- SetUp fuel order -->
 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
    <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;">
                         <div class="widget-header">
                            <i class="icon-pencil"></i>
                            <i class="fa fa-tasks" aria-hidden="true"></i>
                            <h3>Add a Fuel Order</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-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Company</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <!--  <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
                                         <option value="" selected disabled>Select Company</option>
                                         <option ng-repeat="list in companyList">{{list.companyName}}</option>
                                       </select> -->
                                       <input type="text"  disabled ng-model="order.defaultCompanyName" class="form-control"/>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Product</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote); addTotal(order.priceQuote, order.volume)" required>
                                       <option value="" selected disabled>Select Product</option>
                                       <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
                                     </select>
                                     </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>Aircraft</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <select class="form-control" ng-model="order.aircraftName" required>
                                         <option selected disabled value="">Select Aircraft</option>
                                         <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
                                       </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Volume</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control"  placeholder="" required>
                                     </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" style="margin-top: 25px;"><b>ETA</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control"  placeholder="" datepicker required/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etaTime" style="width: 100%;" required>
                                              <option ng-repeat="li in etaTimeList">{{li.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Invoiced</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text"  ng-model="order.invoiced"  class="form-control"  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" style="margin-top: 25px;"><b>ETD</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Total</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
                                     </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>Fuel on</b></label>
                                     </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="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                   <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>FBO Cost</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text"  disabled ng-model="order.fboCost | number : 4" class="form-control"  placeholder="0.0000" />
                                     </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>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </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>Certificate Type</b></label>
                                     </div>
                                      <div class="pull-left" style="width: calc(100% - 110px);">
                                           <select class="form-control" disabled ng-model="order.certificateType"  style="width: 100%;">
                                            <option value="" disabled selected hidden>Select...</option>
                                            <option value="corporate">Part 91 (Corporate)</option>
                                            <option value="charter">Part 135 (Charter)</option>
                                            <option value="scheduled">Part 121 (Scheduled)</option>
                                            <option value="military">Military</option>
                                            <option value="government">Government</option>
                                         </select>
                                      </div>
                                   <div class="clearfix"></div>
                                   </div>
                                    <div class="col-md-6">
                                       <div class="pull-left" style="width: 110px;">
                                          <label class="new-input-label"><b>Status</b></label>
                                       </div>
                                       <div class="pull-left" style="width: calc(100% - 110px);">
                                          <select  class="form-control" ng-model="order.status"  style="width: 100%;">
                                             <option value=""  disabled selected hidden>pending</option>
                                             <option value="pending">pending</option>
                                             <option value="invoiced">invoiced</option>
                                             <option value="paid">paid</option>
                                            <!--  <option value="cancelled">cancelled</option>
                                             <option value="archived">archived</option> -->
                                          </select>
                                       </div>
                                       <div class="clearfix"></div>
                                 </div>
                           </div>
                           <div class="clearfix"></div><br>
                            </div>
                         </div>
                      </div>
                   </div>
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
                <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="fuelOrderForm.$invalid" ng-click="dispatchFuel()">Save</button>
             </div>
          </div>
       </div>
    </div>
 </form>
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <script src="js/multi-step-modal.js"></script>
 <script>
 sendEvent = function(sel, step) {
     $(sel).trigger('next.m.' + step);
 }

app/partials/enterFuelOrder/enterFuelOrder.controller.js

Diff comments View file @0173d74

 'use strict';
 angular.module('acufuel')
 .controller('enterFuelOrderController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'enterFuelOrderService', enterFuelOrderController]);
 function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, enterFuelOrderService) {
 	$scope.showLoader = true;
 	$scope.companyList = {};
 	enterFuelOrderService.getAllCompanies().then(function(result) {
 		$scope.showLoader = false;
 		$scope.companyList = result;
+		//console.log("===company====",result)
 	})
 	$scope.order = {};
 	$scope.dispatchOrder = {};
 	$scope.dispatchOrder.fuelOrderList = [];
 	$scope.order.upliftDate = '';
 	//$scope.order.departingDate = '';
 	$scope.selectedCompanyName = '';
 	$scope.selectedCompanyId = '';
 	$scope.marginId = '';
 	$scope.selectedTier = '';
 	$scope.getAircraft = function(company){
 		$scope.selectedCompanyName = company;
 		$scope.showLoader = true;
 		for (var i = 0; i < $scope.companyList.length; i++) {
 			if ($scope.companyList[i].companyName == company) {
+					$scope.order.certificateType = $scope.companyList[i].certificateType;
+					$scope.baseTenant = $scope.companyList[i].baseTenant;
+					$scope.contractFuelVendor = $scope.companyList[i].contractFuelVendor;
+					$scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
 				if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
 					enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
 					})
 				} else if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS == null) {
 					enterFuelOrderService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
 			        })
 				} else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS != null) {
 					enterFuelOrderService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
 			        	$scope.marginList = margins;
 			        })
 				} else if ($scope.companyList[i].margin == null && $scope.companyList[i].marginAVGAS == null) {
 					enterFuelOrderService.getPapFuelPricing($scope.companyList[i].id).then(function(margins) {
 			        	$scope.marginList = margins;
 			        })
 				}
 				$scope.selectedCompanyId = $scope.companyList[i].id;
 				if ($scope.selectedCompanyId != '') {
 					enterFuelOrderService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
 						$scope.aircraftList = aircraft;
 					})
 				}
 				if($scope.companyList[i].margin == null) {
 					$scope.tierList = [];
 					$scope.tierList.push({
 	        		  	'minTierBreak': '0', 'maxTierBreak': '∞'
 					});
 					$scope.showLoader = false;
 				} else {
 					$scope.marginId = $scope.companyList[i].margin.id;
 					if ($scope.marginId != '') {
 						enterFuelOrderService.getJetTiers($scope.marginId).then(function(tiers) {
 			                $scope.tierList = tiers;
 			                $scope.showLoader = false;
 			                $scope.selectedTier = $scope.tierList[0];
 			            })
 					}else{
 						$scope.showLoader = false;
 					}
 				}
 			}
 		}
 	}
 	$scope.tiervalue=function(){
 		$scope.order.tierBreak=$scope.selectedTier.minTierBreak+'-'+$scope.selectedTier.maxTierBreak;
 	}
 	$scope.cancelOrder = function() {
 		$scope.order = {};
 	}
 	$scope.setCost = function(cost){
 		if(cost != null) {
 			var obj =JSON.parse(cost);
 			$scope.order.fboCost = obj.cost;
 		}
 	}
     /*$scope.addTotal = function(value, valueOf){
       if(valueOf == 'v'){
         $scope.order.total = value * $scope.order.invoiced
       }else if(valueOf == 'i'){
         $scope.order.total = $scope.order.volume * value
       }
     }       */
     $scope.addTotal = function(value, valueOf) {
 		if (value != undefined && valueOf != undefined) {
 			value = JSON.parse(value)
 			$scope.order.total = value.cost * valueOf;
 		}
 	}
 	$scope.dispatchFuel = function(){
 		$scope.showLoader = true;
 		$scope.order.companyId = $scope.selectedCompanyId;
 		$scope.order.companyName = $scope.order.companyName;
 		var aircraftObj =JSON.parse($scope.order.aircraftName);
 		$scope.order.aircraftName = aircraftObj.tail;
 		$scope.order.make = aircraftObj.make;
 		$scope.order.model = aircraftObj.model;
 		$scope.order.fuelOn = $scope.order.fuelOn;
 		$scope.order.invoiced = $scope.order.invoiced;
 		$scope.order.volume = $scope.order.volume;
-        $scope.order.source = $scope.order.source;
+       // $scope.order.source = $scope.order.source;
         $scope.order.total = $scope.order.total;
         var obj =JSON.parse($scope.order.priceQuote);
 		$scope.order.priceQuote = obj.papTotal;
 		$scope.order.fboCost = obj.cost;
 		$scope.order.productName = obj.productName;
 		$scope.order.etaTime = $scope.order.etaTime;
         $scope.order.etdTime = $scope.order.etdTime;
         $scope.order.certificateType = $scope.order.certificateType;
 		var currentDate = new Date();
         var hours = currentDate.getHours();
         var min = currentDate.getMinutes();
         var sec = currentDate.getSeconds();
         if ($scope.order.upliftDate != '') {
                 $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
     			$scope.order.upliftDate = new Date($scope.order.upliftDate);
     			$scope.order.upliftDate = $scope.order.upliftDate.getTime();
     		}
 		if ($scope.order.departingDate != '') {
 			$scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec;
 			$scope.order.departingDate = new Date($scope.order.departingDate);
 			$scope.order.departingDate = $scope.order.departingDate.getTime();
 		}
 		if($scope.order.status === null || $scope.order.status === undefined){
 			$scope.order.status = "pending"; //default status
 		}else {
 			$scope.order.status = $scope.order.status;
 		}
+		if($scope.baseTenant && $scope.contractFuelVendor ){
+			$scope.order.source = "Tenant/Base Customer CAA Member" ;
+		}else if($scope.baseTenant)
+		{
+			$scope.order.source = "Tenant/Base Customer";
+		}else if($scope.contractFuelVendor){
+			$scope.order.source = "CAA Member";
+		}
 		//console.log("===order====",$scope.order);
 		$scope.dispatchOrder.fuelOrderList.push($scope.order);
 		enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
 			$scope.showLoader = false;
 			$scope.order = {};
 			toastr.success('Fuel Order Created Successfully', {
               closeButton: true
             })
 		})
 	}
 	$scope.etaTimeList=[];
     $scope.etdTimeList =[];
 	$scope.etaTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
     $scope.etdTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
 }

app/partials/enterFuelOrder/enterFuelOrder.html

Diff comments View file @0173d74

 <style type="text/css">
 	.subnavbar .mainnav > li:nth-child(4) > a{
 		color: #c44646;
 	}
 	.customInputWrap{
 		margin-top: 15px;
 	}
 	.customInputWrap label{
 		font-weight: normal;
 		margin-bottom: 0;
 	}
 </style>
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="container">
 	<div class="row">
 		<div class="col-xs-8">
 			<div class="widget stacked">
 				<div class="widget-header">
 					<i class="fa fa-tasks" aria-hidden="true"></i>
 					<h3>Create Fuel Order</h3>
 				</div>
 				<div class="widget-content new-widget-content">
 					<form name="orderform" novalidate>
 						<div class="customInputWrap">
 						 <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Company</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
                       									<option value="" selected disabled>Select Company</option>
                       									<option ng-repeat="list in companyList">{{list.companyName}}</option>
                       								</select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Product</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote); addTotal(order.priceQuote, order.volume)" required>
                     									<option value="" selected disabled>Select Product</option>
                     									<option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
                     								</select>
                                     </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>Aircraft</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <select class="form-control" ng-model="order.aircraftName" required>
                       									<option selected disabled value="">Select Aircraft</option>
                       									<option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
                       								</select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Volume</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control"  placeholder="" required>
                                     </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" style="margin-top: 25px;"><b>ETA</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control"  placeholder="" datepicker required/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etaTime" style="width: 100%;" required>
                                              <option ng-repeat="li in etaTimeList">{{li.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Invoiced</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="order.invoiced" class="form-control"  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" style="margin-top: 25px;"><b>ETD</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Total</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
                                     </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>Fuel on</b></label>
                                     </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="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                	  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>FBO Cost</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text"  disabled ng-model="order.fboCost" class="form-control"  placeholder="0.0000" valid-number />
                                     </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>Source</b></label>
 	                                    </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </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>Certificate Type</b></label>
                                     </div>
 		                                 <div class="pull-left" style="width: calc(100% - 110px);">
-		                                      <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
+		                                      <select class="form-control" disabled ng-model="order.certificateType"  style="width: 100%;">
 		                                       <option value="" disabled selected hidden>Select...</option>
 		                                       <option value="corporate">Part 91 (Corporate)</option>
 		                                       <option value="charter">Part 135 (Charter)</option>
 		                                       <option value="scheduled">Part 121 (Scheduled)</option>
 		                                       <option value="military">Military</option>
 		                                       <option value="government">Government</option>
 		                                    </select>
 		                                 </div>
                                		<div class="clearfix"></div>
                                		</div>
                                		 <div class="col-md-6">
 	                                    <div class="pull-left" style="width: 110px;">
 	                                       <label class="new-input-label"><b>Status</b></label>
 	                                    </div>
 	                                    <div class="pull-left" style="width: calc(100% - 110px);">
 	                                       <select  class="form-control" ng-model="order.status"  style="width: 100%;">
  	                                          <option value="" selected disabled hidden>pending</option>
 	                                          <option value="pending">pending</option>
                                             <option value="invoiced">invoiced</option>
                                             <option value="paid">paid</option>
 	                                         <!--  <option value="cancelled">cancelled</option>
 	                                          <option value="archived">archived</option> -->
 	                                       </select>
 	                                    </div>
 	                                    <div class="clearfix"></div>
 	                              </div>
 	                        </div>
 	                        <div class="clearfix"></div><br>
 						<div class="customInputWrap text-right">
 							<div class="col-xs-12">
 								<input type="cancel" value="Cancel" ng-click="cancelOrder()" class="btn btn-default" style="margin-right: 15px; width: 100px;">
 								<input type="submit" value="save" ng-click="dispatchFuel()" class="btn btn-primary" ng-disabled="orderform.$invalid">
 							</div>
 							<div class="clearfix"></div>
 						</div>
 					</form>
 				</div>
 			</div>
 		</div>
 	</div>
 </div>

app/partials/fuelOrders/fuelOrders.controller.js

Diff comments View file @0173d74

 'use strict';
 angular.module('acufuel')
 .controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]);
 function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService,CustomersService,ViewCompanyService) {
       $scope.showFuelOrderModal = false;
       $scope.optionSelected;
       $scope.orderdata = {};
       $scope.showLoader = false;
       $scope.jetShow = [];
       $scope.marginShow = [];
       $scope.jetShow[0] = true;
       $scope.marginShow[0] = true;
       $scope.data = {};
       $scope.order = {};
       $scope.dispatchOrder = {};
       $scope.dispatchOrder.fuelOrderList = [];
       $scope.statusFilterOptions = [];
       $scope.statusFilterOptions.push({
         'id': '', 'title': 'Show All'
       },{
         'id': 'pending', 'title': 'Pending'
       },{
         'id': 'invoiced', 'title': 'Invoiced'
       },{
         'id': 'paid', 'title': 'Paid'
       },{
         'id': 'cancelled', 'title': 'Cancelled'
       },{
         'id': 'archived', 'title': 'Archived'
       }
       );
       getAllCompanies();
     function getAllCompanies(){
       fuelOrdersService.getAllCompanies().then(function(result) {
         $scope.companyList = 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) {
               $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber;
             }
           }
           if ($scope.companyList[i].primaryContact != null) {
             if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) {
               $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName;
             }
           }
           if ($scope.companyList[i].margin != null) {
             if ($scope.companyList[i].margin.marginName != null) {
               $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
             }
           }
         }
         $scope.displayCompanyList = new NgTableParams({
             page: 1,
             count: 10,
           }, {
             data: $scope.companyList
           });
         $scope.showLoader = false;
       })
     }
     $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
     $scope.reset2 = function(){
       $("input").val("");
       $scope.removeMarginValidation();
     }
     function colourFunction() {
       var myselect = document.getElementById('colorfulSelectbox'),
       colour = myselect.options[myselect.selectedIndex].className;
       myselect.style.background = colour;
       myselect.blur();
     }
     /*setInterval(function(){
       colourFunction();
     }, 1)*/
       $scope.attachmentFilterOptions = [];
     $scope.attachmentFilterOptions.push({
         'id': '', 'title': 'Show All'
       },{
         'id': '!null', 'title': 'Attachments'
       },{
         'id': 'null', 'title': 'No Attachments'
       }
      );
       //  $(document).ready(function() {
       //     $scope.showLoader = true;
       //       $('#example').DataTable();
       //       $scope.showLoader = false;
       //   });
      $scope.getOrders = function() {
           fuelOrdersService.getOrders().then(function(result) {
             $scope.orderdata = result;
             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);
                 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();
                 $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.displayFuelOrderList = new NgTableParams({
               page: 1,
               count: 10,
             }, {
               data: $scope.orderdata
             });
             $(document).ready(function(){
             	function changeSelectboxBg(){
                 setInterval(function(){
                   if ($('.table select').is(':focus')) {
                   }else{
             		    var myselect = document.getElementsByClassName('colorfulSelectbox');
                     for (var i = 0; i < myselect.length; i++) {
                       var colourIndex = $(myselect[i]).prop('selectedIndex');
                       colourIndex = colourIndex + 1;
                       var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
                       $(myselect[i]).css('background-color', getColor);
                       myselect[i].blur();
                     }
                   }
                 }, 1000)
             	}
             	changeSelectboxBg();
               /*$('.pagination , .recordCountSelect').click(function(){
             	  changeSelectboxBg();
               })
               $('.input-filter').keydown(function(){
                 console.log('function..........');
                 changeSelectboxBg();
               })*/
             })
           })
      }
      $scope.getOrders();
      $scope.optionSelected='';
      $scope.onFWSelect = function() {
                         if($scope.optionSelected == 'dt'){
                           $('#demo-modal-4').css('display', 'block');
                            $scope.optionSelected='';
                       }
                       if($scope.optionSelected == 'efo'){
                           $scope.showLoader = true;
                             var fileName = "orders.csv";
                             var a = document.createElement("a");
                             document.body.appendChild(a);
                             fuelOrdersService.exportCompany().then(function(result) {
                                   var file = new Blob([result], {type: 'application/csv'});
                                   var fileURL = URL.createObjectURL(file);
                                   a.href = fileURL;
                                   a.download = fileName;
                                   a.click();
                                   $scope.showLoader = false;
                                   $scope.optionSelected='';
                             })
                         }
                     }
      $scope.attachmentrowid = ""
      $scope.attachment = function(id, value, url) {
         $scope.attachmentrowid = id
         if(value == 'uploadAttachment'){
         $('#demo-modal-6').css('display', 'block');
         }else if(value == 'viewAttachment'){
         var win = window.open(url, '_blank');
         win.focus();
         }else if(value == 'deleteAttachment'){
         $('#delete1').css('display', 'block');
         }
     }
     $scope.cancelDeleteAttachment = function() {
           $('#delete1').css('display', '');
     }
     $scope.deleteAttachment = function() {
       $scope.showLoader = true;
       fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {
               if(result.success){
               toastr.success(''+result.success+'', {
                         closeButton: true
                     })
               }
           })
           $scope.showLoader = false;
           $('#delete1').css('display', '');
     }
    $scope.saveUploadAttachment = function(attachmentData) {
      $scope.showLoader = true;
       $scope.data.media = attachmentData
       $scope.data.id = $scope.attachmentrowid
     fuelOrdersService.uploadAttachment($scope.data).then(function(result) {
             if(result){
                   toastr.success(''+"Upload Successful"+'', {
                             closeButton: true
                         })
                   }
             })
               $scope.showLoader = false;
               $('#demo-modal-6').css('display', 'none');
         }
     $scope.cancelUploadAttachment = function() {
           $('#demo-modal-6').css('display', 'none');
     }
     $scope.editdata = {};
     $scope.editTableRow = function(rowData){
      //console.log('row data', rowData);
       $scope.editdata = rowData;
       $('#demo-modal-5').css('display', 'block');
     }
     $scope.updateTotal = function(value, valueOf){
       if(valueOf == 'v'){
         $scope.editdata.total = value * $scope.editdata.invoiced
       }else if(valueOf == 'i'){
         $scope.editdata.total = $scope.editdata.requestedVolume * value
       }
     }
     $scope.setCost = function(cost){
         if(cost != null) {
           var obj =JSON.parse(cost);
           $scope.order.fboCost = obj.cost;
         }
       }
     $scope.addTotal = function(value, valueOf) {
     if (value != undefined && valueOf != undefined) {
       value = JSON.parse(value)
       $scope.order.total = value.cost * valueOf;
     }
   }
    $scope.addFuelData = function() {
-            $scope.showLoader = true;
+          //  $scope.showLoader = true;
             $scope.fuelData = {};
             $scope.fuelData.companyId = $scope.selectedCompanyId;
             $scope.fuelData.companyName = $scope.order.companyName;
             var aircraftObj =JSON.parse($scope.order.aircraftName);
             $scope.fuelData.aircraftName = aircraftObj.tail;
             $scope.fuelData.make = aircraftObj.make;
             $scope.fuelData.model = aircraftObj.model;
             $scope.fuelData.fuelOn = $scope.order.fuelOn;
             $scope.fuelData.invoiced = $scope.order.invoiced;
             $scope.fuelData.volume = $scope.order.volume;
-            $scope.fuelData.source = $scope.order.source;
+           // $scope.fuelData.source = $scope.order.source;
             $scope.fuelData.total = $scope.order.total;
             //tier no use
             $scope.fuelData.tierBreak = $scope.order.tierBreak;
             var obj =JSON.parse($scope.order.priceQuote);
             $scope.fuelData.priceQuote = obj.papTotal;
             $scope.fuelData.fboCost = obj.cost;
             $scope.fuelData.productName = obj.productName;
             $scope.fuelData.etaTime = $scope.order.etaTime;
             $scope.fuelData.etdTime = $scope.order.etdTime;
             $scope.fuelData.certificateType = $scope.order.certificateType;
             var currentDate = new Date();
             var hours = currentDate.getHours();
             var min = currentDate.getMinutes();
             var sec = currentDate.getSeconds();
             if ($scope.order.upliftDate != '') {
                     $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
               $scope.order.upliftDate = new Date($scope.order.upliftDate);
               $scope.fuelData.upliftDate = $scope.order.upliftDate.getTime();
             }
             if ($scope.order.departingDate != '') {
               $scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec;
               $scope.order.departingDate = new Date($scope.order.departingDate);
               $scope.fuelData.departingDate = $scope.order.departingDate.getTime();
             }
             if($scope.order.status === null || $scope.order.status === undefined){
                 $scope.fuelData.status = "pending"; //default status
               }else {
                  $scope.fuelData.status = $scope.order.status;
               }
+            if($scope.baseTenant && $scope.contractFuelVendor ){
+                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+              }else if($scope.baseTenant)
+              {
+                $scope.fuelData.source = "Tenant/Base Customer";
+              }else if($scope.contractFuelVendor){
+                $scope.fuelData.source = "CAA Member";
+              }
             $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-           // console.log("=====$scope.fueldata======",$scope.fuelData)
+          //  console.log("=====$scope.fueldata======",$scope.fuelData)
             fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
                 $scope.showLoader = false;
                 $scope.order = {};
                 $scope.dispatchOrder.fuelOrderList = [];
                 $('#demo-modal-4').css('display', '');
                 $scope.getOrders();
                 toastr.success('Fuel Order Dispatched Successfully', {
                         closeButton: true
                       })
           })
     }
     $scope.updateStatus = function(row, status) {
         $scope.showLoader = true;
         $scope.fuelData = {};
         $scope.fuelData.aircraftName = row.aircraftName
         $scope.fuelData.companyName = row.companyName
         $scope.fuelData.departingDate = row.departingDate
         $scope.fuelData.fboCost = row.fboCost
         $scope.fuelData.id = row.id
         $scope.fuelData.invoiced = row.invoiced
         $scope.fuelData.priceQuote = row.priceQuote
         $scope.fuelData.volume = row.requestedVolume
         $scope.fuelData.source = row.source
         $scope.fuelData.status = status
         $scope.fuelData.tierBreak = row.tierBreak
         $scope.fuelData.total = row.total
         $scope.fuelData.upliftDate = row.upliftDate
       $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
       fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
         $scope.showLoader = false;
         $scope.editdata = {};
         $scope.fuelData = {};
         $scope.dispatchOrder.fuelOrderList = [];
         $('#demo-modal-5').css('display', '');
         $scope.getOrders();
         toastr.success('Fuel Order Updated Successfully', {
           closeButton: true
         });
     })
   }
       $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;
                         $scope.fuelData.fboCost = $scope.editdata.fboCost;
                         $scope.fuelData.id = $scope.editdata.id;
                         $scope.fuelData.invoiced = $scope.editdata.invoiced;
                         $scope.fuelData.priceQuote = $scope.editdata.priceQuote;
                         $scope.fuelData.volume = $scope.editdata.requestedVolume;
                         $scope.fuelData.source = $scope.editdata.source;
                         $scope.fuelData.status = $scope.editdata.status;
                         $scope.fuelData.tierBreak = $scope.editdata.tierBreak;
                         $scope.fuelData.total = $scope.editdata.total;
                         $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
                         $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
                         $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString);
                         $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime();
                         $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
                         $scope.fuelData.departingDate = $scope.editdata.departingDateString;
                         $scope.fuelData.productName = $scope.editdata.productName;
                         /*$scope.fuelData.etaTime = $scope.editdata.etaTime.toLocaleTimeString();
                         $scope.fuelData.etdTime = $scope.editdata.etdTime.toLocaleTimeString();*/
                         $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.dispatchOrder.fuelOrderList.push($scope.fuelData);
                         // console.log("====fueldata===",$scope.dispatchOrder);
                       fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
                        // console.log('result', result);
                         $scope.showLoader = false;
                         $scope.editdata = {};
                         $('#demo-modal-5').css('display', '');
                         $scope.getOrders();
                         toastr.success('Fuel Order Updated Successfully', {
                                 closeButton: true
                               })
                       })
                 } else{
                         {
                               toastr.error('Please select fuelOn.', {
                               closeButton: true
                             })
                         }
                 }
           }else
             {
               toastr.error('Please select Arrival Time and Departure time both.', {
                       closeButton: true
                     })
             }
         }
     $scope.getAircraft = function(company){
       $scope.selectedCompanyName = company;
       //$scope.showLoader = true;
       for (var i = 0; i < $scope.companyList.length; i++) {
         if ($scope.companyList[i].companyName == company) {
+            $scope.order.certificateType = $scope.companyList[i].certificateType;
+            $scope.baseTenant = $scope.companyList[i].baseTenant;
+            $scope.contractFuelVendor = $scope.companyList[i].contractFuelVendor;
+            $scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
           if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
             fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
               $scope.marginList = margins;
             })
           } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) {
             fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
               $scope.marginList = margins;
                 })
           } else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) {
             fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
                   $scope.marginList = margins;
                 })
           }
           $scope.selectedCompanyId = $scope.companyList[i].id;
           $scope.marginId = $scope.companyList[i].margin.id;
           if ($scope.selectedCompanyId != '') {
             fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
               $scope.aircraftList = aircraft;
             })
           }
           if ($scope.marginId != '') {
             fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {
                       $scope.tierList = tiers;
         //              $scope.showLoader = false;
                   })
           }else{
           //  $scope.showLoader = false;
           }
         }
       }
     }
       $scope.cancelData = function() {
             $('#demo-modal-4').css('display', '');
       }
       $scope.canceleditdata = function() {
           $('#demo-modal-5').css('display', '');
     }
       $scope.companyList = {};
               fuelOrdersService.getAllCompanies().then(function(result) {
               $scope.showLoader = true;
               $scope.companyList = result;
               $scope.showLoader = false;
             })
   /*Add a company services API used from customersService */
      getCompanyName();
     function getCompanyName(){
             CustomersService.getCompanyName().then(function(result) {
             $scope.showLoader = true;
             $scope.compNameList = result;
             $scope.showLoader = false;
           })
         }
      $scope.marginFilterOptions = [];
       CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
         $scope.showLoader = true;
         $scope.jetMarginList = result;
         $scope.marginFilterOptions.push({
           'id': '', 'title': 'Show All'
         });
         for (var i = 0; i < result.length; i++) {
           $scope.marginFilterOptions.push({
             'id': result[i].id,
             'title': result[i].marginName
           })
         }
           $scope.showLoader = false;
       })
       CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
         $scope.avgsMarginList = result;
       })
       $scope.showCompanyError = false;
       $scope.showMarginError = false;
       $scope.removeValidation = function(){
         $scope.showCompanyError = false;
           $('.companyNameInput').removeClass('customErrorInput');
           if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') {
             $('.companyNameInput').addClass('customErrorInput');
             $scope.showCompanyError = true;
           }
       }
       $scope.removeMarginValidation = function(){
         $scope.showMarginError = false;
           $('.marginSelectBox').removeClass('customErrorInput');
       }
       getData();
       function getData(){
       $scope.showLoader = true;
       CustomersService.getAircraftMake().then(function(result) {
         $scope.aircraftMakeList = result;
         $scope.showLoader = false;
       })
     }
     var companyData;
       $scope.addFirstData = function(sel, step){
       $scope.showLoader = true;
         if($scope.data.companyName == undefined){
           $scope.showCompanyError = true;
           $('.companyNameInput').addClass('customErrorInput');
         }else if($scope.data.masterMargin == undefined){
           $scope.showMarginError = true;
           $('.marginSelectBox').addClass('customErrorInput');
         }else{
           $scope.aircraftDetails = [{
                   'tail':'',
                   'make': '',
                   'model': '',
                   'sizeId' : '',
                   'marginId': $scope.data.masterMargin,
                   'avgasMarginId': $scope.data.avgasMargin
               }];
           $(sel).trigger('next.m.' + step);
           getData();
         }
       $scope.showLoader = false;
       }
         $scope.addNew = function(){
       $scope.showLoader = true;
             $scope.aircraftDetails.push({
                 'tail':'',
               'make': '',
               'model': '',
               'sizeId' : '',
               'marginId': $scope.data.masterMargin,
               'avgasMarginId': $scope.data.avgasMargin
             });
       $scope.showLoader = false;
         };
     $scope.aircraft = {};
      $scope.getModal = function(makeId, index){
           $scope.showLoader = true;
         $scope.aircraft.make = makeId;
           CustomersService.getModal($scope.aircraft.make).then(function(result) {
             $scope.showLoader = false;
             $scope.aircraftDetails[index].aircraftModalList = result;
             //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
           })
         }
         $scope.getSize = function(model, index){
           $scope.showLoader = true;
           CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
             $scope.showLoader = false;
               $scope.aircraftDetails[index].aircraftSizeList = result;
             //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
           })
         }
      $scope.aircraftListData = {};
         $scope.addData = [];
         $scope.saveCompanyData = function(){
           CustomersService.addCompany($scope.data).then(function(result) {
               $scope.accountId = result;
             $scope.aircraft.accountId = $scope.accountId;
             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,
                     'marginId': $scope.aircraftDetails[i].marginId,
                     'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId
                   });
               }
               $scope.aircraftListData.aircraftList = $scope.addData;
               $scope.aircraftListData.accountId = $scope.aircraft.accountId;
               if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){
                 $scope.aircraftListData.aircraftList = [];
               }
               CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
                 if(result != null && result.success){
                   toastr.success(''+result.success+'', {
                       closeButton: true
                     })
                     $('#demo-modal-3').modal('hide');
                     getAllCompanies();
                 }else{
                   toastr.error(''+result.statusText+'', {
                       closeButton: true
                     })
                 }
               });
             })
         }
         $scope.checkJetWithTail = function(tail, index){
           ViewCompanyService.checkJetType(tail).then(function(result) {
             if(result.jetA == "true"){
               $scope.jetShow[index] = false;
               $scope.marginShow[index] = true;
             }else{
               $scope.jetShow[index] = true;
               $scope.marginShow[index] = false;
             }
           })
         }
    $scope.etaTimeList=[];
    $scope.etdTimeList =[];
   $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];
   $scope.etaTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
   $scope.etdTimeList  = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
                       {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
                       {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
                       {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
                       {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
                       {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
   $scope.data = {};
    }

app/partials/fuelOrders/fuelOrders.html

Diff comments View file @0173d74

 <style>
    .subnavbar .mainnav > li:nth-child(4) > a{
    color: #c44646;
    }
    .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="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-md-12">
             <div class="widget stacked ">
                <div class="widget-content">
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li style="margin: 0px 10px 4px 10px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" ng-model="searchText" placeholder="Search In Table"></li>
                         <li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">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 Company</button></li>
                      </ul>
                      <br>
                      <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
                           <table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true">
                            <tr ng-repeat="row in $data | filter:searchText" style="cursor: pointer;"  >
                              <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
                               {{row.companyName}}
                              </td>
                              <td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'" ng-click="editTableRow(row)">
                               {{row.upliftDateString}}
                              </td>
                              <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
                               {{row.aircraftName}}
                              </td>
                              <td data-title="'Source'" filter="{source: 'text'}" sortable="'source'" ng-click="editTableRow(row)">
                               {{row.source}}
                              </td>
                              <td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'" ng-click="editTableRow(row)">
                               {{row.requestedVolume}}
                              </td>
                              <td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'" ng-click="editTableRow(row)">
                              {{row.fboCost | number : 4}}
                              </td>
                              <td data-title="'Quoted'" filter="{priceQuote: 'text'}"  sortable="'priceQuote'" ng-click="editTableRow(row)">
                              {{row.priceQuote | number : 4}}
                              </td>
                              <td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'" ng-click="editTableRow(row)">
                               {{row.invoiced | number : 4}}
                              </td>
                              <td data-title="'Total'" filter="{total: 'text'}" sortable="'total'" ng-click="editTableRow(row)">
                               {{row.total | number : 4}}
                              </td>
                              <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">
                                     <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
                                         <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
                                         <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
                                         <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
                                         <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
                                         <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
                                     </select>
                              </td>
                              <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
                                     <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" ng-if="row.orderInvoice !== null" >View</option>
                                         <option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option>
                                         <option value="0" disabled >_____________</option>
                                         <option value="uploadAttachment" >Upload</option>
                                     </select>
                                     <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>
                              </td>
                            </tr>
                          </table>
                                     <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()">
                                         <option value="" disabled selected="selected">Fuel Widget</option>
                                         <option value="dt" >Direct Transaction</option>
                                         <option value="efo" >Export Fuel Orders</option>
                                     </select>
                         </div>
                      </div>
                   </div>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->
          </div>
          <!-- /span8 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
 <form class="modal multi-step" id="demo-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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</h3>
                               <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
                                  <div style="color: #ff9a01;">Activate &nbsp &nbsp
                                     <toggle ng-model="data.activate" size="customToogle"></toggle>
                                  </div>
                               </div>
                               <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-8">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Company Name *</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <!-- <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required> -->
                                        <input type="text" ng-keyup="removeValidation()" ng-model="data.companyName" uib-typeahead="company.companyName for company in compNameList | filter:$viewValue | limitTo:8" class="form-control companyNameInput">
                                        <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-4">
                                     <div class="pull-right">
                                        <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control"  placeholder="">
                                     </div>
                                     <div class="pull-right">
                                        <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-7">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Relationship&nbsp;</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 32px;">
                                        <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
                                        <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
                                        <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-2 Airport" style="text-align: right;">
                                     <b>Certificate Type</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select required class="form-control" ng-model="data.certificateType">
                                        <option value="" disabled selected hidden>Select...</option>
                                        <option value="corporate">Part 91 (Corporate)</option>
                                        <option value="charter">Part 135 (Charter)</option>
                                        <option value="scheduled">Part 121 (Scheduled)</option>
                                        <option value="military">Military</option>
                                        <option value="government">Government</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <b>JET A Margin *</b>
                                     </div>
                                     <div class="pull-left">
                                       <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
                                        <option value="" disabled>Select...</option>
                                       </select>
                                       <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
                                       <div class="clearfix"></div>
                                     </div>
                                   </div>
                                  <div class="col-md-3 Airport" style="text-align: right;">
                                     <b>AVGAS 100LL Margin</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
                                     <option value="" disabled>Select...</option>
                                     </select>
                                  </div>
                                  <div class="clearfix"></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-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" ng-model="data.addressOne"  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>Address2</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.addressTwo" class="form-control"  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>City</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.city" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left" style="width: 40px;">
                                        <label class="new-input-label"><b>State</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.state" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Zip Code</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 60px);">
                                        <input type="tel" ng-model="data.zipcode" class="form-control"  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>Country</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.country" 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>Internal Note</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <textarea  name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                              <!--  <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-2 Airport"></div>
                                  <div class="col-md-10 Airport">
                                     <div class="pull-right">
                                        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
                                        <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
                                     </div>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Company</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; ">
                                     <div class="table-responsive">
                                        <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
                                           <thead>
                                              <tr>
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                                 <th>Margin</th>
                                              </tr>
                                           </thead>
                                           <tbody>
                                              <tr>
                                                 <td>
                                                    <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                                       <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 20%;">
                                                    <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                                       <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.size">
                                                       <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                                    </select>
                                                 </td>
                                                 <td>
                                                    <select class="form-control">
                                                       <option>Margin1</option>
                                                       <option>Margin2</option>
                                                    </select>
                                                 </td>
                                              </tr>
                                           </tbody>
                                        </table> -->
                                       <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>
                                                 <th>JET A Margin</th>
                                                 <th>AVGS 100LL Margin</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: 15%">
                                                     <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
                                                       <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
                                                       <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                     <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                         <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
                                                         <option value="" disabled>Select...</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
                                                     <option value="" disabled>Select...</option>
                                                   </select> -->
                                                   <select class="form-control" ng-model="aircraftData.sizeId">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
                                                   </select>
                                                     <!-- <select class="form-control" ng-model="aircraftData.size">
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
                                                     </select> -->
                                                 </td>
                                                 <td style="width: 17%">
                                                   <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
                                                     <option value="" disabled>Select...</option>
                                                   </select> -->
                                                   <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                                   </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                  <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
                                                     <option value="" disabled>Select...</option>
                                                   </select> -->
                                                   <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</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 class="col-xs-12" style="margin-bottom: 20px;">
                                  <div class="pull-right">
                                     <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
                                     <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
                                     <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <!-- <div class="modal-body step-3" data-step="3">
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" ng-click="reset2()" 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-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
    <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;">
                         <div class="widget-header">
                            <i class="icon-pencil"></i>
                            <i class="fa fa-tasks" aria-hidden="true"></i>
                            <h3>Add a Fuel Order</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-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Company</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
                                         <option value="" selected disabled>Select Company</option>
                                         <option ng-repeat="list in companyList">{{list.companyName}}</option>
                                       </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Product</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote);addTotal(order.priceQuote, order.volume)" required>
                                       <option value="" selected disabled>Select Product</option>
                                       <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
                                     </select>
                                     </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>Aircraft</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <select class="form-control" ng-model="order.aircraftName" required>
                                         <option selected disabled value="">Select Aircraft</option>
                                         <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
                                       </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Volume</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control"  placeholder="" required>
                                     </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" style="margin-top: 25px;"><b>ETA</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control"  placeholder="" datepicker required/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etaTime" style="width: 100%;" required>
                                              <option ng-repeat="li in etaTimeList">{{li.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Invoiced</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="order.invoiced" class="form-control"  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" style="margin-top: 25px;"><b>ETD</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               <div class="col-md-6" style="margin-top: 22px;">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Total</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
                                     </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>Fuel on</b></label>
                                     </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="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                   <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>FBO Cost</b></label>
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text"  disabled ng-model="order.fboCost" class="form-control"  placeholder="0.0000" valid-number />
                                     </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>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                      <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                      <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </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>Certificate Type</b></label>
                                     </div>
                                      <div class="pull-left" style="width: calc(100% - 110px);">
-                                          <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
+                                          <select class="form-control" disabled ng-model="order.certificateType"  style="width: 100%;">
                                            <option value="" disabled selected hidden>Select...</option>
                                            <option value="corporate">Part 91 (Corporate)</option>
                                            <option value="charter">Part 135 (Charter)</option>
                                            <option value="scheduled">Part 121 (Scheduled)</option>
                                            <option value="military">Military</option>
                                            <option value="government">Government</option>
                                         </select>
                                      </div>
                                   <div class="clearfix"></div>
                                   </div>
                                    <div class="col-md-6">
                                       <div class="pull-left" style="width: 110px;">
                                          <label class="new-input-label"><b>Status</b></label>
                                       </div>
                                       <div class="pull-left" style="width: calc(100% - 110px);">
                                          <select  class="form-control" ng-model="order.status"  style="width: 100%;">
                                             <option value=""  disabled selected hidden>pending</option>
                                             <option value="pending">pending</option>
                                             <option value="invoiced">invoiced</option>
                                             <option value="paid">paid</option>
                                             <!-- <option value="cancelled">cancelled</option>
                                             <option value="archived">archived</option> -->
                                          </select>
                                       </div>
                                       <div class="clearfix"></div>
                                 </div>
                           </div>
                           <div class="clearfix"></div><br>
                            </div>
                         </div>
                      </div>
                   </div>
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
                <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="fuelOrderForm.$invalid" ng-click="addFuelData()">Save</button>
             </div>
          </div>
       </div>
    </div>
 </form>
  <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm">
     <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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Update Fuel Order</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-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                         Date
                                          <input type="text" style="width: 90%;" ng-model="editdata.upliftDateString" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time
                                           <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;">
                                              <option ng-repeat="li in etaTimeList">{{li.time}}</option>
                                          </select>
                                       </div>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6" style="margin-top: 25px;">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Volume</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control"  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>ETD</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <div style="width: 50%; float: left;">
                                          <input type="text" style="width: 90%"  ng-model="editdata.departingDateString" class="form-control"  placeholder="" datepicker/>
                                      </div>
                                      <div style="width: 50%; float: left;">
                                         <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
                                       </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>Fuel on</b></label>
                                     </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="Arrival">Arrival</option>
                                             <option value="Departure">Departure</option>
                                         </select>
                                     </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>Company</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         {{editdata.companyName}}
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Invoiced</b></label>
                                         <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control"  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>Tail #</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                         {{editdata.aircraftName}}
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                   <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Total</b></label>
                                         <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" disabled ng-model="editdata.total | number : 4" placeholder="" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
                                     </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>Source</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select class="form-control" ng-model="editdata.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
                                         </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                   <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Product</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        {{editdata.productName}}
                                     </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>Status</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="editdata.status"  style="width: 100%;">
                                           <option value="" disabled selected hidden>Select Status</option>
                                           <option value="pending">pending</option>
                                           <option value="invoiced">invoiced</option>
                                           <option value="paid">paid</option>
                                           <option value="cancelled">cancelled</option>
                                           <option value="archived">archived</option>
                                        </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Certificate Type</b></label>
                                     </div>
                                  <div class="pull-left" style="width: calc(100% - 110px);">
                                       <select class="form-control" ng-model="editdata.certificateType"  style="width: 100%;" required>
                                        <option value="" disabled selected hidden>Select...</option>
                                        <option value="corporate">Part 91 (Corporate)</option>
                                        <option value="charter">Part 135 (Charter)</option>
                                        <option value="scheduled">Part 121 (Scheduled)</option>
                                        <option value="military">Military</option>
                                        <option value="government">Government</option>
                                     </select>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                               </div>
                               <div class="clearfix"></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" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button>
            </div>
         </div>
     </div>
 </div>
 </form>
 <form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm">
     <div class="modal-dialog modal-xs">
         <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;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Upload Attachment</h3>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                       <div class="col-xs-6">
                             <div class="col-xs-6">
                                  <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" accept=".pdf" file-model = "uploadFile.attachment">
                                        <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
                                     </div>
                                     <div class="clearfix"></div>
                                  </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" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button>
            </div>
         </div>
     </div>
 </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">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <script src="js/multi-step-modal.js"></script>
 <script>
 sendEvent = function(sel, step) {
     $(sel).trigger('next.m.' + step);
 }
 </script>
 <script>
   angular.module("KendoDemos", [ "kendo.directives" ])
       .controller("MyCtrl", function($scope){
           $scope.getType = function(x) {
               return typeof x;
           };
           $scope.isDate = function(x) {
               return x instanceof Date;
           };
       })
 </script>

app/partials/viewCompany/viewCompany.controller.js

Diff comments View file @0173d74

 'use strict';
 //Load controller
 angular.module('acufuel')
     .controller('viewCompanyController', ['$scope', '$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', 'updateFuelManagerService', 'ViewFuelVendorService', 'ViewcontactService', '$state', 'fuelOrdersService', 'enterFuelOrderService', 'NgTableParams', function($scope, $uibModal, $stateParams, ViewCompanyService, CustomersService, updateFuelManagerService, ViewFuelVendorService, ViewcontactService, $state, fuelOrdersService, enterFuelOrderService, NgTableParams) {
         $scope.data = {};
         $scope.data.priceEmail = true;
         $scope.aircraft = {};
         $scope.primayData = {};
         $scope.showLoader = false;
         $scope.showUpdateBtn = false;
         $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
         $scope.selected = [];
         $scope.jetShow = [];
         $scope.marginShow = [];
         $scope.compId = $stateParams.id;
         $scope.jetShow[0] = true;
         $scope.marginShow[0] = true;
         $scope.dispatchOrder = {};
         $scope.dispatchOrder.fuelOrderList = [];
         $scope.statusFilterOptions = [];
         $scope.companyList = {};
         $scope.statusFilterOptions.push({
                 'id': '',
                 'title': 'Show All'
             }, {
                 'id': 'pending',
                 'title': 'Pending'
             }, {
                 'id': 'invoiced',
                 'title': 'Invoiced'
             }, {
                 'id': 'paid',
                 'title': 'Paid'
             }, {
                 'id': 'cancelled',
                 'title': 'Cancelled'
             }, {
                 'id': 'archived',
                 'title': 'Archived'
             }
         );
         $scope.order = {};
         $scope.order.companyName = '';
     	$scope.order.upliftDate = '';
         /*Get AllCompany api is used from CustomersService*/
         getAllCompanies();
         function getAllCompanies() {
             CustomersService.getAllCompanies().then(function(result) {
                //console.log('log', result[2].id);
                 $scope.companyList = 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) {
                             $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber;
                         }
                     }
                     if ($scope.companyList[i].primaryContact != null) {
                         if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) {
                             $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName;
                         }
                     }
                     if ($scope.companyList[i].margin != null) {
                         if ($scope.companyList[i].margin.marginName != null) {
                             $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
                         }
                     }
                 }
                 $scope.displayCompanyList = new NgTableParams({
                     page: 1,
                     count: 10,
                 }, {
                     data: $scope.companyList
                 });
                 $scope.showLoader = false;
             })
         }
         $(document).ready(function() {
             $("#reset").click(function() {
                 $("input").val("");
             });
         });
         $scope.values = [{
                 'id': 1,
                 'first': 'Tenant/Base Customer'
             },
             {
                 'id': 2,
                 'first': 'FuelerLinx Customer'
             },
             {
                 'id': 3,
                 'first': 'CAA Member'
             }
         ];
         $scope.changeValue = function(selected) {
             $scope.showUpdateBtn = true;
             // console.log("data to be true", selected);
             for (var i = 0; i < selected.length; i++) {
                 //  console.log(selected[i])
                 if (selected[i] == 'Tenant/Base Customer') {
                     $scope.companyData.baseTenant = true;
                 } else {
                     $scope.companyData.baseTenant = false;
                 }
                 if (selected[i] == 'FuelerLinx Customer') {
                     $scope.companyData.fuelerlinxCustomer = true;
                 } else {
                     $scope.companyData.fuelerlinxCustomer = false;
                 }
                 if (selected[i] == 'CAA Member') {
                     $scope.companyData.contractFuelVendor = true;
                 } else {
                     $scope.companyData.contractFuelVendor = false;
                 }
                 // console.log($scope.companyData)
             }
         }
         // $scope.selected =[
         //   {'id': 1, 'first': 'Tenant/Base Customer'},
         //   {'id': 2, 'first': 'FuelerLinx Customer'},
         //   {'id': 3, 'first': 'CAA Member'}
         // ];
         // CustomersService.getMargin().then(function(result) {
         //   $scope.marginList = result;
         // })
         var value = "";
         var companyId = $stateParams.id;
         $scope.companyData = {};
         $scope.multipleMsg = false;
         $scope.companyData.masterMargin = "";
         $scope.isGlobal = false;
         getCompanyDetail();
         function getCompanyDetail() {
             $scope.showLoader = true;
             ViewCompanyService.getCompany(companyId).then(function(result) {
+                console.log("===getCompanyDetail====",result)
                 $scope.companyData = result;
                 $scope.isGlobal = result.global;
                 if (result.global == true) {
                     $scope.companyData.global = true;
                 }
                 if (result.margin != null) {
                     $scope.companyData.masterMargin = result.margin.id;
                 }
                 if (result.marginAVGAS != null) {
                     $scope.companyData.avgasMargin = result.marginAVGAS.id;
                 }
                 if ($scope.companyData.baseTenant) {
                     $scope.selected.push({
                         'first': 'Tenant/Base Customer'
                     })
                     // console.log("$scope.selected",$scope.selected)
                 }
                 if ($scope.companyData.fuelerlinxCustomer) {
                     $scope.selected.push({
                         'first': 'FuelerLinx Customer'
                     })
                     // console.log("$scope.selected",$scope.selected)
                 }
                 if ($scope.companyData.contractFuelVendor) {
                     $scope.selected.push({
                         'first': 'CAA Member'
                     })
                     // console.log("$scope.selected",$scope.selected)
                 }
                 // console.log("$scope.companyData",$scope.companyData)
                 getAircraftList();
                 $scope.order.companyName = $scope.companyData.companyName;
                 $scope.getAircraft(result.companyName);
                 $scope.showLoader = false;
             })
         }
         $scope.changeCompanyStatus = function() {
             $('#delete3').css('display', 'block');
             if ($scope.companyData.activate == true) {
                 $scope.statusMessage = 'Please confirm! Are you sure you want to ACTIVATE this company?'
             } else {
                 $scope.statusMessage = 'Please confirm! Are you sure you want to DEACTIVATE this company?'
             }
         }
         $scope.companyStatus = function() {
             $scope.showLoader = true;
             var statusData = "status=" + $scope.companyData.activate;
             ViewCompanyService.changeStatus(companyId, statusData).then(function(result) {
                 if (result.success) {
                     $('#delete3').css('display', 'none');
                     toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                     getContactList();
                 }
             })
             $scope.showLoader = false;
         }
         $scope.cancelStatus = function() {
             $('#delete3').css('display', 'none');
             $scope.companyData.activate = !$scope.companyData.activate;
         }
         getContactList();
         function getContactList() {
             ViewCompanyService.getContact(companyId).then(function(result) {
                 $scope.companyContactList = result;
             })
         }
         $scope.aircraftmargins = [];
         $scope.abc = false;
         $scope.xyz = false;
         function getAircraftList() {
             ViewCompanyService.getAircraft(companyId).then(function(result) {
                 $scope.contactAircraftList = result;
                 console.log("===contactAircraftList===",result)
                 for (var i = 0; i < $scope.contactAircraftList.length; i++) {
                     if ($scope.contactAircraftList[i].aircraftsMargin != null) {
                         $scope.aircraftmargins.push({
                             'id': $scope.contactAircraftList[i].aircraftsMargin.id
                         })
                         $scope.contactAircraftList[i].fuelType = "Jet-A";
                         $scope.contactAircraftList[i].marginValue = result[i].aircraftsMargin.marginValue;
                         $scope.abc = true;
                     }else{
                         $scope.contactAircraftList[i].fuelType = "100LL";
                         $scope.contactAircraftList[i].marginValue = result[i].aircraftsAVGASMargin.marginValue;
                         $scope.xyz = true;
                     }
                 }
                 if ($scope.aircraftmargins.length > 0) {
                     for (var i = 0; i < $scope.aircraftmargins.length; i++) {
                         if ($scope.aircraftmargins[i].id != $scope.companyData.masterMargin) {
                             $scope.multiple = true;
                             $scope.multipleMsg = true;
                             if ($scope.multiple) {
                                 $scope.companyData.masterMargin = "multiple";
                             }
                         }
                     }
                 }
             })
         }
         $scope.contactData = {};
         $scope.contactData.contactList = [];
         $scope.addContact = function() {
             $scope.showLoader = true;
             $scope.data.companyId = companyId;
             $scope.contactData.contactList.push($scope.data);
             ViewCompanyService.addContact($scope.contactData).then(function(result) {
                 //console.log("data==",$scope.contactData)
                 // console.log(result)
                 if (result.status == 200) {
                     $('#contact-modal-3').modal('hide');
                     $scope.primayData.id = result.data;
                     $scope.data = {};
                     $scope.sendPrimaryContact();
                     getContactList();
                     $scope.contactData.contactList = [];
                     $scope.data.email = '';
                     toastr.success('Created Successfully', {
                         closeButton: true
                     })
                 } else {
                     toastr.error('' + result.statusText + '', {
                         closeButton: true
                     })
                 }
             })
             $scope.showLoader = false;
         }
         getData();
         function getData() {
             $scope.showLoader = true;
             CustomersService.getAircraftMake().then(function(result) {
                 $scope.aircraftMakeList = result;
                // console.log("make",result)
             })
             $scope.showLoader = false;
         }
         $scope.clearAircrafts = function() {
             $scope.aircraftDetails = [];
             $scope.aircraftDetails = [{
                 'tail': '',
                 'make': '',
                 'model': '',
                 'sizeId': '',
                 'marginId': '',
                 'avgasMarginId': ''
             }];
         }
         $scope.addNew = function() {
             $scope.aircraftDetails.push({
                 'tail': '',
                 'make': '',
                 'model': '',
                 'sizeId': '',
                 'marginId': '',
                 'avgasMarginId': ''
             });
             //  console.log($scope.aircraftDetails)
         };
         $scope.getModal = function(makeId, index) {
             $scope.showLoader = true;
             $scope.aircraft.make = makeId;
             CustomersService.getModal($scope.aircraft.make).then(function(result) {
                 $scope.showLoader = false;
                 $scope.aircraftDetails[index].aircraftModalList = result;
                 //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
             })
         }
         $scope.selectedOption = '';
         $scope.getSize = function(model, index) {
             $scope.showLoader = true;
             $scope.aircraft.model = model;
             CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
                 $scope.showLoader = false;
                 $scope.aircraftDetails[index].aircraftSizeList = result;
                 $scope.getFuelType($scope.aircraftDetails[index].aircraftSizeList[0].aircraftSize.id,index);
             })
         }
         $scope.getFuelType = function(size, index) {
         	$scope.showLoader = true;
         	var data = "model="+$scope.aircraft.model+"&make="+$scope.aircraft.make+"&sizeId="+size;
         	ViewCompanyService.checkFuelType(data).then(function(result){
               $scope.showLoader = false;
               if (result.type == "JetA") {
                   $scope.jetShow[index] = false;
                   $scope.marginShow[index] = true;
               } else if (result.type == "Avgas")   {
                   $scope.jetShow[index] = true;
                   $scope.marginShow[index] = false;
               }else {
                   $scope.jetShow[index] = true;
                   $scope.marginShow[index] = true;
               }
         	})
         }
         $scope.aircraftListData = {};
         $scope.addData = [];
         $scope.tailArray = [];
         function check(array){
             return (new Set(array)).size !== array.length;
         }
         $scope.saveCompanyData = function() {
             $scope.tailArray = [];
                 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,
                         'marginId': $scope.aircraftDetails[i].marginId,
                         'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId
                     });
                     $scope.tailArray.push($scope.aircraftDetails[i].tail);
                 }
                 console.log('check', check($scope.tailArray));
                 if (check($scope.tailArray)) {
                     toastr.error('Duplicate Tail Added.', {
                                 closeButton: true
                             })
                 }else{
                     $scope.aircraftListData.aircraftList = $scope.addData;
                     $scope.aircraftListData.accountId = companyId;
                     CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
                         if (result != null && result.success) {
                             toastr.success('' + result.success + '', {
                                 closeButton: true
                             })
                             $('#aircraft-modal-3').css('display', 'none');
                             $('.modal-backdrop').css('display', 'none');
                             getAircraftList();
                         } else {
                             toastr.error('' + result.statusText + '', {
                                 closeButton: true
                             })
                         }
                     });
                 }
         }
         $scope.showNoteData = true;
         $scope.showCompanyName = true;
         $scope.showAddress = true;
         $scope.showNote = function() {
             $scope.showNoteData = false;
             $scope.showUpdateBtn = true;
         }
         $scope.company = function() {
             $scope.showCompanyName = false;
             $scope.showUpdateBtn = true;
         }
         $scope.base = function() {
             $scope.showUpdateBtn = true;
         }
         $scope.addressChange = function() {
             $scope.showAddress = false;
             $scope.showUpdateBtn = true;
         }
         $scope.editData = function(inputName) {
+            console.log("===input===",inputName)
             //console.log($scope.companyData)
             $scope.showLoader = true;
             /*if(inputName == 'showNoteData'){
               $scope.showNoteData = true;
             }else if(inputName == 'showCompanyName'){
               $scope.showCompanyName = true;
             }else if(inputName == 'showAddress'){
               $scope.showAddress = true;
             }*/
             $scope.showNoteData = true;
             $scope.showCompanyName = true;
             $scope.showAddress = true;
             var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin + "&avgasMargin=" + $scope.companyData.avgasMargin +
                 "&addressOne=" + $scope.companyData.addressOne + "&addressTwo=" + $scope.companyData.addressTwo + "&city=" + $scope.companyData.city + "&state=" +
                 $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote=" +
                 $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant +
                 "&fuelerlinxCustomer=" + $scope.companyData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.companyData.contractFuelVendor +
                 "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId + "&global=" + $scope.companyData.global;
             ViewCompanyService.updateCompany(companyData).then(function(result) {
                 if (result != null && result.success) {
                     toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                     $scope.showUpdateBtn = false;
                     getCompanyDetail();
                 } else {
                     toastr.error('Error Updating Company', {
                         closeButton: true
                     })
                     $scope.showUpdateBtn = true;
                 }
                 $scope.showLoader = false;
             })
         }
         $scope.cancelUpdateData = function() {
             $scope.showNoteData = true;
             $scope.showCompanyName = true;
             $scope.showAddress = true;
             $scope.showUpdateBtn = false;
         }
         $scope.sendMail = function() {
         	$scope.showLoader = true;
             $('#confirm1').css('display', 'none');
             ViewCompanyService.sendMail(companyId).then(function(result) {
                 if (result != null && result.success) {
                     toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                 } else {
                     toastr.error('Error Sending Email', {
                         closeButton: true
                     })
                 }
                 $scope.showLoader = false;
             })
         }
         $scope.openConfirmMail = function() {
             $('#confirm1').css('display', 'block');
         }
         $scope.cancelAndCloseConfirm = function() {
             $('#confirm1').css('display', 'none');
         }
         $scope.primaryContact = false;
         $scope.cancelPrimaryContact = function() {
             $('#primaryContact').css('display', 'none');
             $scope.primaryContact = false;
         }
         $scope.checkPrimaryContact = function() {
             if ($scope.primaryContact == true) {
                 $scope.primaryContact = true;
                 ViewCompanyService.checkPrimaryContact(companyId).then(function(result) {
                     //console.log(result)
                     if (result.status == 422) {
                         $('#primaryContact').css('display', 'block');
                     }
                 })
             }
         }
         $scope.sendPrimaryContact = function() {
             $('#primaryContact').css('display', 'none');
             if ($scope.primayData.id != null || $scope.primayData.id != undefined) {
                 var priamryContactData = "companyContactId=" + $scope.primayData.id + "&primary=" + $scope.primaryContact;
                 ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) {
                     // console.log(result)
                 })
             }
         }
         $scope.updateData = ""
         $scope.showUpdateContact = function(data, value) {
             $('#updateContact').css('display', 'block');
             $scope.updateData = data;
             // console.log($scope.updateData)
             if ($scope.updateData.email == null) {
                 $scope.updateData.content = data.contactNumber;
             } else {
                 $scope.updateData.content = data.email;
             }
         }
         $scope.showUpdateEmail = function(data, value) {
             $('#updateEmail').css('display', 'block');
             $scope.updateData = data;
             // console.log($scope.updateData)
             if ($scope.updateData.email == null) {
                 $scope.updateData.content = data.contactNumber;
             } else {
                 $scope.updateData.content = data.email;
             }
         }
         $scope.acceptUpdateField = function(newContactName) {
             // console.log($scope.updateData)
             if ($scope.updateData.content == undefined) {
                 toastr.error('Please add some content', {
                     closeButton: true
                 })
             } else {
                 if (newContactName == 'phone') {
                     var updateCustomData = "companyId=" + companyId + "&contactNumber=" + $scope.updateData.content + "&contactId=" + $scope.updateData.id +
                         "&title=" + $scope.updateData.title;
                 } else {
                     var updateCustomData = "companyId=" + companyId + "&email=" + $scope.updateData.content + "&contactId=" + $scope.updateData.id +
                         "&title=" + $scope.updateData.title;
                 }
                 ViewCompanyService.updateCustomField(updateCustomData).then(function(result) {
                     if (result != null && result.success) {
                         $('#updateContact').css('display', 'none');
                         $('#updateEmail').css('display', 'none');
                         getCompanyDetail();
                     }
                 })
             }
         }
         $scope.deleteContent = function(data){
         	ViewCompanyService.deleteCustomContact(data.id).then(function(result) {
                 if (result != null && result.success) {
                 	toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                     getCompanyDetail();
                 }
             })
         }
         $scope.cancelUpdateField = function() {
             $('#updateContact').css('display', 'none');
             $('#updateEmail').css('display', 'none');
         }
         $scope.showEditTier2 = function(number) {
             // console.log(number)
             $scope.contactNumber = number;
         }
         $scope.addCustomPhone = function(value) {
             //console.log(value)
             if (value != null) {
                 $('#customFieldPhone').css('display', 'block');
             }
             $scope.custom = {};
         }
         $scope.addCustomEmail = function(value) {
             //console.log(value)
             if (value != null) {
                 $('#customFieldEmail').css('display', 'block');
             }
             $scope.custom = {};
         }
         $scope.cancelCustomField = function() {
             $('#customFieldEmail').css('display', 'none');
             $('#customFieldPhone').css('display', 'none');
         }
         $scope.acceptCustomField = function(contactName) {
             if ($scope.custom.content == undefined) {
                 toastr.error('Please add some content', {
                     closeButton: true
                 })
             } else {
                 if (contactName == 'phone') {
                     var customData = "companyId=" + companyId + "&contactNumber=" + $scope.custom.content +
                         "&title=" + $scope.custom.title;
                 } else {
                     var customData = "companyId=" + companyId + "&email=" + $scope.custom.content +
                         "&title=" + $scope.custom.title;
                 }
                 // console.log(customData.email)
                 ViewCompanyService.addCustomField(customData).then(function(result) {
                     // console.log(result)
                     if (result != null && result.success) {
                         $('#customFieldEmail').css('display', 'none');
                         $('#customFieldPhone').css('display', 'none');
                         $scope.custom = {};
                         getCompanyDetail();
                     }
                 })
             }
         }
         /*  omit strike out*/
         updateFuelManagerService.getFuelPricingNew().then(function(result) {
             $scope.fuelPricing = result;
             $scope.omitData;
             ViewCompanyService.getOmitCompany($scope.compId).then(function(result){
                 $scope.omitData = result;
                 //console.log("omit data===", $scope.omitData);
                 for(var i = 0 ; i< $scope.fuelPricing.length; i++){
                     for(var j = 0; j<$scope.omitData.length; j++){
                         if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){
                             $scope.fuelPricing[i].fuelPricing.omit = $scope.omitData[j].omit;
                     }
                         }
                 }
             })
            // console.log("$scope.fuelPricing",$scope.fuelPricing)
             for (var i = 0; i < $scope.fuelPricing.length; i++) {
               //  console.log('$scope.fuelPricing[i].fuelPricing', $scope.fuelPricing[i].fuelPricing);
               //console.log("fuelid",$scope.fuelPricing[i].fuelPricing.id,"getid",$scope.omitData[j].id)
                 if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) {
                     $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate);
                     var newTime = new Date($scope.fuelPricing[i].fuelPricing.expirationDate);
                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                     var dday = newTime.getUTCDate();
                     var dyear = newTime.getUTCFullYear();
                     $scope.fuelPricing[i].fuelPricing.expirationDate = dmonth + '/' + dday + '/' + dyear;
                 }
                 // for (var j = 0; j<$scope.omitData.length; j++) {
                 //     if($scope.fuelPricing[i].fuelPricing.id === $scope.omitData[j].id){
                 //     }
                 // }
             }
         })
         var deleteAircraftId = "";
         $scope.deleteAircraft = function(id) {
             $('#delete1').css('display', 'block');
             deleteAircraftId = id;
         }
         $scope.aircraftDelete = function() {
             ViewCompanyService.deleteAircraft(deleteAircraftId).then(function(result) {
                 // console.log(result)
                 getAircraftList();
                 getCompanyDetail();
                 $('#delete1').css('display', 'none');
             })
         }
         $scope.cancelDelete = function() {
             $('#delete1').css('display', 'none');
         }
         CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
             $scope.jetMarginList = result;
         })
         CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
             $scope.avgsMarginList = result;
         })
         $scope.changePriceEmail = function(id, index) {
             event.stopPropagation();
             var contactId = id;
             var statusData = "status=" + $scope.companyContactList[index].priceEmail;
             ViewcontactService.changePriceEmail(contactId, statusData).then(function(result) {
                 if (result.success) {
                     $('#toogleMail').css('display', 'block');
                     if ($scope.companyContactList[index].priceEmail == true) {
                         $scope.messageText = 'You have enabled price distribution for this contact';
                     } else {
                         $scope.messageText = 'You have disabled price distribution for this contact';
                     }
                 }
             })
         }
         $scope.cancelToogle = function() {
             $('#toogleMail').css('display', 'none');
         }
         $scope.checkboxStatus = function(value) {
             //  console.log("checkbox",value)
             $scope.showUpdateBtn = true;
         }
         $scope.fuelercheckboxStatus = function(value) {
             $('#fuelerchange').css('display', 'block');
             if (value == true) {
                 $scope.statusMessage = 'Please confirm! Enabling FuelerLinx for this customer will enable price distribution web services and disable price emails for the contacts in this company'
             } else {
                 $scope.statusMessage = 'Please confirm! Disabling FuelerLinx for this customer will disable price distribution web services into their FuelerLinx account. If you proceed then remember to enable price emails for the appropriate contacts in this company.'
             }
         }
         $scope.fuelerCancelStatus = function() {
             $('#fuelerchange').css('display', 'none');
             $scope.companyData.fuelerlinxCustomer = !$scope.companyData.fuelerlinxCustomer;
         }
         $scope.fuelerAcceptStatus = function() {
             $('#fuelerchange').css('display', 'none');
             $scope.showLoader = true;
             var statusData;
             if ($scope.companyData.fuelerlinxCustomer == false) {
                 statusData = "status=true";
             } else {
                 statusData = "status=false";
             }
             ViewCompanyService.fuelerPricingChange(companyId, statusData).then(function(result) {
                 if (result.success) {
                     $scope.showLoader = false;
                     $scope.editData();
                     getContactList();
                 }
             })
         }
         $scope.updateOmit = function(fuel, omit) {
             $scope.fuelData = {};
             $scope.fuelData.expirationDate = new Date(fuel.expirationDate);
             $scope.fuelData.customMarginId = fuel.id;
             $scope.fuelData.omit = fuel.omit;
             $scope.fuelData.papMargin = fuel.papMargin;
             $scope.fuelData.papTotal = fuel.papTotal;
             $scope.fuelData.cost = fuel.cost;
             $scope.fuelData.companyId = $scope.compId ;
             if($scope.fuelData.omit == true)
             {
                 var customData = "companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId;
                  ViewCompanyService.omitAddCompanyFuel(customData).then(function(result) {
                     if (result.success) {
                         toastr.success('' + result.success + '', {
                             closeButton: true
                         })
                     } else {
                         toastr.error('' + result.statusText + '', {
                             closeButton: true
                         })
                     }
                 })
             }else{
                      var data ="companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId;
                 ViewCompanyService.omitDeleteCompanyFuel(data).then(function(result){
                         if (result.success) {
                         toastr.success('' + result.success + '', {
                             closeButton: true
                         })
                       } else {
                         toastr.error('' + result.statusText + '', {
                             closeButton: true
                         })
                     }
                 })
             }
         }
         //--fuel type based on tail is not in use--
         // $scope.aircraftData = {}
         /*$scope.checkJetWithTail = function(tail, index) {
               console.log("tail==============",tail, index)
             ViewCompanyService.checkJetType(tail).then(function(result) {
                    console.log("result",result)
                 if (result.jetA == "true") {
                     $scope.jetShow[index] = false;
                     $scope.marginShow[index] = true;
                 } else {
                     $scope.jetShow[index] = true;
                     $scope.marginShow[index] = false;
                 }
             })
         }*/
         /*add a fuel order*/
         $scope.getOrders = function() {
             fuelOrdersService.getOrders().then(function(result) {
                 $scope.orderdata = result;
                 for (var i = 0; i < $scope.orderdata.length; i++) {
                     $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
                     // var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
                     var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
                     //  str = str.slice(4,16)
                     $scope.orderdata[i].upliftDateString = str
                     // console.log(str);
                 }
                 $scope.displayFuelOrderList = new NgTableParams({
                     page: 1,
                     count: 10,
                 }, {
                     data: $scope.orderdata
                 });
                 $(document).ready(function() {
                     var myselect = document.getElementsByClassName('colorfulSelectbox');
                     for (var i = 0; i < myselect.length; i++) {
                         var colourIndex = $(myselect[i]).prop('selectedIndex');
                         colourIndex = colourIndex + 1;
                         // console.log(colourIndex);
                         var getColor = $('.colorfulSelectbox option:nth-child(' + colourIndex + ')').css('color');
                         $(myselect[i]).css('background-color', getColor);
                         // console.log('colour', getColor);
                         myselect[i].blur();
                     }
                 })
             })
         }
         $scope.getOrders();
         $scope.tiervalue=function(){
     		$scope.order.tierBreak=$scope.selectedTier.minTierBreak+'-'+$scope.selectedTier.maxTierBreak;
     	}
     	$scope.setCost = function(cost){
     		if(cost != null) {
     			var obj =JSON.parse(cost);
     			$scope.order.fboCost = obj.cost;
     		}
     	}
     	$scope.cancelOrder = function() {
     		$scope.order = {};
     	}
     	$scope.dispatchFuel = function(){
     		$scope.showLoader = true;
     		$scope.order.companyId = $scope.compId;
     		if ($scope.order.upliftDate != '') {
     			var currentDate = new Date();
                 var hours = currentDate.getHours();
                 var min = currentDate.getMinutes();
                 var sec = currentDate.getSeconds();
                 $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
     			$scope.order.upliftDate = new Date($scope.order.upliftDate);
     			$scope.order.upliftDate = $scope.order.upliftDate.getTime();
     		}
     		$scope.order.status = 'pending';
     		var obj =JSON.parse($scope.order.priceQuote);
     		$scope.order.priceQuote = obj.papTotal;
     		$scope.order.fboCost = obj.cost;
     		$scope.order.total = obj.papTotal * $scope.order.volume;
     		var aircraftObj =JSON.parse($scope.order.aircraftName);
     		$scope.order.aircraftName = aircraftObj.tail;
     		$scope.order.make = aircraftObj.make;
     		$scope.order.model = aircraftObj.model;
     		$scope.dispatchOrder.fuelOrderList.push($scope.order);
     		enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
     			$scope.showLoader = false;
     			$scope.order = {};
     			$('#demo-modal-4').css('display', '');
     			toastr.success('Fuel Order Dispatched Successfully', {
                   closeButton: true
                 })
     		})
     	}
         $scope.addTotal = function(value, valueOf) {
             if (valueOf == 'v') {
                 $scope.order.total = value * $scope.order.invoiced
             } else if (valueOf == 'i') {
                 $scope.order.total = $scope.order.volume * value
             }
         }
         $scope.getAircraft = function(company) {
             $scope.selectedCompanyName = company;
             if ($scope.companyData.margin != null && $scope.companyData.marginAVGAS != null) {
                 fuelOrdersService.getFuelCost($scope.companyData.id).then(function(margins) {
                     $scope.marginList = margins;
                     //console.log('$scope.marginList', $scope.marginList);
                 })
             } else if ($scope.companyData.margin != null || $scope.companyData.marginAVGAS == null) {
                 fuelOrdersService.getATypeFuelPricing($scope.companyData.id).then(function(margins) {
                     $scope.marginList = margins;
                 })
             } else if ($scope.companyData.margin == null || $scope.companyData.marginAVGAS != null) {
                 fuelOrdersService.getVTypeFuelPricing($scope.companyData.id).then(function(margins) {
                     $scope.marginList = margins;
                 })
             }
         	$scope.selectedCompanyId = $scope.companyData.id;
             $scope.marginId = $scope.companyData.margin.id;
             if ($scope.selectedCompanyId != '') {
                 fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
                     $scope.aircraftList = aircraft;
                 })
             }
             if ($scope.marginId != '') {
                 fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {
                     $scope.tierList = tiers;
                     //              $scope.showLoader = false;
                 })
             }
         }
         $scope.setCost = function(cost) {
             //  console.log(cost);
             if (cost != null) {
                 var obj = JSON.parse(cost);
                 // console.log("0bj",obj)
                 $scope.order.fboCost = obj.cost;
             }
         }
         $scope.sourceList = [{
             source: "Direct Jet-A"
         }, {
             source: "Direct AVGAS 100LL"
         }];
         $scope.cancelData = function() {
             $('#demo-modal-4').css('display', '');
         }
         $scope.setFuel = function() {
             $('#demo-modal-4').css('display', 'block');
         }
         /*delete company*/
         var deletecompanyId = "";
         $scope.deleteComp = function(companyDataid) {
             $('#delete2').css('display', 'block');
             //console.log("asda",companyDataid)
             deletecompanyId = companyDataid;
         }
         $scope.aircraftIdx = '';
         $scope.checkTail = function(tail, idx){
         	var data = "tail=" + tail + "&id=" + companyId;
         	$scope.aircraftIdx = idx;
         	ViewCompanyService.checkTail(data).then(function(result) {
                 if(result.error) {
                 	$scope.aircraftMessage = result.error;
                 	$scope.openAddAirCraftError();
                 } else if(result.warning) {
                 	$scope.aircraftMessage = result.warning;
                 	$scope.openAddAirCraftWarning();
                 }
             })
         }
         $scope.openAddAirCraftError = function() {
         	$('#addAirCraftError').css('display', 'block');
         }
         $scope.openAddAirCraftWarning = function() {
        	 	$('#addAirCraftWarning').css('display', 'block');
         }
         $scope.acceptAirCraftError = function() {
         	$('#addAirCraftWarning').css('display', 'none');
         }
         $scope.cancelAirCraftError = function() {
         	$scope.aircraftDetails[$scope.aircraftIdx].tail = '';
         	$('#addAirCraftWarning').css('display', 'none');
         	$('#addAirCraftError').css('display', 'none');
         }
         $scope.deleteCompanyData = function() {
             ViewCompanyService.deleteCompany(deletecompanyId).then(function(result) {
                 $('#delete2').css('display', 'none');
                 if (result.success) {
                     toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                 } else {
                     toastr.error('' + result.statusText + '', {
                         closeButton: true
                     })
                 }
                 $state.go('app.customers')
             })
         }
         $scope.cancelDelete = function() {
             $('#delete2').css('display', 'none');
         }
         $scope.editJetMargin = function(aircraftData, type) {
             $scope.showLoader = true;
             if (type == 'jet') {
                 var aircraftdataMargin = "marginId=" + aircraftData.aircraftsMargin.id + "&type=" + type;
             } else {
                 var aircraftdataMargin = "marginId=" + aircraftData.aircraftsAVGASMargin.id + "&type=" + type;
             }
             var id = aircraftData.id;
             ViewCompanyService.updateAircraftMargin(aircraftdataMargin, id).then(function(result) {
                 if (result != null && result.success) {
                     $scope.showLoader = false;
                     toastr.success('' + result.success + '', {
                         closeButton: true
                     })
                    // getAircraftWithMarginList();
                    getAircraftList();
                 } else {
                     $scope.showLoader = false;
                     toastr.error('' + result.statusText + '', {
                         closeButton: true
                     })
                 }
             })
         }
         /* //not used currently
         function getAircraftWithMarginList() {
             ViewCompanyService.getJetAMargin(companyId).then(function(result) {
                 $scope.contactAircraftList = result;
                 for (var i = 0; i < $scope.contactAircraftList.length; i++) {
                     if ($scope.contactAircraftList[i].aircraftsMargin != null) {
                         $scope.aircraftmargins.push({
                             'id': $scope.contactAircraftList[i].aircraftsMargin.id
                         })
                     }
                 }
                 if ($scope.aircraftmargins.length > 0) {
                     for (var i = 0; i < $scope.aircraftmargins.length; i++) {
                         if ($scope.aircraftmargins[i].id != $scope.companyData.masterMargin) {
                             $scope.multiple = true;
                             $scope.multipleMsg = true;
                             if ($scope.multiple) {
                                 $scope.companyData.masterMargin = "multiple";
                             }
                         }
                     }
                 }
             })
         }*/
     }]);

app/partials/viewCompany/viewCompany.html

Diff comments View file @0173d74

 <style>
    .subnavbar .mainnav > li:nth-child(2) > a{
    color: #ca5c6a;
    }
    .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="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="col-xs-12 col-md-12">
    <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>{{companyData.companyName}} <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteComp(companyData.id)" aria-hidden="true"></i></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" ng-show="isGlobal">
                      <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="companyData.baseIcao" ng-click="base()" style="line-height: 18px;width: 80px;padding: 0px 9px;" />
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
                               <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
                             </div>
                         </div>
                         <div class="widget-content" style="min-height: 350px;">
                            <div class="row" style="margin-left:0px;">
                               <div class="col-md-7" style="padding-left: 0;">
                                  <h4 ng-show="showCompanyName">
                                     <b style="color:#F90;">{{companyData.companyName}}</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="companyData.companyName" class="form-control"/>
                               </div>
                               <div class="col-md-5">
                                  <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="companyData.certificateType">
                                     <option class="optionclass" value="" 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>JET A Margin </span>
                                  <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.masterMargin">
                                  	<option ng-if="multiple" value="multiple">Multiple</option>
                                     <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
                                  <span ng-show="multipleMsg">&nbsp;See Aircrart List</span>
                                  <div class="clearfix"></div>
                               </p>
                            </div>
                            <div>
                               <p class="new-label">
                                  <span>AVGAS 100LL </span>
                                  <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.avgasMargin">
                                     <option value="">N/A</option>
                                     <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
                                  <div class="clearfix"></div>
                               </p>
                            </div>
                            <div>
                            <ui-select multiple class="form-control" ng-model="selected" name="name" ng-change="changeValue(selected)">
                               <ui-select-match placeholder="Select or Search">{{$item.first}}</ui-select-match>
                               <ui-select-choices repeat="val.first as val in values | filter: $select.search">
                                {{val.first}}
                                <!-- <div ng-bind-html="val | highlight: $select"></div> -->
                               </ui-select-choices>
                             </ui-select>
                            </div>
                            </br>
                            <div class="new-address">
                            </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">{{companyData.internalNote}}</p>
                               <textarea  name="message" ng-hide="showNoteData" style="margin-bottom: 6px;" class="form-control" ng-model="companyData.internalNote" rows="4" cols="34"></textarea>
                            </div>
                            <div class="pull-left">
                               <button ng-click="editData()" ng-show="showUpdateBtn" class="btn btn-success">Save</button>
                               <button ng-click="cancelUpdateData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
                            </div>
                            <div class="pull-right">
                               <button type="button" ng-show="isShowEmail" ng-click="sendMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
                               <button type="button" class="btn btn-info" ng-click="setFuel()">Setup Fuel</button>
                             </div>
                             <div class="clearfix"></div>
                         </div>
                      </div>
                   </div>
                   <div class="col-md-6" ng-hide="isGlobal">
                      <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="companyData.baseIcao" ng-click="base()" style="line-height: 18px;width: 80px;padding: 0px 9px;" />
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
                               <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
                             </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;">{{companyData.companyName}}</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="companyData.companyName" class="form-control"/>
                               </div>
                               <div class="col-md-5">
                                  <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="companyData.certificateType">
                                     <option class="optionclass" value="" 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>JET A Margin </span>
                                  <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.masterMargin">
                                  	<option ng-if="multiple" value="multiple">Multiple</option>
                                     <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
                                  <span ng-show="multipleMsg">&nbsp;See Aircraft List</span>
                                  <div class="clearfix"></div>
                               </p>
                            </div>
                            <div>
                               <p class="new-label">
                                  <span>AVGAS 100LL </span>
                                  <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.avgasMargin">
                                     <option value="">N/A</option>
                                     <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
                                  <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-model="companyData.baseTenant" ng-change="checkboxStatus(companyData.baseTenant)"> Tenant/Base Customer
                               </div>
-                              <div class="col-md-5" style="padding-left: 0;">
+                              <!--fuelerlinxCustomer later use not to be deleted just hidden-->
+                              <!-- <div class="col-md-5" style="padding-left: 0;">
                                  <input type="checkbox" name="" ng-model="companyData.fuelerlinxCustomer" ng-change="fuelercheckboxStatus(companyData.fuelerlinxCustomer)"> FuelerLinx Customer
                               </div>
-                           </div>
+                           </div>-->
                            <div>
                               <input type="checkbox" name="" ng-model="companyData.contractFuelVendor" ng-change="checkboxStatus(companyData.contractFuelVendor)"> CAA Member
                            </div>
+                         </div>
                            </br>
                            <div class="new-address">
                               <p ng-show="showAddress"><i class="fa fa-map-marker"></i>
                               	<span ng-hide="companyData.addressOne == 'null'">{{companyData.addressOne}}</span><span ng-hide="companyData.addressTwo == 'null'">,
                               	{{companyData.addressTwo}}</span>   <span ng-hide="companyData.city == 'null'"><br/>{{companyData.city}},</span> <span ng-hide="companyData.state == 'null'">{{companyData.state}}</span> <span ng-hide="companyData.zipcode == 'null'">{{companyData.zipcode}}</span> <span ng-hide="companyData.country == 'null'"></br>{{companyData.country}}</span> &nbsp;<i class="fa fa-pencil-square-o" ng-click="addressChange()" aria-hidden="true"></i> </p>
                               <div ng-hide="showAddress" style="margin-bottom:10px;">
                                  <label>Address1</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.addressOne" class="form-control" />
                                  <label>Address2</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.addressTwo" class="form-control" />
                                  <label>City</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.city" class="form-control" />
                                  <label>State</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.state" class="form-control" />
                                  <label>ZipCode</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.zipcode" class="form-control" />
                                  <label>Country</label>
                                  <input type="tel" style="width: 50%;" ng-hide="showAddress" ng-model="companyData.country" class="form-control" />
                               </div>
                               <p ng-repeat="data in companyData.companyCustomContacts" ng-if="data.contactNumber != null">
                                 <i class="fa fa-phone" ng-hide="showEditContact"></i>
                                 <span ng-hide="showEditContact">{{data.contactNumber}} &nbsp;</span>
                                 <i ng-click="showUpdateContact(data, 'phone')" ng-hide="showEditContact" class="fa fa-pencil-square-o" aria-hidden="true"></i>
                                 <i class="fa fa-trash-o" ng-click="deleteContent(data)" ng-hide="showEditContact" aria-hidden="true"></i>
                               </p>
                               <p ng-repeat="data in companyData.companyCustomContacts" ng-if="data.email != null">
                                 <i class="fa fa-envelope" ng-hide="showEditEmail"></i>
                                 <span ng-hide="showEditEmail">{{data.email}} &nbsp;</span>
                                 <i ng-click="showUpdateEmail(data, 'email')" ng-hide="showEditEmail" class="fa fa-pencil-square-o" aria-hidden="true"></i>
 								<i class="fa fa-trash-o" ng-click="deleteContent(data)" ng-hide="showEditEmail" aria-hidden="true"></i>
                               </p>
                            </div>
                            <div style="margin-top:5px; margin-bottom:5px;">
                               <button type="button" ng-click="addCustomPhone('phone')" class="btn btn-default">Add Phone</button>
                               <button type="button" class="btn btn-info" ng-click="addCustomEmail('email')">Add Email</button>
                            </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">{{companyData.internalNote}}</p>
                               <textarea  name="message" ng-hide="showNoteData" style="margin-bottom: 6px;" class="form-control" ng-model="companyData.internalNote" rows="4" cols="34"></textarea>
                            </div>
                            <div class="pull-left">
                               <button ng-click="editData()" ng-show="showUpdateBtn" class="btn btn-success">Save</button>
                               <button ng-click="cancelUpdateData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
                            </div>
                            <div class="pull-right">
                               <button type="button" ng-show="isShowEmail" ng-click="sendMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
                               <button type="button" class="btn btn-info" ng-click="setFuel()">Setup Fuel</button>
                             </div>
                             <div class="clearfix"></div>
                         </div>
                      </div>
                   </div>
                   <div class="col-md-6">
                      <div class="widget" style="min-height: 350px;">
                         <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" ng-click="clearAircrafts()" 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;min-height: 350px;">
                            <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>Fuel Type</th>
                                        <th>Margin</th>
                                        <th>Value</th>
                                        <th>All In</th>
                                        <!-- <th>AVGAS</th> -->
                                       <!--  <th>All In</th> -->
                                        <th></th>
                                     </tr>
                                  </thead>
                                  <tbody>
                                     <tr ng-repeat="aircraft in contactAircraftList">
                                        <td ng-style="aircraft.global && {color:'#9e9696'}">{{aircraft.tail}}</td>
                                        <td ng-style="aircraft.global && {color:'#9e9696'}">{{aircraft.make}}</td>
                                        <td ng-style="aircraft.global && {color:'#9e9696'}">{{aircraft.model}}</td>
                                        <td ng-style="aircraft.global && {color:'#9e9696'}">{{aircraft.fuelType}}</td>
                                        <td>
                                           <select ng-show="abc && aircraft.fuelType=='Jet-A'" class="form-control" style="height:31px;" ng-model="aircraft.aircraftsMargin.id" ng-change="editJetMargin(aircraft,'jet')" ng-options="margin.id as margin.marginName for margin in jetMarginList" required>
                                           	<option value="">N/A</option>
                                           </select>
                                        <!-- </td>
                                        <td> -->
                                         <select ng-show ="xyz && aircraft.fuelType=='100LL'" class="form-control" style="height:31px;" ng-model="aircraft.aircraftsAVGASMargin.id" ng-change="editJetMargin(aircraft,'avgas')">
                                           <option value="">N/A</option>
                                           <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                         </select>
                                       </td>
                                        <td ng-style="aircraft.global">
                                         <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'equal' || aircraft.aircraftsAVGASMargin.pricingStructure === 'equal' ">
                                         =${{aircraft.marginValue}}
                                         </span>
                                         <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'minus'  || aircraft.aircraftsAVGASMargin.pricingStructure === 'minus'" style="color: #ff0000;">-${{aircraft.marginValue}}
                                         </span>
                                         <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'plus'  || aircraft.aircraftsAVGASMargin.pricingStructure === 'plus' " style="color: green;">+${{aircraft.marginValue}}
                                         </span>
                                       </td>
                                         <td>
                                       <!--  <td ng-show="abc && aircraft.fuelType=='Jet-A'" style="color:#55AF8B;">${{aircraft.marginAllIn | number : 4}}</td>
                                        <td ng-show="xyz && aircraft.fuelType=='100LL'" style="color:#55AF8B;">${{aircraft.marginAvgasAllIn | number : 4}}</td> -->
                                        <label id="l1" ng-show="abc && aircraft.fuelType=='Jet-A'" style="color:#55AF8B;">${{aircraft.marginAllIn | number : 4}}</label>
                                        <label id="l2" ng-show="xyz && aircraft.fuelType=='100LL'" style="color:#55AF8B;">${{aircraft.marginAvgasAllIn | number : 4}}</label>
                                      </td>
                                        <td>
                                         <i class="fa fa-trash-o deleteTierIcon" ng-if="!aircraft.global" ng-click="deleteAircraft(aircraft.id)" aria-hidden="true"></i>
                                        </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 companyContactList" style="cursor: pointer;" ui-sref="app.viewContact({id : contact.id})">
                                        <td><toggle ng-model="contact.priceEmail" ng-change="changePriceEmail(contact.id, $index)" size="customToogle"></toggle></td>
                                        <td>
                                             {{contact.firstName}}
                                         </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-striped strikeTable" style="position: relative; margin-bottom: 0;">
                                 <!-- <table class="table table-striped" style="position: relative; margin-bottom: 0;"> -->
                                  <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 ng-repeat="fuel in fuelPricing | orderBy:'name' : 'reverse' | filter:{ status: true }" ng-class="fuel.fuelPricing.omit ? 'strikeout' : ''">
                                       <!-- <tr ng-repeat="fuel in fuelPricing | orderBy:'name' : 'reverse' | filter:{ status: true }"> -->
                                        <td><input type="checkbox" ng-model="fuel.fuelPricing.omit" ng-change="updateOmit(fuel.fuelPricing, fuel.status)"></td>
                                        <td>{{fuel.name}}</td>
                                        <td>${{fuel.fuelPricing.cost | number :4}}</td>
                                        <td>${{fuel.fuelPricing.papMargin | number :4}}</td>
                                        <td style="color:#55AF8B;">${{fuel.fuelPricing.papTotal | number :4}}</td>
                                        <td style="color:#F90">{{fuel.fuelPricing.expirationDate | date : "MM/dd/y" }}</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
                                           <toggle ng-model="data.priceEmail" size="customToogle"></toggle>
                                        </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-click="checkPrimaryContact()" ng-model="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" id="reset" 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>
 <!-- SetUp fuel order -->
 <form class="modal" id="demo-modal-4" name="orderform">
     <div class="modal-dialog modal-md">
         <div class="modal-content">
             <div class="modal-body" 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>Search and Dispatch Fuel</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-xs-12">
                                            <div class="pull-left" style="width: 110px;">
                                                <label class="new-input-label"><b>Company</b></label>
                                            </div>
                                            <div class="pull-left" style="width: calc(100% - 110px);">
                                                <input type="text" disabled ng-model="order.companyName"  class="form-control" value="{{order.companyName}}" />
                                            </div>
                                            <div class="clearfix"></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>Aircraft</b></label>
                                                 </div>
                                                 <div class="pull-left" style="width: calc(100% - 110px);">
                                                     <select class="form-control" ng-model="order.aircraftName" required>
 														<option selected disabled value="">Select Aircraft</option>
 														<option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
 													</select>
                                                 </div>
                                                 <div class="clearfix"></div>
                                             </div>
                                             <div class="col-md-6">
                                                 <div class="pull-left" style="width: 110px;">
                                                     <label class="new-input-label"><b>Requested Volume</b></label>
                                                 </div>
                                                 <div class="pull-left" style="width: calc(100% - 110px);">
                                                     <input type="text" ng-model="order.volume" class="form-control" required>
                                                 </div>
                                                 <div class="clearfix"></div>
                                             </div>
                                         </div>
                                         <div class="clearfix"></div>
                                         <br/>
                                         <div class="col-xs-12">
                                              <div class="pull-left" style="width: 110px;">
                                                  <label class="new-input-label"><b>Price Quote</b></label>
                                              </div>
                                              <div class="pull-left" style="width: calc(100% - 110px);">
                                                  <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote); tiervalue()" required>
 													<option value="" selected disabled>Select Price Quote</option>
 													<option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 2}} {{margin.productName}}</option>
 												</select>
                                              </div>
                                              <div class="clearfix"></div>
                                         </div>
                                         <div class="clearfix"></div>
                                         <br/>
                                         <div class="col-xs-12">
                                             <div class="pull-left" style="width: 110px;">
                                                 <label class="new-input-label"><b>Tier Break</b></label>
                                             </div>
                                             <div class="pull-left" style="width: calc(100% - 110px);">
                                                 <select class="form-control" ng-model="order.tierBreak">
 													<option value="" selected disabled>Select Tier Break</option>
 													<option ng-repeat="list in tierList" value="{{list.minTierBreak}}-{{list.maxTierBreak}}">
 														{{list.minTierBreak}}-{{list.maxTierBreak}} = ${{list.marginTotal | number: 2}} {{list.marginTemplate.marginName}}
 													</option>
 												</select>
                                             </div>
                                             <div class="clearfix"></div>
                                         </div>
                                         <div class="clearfix"></div>
                                         <br/>
                                         <div class="col-xs-12">
                                             <div class="pull-left" style="width: 110px;">
                                                 <label class="new-input-label"><b>Uplift Date</b></label>
                                             </div>
                                             <div class="pull-left" style="width: calc(100% - 110px);">
                                                 <input type="text" ng-model="order.upliftDate" datepicker class="form-control" style="width: 100px" required>
                                             </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" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
                     <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="dispatchFuel()">Dispatch</button>
                 </div>
             </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 kd</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>
                                                 <th>JET A Margin</th>
                                                 <th>AVGS 100LL Margin</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: 15%">
                                                    <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
                                                 </td> -->
                                                 <td style="width: 15%">
                                                    <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                    <select class="form-control" style="width: fit-content;" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                    <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.size" ng-change="getFuelType(aircraftData.size, $index)">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}" ng-selected="aircraftData.size = aircraftData.aircraftSizeList[0].aircraftSize.id">{{size.aircraftSize.size}}</option>
                                                   </select>
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                                   </select>
                                                   <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList" ng-disabled="jetShow[$index]">
                                                     <option value="" disabled>Select...</option>
                                                   </select> -->
                                                 </td>
                                                 <td style="width: 17%">
                                                   <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
                                                       <option value="" disabled>Select</option>
                                                       <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
                                                   </select>
                                                  <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList" ng-disabled="marginShow[$index]">
                                                     <option value="" disabled>Select...</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" id="reset" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="aircraftForm.$invalid" ng-click="saveCompanyData()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <div class="customConfirmPopBackdrop" id="fuelerchange" >
    <div class="customModalInner" style="max-width: 550px;">
       <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;">{{statusMessage}}</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="fuelerAcceptStatus()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="fuelerCancelStatus()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="confirm1">
    <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 that you want to email pricing to everyone in your contact list?</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="sendMail()">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="primaryContact">
    <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 set this person as your primary contact?</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="sendPrimaryContact()">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelPrimaryContact()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="customFieldEmail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
             <div class="col-md-10">
                 <form>
                   Email Type:<br>
                   <input type="text" name="firstname" ng-model="custom.title"><br>
                   Email-Address:<br>
                   <input type="text" name="lastname" ng-model="custom.content">
                 </form>
             </div>
             <div class="clearfix"></div>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptCustomField('email')">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelCustomField()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="customFieldPhone">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
             <div class="col-md-10">
                 <form>
                   Phone Type:<br>
                   <input type="text" name="firstname" ng-model="custom.title"><br>
                   Number:<br>
                   <input type="text" name="lastname" ng-model="custom.content">
                 </form>
             </div>
             <div class="clearfix"></div>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptCustomField('phone')">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelCustomField()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="updateContact">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
             <div class="col-md-10">
                 <form>
                   Phone Type:<br>
                   <input type="text" name="firstname" ng-model="updateData.title"><br>
                   Number:<br>
                   <input type="text" name="lastname" ng-model="updateData.content">
                 </form>
             </div>
             <div class="clearfix"></div>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptUpdateField('phone')">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelUpdateField()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="updateEmail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <div class="col-md-2"><img class="src-image" src="img/images.jpg"></div>
             <div class="col-md-10">
                 <form>
                   Email Type:<br>
                   <input type="text" name="firstname" ng-model="updateData.title"><br>
                   Email-Address:<br>
                   <input type="text" name="lastname" ng-model="updateData.content">
                 </form>
             </div>
             <div class="clearfix"></div>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptUpdateField('email')">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelUpdateField()">Cancel</button>
       </div>
    </div>
 </div>
 <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;">Please confirm! Are you sure you want to DELETE this Aircraft?</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="aircraftDelete()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="delete2">
    <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;">Please confirm! Are you sure you want to DELETE this Company & its related data?</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="deleteCompanyData()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="delete3">
    <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;">{{statusMessage}}</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="companyStatus()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelStatus()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="toogleMail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <!-- <td>
                   <img src="" style="width: 50px;">
                </td> -->
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;text-align: center;">{{messageText}}</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="cancelToogle()">Ok</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="addAirCraftError">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</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="cancelAirCraftError()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="addAirCraftWarning">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</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="acceptAirCraftError()">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
       </div>
    </div>
 </div>
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <!-- <script
    CKEDITOR.replace( 'editor2', {
       height: 250,
       extraPlugins: 'divarea'
    } );
    </script> -->