alexs 3f82147024 Merge branch 'master' of github.com:eaterprises/openfoodweb ...

Conflicts:
	db/schema.rb

2013-08-06 18:32:53 +10:00

..

controllers

Fix bulk product edit so that it works with products with a blank available_on field.

2013-07-25 13:51:37 +10:00

features

Use correct amount for order total in spec

2013-08-06 13:47:17 +10:00

helpers

Added login to the landing page.

2013-08-06 12:34:22 +10:00

javascripts/unit

Remove coordinator fees

2013-07-30 11:55:21 +10:00

lib

Refactor LineItem and clients for new fields

2013-08-06 13:47:17 +10:00

models

Merge branch 'master' of github.com:eaterprises/openfoodweb

2013-08-06 18:32:53 +10:00

support

Add cancan ability tests on enterprise user roles

2013-08-06 11:12:37 +10:00

factories.rb

Fix payment not being captured due to being to small to cover order's distribution fee

2013-08-06 13:47:17 +10:00

spec_helper.rb

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00