luisramos0 27f5e6db8a Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94)

2018-08-25 12:50:36 +01:00

..

assets

Merge branch 'master' into 2-0-stable

2018-07-27 10:21:47 +02:00

controllers

Style recently merged code

2018-07-26 10:52:56 +10:00

helpers

Load all shops that a user is associated with as a customer

2018-06-24 16:28:47 +10:00

jobs

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

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

mailers

Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94)

2018-08-25 12:50:36 +01:00

models

Merge branch 'master' into 2-0-stable

2018-07-27 10:21:47 +02:00

overrides

Remove spree product navigation override

2018-07-13 16:58:57 +10:00

presenters

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

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

serializers/api

Revert accidental copy and paste

2018-07-10 10:31:51 +10:00

services

Update attribute that errors are added to from credit_card to payment_method

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

validators

Fix failing tests and extract validation message Procs into methods

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

views

Merge pull request #2389 from luisramos0/bulk_prod_edit_fix

2018-07-26 14:09:21 +10:00