diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index b2c1e692f0..97a2aeb1c4 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -26,7 +26,6 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, 'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'], 'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'], 'q[completed_at_not_null]': $scope['q']['completed_at_not_null'], - 'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_null'], 'q[distributor_id_in]': $scope['q']['distributor_id_in'], 'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'], 'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'], diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb index 88110da52f..7d199d5de7 100644 --- a/app/controllers/spree/admin/orders_controller_decorator.rb +++ b/app/controllers/spree/admin/orders_controller_decorator.rb @@ -36,8 +36,6 @@ Spree::Admin::OrdersController.class_eval do created_at_gt = params[:q][:created_at_gt] created_at_lt = params[:q][:created_at_lt] - params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0" - if !params[:q][:created_at_gt].blank? params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue "" end diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml index 5ebea2a4cd..fa9ca6b85b 100644 --- a/app/views/spree/admin/orders/_filters.html.haml +++ b/app/views/spree/admin/orders/_filters.html.haml @@ -30,10 +30,6 @@ %label = f.check_box :completed_at_not_null, {:checked => @show_only_completed, 'ng-model' => 'q.completed_at_not_null'}, '1', '' = t(:show_only_complete_orders) - .field.checkbox - %label - = f.check_box :inventory_units_shipment_id_null, {'ng-model' => 'q.inventory_units_shipment_id_null'}, '1', '0' - = t(:show_only_unfulfilled_orders) .field-block.alpha.eight.columns = label_tag nil, t(:distributors) = select_tag("q[distributor_id_in]", diff --git a/config/locales/en.yml b/config/locales/en.yml index be7e43f7b5..009526aa22 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -242,7 +242,6 @@ en: notes: Notes error: Error processing_payment: Processing payment... - show_only_unfulfilled_orders: Show only unfulfilled orders filter_results: Filter Results quantity: Quantity pick_up: Pick up