Rohan Mitchell e388e82d50 Merge branch 'checkout-changes'

2012-11-21 15:15:10 +11:00

..

assets

Merge branch 'master' into enterprises

2012-11-01 11:02:02 +11:00

controllers

Don't display unit size in reports for products that are not group buy items

2012-11-16 17:00:57 +11:00

helpers

Rename DistributorsHelper to EnterprisesHelper

2012-11-01 10:07:55 +11:00

mailers

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

models

Do not show duplicate products with in_supplier_or_distributor scope

2012-11-10 12:26:41 +11:00

overrides

Merge remote-tracking branch 'origin/master' into checkout-changes

2012-11-16 16:10:51 +11:00

views

Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees

2012-11-16 18:32:02 +11:00