Rohan Mitchell 5ac904005b Merge branch 'order-cycle-reports' ...

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

2012-10-31 10:18:11 +11:00

..

admin

Merge branch 'order-cycle-reports'

2012-10-31 10:18:11 +11:00

checkout

Display distributor details on product page when distributor is selected

2012-10-27 12:49:57 +11:00

order_mailer

add distributor name to confirmation email

2012-07-11 23:20:59 +10:00

orders

Fix checkout totals, also amend factories for valid test shipping method data

2012-09-21 12:35:01 +10:00

products

Update distributor details when distributor is changed

2012-10-27 18:50:09 +11:00

shared

Viewing another products listing page does not display home page content

2012-10-12 09:39:49 +11:00

_sidebar.html.haml

Display suppliers and distributors in sidebar

2012-06-20 17:44:11 +10:00