Rohan Mitchell 4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb

2014-12-19 09:38:02 +11:00

..

orders

Syntax tweaks

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

base_controller_decorator.rb

Display an error message to admin when there are hubs in order cycles that are not ready for checkout

2014-10-31 12:22:02 +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

orders_controller_decorator.rb

Swtich API key injection over to helper

2014-09-11 17:07:05 +10:00

overview_controller_decorator.rb

Make admins get multi enterprise dashboard

2014-10-24 17:59:58 +11: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

WIP: Extract variant overrides to own controller - route, controller, views

2014-12-12 13:33:14 +11:00

reports_controller_decorator.rb

Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch

2014-12-19 09:38:02 +11:00

shipping_methods_controller_decorator.rb

Rearrange shipping method edit page

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

variants_controller_decorator.rb

Variants controller #search filters by distribution

2014-07-16 10:31:12 +10:00