Maikel 5ecea06098 Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl ...

[Spree Upgrade] Fix credit card controller

2018-11-16 10:43:16 +11:00

..

assets

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

2018-11-08 11:18:54 +00:00

controllers

Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl

2018-11-16 10:43:16 +11:00

helpers

Remove admin order #show link from helper

2018-11-06 11:03:06 +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

Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for

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

overrides

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

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

presenters

…

serializers/api

Merge pull request #2998 from coopdevs/adapt-product-on-demand

2018-11-08 19:21:46 +00:00

services

Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout

2018-11-13 21:25:59 +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-nov-14th

2018-11-14 11:35:58 +00:00