Rafael Schouten 1aa80e53b1 Merge branch 'master' into currency ...

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

2014-09-16 10:25:22 +10:00

..

admin

Creating an enterprise works in registration process

2014-09-11 17:07:05 +10:00

spree

Merge branch 'master' into currency

2014-09-11 12:09:18 +10:00

add_to_cart_helper.rb

Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products

2013-06-04 10:26:13 +10:00

angular_form_builder.rb

ng_text_field handling options parameter

2014-07-31 15:20:22 +10:00

angular_form_helper.rb

Change angular_ prefix to ng_

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

application_helper.rb

Adding some requirement filters to the Orders controller

2014-03-21 15:18:27 +11:00

checkout_helper.rb

Smoosh distributions up into cart item subtotal in order confirmation email

2014-08-08 17:50:00 +10:00

enterprise_fees_helper.rb

angular_options_for_select

2012-11-22 11:24:05 +11:00

enterprises_helper.rb

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

groups_helper.rb

Adding groups to this branch, also tidying up the shop stuff for Laura

2014-05-16 14:00:33 +10:00

html_helper.rb

Show two linebreaks for end of block level tags, strip whitespace from end of string

2014-03-12 13:52:13 +11:00

injection_helper.rb

Merge branch 'master' into currency

2014-09-16 10:25:22 +10:00

map_helper.rb

Starting on on the map

2014-06-06 14:04:45 +10:00

order_cycles_helper.rb

Revert 5ede8d1, reinstating a4be0ff..7b89e6a

2014-08-29 16:38:10 +10:00

shared_helper.rb

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

shop_helper.rb

We can now hit the index page

2013-12-05 15:07:46 +11:00

spree_currency_helper.rb

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00