alexs 24d559cd3a Merge branch 'master' into landing_page ...

Conflicts:
	db/schema.rb
	db/seeds.rb

2013-08-05 17:08:39 +10:00

..

calculator

Weight shipping calculator treats variants without weight defined as zero weight

2012-08-08 15:29:47 +10:00

enterprise_fee_spec.rb

Add EnterpriseFee model

2012-11-15 13:42:55 +11:00

enterprises_spec.rb

Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way.

2013-08-02 18:13:42 +10:00

exchange_spec.rb

Each order cycle may not have duplicate exchanges between the same enterprises

2012-11-30 16:37:29 +11:00

landing_page_image_spec.rb

New landing page - initial layout and functionality

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

line_item_spec.rb

Move save button back within form, fix failing test

2013-05-20 16:05:25 +10:00

order_cycle_spec.rb

Make order cycle coordinator fees many-to-many

2013-07-30 11:34:10 +10:00

order_populator_spec.rb

Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages.

2013-06-21 11:36:24 +10:00

order_spec.rb

Fix tests - don't have feature toggle overrides on when running tests!

2013-08-01 15:37:42 +10:00

product_distribution_spec.rb

Model specs pass

2012-10-28 18:00:15 +11:00

product_spec.rb

Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way.

2013-08-02 18:13:42 +10:00