From 87660da6c92cf73436909d8a3fe2f15343d4fe50 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Tue, 25 Sep 2018 15:59:32 +0530
Subject: [PATCH] testing

---
 app/partials/customers/customers.controller.js | 20 ++++++++++++--------
 app/partials/customers/customers.html          | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index 3b825b4..f253edd 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -80,7 +80,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 
 	function getAllCompanies() {
 		CustomersService.getAllCompanies().then(function(result) {
-			//console.log('log', result);
+			console.log('company list', result);
 			$scope.companyList = result;
 			for (var i = 0; i < $scope.companyList.length; i++) {
 				if ($scope.companyList[i].companyContact != null) {
@@ -141,6 +141,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	function getData() {
 		$scope.showLoader = true;
 		CustomersService.getAircraftMake().then(function(result) {
+			//console.log("==aircrafts===",result)
 			$scope.aircraftMakeList = result;
 			$scope.showLoader = false;
 		})
@@ -249,6 +250,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	$scope.aircraftListData = {};
 	$scope.addData = [];
 	$scope.saveCompanyData = function() {
+		console.log("company data --",$scope.data)
 		CustomersService.addCompany($scope.data).then(function(result) {
 			$scope.accountId = result;
 			$scope.aircraft.accountId = $scope.accountId;
@@ -276,7 +278,8 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 					toastr.success('' + result.success + '', {
 						closeButton : true
 					})
-					$('#demo-modal-3').modal('hide');
+					 $('#demo-modal-3').css('display', 'none');
+                     $('.modal-backdrop').css('display', 'none');
 					getAllCompanies();
 				} else {
 					toastr.error('' + result.statusText + '', {
@@ -291,7 +294,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	/*add a fuel order*/
 	$scope.getOrders = function() {
 		fuelOrdersService.getOrders().then(function(result) {
-
+			console.log("==get orders===",result)
 			$scope.orderdata = result;
 			for (var i = 0; i < $scope.orderdata.length; i++) {
 				$scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
@@ -411,10 +414,9 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	}
 
 	$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
+		if (value != undefined && valueOf != undefined) {
+			value = JSON.parse(value)
+			$scope.order.total = value.cost * valueOf; 
 		}
 	}
 
@@ -443,6 +445,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 				if ($scope.selectedCompanyId != '') {
 					fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
 						$scope.aircraftList = aircraft;
+						console.log("===tail search====",aircraft);
 					})
 				}
 				if ($scope.marginId != '') {
@@ -468,9 +471,10 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 		$('#demo-modal-4').css('display', '');
 	}
 
-	$scope.setFuel = function(companyName) {
+	$scope.setFuel = function(companyName,certificateType) {
 		$('#demo-modal-4').css('display', 'block');
 		$scope.order.defaultCompanyName = companyName;
+		$scope.order.certificateType = certificateType; 
 		$scope.getAircraft(companyName);
 	//  event.stopPropagation();
 	//  $state.go('app.updateFuelManager');
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index 4631d03..ee4d989 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -130,7 +130,7 @@
                               {{row.marginAllIn | number : 4}}
                              </td>
                              <td data-title="''">
-                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName)">Setup Fuel</button>
+                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.certificateType)">Setup Fuel</button>
                              </td>
                            </tr>
                          </table>
@@ -543,7 +543,7 @@
                                        <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)" required>
+                                       <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>
@@ -575,7 +575,7 @@
                                        <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.volume,'v')" class="form-control"  placeholder="" required>
+                                        <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>
@@ -606,13 +606,13 @@
                                     <div class="clearfix"></div>
                                  </div>
                               
-                              <div class="col-md-6" style="margin-top: 22px;">
+                              <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" ng-keyup="addTotal(order.invoiced,'i')" class="form-control"  placeholder="">
+                                       <input type="text"  ng-model="order.invoiced"  class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -677,7 +677,7 @@
                                        <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 />
+                                       <input type="text"  disabled ng-model="order.fboCost | number : 4" class="form-control"  placeholder="0.0000" />
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -710,7 +710,7 @@
                                        <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>
@@ -728,11 +728,11 @@
                                       <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="pending">pending</option> 
                                             <option value="invoiced">invoiced</option>
                                             <option value="paid">paid</option>
-                                            <option value="cancelled">cancelled</option>
-                                            <option value="archived">archived</option>
+                                           <!--  <option value="cancelled">cancelled</option>
+                                            <option value="archived">archived</option> -->
                                          </select>
                                       </div>
                                       <div class="clearfix"></div>
-- 
2.0.0