Will Marshall edaba844d9 Merge branch 'laura_and_will' into new_cart ...

Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-18 17:02:19 +10:00

..

ability_spec.rb

Enterprise user can manage their enterprises' producer properties

2014-06-18 16:04:41 +10:00

addresses_spec.rb

Adding some spec tweaks

2014-02-21 15:17:18 +11:00

adjustment_spec.rb

Move spree model decorator specs into their own dir to mirror model dir layout

2013-10-17 09:53:54 +11:00

classification_spec.rb

Adding primary taxon field to product

2014-05-30 14:31:03 +10:00

line_item_spec.rb

LineItem.supplied_by_any

2014-06-06 09:47:15 +10:00

order_populator_spec.rb

Reworking order populator and controller to handle replacement of line items rather than addition

2014-07-16 16:00:28 +10:00

order_spec.rb

Removing payments when emptying order

2014-06-10 11:15:04 +10:00

payment_method_spec.rb

Sort payment methods by name

2013-11-21 14:42:28 +11:00

product_spec.rb

Retrieve properties for a product as a hash

2014-06-18 15:22:03 +10:00

shipping_method_spec.rb

Restoring the old checkout, but NOW our new checkout is broken

2014-03-06 16:16:00 +11:00

user_spec.rb

Adding a signup confirmation email

2014-04-04 12:36:33 +13:00

variant_spec.rb

Add Spree::Variant.in_order_cycle

2014-07-16 09:33:59 +10:00