viithiisys / Acufuel

Download as
Browse Code ยป

Commit 3c2c216d60fe2d3f944a6d9fc0206c29827a7064

Authored by Kuldeep Arora
1 parent 18dcf8f5c7
Exists in master

direct transaction fixed

Showing 2 changed files with 11 additions and 6 deletions   Show diff stats
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @3c2c216
... ... @@ -147,10 +147,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
147 147 }
148 148  
149 149 $scope.getOrders();
150   -
  150 + $scope.optionSelected='';
151 151 $scope.onFWSelect = function() {
152 152 if($scope.optionSelected == 'dt'){
153   - $('#demo-modal-4').css('display', 'block');
  153 + $('#demo-modal-4').css('display', 'block');
  154 + $scope.optionSelected='';
  155 +
154 156 }
155 157 if($scope.optionSelected == 'efo'){
156 158 $scope.showLoader = true;
... ... @@ -164,6 +166,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
164 166 a.download = fileName;
165 167 a.click();
166 168 $scope.showLoader = false;
  169 + $scope.optionSelected='';
167 170 })
168 171 }
169 172 }
... ... @@ -250,7 +253,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
250 253 }
251 254 }
252 255  
253   - $scope.addData = function() {
  256 + $scope.addFuelData = function() {
254 257 $scope.showLoader = true;
255 258  
256 259 if ($scope.order.upliftDate != '') {
... ... @@ -287,7 +290,9 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
287 290 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
288 291 // console.log('$scope.order', $scope.dispatchOrder);
289 292 fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
290   - // console.log('result', result);
  293 + console.log("fuel data---",$scope.fuelData)
  294 + console.log("oder data",$scope.dispatchOrder)
  295 + console.log('result', result);
291 296 $scope.showLoader = false;
292 297 $scope.order = {};
293 298 $('#demo-modal-4').css('display', '');
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @3c2c216
... ... @@ -667,7 +667,7 @@
667 667 <div class="pull-left" style="width: calc(100% - 110px);">
668 668 <select ui-select2 ng-model="order.status" style="width: 100%;">
669 669 <option value="" selected disabled>Select Status</option>
670   - <option>Pending</option>
  670 + <option>pending</option>
671 671 <option>Invoiced</option>
672 672 <option>Paid</option>
673 673 <option>Cancelled</option>
... ... @@ -710,7 +710,7 @@
710 710  
711 711 <div class="modal-footer" style="border-top: 0;">
712 712 <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
713   - <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData()">Save</button>
  713 + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFuelData()">Save</button>
714 714 </div>
715 715 </div>
716 716 </div>
... ...