Rob H 3b8c41840f Merge branch 'master' of github.com:andrewspinks/openfoodweb ...

Conflicts:
	app/models/spree/line_item_decorator.rb
	db/migrate/20120919013335_add_shipping_method_to_line_items.rb

2012-10-03 10:27:19 +10:00

..

distributor_set.rb

Add distributor next_collection_at field, bulk edit in admin backend

2012-07-02 14:24:52 +10:00

distributor.rb

When loading distributors for sidebar, only show those that have active products on hand

2012-08-04 17:51:08 +10:00

line_item_decorator.rb

Merge branch 'master' of github.com:andrewspinks/openfoodweb

2012-10-03 10:27:19 +10:00

order_decorator.rb

Fix checkout totals, also amend factories for valid test shipping method data

2012-09-21 12:35:01 +10:00

product_decorator.rb

Add group buy option to new/edit product in admin

2012-08-02 13:42:47 +10:00

product_distribution.rb

Display delivery fee breakdown along with cart

2012-07-01 19:09:34 +10:00

supplier.rb

Validate presence of address on supplier and distributor

2012-06-27 09:25:14 +10:00

taxon_decorator.rb

Disable filtering distributors using spree filters

2012-06-20 17:43:14 +10:00