raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit

Browse Source
This commit is contained in:
Rohan Mitchell
2015-05-29 14:36:51 +10:00
parent c14de4e97f 9c884b31a3
commit e5b3736e86
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/spree/admin/orders_controller_decorator.rb
View File

@@ -23,6 +23,13 @@ Spree::Admin::OrdersController.class_eval do
distributed_by_user(spree_current_user).
page(params[:page]).
per(params[:per_page] || Spree::Config[:orders_per_page])
# Filter orders by distributor
if params[:distributor_ids]
@orders = @orders.where(distributor_id: params[:distributor_ids])
end
if params[:order_cycle_ids]
@orders = @orders.where(order_cycle_id: params[:order_cycle_ids])
end
} } }
# Overwrite to use confirm_email_for_customer instead of confirm_email.

13
app/overrides/spree/admin/orders/index/add_distributor_and_order_cycle_filter_inputs.html.haml.deface Normal file
View File

@@ -0,0 +1,13 @@
/ insert_before "div.clearfix"
.field-block.alpha.eight.columns
= label_tag nil, t(:distributors)
= select_tag(:distributor_ids,
options_for_select(Enterprise.is_distributor.managed_by(spree_current_user).map {|e| [e.name, e.id]}, params[:distributor_ids]),
{class: "select2 fullwidth", multiple: true})
.field-block.alpha.eight.columns
= label_tag nil, t(:order_cycles)
= select_tag(:order_cycle_ids,
options_for_select(OrderCycle.managed_by(spree_current_user).map {|oc| [oc.name, oc.id]}, params[:order_cycle_ids]),
{class: "select2 fullwidth", multiple: true})