Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +11:00

..

gateway

Add MiGS payment gateway

2013-04-29 15:37:48 +10:00

ability_decorator.rb

Adding destroy ability to enterprise users

2013-12-13 15:40:23 +11:00

address_decorator.rb

Only geocode addresses associated with enterprises. Makes Checkout#update much faster.

2013-09-19 16:56:48 +10:00

adjustment_decorator.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

line_item_decorator.rb

Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering

2013-09-27 14:11:12 +10:00

order_decorator.rb

Remove redundant serializer spec, reinstate creation of order distribution charges

2014-01-08 13:22:34 +11:00

order_populator_decorator.rb

Removing redundant functionality from the Order Populator

2014-01-08 14:45:40 +11:00

payment_method_decorator.rb

Sort payment methods by name

2013-11-21 14:42:28 +11:00

product_decorator.rb

Rename option_type_for_variant_unit to variant_unit_option_type

2014-01-07 10:31:53 +11:00

product_set.rb

Fix product lists not matching when saving changes to product unit+values fields

2014-01-10 15:43:45 +11:00

shipping_method_decorator.rb

Order shipping methods by name, not distributor

2013-11-07 16:25:43 +11:00

taxon_decorator.rb

Disable filtering distributors using spree filters

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

user_decorator.rb

Fix multi-cart association and add some temporary multi-cart support into the current front end.

2013-08-14 10:49:54 +10:00

variant_decorator.rb

When variant already has a value set, remove old option value and assign a new one

2014-01-09 14:11:54 +11:00