Pau Perez 59f39b14f4 Do not restore adjustments that aren't in the hash ...

This way we don't modify adjustments that get created as part of the
passed block. We don't know how this might be used in the future.

2019-01-29 09:40:54 +01:00

..

assets

Merge branch 'master' into 2-0-stable-jan-17th

2019-01-17 22:51:25 +00:00

controllers

Do not restore adjustments that aren't in the hash

2019-01-29 09:40:54 +01:00

helpers

Merge branch 'master' into 2-0-stable-jan-11th

2019-01-11 11:58:24 +00:00

jobs

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

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

mailers

Fix merge typo in the cancel email method of the order mailer decorator

2019-01-08 15:31:28 +00:00

models

Merge pull request #3250 from coopdevs/open-adjustments-for-update

2019-01-24 10:25:16 +11: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

Merge pull request #3347 from luisramos0/2-0-default-on-demand

2019-01-21 17:34:46 +01:00

validators

Fix failing tests and extract validation message Procs into methods

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

views

Merge branch 'master' into 2-0-stable-jan-17th

2019-01-17 22:51:25 +00:00