Rohan Mitchell fe61cddda6 Merge branch 'local-organics' ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb

2013-07-23 11:40:03 +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

Integrate functionality from distributor into enterprise

2012-10-28 17:46:45 +11:00

exchange_spec.rb

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

2012-11-30 16:37:29 +11: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

Fix failing tests

2012-12-04 11:39:39 +11:00

order_spec.rb

Fix StaleObjectError in order model test

2013-02-14 16:49:28 +11:00

product_distribution_spec.rb

Model specs pass

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

product_spec.rb

Do not show duplicate products with in_supplier_or_distributor scope

2012-11-10 12:26:41 +11:00