Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

orders

Syntax tweaks

2013-08-23 14:00:31 +10:00

adjustments_controller_decorator.rb

Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax

2015-11-11 11:53:04 +11:00

base_controller_decorator.rb

WIP: BOM Refactor, adding for_line_items action to enterprises controller

2015-11-04 15:02:29 +11:00

image_settings_controller_decorator.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

line_items_controller_decorator.rb

Can pass params for order or line items into LineItemsController#index

2015-11-05 17:07:47 +11:00

orders_controller_decorator.rb

Allow use of completed_at for orders index ransacking

2015-11-12 10:01:35 +11:00

overview_controller_decorator.rb

Rerouting welcome page to be an enterprise action, updates to copy for package selection

2015-06-12 01:49:38 +08:00

payment_methods_controller_decorator.rb

Set environment for payment methods unless admin

2014-10-24 18:15:48 +11:00

payments_controller_decorator.rb

Payment Method must belong to a Distributor

2013-08-21 15:14:01 +10:00

products_controller_decorator.rb

Handle invalid referer URLs

2015-06-05 12:43:49 +10:00

reports_controller_decorator.rb

Adding tweaks that have been missed from merges

2015-10-30 11:54:06 +11:00

search_controller_decorator.rb

Admin users can access all users through known_users

2015-02-12 11:34:58 +11:00

shipping_methods_controller_decorator.rb

Rearrange shipping method edit page

2014-06-18 10:21:21 +10:00

variants_controller_decorator.rb

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10:00