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

..

api/testing_support

Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user

2014-04-24 13:20:16 +10:00

core/controller_helpers

Display overridden prices when products are in the cart

2015-01-12 14:58:35 +11:00

money_decorator.rb

Fix grammar

2015-01-08 10:39:51 +11:00

product_filters.rb

Refactor libs to use enterprise instead of supplier and distributor

2012-10-29 14:57:03 +11:00