From 3c2c216d60fe2d3f944a6d9fc0206c29827a7064 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Wed, 7 Mar 2018 11:47:07 +0530
Subject: [PATCH] direct transaction fixed

---
 app/partials/fuelOrders/fuelOrders.controller.js | 13 +++++++++----
 app/partials/fuelOrders/fuelOrders.html          |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index e08cc55..4a9f2fb 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -147,10 +147,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
      }
      
      $scope.getOrders();
-     
+     $scope.optionSelected='';
      $scope.onFWSelect = function() {
                         if($scope.optionSelected == 'dt'){
-                        $('#demo-modal-4').css('display', 'block');
+                          $('#demo-modal-4').css('display', 'block');
+                           $scope.optionSelected='';
+
                       }
                       if($scope.optionSelected == 'efo'){
                         	$scope.showLoader = true;
@@ -164,6 +166,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                                   a.download = fileName;
                                   a.click();
                                   $scope.showLoader = false;
+                                  $scope.optionSelected='';
                             })
                         }
                     }
@@ -250,7 +253,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
       }
     }                    
 
-   $scope.addData = function() {
+   $scope.addFuelData = function() {
      $scope.showLoader = true;
 
       if ($scope.order.upliftDate != '') {
@@ -287,7 +290,9 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
       $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
     //  console.log('$scope.order', $scope.dispatchOrder);
       fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
-       // console.log('result', result);
+        console.log("fuel data---",$scope.fuelData)
+        console.log("oder data",$scope.dispatchOrder)
+        console.log('result', result);
         $scope.showLoader = false;
         $scope.order = {};
         $('#demo-modal-4').css('display', '');
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index aa7a5b1..15f2932 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -667,7 +667,7 @@
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select ui-select2 ng-model="order.status"  style="width: 100%;">
                                           <option value="" selected disabled>Select Status</option>
-                                          <option>Pending</option>
+                                          <option>pending</option>
                                           <option>Invoiced</option>
                                           <option>Paid</option>
                                           <option>Cancelled</option>
@@ -710,7 +710,7 @@
            
             <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="addData()">Save</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFuelData()">Save</button>
            </div>
         </div>
     </div>
-- 
2.0.0