Rob Harrington 903ed7e507 Merge branch 'master' into variable_weights ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb

2015-05-21 17:31:33 +10:00

..

gateway

Add Pin Payments gateway

2014-12-12 10:59:23 +11:00

ability_decorator.rb

Adding managed controller action which uses new order serializer to render json

2015-05-20 11:48:13 +10:00

address_decorator.rb

Fixing typos and changing delivery address display in order confirmation email

2014-12-12 12:00:15 +11:00

adjustment_decorator.rb

Fix tax calculations for determining tax included in an amount

2015-03-05 13:03:53 +11:00

app_configuration_decorator.rb

Config option for tax rate on shipping

2015-03-05 10:43:50 +11:00

classification_decorator.rb

cleaning up touches

2014-07-04 14:38:27 +10:00

gateway_decorator.rb

Default payment method server/test_mode to live

2014-12-12 11:35:18 +11:00

image_decorator.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

inventory_unit_decorator.rb

When order is placed, subtract stock from variant override

2015-01-12 11:23:53 +11:00

line_item_decorator.rb

Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.

2015-05-09 19:10:55 +01:00

money_decorator.rb

Added currency symbols to sales tax report

2015-03-05 10:43:51 +11:00

order_decorator.rb

Populate the line item unit value, when line_item created and update old data in migration

2015-05-09 19:10:55 +01:00

order_populator_decorator.rb

Show overridden price in shopping cart

2014-12-19 16:51:11 +11:00

payment_decorator.rb

Payments can be refunded

2015-04-30 15:49:48 +10:00

payment_method_decorator.rb

Add Pin Payments gateway

2014-12-12 10:59:23 +11:00

product_decorator.rb

Pulling property values into the shopfront

2015-04-23 13:51:49 +10:00

product_option_type_decorator.rb

When removing a product's option type, remove its variants' associated option values

2014-02-06 10:47:13 +11:00

product_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

shipment_decorator.rb

Do not charge tax on shipments when distributor does not charge sales tax

2015-04-17 13:41:38 +10:00

shipping_category_decorator.rb

Adding ability to edit ShippingCategory.temperature_controlled from admin interface

2015-03-04 12:02:07 +11:00

shipping_method_decorator.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

tax_rate_decorator.rb

When the order does not have a hub, all tax rates apply

2015-04-17 13:41:38 +10:00

taxon_decorator.rb

Store all images in a consistent path, compatible with development, and support S3 all round

2014-07-17 11:07:34 +10:00

user_decorator.rb

Fix infinite job loop

2015-05-13 11:06:42 +10:00

variant_decorator.rb

Documentation of Variant.full_name

2015-04-23 10:02:32 +10:00