Rohan Mitchell 4491d3cc73 Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml
	spec/features/admin/order_cycles_spec.rb

2015-03-16 12:14:54 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

When enterprise user creates an enterprise, make it a hub if they have other hubs

2015-03-13 16:06:42 +11:00

features

Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix

2015-03-16 12:14:54 +11:00

helpers

User must set the coordinator first when creating an order cycle

2015-02-27 17:24:36 +11:00

javascripts

Display extended variant name in quick cart

2015-03-13 12:58:53 +11:00

lib

Record the tax included in per-order EnterpriseFees

2015-03-06 10:38:55 +11:00

mailers

Adding a ship address to order in spec

2015-03-01 12:22:06 +11:00

models

Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix

2015-03-16 12:14:54 +11:00

requests

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11:00

serializers

Move controller spec to serializer spec

2014-12-17 14:01:59 +11:00

support

Login to consumer section in a way that ensures user is not an admin

2015-03-14 11:02:45 +11:00

views

Rename spec to match view name change

2014-09-05 15:10:14 +10:00

factories.rb

When enterprise user creates an enterprise, make it a hub if they have other hubs

2015-03-13 16:06:42 +11:00

spec_helper.rb

Moving test seeding into spec/support/seeds.rb

2014-12-04 15:38:59 +11:00