From 6c795a9f9e21b380edc0edc72badb7034e042ae6 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Fri, 12 Oct 2018 18:30:29 +0530
Subject: [PATCH] tenant/caa status changed

---
 app/partials/customers/customers.controller.js           | 2 +-
 app/partials/customers/customers.html                    | 5 +++--
 app/partials/enterFuelOrder/enterFuelOrder.controller.js | 2 +-
 app/partials/enterFuelOrder/enterFuelOrder.html          | 5 +++--
 app/partials/fuelOrders/fuelOrders.controller.js         | 2 +-
 app/partials/fuelOrders/fuelOrders.html                  | 5 +++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index ec09420..4594ab4 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -482,7 +482,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	          } 
           		
           	 if($scope.baseTenant && $scope.contractFuelVendor ){
-                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+                $scope.fuelData.source = "Tenant/CAA" ;
               }else if($scope.baseTenant)
               {
                 $scope.fuelData.source = "Tenant/Base Customer";
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index 71a38c8..d89ad86 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -750,8 +750,9 @@
                                          <label class="new-input-label"><b>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
-                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
+                                        <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</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>
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
index 52c7f3f..5b88a45 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -169,7 +169,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 		}
 
 		if($scope.baseTenant && $scope.contractFuelVendor ){
-			$scope.order.source = "Tenant/Base Customer CAA Member" ;
+			$scope.order.source = "Tenant/CAA" ;
 		}else if($scope.baseTenant)
 		{
 			$scope.order.source = "Tenant/Base Customer";
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html
index 22ab7eb..75f0341 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.html
+++ b/app/partials/enterFuelOrder/enterFuelOrder.html
@@ -191,8 +191,9 @@
 	                                       <label class="new-input-label"><b>Source</b></label>
 	                                    </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
-                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                        <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</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>
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index cedc303..67c5c18 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -335,7 +335,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
               } 
             
             if($scope.baseTenant && $scope.contractFuelVendor ){
-                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+                $scope.fuelData.source = "Tenant/CAA" ;
               }else if($scope.baseTenant)
               {
                 $scope.fuelData.source = "Tenant/Base Customer";
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 16d9d5c..87dcaed 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -709,8 +709,9 @@
                                          <label class="new-input-label"><b>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                      <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
-                                      <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</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>
-- 
2.0.0