Maikel 26eb79f5f2 Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser ...

[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer

2018-09-24 08:56:21 +10:00

..

assets

Merge branch 'master' into 2-0-stable-sept

2018-09-04 17:43:20 +01:00

controllers

Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour

2018-09-19 16:21:12 +01:00

helpers

Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user

2018-09-03 14:38:56 +10:00

jobs

Reload order before sending emails to ensure state is up to date

2018-07-05 19:26:12 +10:00

mailers

Merge branch 'master' into 2-0-stable-sept

2018-09-04 17:43:20 +01:00

models

In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists

2018-09-14 17:13:20 +01:00

overrides

Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit

2018-09-21 16:16:25 +02:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

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

serializers/api

In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.

2018-09-18 16:11:01 +01:00

services

CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly

2018-09-10 10:21:23 +01:00

validators

Fix failing tests and extract validation message Procs into methods

2017-07-21 12:17:12 +10:00

views

Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit

2018-09-21 16:16:25 +02:00