Rohan Mitchell 83e3c6815d Merge branch 'checkout-changes' ...

Conflicts:
	.rvmrc
	app/helpers/application_helper.rb

2013-01-22 10:30:51 +11:00

..

admin

Report filtering on completion date, not creation date

2012-11-09 20:31:08 +11:00

checkout

Fixes following code review for checkout changes

2013-01-18 19:17:55 +11:00

order_mailer

Reference name of payment method rather than payment method itself

2012-12-07 14:30:05 +11:00

orders

Fixes following code review for checkout changes

2013-01-18 19:17:55 +11:00

products

Fixes following code review for checkout changes

2013-01-18 19:17:55 +11:00

shared

Replace order information display for Confirm and Complete stages of checkout

2012-11-23 10:51:14 +11:00

_sidebar.html.haml

Display suppliers and distributors in sidebar

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