Rohan Mitchell 7640eb497a Merge branch 'supplied-active-products-on-hand' ...

Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb

2013-07-29 11:05:42 +10:00

..

open_food_web/calculator

Weight shipping calculator treats variants without weight defined as zero weight

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

spree

Fix selection of itemwise shipping method that broke after the spree upgrade.

2013-07-23 15:46:07 +10:00

.gitkeep

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

enterprise_fee_set.rb

Create new enterprise fee, display errors when present

2012-11-21 09:47:51 +11:00

enterprise_fee.rb

Move presentation to presenter, display calculator fields

2012-11-22 14:37:38 +11:00

enterprise_set.rb

Create new enterprise fee, display errors when present

2012-11-21 09:47:51 +11:00

enterprise.rb

Merge branch 'supplied-active-products-on-hand'

2013-07-29 11:05:42 +10:00

exchange_fee.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

Add or update exchange variants when creating or updating order cycles

2013-01-09 10:06:51 +11:00

model_set.rb

Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.

2012-11-23 17:02:58 +11:00

order_cycle_set.rb

Admin list order cycles

2012-11-27 10:13:12 +11:00

order_cycle.rb

Order cycle reports on the variants distributed by a particular distributor

2013-06-17 14:58:13 +10:00

product_distribution.rb

Integrate functionality from distributor into enterprise

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