Maikel 14ccb39478 Merge pull request #3287 from luisramos0/2-0-edit-variants ...

[Spree Upgrade] Fix variant edit page optiontype deface code

2019-01-08 16:37:38 +11:00

..

assets

Merge branch 'master' into 2-0-stable-dec-18th

2018-12-18 23:32:45 +00:00

controllers

Merge branch 'master' into 2-0-stable-dec-18th

2018-12-18 23:32:45 +00:00

helpers

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00: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-oct

2018-10-15 17:09:26 +01:00

models

Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read

2018-12-24 16:39:06 +00:00

overrides

Fix variant edit page optiontype deface code

2019-01-07 12:16:47 +00:00

presenters

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

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

serializers/api

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00:00

services

Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details

2018-12-21 15:13:43 +00:00

validators

Fix failing tests and extract validation message Procs into methods

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

views

Fix admin orders spec by adapting the spec to the recently de-defaced page

2019-01-07 12:16:28 +00:00