alexs 845f7bb8d7 Merge branch 'master' of github.com:eaterprises/openfoodweb

2013-08-21 10:50:08 +10:00

..

controllers

Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.

2013-08-16 17:08:19 +10:00

features

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

2013-08-21 10:50:08 +10:00

helpers

Fix error when generating checkout email when distributor_info is nil

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

javascripts/unit

Translate exchange fees for processing by rails

2013-08-16 10:22:29 +10:00

lib

OrderCycleFormApplicator sets exchange fees

2013-08-16 10:22:29 +10:00

models

Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface

2013-08-20 16:26:46 +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

Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5

2013-08-20 10:47:56 +10:00

spec_helper.rb

Adjusted specs to accommodate for new (temporary) landing page.

2013-08-20 16:14:29 +10:00