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 'master' into units

Browse Source
This commit is contained in:
Rob H
2014-06-12 12:13:44 +10:00
parent c09aeeee8f a6e3dd65fe
commit 3b1411283a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/spree/admin/reports/customers.html.haml
View File

@@ -13,9 +13,8 @@
%br
= label_tag nil, "Order Cycle: "
- order_cycles_select = @order_cycles.collect {|oc| [ "#{oc.name}   (#{oc.orders_open_at.to_s(:short)} - #{oc.orders_close_at.to_s(:short)})".html_safe, oc.id ] }
= select_tag(:order_cycle_id,
options_for_select(order_cycles_select, params[:order_cycle_id]),
options_for_select(report_order_cycle_options(@order_cycles), params[:order_cycle_id]),
include_blank: true)
%br

3
app/views/spree/admin/reports/products_and_inventory.html.haml
View File

@@ -13,9 +13,8 @@
%br
= label_tag nil, "Order Cycle: "
- order_cycles_select = @order_cycles.collect {|oc| [ "#{oc.name}   (#{oc.orders_open_at.to_s(:short)} - #{oc.orders_close_at.to_s(:short)})".html_safe, oc.id ] }
= select_tag(:order_cycle_id,
options_for_select(order_cycles_select, params[:order_cycle_id]),
options_for_select(report_order_cycle_options(@order_cycles), params[:order_cycle_id]),
include_blank: true)
%br