Rohan Mitchell 6670c9543b Remove spork ...

Conflicts:

	Gemfile
	Gemfile.lock

2013-06-04 14:04:26 +10:00

..

controllers

Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle

2013-04-05 15:00:42 +11:00

features

Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products

2013-06-04 10:26:13 +10:00

helpers

Selecting an order cycle highlights valid distributor choices

2013-03-08 15:17:23 +11:00

javascripts/unit

Only show variants for distribution that are supplied to the order cycle

2013-01-18 11:52:01 +11:00

lib

Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products

2013-06-04 10:26:13 +10:00

models

Add OrderCycle#distributed_variants

2013-05-28 14:01:04 +10:00

support

Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method

2013-05-27 13:00:12 +10:00

factories.rb

Write new query for Product#in_distributor that queries order cycles instead of product_distributions

2013-03-08 15:18:52 +11:00

spec_helper.rb

Remove spork

2013-06-04 14:04:26 +10:00