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

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

..

assets

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

2019-01-08 14:29:50 +00:00

controllers

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

2019-01-08 14:29:50 +00:00

helpers

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

2019-01-08 14:29:50 +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 branch 'master' into 2-0-stable-jan-8th

2019-01-08 14:29:50 +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

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

2019-01-08 14:29:50 +00:00