Maikel Linke 2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon ...

Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb

2016-03-11 15:38:28 +11:00

..

calculator

EnterpriseFees can inherit tax_category from product

2016-03-02 11:56:46 +11:00

gateway

Add Pin Payments gateway

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

preferences

Allow overriding mobile logo (raster and SVG) and home hero image

2015-07-17 16:06:50 +10:00

ability_decorator.rb

WIP: Adding infrastructure to show/hide variants + overrides using inventory items

2016-03-02 12:10:22 +11: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

Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee

2016-01-07 10:52:36 +11:00

app_configuration_decorator.rb

Reorganising busines model config settings, moving account invoice tax rate in busines model config settings

2015-12-16 19:18:57 +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

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10:00

line_item_decorator.rb

When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value

2015-12-16 19:18:59 +11:00

money_decorator.rb

Added currency symbols to sales tax report

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

order_decorator.rb

Move premature Spree::Order#update prevention up a level, for even greater efficiency gains

2016-01-07 12:09:57 +11:00

order_populator_decorator.rb

Use pluck instead of map

2015-11-13 14:03:07 +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

Merge remote-tracking branch 'origin/master' into i18n-hackathon

2016-03-11 15:38:28 +11: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

Fixing broken specs

2015-04-17 13:00:20 +10:00

shipment_decorator.rb

wip: user invoice updater finalizes orders on the first of the month

2015-09-17 22:37:56 +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

Look up the shipping services (pickup, delivery) that different hubs provide

2015-05-27 15:44:01 +10:00

tax_rate_decorator.rb

with_tax_included_in_price handles exceptions gracefully

2015-11-11 11:53:04 +11:00

taxon_decorator.rb

Find all supplied and distributed taxons

2015-05-27 15:44:01 +10:00

user_decorator.rb

Updating the admin account view to show use the new account_invoice model to display data

2015-09-17 22:38:29 +10:00

variant_decorator.rb

Bugfix: Spree::Variant#not_hidden_for scope was broken

2016-03-02 12:10:22 +11:00