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

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

2013-08-05 17:08:39 +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 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

.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_role.rb

Add EnterpriseRole model and link up to users and enterprises.

2013-08-01 10:32:49 +10:00

enterprise_set.rb

Create new enterprise fee, display errors when present

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

enterprise.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_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

landing_page_image.rb

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10: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

Make order cycle coordinator fees many-to-many

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

product_distribution.rb

Integrate functionality from distributor into enterprise

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