Commit 6c795a9f9e21b380edc0edc72badb7034e042ae6
1 parent
e33f16d894
Exists in
master
tenant/caa status changed
Showing
6 changed files
with
12 additions
and
9 deletions
Show diff stats
app/partials/customers/customers.controller.js
| ... | ... | @@ -482,7 +482,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta |
| 482 | 482 | } |
| 483 | 483 | |
| 484 | 484 | if($scope.baseTenant && $scope.contractFuelVendor ){ |
| 485 | - $scope.fuelData.source = "Tenant/Base Customer CAA Member" ; | |
| 485 | + $scope.fuelData.source = "Tenant/CAA" ; | |
| 486 | 486 | }else if($scope.baseTenant) |
| 487 | 487 | { |
| 488 | 488 | $scope.fuelData.source = "Tenant/Base Customer"; | ... | ... |
app/partials/customers/customers.html
| ... | ... | @@ -750,8 +750,9 @@ |
| 750 | 750 | <label class="new-input-label"><b>Source</b></label> |
| 751 | 751 | </div> |
| 752 | 752 | <div class="pull-left" style="width: calc(100% - 110px);"> |
| 753 | - <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div> | |
| 754 | - <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div> | |
| 753 | + <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div> | |
| 754 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div> | |
| 755 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div> | |
| 755 | 756 | <!-- <select class="form-control" ng-model="order.source" style="width: 100%;"> |
| 756 | 757 | <option value="" disabled selected hidden>Select Source</option> |
| 757 | 758 | <option value="Tenant">Tenant</option> | ... | ... |
app/partials/enterFuelOrder/enterFuelOrder.controller.js
| ... | ... | @@ -169,7 +169,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | if($scope.baseTenant && $scope.contractFuelVendor ){ |
| 172 | - $scope.order.source = "Tenant/Base Customer CAA Member" ; | |
| 172 | + $scope.order.source = "Tenant/CAA" ; | |
| 173 | 173 | }else if($scope.baseTenant) |
| 174 | 174 | { |
| 175 | 175 | $scope.order.source = "Tenant/Base Customer"; | ... | ... |
app/partials/enterFuelOrder/enterFuelOrder.html
| ... | ... | @@ -191,8 +191,9 @@ |
| 191 | 191 | <label class="new-input-label"><b>Source</b></label> |
| 192 | 192 | </div> |
| 193 | 193 | <div class="pull-left" style="width: calc(100% - 110px);"> |
| 194 | - <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div> | |
| 195 | - <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div> | |
| 194 | + <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div> | |
| 195 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div> | |
| 196 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div> | |
| 196 | 197 | <!-- <select class="form-control" ng-model="order.source" style="width: 100%;"> |
| 197 | 198 | <option value="" disabled selected hidden>Select Source</option> |
| 198 | 199 | <option value="Tenant">Tenant</option> | ... | ... |
app/partials/fuelOrders/fuelOrders.controller.js
| ... | ... | @@ -335,7 +335,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT |
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | if($scope.baseTenant && $scope.contractFuelVendor ){ |
| 338 | - $scope.fuelData.source = "Tenant/Base Customer CAA Member" ; | |
| 338 | + $scope.fuelData.source = "Tenant/CAA" ; | |
| 339 | 339 | }else if($scope.baseTenant) |
| 340 | 340 | { |
| 341 | 341 | $scope.fuelData.source = "Tenant/Base Customer"; | ... | ... |
app/partials/fuelOrders/fuelOrders.html
| ... | ... | @@ -709,8 +709,9 @@ |
| 709 | 709 | <label class="new-input-label"><b>Source</b></label> |
| 710 | 710 | </div> |
| 711 | 711 | <div class="pull-left" style="width: calc(100% - 110px);"> |
| 712 | - <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div> | |
| 713 | - <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div> | |
| 712 | + <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div> | |
| 713 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div> | |
| 714 | + <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div> | |
| 714 | 715 | <!-- <select class="form-control" ng-model="order.source" style="width: 100%;"> |
| 715 | 716 | <option value="" disabled selected hidden>Select Source</option> |
| 716 | 717 | <option value="Tenant">Tenant</option> | ... | ... |