Luis Ramos 61c778eeac Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations ...

[Spree Upgrade] Improve order state translations in v2

2019-03-20 12:26:35 +00:00

..

assets

Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code

2019-03-12 19:42:08 +00:00

controllers

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

2019-03-16 16:17:38 +00:00

helpers

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

2019-03-16 16:17:38 +00:00

jobs

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

2019-03-16 16:17:38 +00:00

mailers

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

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

models

Enable products cache by default only in staging and production

2019-03-17 15:03:15 +00:00

overrides

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

2019-03-16 16:17:38 +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-Mar16

2019-03-16 16:17:38 +00:00

services

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

2019-03-16 16:17:38 +00:00

validators

Add validator for integer arrays

2019-02-08 21:26:36 +00:00

views

Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations

2019-03-20 12:26:35 +00:00