viithiisys / Acufuel

Download as
Browse Code ยป

Commit 60b62c053d275b6c194a0a684b4fb6ededa20309

Authored by Kuldeep Arora
1 parent 2075411ed7
Exists in master

redesign of direct transaction

Showing 3 changed files with 240 additions and 275 deletions   Show diff stats
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @60b62c0
... ... @@ -26,80 +26,6 @@
26 26 <form name="orderform" novalidate>
27 27  
28 28 <div class="customInputWrap">
29   - <!-- <div class="col-md-3 text-right">
30   - <label>Company</label>
31   - </div>
32   - <div class="col-md-9">
33   - <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
34   - <option value="" selected disabled>Select Company</option>
35   - <option ng-repeat="list in companyList">{{list.companyName}}</option>
36   - </select>
37   - </div>
38   - <div class="clearfix"></div>
39   - </div>
40   - <div class="customInputWrap">
41   - <div class="col-xs-10">
42   - <label>Aircraft</label>
43   - </div>
44   - <div class="col-md-3">
45   - <select class="form-control" ng-model="order.aircraftName" required>
46   - <option selected disabled value="">Select Aircraft</option>
47   - <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
48   - </select>
49   - </div>
50   - <div class="col-md-3 text-right">
51   - <label>Requested Volume</label>
52   - </div>
53   - <div class="col-md-3">
54   - <input type="text" ng-model="order.volume" class="form-control" required>
55   - </div>
56   - <div class="clearfix"></div>
57   - </div>
58   -
59   - <div class="customInputWrap">
60   - <div class="col-md-3 text-right">
61   - <label>Product</label>
62   - </div>
63   - <div class="col-md-8 col-md-offset-1">
64   - <select class="form-control" ng-model="order.priceQuote" required>
65   - <option value="" selected disabled>Select Product</option>
66   - <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 2}} {{margin.productName}}</option>
67   - </select>
68   - </div>
69   - <div class="clearfix"></div>
70   - </div>
71   -
72   - <div class="customInputWrap">
73   - <div class="col-md-3 text-right">
74   - <label>Tier Break</label>
75   - </div>
76   - <div class="col-md-8 col-md-offset-1">
77   - <select class="form-control" ng-model="order.tierBreak">
78   - <option value="" selected disabled>Select Tier Break</option>
79   - <option ng-repeat="list in tierList" value="{{list.minTierBreak}}-{{list.maxTierBreak}}">
80   - {{list.minTierBreak}}-{{list.maxTierBreak}} = ${{list.marginTotal | number: 2}} {{list.marginTemplate.marginName}}
81   - </option>
82   - </select>
83   - </div>
84   - <div class="clearfix"></div>
85   - </div>
86   -
87   - <div class="customInputWrap">
88   - <div class="col-md-3 text-right">
89   - <label>Uplift Date</label>
90   - </div>
91   - <div class="col-md-3">
92   - <input type="text" ng-model="order.upliftDate" datepicker class="form-control" style="width: 100px" required>
93   - </div>
94   - <div class="col-md-3 text-right">
95   - <label>Departing FBO</label>
96   - </div>
97   - <div class="col-md-3">
98   - <input type="text" ng-model="order.departingDate" datepicker class="form-control">
99   - </div>
100   - <div class="clearfix"></div>
101   - </div> -->
102   -
103 29 <div class="col-xs-12">
104 30  
105 31 <div class="col-md-6">
... ... @@ -108,9 +34,9 @@
108 34 </div>
109 35 <div class="pull-left" style="width: calc(100% - 110px);">
110 36 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
111   - <option value="" selected disabled>Select Company</option>
112   - <option ng-repeat="list in companyList">{{list.companyName}}</option>
113   - </select>
  37 + <option value="" selected disabled>Select Company</option>
  38 + <option ng-repeat="list in companyList">{{list.companyName}}</option>
  39 + </select>
114 40 </div>
115 41 <div class="clearfix"></div>
116 42 </div>
... ... @@ -120,9 +46,9 @@
120 46 </div>
121 47 <div class="pull-left" style="width: calc(100% - 110px);">
122 48 <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
123   - <option value="" selected disabled>Select Product</option>
124   - <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
125   - </select>
  49 + <option value="" selected disabled>Select Product</option>
  50 + <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
  51 + </select>
126 52 </div>
127 53 <div class="clearfix"></div>
128 54 </div>
... ... @@ -140,9 +66,9 @@
140 66 </div>
141 67 <div class="pull-left" style="width: calc(100% - 110px);">
142 68 <select class="form-control" ng-model="order.aircraftName" required>
143   - <option selected disabled value="">Select Aircraft</option>
144   - <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
145   - </select>
  69 + <option selected disabled value="">Select Aircraft</option>
  70 + <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
  71 + </select>
146 72 </div>
147 73 <div class="clearfix"></div>
148 74 </div>
... ... @@ -151,7 +77,6 @@
151 77 <label class="new-input-label"><b>Volume</b></label>
152 78 </div>
153 79 <div class="pull-left" style="width: calc(100% - 110px);">
154   - <!-- <input type="text" ng-model="order.volume" class="form-control" required> -->
155 80 <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
156 81 </div>
157 82 <div class="clearfix"></div>
... ... @@ -208,14 +133,11 @@
208 133 Date
209 134 <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
210 135 </div>
211   - <!-- {{editdata.upliftDateString}} -->
212 136 <div style="width: 50%; float: left;">
213 137 Time
214 138 <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
215 139 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
216 140 </select>
217   - <!-- <input type="time" ng-model="editdata.etaTime" step="60" value="12:00" style="width: 90%"> -->
218   -
219 141 </div>
220 142 </div>
221 143 <div class="clearfix"></div>
... ... @@ -228,7 +150,6 @@
228 150 </div>
229 151 <div class="pull-left" style="width: calc(100% - 110px);">
230 152 <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
231   - <!--{{editdata.total }}-->
232 153 </div>
233 154 </div>
234 155 </div>
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @60b62c0
... ... @@ -262,6 +262,14 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
262 262 }
263 263 }
264 264  
  265 + $scope.setCost = function(cost){
  266 + if(cost != null) {
  267 + var obj =JSON.parse(cost);
  268 + $scope.order.fboCost = obj.cost;
  269 + }
  270 +
  271 + }
  272 +
265 273 $scope.addTotal = function(value, valueOf){
266 274 if(valueOf == 'v'){
267 275 $scope.order.total = value * $scope.order.invoiced
... ... @@ -271,62 +279,67 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
271 279 }
272 280  
273 281 $scope.addFuelData = function() {
274   - $scope.showLoader = true;
275   -
276   - if ($scope.order.priceQuote === null || $scope.order.priceQuote == '') {
277   - $scope.showLoader = false;
278   - toastr.error('Please select Company and Price Quote.', {
279   - closeButton: true
280   - })
281   - }else{
  282 + $scope.showLoader = true;
  283 + $scope.fuelData = {};
  284 + $scope.fuelData.companyId = $scope.selectedCompanyId;
  285 +
  286 + $scope.fuelData.companyName = $scope.order.companyName;
  287 + var aircraftObj =JSON.parse($scope.order.aircraftName);
  288 + $scope.fuelData.aircraftName = aircraftObj.tail;
  289 + $scope.fuelData.make = aircraftObj.make;
  290 + $scope.fuelData.model = aircraftObj.model;
  291 + $scope.fuelData.fuelOn = $scope.order.fuelOn;
  292 + $scope.fuelData.invoiced = $scope.order.invoiced;
  293 + $scope.fuelData.volume = $scope.order.volume;
  294 + $scope.fuelData.source = $scope.order.source;
  295 + $scope.fuelData.status = $scope.order.status;
  296 + $scope.fuelData.total = $scope.order.total;
  297 + //tier no use
  298 + $scope.fuelData.tierBreak = $scope.order.tierBreak;
  299 +
  300 + var obj =JSON.parse($scope.order.priceQuote);
  301 + $scope.fuelData.priceQuote = obj.papTotal;
  302 + $scope.fuelData.fboCost = obj.cost;
  303 + $scope.fuelData.productName = obj.productName;
  304 +
  305 + $scope.fuelData.etaTime = $scope.order.etaTime;
  306 + $scope.fuelData.etdTime = $scope.order.etdTime;
  307 + $scope.fuelData.certificateType = $scope.order.certificateType;
  308 + var currentDate = new Date();
  309 + var hours = currentDate.getHours();
  310 + var min = currentDate.getMinutes();
  311 + var sec = currentDate.getSeconds();
  312 + if ($scope.order.upliftDate != '') {
  313 + $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
  314 + $scope.order.upliftDate = new Date($scope.order.upliftDate);
  315 + $scope.fuelData.upliftDate = $scope.order.upliftDate.getTime();
  316 + }
282 317  
283   - if ($scope.order.upliftDate != '') {
284   - $scope.order.upliftDate = new Date($scope.order.upliftDate);
285   - $scope.order.upliftDate = $scope.order.upliftDate.getTime();
286   - }
287   - if ($scope.order.departingDate != '') {
288   - $scope.order.departingDate = new Date($scope.order.departingDate);
289   - $scope.order.departingDate = $scope.order.departingDate.getTime();
290   - }
291   - var obj =JSON.parse($scope.order.priceQuote);
292   - //$scope.order.priceQuote = obj.papMargin;
293   - $scope.order.priceQuote = obj.papTotal;
294   - $scope.fuelData = {};
295   - $scope.fuelData.aircraftName = $scope.order.aircraftName;
296   - $scope.fuelData.companyName = $scope.order.companyName;
297   - $scope.fuelData.departingDate = $scope.order.departingDate;
298   - $scope.fuelData.fboCost = $scope.order.fboCost;
299   - $scope.fuelData.id = $scope.order.id;
300   - $scope.fuelData.invoiced = $scope.order.invoiced;
301   - $scope.fuelData.priceQuote = $scope.order.priceQuote;
302   - $scope.fuelData.productName = obj.productName;
303   - $scope.fuelData.volume = $scope.order.volume;
304   - $scope.fuelData.source = $scope.order.source;
305   - $scope.fuelData.status = $scope.order.status;
306   - $scope.fuelData.tierBreak = $scope.order.tierBreak;
307   - $scope.fuelData.total = $scope.order.total;
308   - $scope.fuelData.upliftDate = $scope.order.upliftDate;
309   - $scope.fuelData.companyId = $scope.selectedCompanyId;
  318 +
  319 + if ($scope.order.departingDate != '') {
  320 + $scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec;
  321 + $scope.order.departingDate = new Date($scope.order.departingDate);
  322 + $scope.fuelData.departingDate = $scope.order.departingDate.getTime();
  323 + }
  324 +
310 325  
311   -
312   -
313   - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
314   - //console.log("=====$scope.fueldata======",$scope.fuelData)
315   - fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
316   - $scope.showLoader = false;
317   - $scope.order = {};
318   - $scope.dispatchOrder.fuelOrderList = [];
319   - $('#demo-modal-4').css('display', '');
320   - $scope.getOrders();
321   - toastr.success('Fuel Order Dispatched Successfully', {
322   - closeButton: true
323   - })
324   - })
325   -
326   - }
  326 +
  327 + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  328 + //console.log("=====$scope.fueldata======",$scope.fuelData)
  329 + fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
  330 + $scope.showLoader = false;
  331 + $scope.order = {};
  332 + $scope.dispatchOrder.fuelOrderList = [];
  333 + $('#demo-modal-4').css('display', '');
  334 + $scope.getOrders();
  335 + toastr.success('Fuel Order Dispatched Successfully', {
  336 + closeButton: true
  337 + })
  338 + })
327 339  
328   -
  340 +
329 341 }
  342 +
330 343 $scope.updateStatus = function(row, status) {
331 344 $scope.showLoader = true;
332 345 $scope.fuelData = {};
... ... @@ -460,13 +473,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
460 473 }
461 474  
462 475 }
463   - $scope.setCost = function(cost){
464   - if(cost != null) {
465   - var obj =JSON.parse(cost);
466   - $scope.order.fboCost = obj.cost;
467   - }
468   -
469   - }
  476 +
470 477  
471 478  
472 479 $scope.cancelData = function() {
... ... @@ -600,6 +607,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
600 607  
601 608 $scope.aircraftListData = {};
602 609 $scope.addData = [];
  610 +
603 611 $scope.saveCompanyData = function(){
604 612 CustomersService.addCompany($scope.data).then(function(result) {
605 613 $scope.accountId = result;
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @60b62c0
... ... @@ -527,160 +527,168 @@
527 527  
528 528  
529 529 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
530   - <div class="modal-dialog modal-lg">
531   - <div class="modal-content">
532   - <div class="modal-body step-1" data-step="1" style="padding: 0;">
533   - <div>
534   - <div class="row" style="margin: 0;">
535   - <div>
536   - <div class="widget" style="margin-bottom: 0;">
537   - <div class="widget-header">
538   - <i class="icon-pencil"></i>
539   - <i class="fa fa-tasks" aria-hidden="true"></i>
540   - <h3>Add a Fuel Order</h3>
541   - <div class="clearfix"></div>
542   - </div>
543   - <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
544   - <div class="col-xs-12">
545   - <div class="col-xs-12">
  530 + <div class="modal-dialog modal-lg">
  531 + <div class="modal-content">
  532 + <div class="modal-body step-1" data-step="1" style="padding: 0;">
  533 + <div>
  534 + <div class="row" style="margin: 0;">
  535 + <div>
  536 + <div class="widget" style="margin-bottom: 0;">
  537 + <div class="widget-header">
  538 + <i class="icon-pencil"></i>
  539 + <i class="fa fa-tasks" aria-hidden="true"></i>
  540 + <h3>Add a Fuel Order</h3>
  541 + <div class="clearfix"></div>
  542 + </div>
  543 + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
  544 + <div class="col-xs-12">
  545 + <div class="col-xs-12">
546 546  
547 547 <div class="col-md-6">
548 548 <div class="pull-left" style="width: 110px;">
549   - <label class="new-input-label"><b>Fueling Date</b></label>
  549 + <label class="new-input-label"><b>Company</b></label>
550 550 </div>
551 551 <div class="pull-left" style="width: calc(100% - 110px);">
552   - <input type="type" ng-model="order.upliftDate" class="form-control" placeholder="Select Date" datepicker />
553   - <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
  552 + <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
  553 + <option value="" selected disabled>Select Company</option>
  554 + <option ng-repeat="list in companyList">{{list.companyName}}</option>
  555 + </select>
554 556 </div>
555 557 <div class="clearfix"></div>
556 558 </div>
557   - <div class="col-md-6">
  559 + <div class="col-md-6">
558 560 <div class="pull-left" style="width: 110px;">
559   - <label class="new-input-label"><b>Volume</b></label>
  561 + <label class="new-input-label"><b>Product</b></label>
560 562 </div>
561 563 <div class="pull-left" style="width: calc(100% - 110px);">
562   - <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
  564 + <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
  565 + <option value="" selected disabled>Select Product</option>
  566 + <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
  567 + </select>
563 568 </div>
564 569 <div class="clearfix"></div>
565 570 </div>
566   - </div>
567   - <div class="clearfix"></div><br>
  571 +
  572 + </div>
  573 + <div class="clearfix"></div>
  574 + <br/>
568 575  
569   - <div class="col-xs-12">
  576 +
  577 + <div class="col-xs-12">
570 578  
571 579 <div class="col-md-6">
572 580 <div class="pull-left" style="width: 110px;">
573   - <label class="new-input-label"><b>Company</b></label>
  581 + <label class="new-input-label"><b>Aircraft</b></label>
574 582 </div>
575 583 <div class="pull-left" style="width: calc(100% - 110px);">
576   - <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">
577   - <option value="" selected disabled>Select Company</option>
578   - <option ng-repeat="list in companyList">{{list.companyName}}</option>
579   - </select>
  584 + <select class="form-control" ng-model="order.aircraftName" required>
  585 + <option selected disabled value="">Select Aircraft</option>
  586 + <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
  587 + </select>
580 588 </div>
581 589 <div class="clearfix"></div>
582 590 </div>
583   - <div class="col-md-6">
  591 + <div class="col-md-6">
584 592 <div class="pull-left" style="width: 110px;">
585   - <label class="new-input-label"><b>Invoiced</b></label>
586   - <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
  593 + <label class="new-input-label"><b>Volume</b></label>
587 594 </div>
588 595 <div class="pull-left" style="width: calc(100% - 110px);">
589   - <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="0.0000" valid-number />
  596 + <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
590 597 </div>
591 598 <div class="clearfix"></div>
592 599 </div>
593 600  
594   - </div>
  601 + </div>
595 602 <div class="clearfix"></div>
596   - <br/>
597   -
598   -
599   - <div class="col-xs-12">
  603 + <br/>
600 604  
601   -
602   - <div class="col-md-6">
  605 + <div class="col-xs-12">
  606 +
  607 + <div class="col-md-6">
603 608 <div class="pull-left" style="width: 110px;">
604   - <label class="new-input-label"><b>Tail #</b></label>
  609 + <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
605 610 </div>
606   - <div class="pull-left" style="width: calc(100% - 110px);">
607   - <select class="form-control" ng-model="order.aircraftName">
608   - <option selected disabled value="">Select Aircraft</option>
609   - <option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
610   - </select>
  611 + <div class="pull-left" style="width: calc(100% - 110px);">
  612 + <div style="width: 50%; float: left;">
  613 + Date
  614 + <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control" placeholder="" datepicker/>
  615 + </div>
  616 + <div style="width: 50%; float: left;">
  617 + Time
  618 + <select class="form-control" ng-model="order.etaTime" style="width: 100%;">
  619 + <option ng-repeat="li in etaTimeList">{{li.time}}</option>
  620 + </select>
  621 +
  622 + </div>
611 623 </div>
612 624 <div class="clearfix"></div>
613 625 </div>
614   - <div class="col-md-6">
  626 +
  627 + <div class="col-md-6" style="margin-top: 22px;">
615 628 <div class="pull-left" style="width: 110px;">
616   - <label class="new-input-label"><b>Total</b></label>
  629 + <label class="new-input-label"><b>Invoiced</b></label>
617 630 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
618 631 </div>
619 632 <div class="pull-left" style="width: calc(100% - 110px);">
620   - <input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0000" value="{{order.volume * order.invoiced}}" valid-number />
621   -
  633 + <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
622 634 </div>
623 635 <div class="clearfix"></div>
624 636 </div>
625   - </div>
626   - <div class="clearfix"></div>
627   - <br/>
628   - <div class="col-xs-12">
  637 + </div>
  638 + <div class="clearfix"></div><br>
629 639  
630   -
631   - <div class="col-md-6">
  640 +
  641 + <div class="col-xs-12">
  642 +
  643 + <div class="col-md-6">
632 644 <div class="pull-left" style="width: 110px;">
633   - <label class="new-input-label"><b>Source</b></label>
  645 + <label class="new-input-label" style="margin-top: 25px;"><b>ETD</b></label>
634 646 </div>
635   - <div class="pull-left" style="width: calc(100% - 110px);">
636   - <!-- <select ui-select2 ng-model="order.source" style="width: 100%;">
637   - <option value="" selected disabled>Select Source</option>
638   - <option ng-repeat="list in sourceList">{{list.source}}</option>
639   - </select> -->
640   - <select class="form-control" ng-model="order.source" style="width: 100%;">
641   - <option value="" disabled selected hidden>Select Source</option>
642   - <option value="Tenant">Tenant</option>
643   - <option value="CAA">CAA</option>
644   - <option value="Tenant/CAA">Tenant/CAA</option>
645   - </select>
  647 + <div class="pull-left" style="width: calc(100% - 110px);">
  648 + <div style="width: 50%; float: left;">
  649 + Date
  650 + <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
  651 + </div>
  652 + <div style="width: 50%; float: left;">
  653 + Time
  654 + <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
  655 + <option ng-repeat="list in etdTimeList">{{list.time}}</option>
  656 + </select>
  657 +
  658 + </div>
646 659 </div>
647 660 <div class="clearfix"></div>
648 661 </div>
649   - <div class="col-md-6">
  662 +
  663 + <div class="col-md-6" style="margin-top: 22px;">
650 664 <div class="pull-left" style="width: 110px;">
651   - <label class="new-input-label"><b>Product</b></label>
  665 + <label class="new-input-label"><b>Total</b></label>
  666 + <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
652 667 </div>
653   - <div class="pull-left" style="width: calc(100% - 110px);">
654   - <select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" class="price-quote-select">
655   - <option value="" selected disabled>Select Product</option>
656   - <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
657   - </select>
658   - </div>
659   - <div class="clearfix"></div>
  668 + <div class="pull-left" style="width: calc(100% - 110px);">
  669 + <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
660 670 </div>
661   -
662   - </div>
663   - <div class="clearfix"></div>
664   - <br/>
665   - <div class="col-xs-12">
  671 + </div>
  672 + </div>
  673 + <div class="clearfix"></div><br>
666 674  
667   -
668   - <div class="col-md-6">
  675 +
  676 + <div class="col-xs-12">
  677 +
  678 + <div class="col-md-6">
669 679 <div class="pull-left" style="width: 110px;">
670   - <label class="new-input-label"><b>Status</b></label>
  680 + <label class="new-input-label"><b>Fuel on</b></label>
671 681 </div>
672 682 <div class="pull-left" style="width: calc(100% - 110px);">
673   - <select ui-select2 ng-model="order.status" style="width: 100%;">
674   - <option value="" selected disabled>Select Status</option>
675   - <option value="pending">pending</option>
676   - <option value="invoiced">invoiced</option>
677   - <option value="paid">paid</option>
678   - <option value="cancelled">cancelled</option>
679   - <option value="archived">archived</option>
680   - </select>
  683 + <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
  684 + <option value="" disabled selected hidden>Select...</option>
  685 + <option value="Arrival">Arrival</option>
  686 + <option value="Departure">Departure</option>
  687 + </select>
681 688 </div>
682 689 <div class="clearfix"></div>
683 690 </div>
  691 +
684 692 <div class="col-md-6">
685 693 <div class="pull-left" style="width: 110px;">
686 694 <label class="new-input-label"><b>FBO Cost</b></label>
... ... @@ -691,35 +699,78 @@
691 699 </div>
692 700 <div class="clearfix"></div>
693 701 </div>
694   - </div>
695   - <div class="clearfix"></div>
696   - <br/>
697   - <div class="col-xs-12">
  702 + </div>
  703 + <div class="clearfix"></div><br>
698 704  
699   -
  705 + <div class="col-xs-12">
  706 + <div class="col-md-6">
  707 + <div class="pull-left" style="width: 110px;">
  708 + <label class="new-input-label"><b>Source</b></label>
  709 + </div>
  710 + <div class="pull-left" style="width: calc(100% - 110px);">
  711 + <select class="form-control" ng-model="order.source" style="width: 100%;">
  712 + <option value="" disabled selected hidden>Select Source</option>
  713 + <option value="Tenant">Tenant</option>
  714 + <option value="CAA">CAA</option>
  715 + <option value="Tenant/CAA">Tenant/CAA</option>
  716 + </select>
  717 + </div>
  718 + <div class="clearfix"></div>
700 719 </div>
701   - <div class="clearfix"></div>
702   - <br/>
703   - <div class="col-xs-12">
  720 + </div>
  721 + <div class="clearfix"></div>
  722 + <br/>
  723 + <div class="col-xs-12">
  724 +
  725 +
  726 + <div class="col-md-6">
  727 + <div class="pull-left" style="width: 110px;">
  728 + <label class="new-input-label"><b>Certificate Type</b></label>
  729 + </div>
  730 + <div class="pull-left" style="width: calc(100% - 110px);">
  731 + <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required>
  732 + <option value="" disabled selected hidden>Select...</option>
  733 + <option value="corporate">Part 91 (Corporate)</option>
  734 + <option value="charter">Part 135 (Charter)</option>
  735 + <option value="scheduled">Part 121 (Scheduled)</option>
  736 + <option value="military">Military</option>
  737 + <option value="government">Government</option>
  738 + </select>
  739 + </div>
  740 + <div class="clearfix"></div>
  741 + </div>
  742 + <div class="col-md-6">
  743 + <div class="pull-left" style="width: 110px;">
  744 + <label class="new-input-label"><b>Status</b></label>
  745 + </div>
  746 + <div class="pull-left" style="width: calc(100% - 110px);">
  747 + <select class="form-control" ng-model="order.status" style="width: 100%;">
  748 + <option value="" disabled selected hidden>Select Status</option>
  749 + <option value="pending">pending</option>
  750 + <option value="invoiced">invoiced</option>
  751 + <option value="paid">paid</option>
  752 + <option value="cancelled">cancelled</option>
  753 + <option value="archived">archived</option>
  754 + </select>
  755 + </div>
  756 + <div class="clearfix"></div>
  757 + </div>
  758 + </div>
  759 + <div class="clearfix"></div><br>
704 760  
705   - </div>
706   - <div class="clearfix"></div>
707   -
708 761 </div>
709 762 </div>
710   - <div class="clearfix"></div>
711 763 </div>
712 764 </div>
713 765 </div>
714 766 </div>
715   -
716 767 <div class="modal-footer" style="border-top: 0;">
717   - <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
718   - <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFuelData()">Save</button>
719   - </div>
720   - </div>
721   - </div>
722   -</div>
  768 + <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
  769 + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="fuelOrderForm.$invalid" ng-click="addFuelData()">Save</button>
  770 + </div>
  771 + </div>
  772 + </div>
  773 + </div>
723 774 </form>
724 775  
725 776  
... ... @@ -750,13 +801,11 @@
750 801 Date
751 802 <input type="text" style="width: 90%;" ng-model="editdata.upliftDateString" class="form-control" placeholder="" datepicker/>
752 803 </div>
753   - <!-- {{editdata.upliftDateString}} -->
754 804 <div style="width: 50%; float: left;">
755 805 Time
756 806 <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;">
757 807 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
758 808 </select>
759   - <!-- <input type="time" ng-model="editdata.etaTime" step="60" value="12:00" style="width: 90%"> -->
760 809  
761 810 </div>
762 811 </div>
... ... @@ -788,7 +837,6 @@
788 837 <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;">
789 838 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
790 839 </select>
791   - <!-- <input type="time" ng-model="editdata.etdTime" step="60" value="12:00" style="width: 90%"> -->
792 840 </div>
793 841 </div>
794 842 <div class="clearfix"></div>
... ... @@ -802,9 +850,7 @@
802 850 <option value="" disabled selected hidden>Select...</option>
803 851 <option value="Arrival">Arrival</option>
804 852 <option value="Departure">Departure</option>
805   - <!-- <option ng-repeat="list in sourceList">{{list.source}}</option> -->
806 853 </select>
807   - <!-- <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> -->
808 854 </div>
809 855 <div class="clearfix"></div>
810 856 </div>
... ... @@ -818,10 +864,6 @@
818 864 <label class="new-input-label"><b>Company</b></label>
819 865 </div>
820 866 <div class="pull-left" style="width: calc(100% - 110px);">
821   - <!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;">
822   - <option value="" selected disabled>Select Company</option>
823   - <option ng-repeat="list in companyList">{{list.companyName}}</option>
824   - </select>-->
825 867 {{editdata.companyName}}
826 868 </div>
827 869 <div class="clearfix"></div>
... ... @@ -849,7 +891,6 @@
849 891 <label class="new-input-label"><b>Tail #</b></label>
850 892 </div>
851 893 <div class="pull-left" style="width: calc(100% - 110px);">
852   - <!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">-->
853 894 {{editdata.aircraftName}}
854 895 </div>
855 896 <div class="clearfix"></div>
... ... @@ -861,7 +902,6 @@
861 902 </div>
862 903 <div class="pull-left" style="width: calc(100% - 110px);">
863 904 <input type="text" class="form-control" disabled ng-model="editdata.total | number : 4" placeholder="" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
864   - <!--{{editdata.total }}-->
865 905 </div>
866 906 <div class="clearfix"></div>
867 907 </div>
... ... @@ -881,9 +921,7 @@
881 921 <option value="Tenant">Tenant</option>
882 922 <option value="CAA">CAA</option>
883 923 <option value="Tenant/CAA">Tenant/CAA</option>
884   - <!-- <option ng-repeat="list in sourceList">{{list.source}}</option> -->
885 924 </select>
886   - <!-- {{editdata.source}} -->
887 925 </div>
888 926 <div class="clearfix"></div>
889 927 </div>
... ... @@ -892,7 +930,6 @@
892 930 <label class="new-input-label"><b>Product</b></label>
893 931 </div>
894 932 <div class="pull-left" style="width: calc(100% - 110px);">
895   - <!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">-->
896 933 {{editdata.productName}}
897 934 </div>
898 935 <div class="clearfix"></div>
... ... @@ -916,7 +953,6 @@
916 953 <option value="cancelled">cancelled</option>
917 954 <option value="archived">archived</option>
918 955 </select>
919   - <!-- {{editdata.status}} -->
920 956 </div>
921 957 <div class="clearfix"></div>
922 958 </div>
... ...