Rohan Mitchell 0431e0048c Merge branch 'master' into variant-overrides-frontend ...

Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb

2015-01-12 16:48:51 +11:00

..

open_food_network/calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

.gitkeep

new rails 3.1.4 app

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

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

cart.rb

Fix multicart use of OrderPopulator

2014-01-08 14:13:19 +11:00

distributor_shipping_method.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

Add fundraising fees

2014-08-13 15:07:32 +10:00

enterprise_group.rb

Make Enterprise and EnterpriseGroup promo images jpg format

2014-10-10 15:40:05 +11:00

enterprise_relationship_permission.rb

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

enterprise_relationship.rb

When deleting enterprise relationships, delete dependent permissions

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

enterprise_role.rb

Enterprise roles must be unique

2014-08-15 16:09:05 +10:00

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Implementing primary taxon ordering on the shopfront

2014-12-19 14:05:23 +11: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

When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges

2014-05-23 11:28:00 +10:00

model_set.rb

Setting both values to blank deletes override

2014-12-12 13:33:14 +11:00

order_cycle_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

order_cycle.rb

Implementing primary taxon ordering on the shopfront

2014-12-19 14:05:23 +11:00

producer_property.rb

Admin can reorder producer properties

2014-06-18 15:28:41 +10:00

product_distribution.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

suburb.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00

variant_override_set.rb

Setting both values to blank deletes override

2014-12-12 13:33:14 +11:00

variant_override.rb

Add VariantOverride.decrement_stock

2015-01-12 10:39:23 +11:00