From 6966fbba7c4174ea9f49e67a827d35abfa08313d Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 12 Nov 2015 17:40:35 +1100 Subject: [PATCH] Present date limits being set in line items controller .js unless orderCycleFilter has actually been set --- .../controllers/line_items_controller.js.coffee | 8 +------- spec/features/admin/bulk_order_management_spec.rb | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 2759c33f0c..864d0750a5 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -35,7 +35,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $http, $q $scope.quickSearch = "" $scope.refreshData = -> - unless $scope.orderCycleFilter == "0" || angular.equals(OrderCycles.orderCyclesByID, {}) + unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == "0" $scope.startDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].first_order $scope.endDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].last_order @@ -133,12 +133,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $http, $q $scope.unitsVariantSelected = -> !angular.equals($scope.selectedUnitsVariant,{}) - $scope.resetSelectFilters = -> - $scope.distributorFilter = $scope.distributors[0].id - $scope.supplierFilter = $scope.suppliers[0].id - $scope.orderCycleFilter = $scope.orderCycles[0].id - $scope.quickSearch = "" - $scope.weightAdjustedPrice = (lineItem) -> if lineItem.final_weight_volume > 0 unit_value = lineItem.final_weight_volume / lineItem.quantity diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index a96d4e8203..bb248d4871 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -282,10 +282,7 @@ feature %q{ end it "displays a select box for order cycles, which filters line items by the selected order cycle" do - order_cycle_names = OrderCycle.pluck(:name).push "All" - find("div.select2-container#s2id_order_cycle_filter").click - order_cycle_names.each { |ocn| expect(page).to have_selector "div.select2-drop-active ul.select2-results li", text: ocn } - find("div.select2-container#s2id_order_cycle_filter").click + expect(page).to have_select2 'order_cycle_filter', options: OrderCycle.order('orders_close_at DESC').pluck(:name).unshift("All") expect(page).to have_selector "tr#li_#{li1.id}" expect(page).to have_selector "tr#li_#{li2.id}" select2_select oc1.name, from: "order_cycle_filter"