David Cook 6a303d7db9 Merge branch 'enterprise-reports' ...

Conflicts:
	app/models/spree/ability_decorator.rb

2013-08-30 16:27:13 +10:00

..

controllers

Ensure Supplier enterprise users can only view their own products in reports

2013-08-30 15:17:27 +10:00

features

Merge branch 'enterprise-reports'

2013-08-30 16:27:13 +10:00

helpers

Fix error when generating checkout email when distributor_info is nil

2013-08-20 09:19:23 +10:00

javascripts/unit

Enterprise manager can bulk edit products

2013-08-22 11:21:49 +10:00

lib

Payment Method must belong to a Distributor

2013-08-21 15:14:01 +10:00

models

Shipping methods are only shown at checkout if their distributor matches the order

2013-08-30 12:27:13 +10:00

support

Fixed specs broken by new temp landing page (take 1).

2013-08-20 11:05:06 +10:00

views/suburbs

Added tests for suburbs JSON.

2013-08-15 11:40:09 +10:00

factories.rb

Shipping method has a distributor, admin can create and edit

2013-08-30 11:43:45 +10:00

spec_helper.rb

Admin create order can set distributor and order cycle

2013-08-23 14:00:31 +10:00