Luis Ramos ef2e00ae31 Merge pull request #3604 from luisramos0/2-0-fix-splitters ...

[Spree Upgrade] Override default spree splitters config

2019-04-09 09:19:00 +01:00

..

config

Override default spree splitters config (was Shipping Category and Backordered) to use only Base splitter, this splitter does not split the orders into multiple shipments

2019-03-26 15:37:35 +00:00

controllers

Uncomment report specs so we can make them work in v2

2019-03-29 22:16:38 +00:00

factories

Add address factory with randomized attributes

2019-03-22 02:45:50 +08:00

features

Add manual shipping adjustment

2019-03-29 22:16:39 +00:00

helpers

Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4

2019-03-29 22:16:39 +00:00

javascripts

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

2019-03-06 09:19:53 +00:00

jobs

Use :performing_deliveries in spec

2019-03-28 02:04:13 +08:00

lib

Uncomment report specs so we can make them work in v2

2019-03-29 22:16:38 +00:00

mailers

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

2019-03-22 10:55:17 +00:00

models

Merge pull request #3604 from luisramos0/2-0-fix-splitters

2019-04-09 09:19:00 +01:00

performance

Revert "Refactor Order#current_order argument"

2018-06-05 18:42:41 +02:00

requests

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

serializers

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

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

services

Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment

2019-03-27 14:10:51 +00:00

support

Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4

2019-03-29 22:16:39 +00:00

validators

Add validator for integer arrays

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

factories.rb

Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment

2019-03-27 14:10:51 +00:00

spec_helper.rb

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

2019-02-12 16:03:33 +00:00