David Cook bf3c5c6dd6 Merge branch 'master' into reports-completed-only ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb

2013-08-30 16:42:00 +10:00

..

admin

Enterprise manager can clone an order cycle

2013-08-22 17:11:53 +10:00

open_food_web

Add controller action for adding products to multi cart via javascript API.

2013-08-15 15:36:35 +10:00

spree

Merge branch 'master' into reports-completed-only

2013-08-30 16:42:00 +10:00

application_controller.rb

Fix merge issues: DCV name change and application controller var name issues.

2013-07-29 11:49:43 +10:00

base_controller.rb

WIP Upgrade to Spree 1.3

2013-02-05 15:01:45 +11:00

enterprises_controller.rb

Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.

2013-08-16 17:08:19 +10:00

home_controller.rb

Making sure that only distributor enterprises are displayed on the landing page.

2013-08-21 12:03:44 +10:00

suburbs_controller.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00