duplicate... [Spree Upgrade] WIP - Added adapted order.ship_method=#2666

Closed

luisramos0 wants to merge 67 commits intoopenfoodfoundation:masterfrom luisramos0:2-0-ship-method=

+1,169-578

Commits on Apr 17, 2018

update gemfile to spree 2.0.13

HugsDaniel
authored and
sauloperez
committed
Remove ssl deprecated configuration

HugsDaniel
authored and
sauloperez
committed
Refactor Order#current_order argument

HugsDaniel
authored and
sauloperez
committed
Removing redundant curly braces

HugsDaniel
authored and
sauloperez
committed
Removing useless spaces

HugsDaniel
authored and
sauloperez
committed
Remove commented out gem from Gemfile
sauloperez
committed

Commits on Apr 18, 2018

Upgrade Spree to 2.0.4 instead of 2.0.13
sauloperez
committed

Commits on Apr 23, 2018

Merge pull request openfoodfoundation#2235 from coopdevs/upgrade-to-spree-2.0.4
sauloperez
authored

Commits on Apr 26, 2018

Use OFN's Spree fork of 2.0.4 to get fixes
sauloperez
committed

Commits on Apr 27, 2018

Commits on Apr 30, 2018

Commits on May 2, 2018

Skip methods that distributor can't use in Package
sauloperez
committed

Commits on May 16, 2018

Merge pull request openfoodfoundation#2285 from coopdevs/get-last-spree-fork-changes
sauloperez
authored

Commits on Jun 5, 2018

Commits on Jun 7, 2018

Merge pull request openfoodfoundation#2358 from coopdevs/revert-current-order-argument
mkllnk
authored

Commits on Jun 12, 2018

Changed require syntax to fit jquery < 5.0
HugsDaniel
committed

Commits on Jun 13, 2018

Merge pull request openfoodfoundation#2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined
sauloperez
authored

Commits on Jun 22, 2018

Merge branch 'master' into 2-0-stable
sauloperez
committed

Commits on Jul 5, 2018

Skip shipment creation for payment step
mkllnk
committed

Commits on Jul 11, 2018

Less invasive modifying the checkout state machine
mkllnk
committed

Commits on Jul 20, 2018

Remove dependency to Dash and Jirafe
HugsDaniel
committed

Commits on Jul 24, 2018

Commits on Jul 26, 2018

Commits on Jul 27, 2018

Commits on Jul 30, 2018

Commits on Aug 19, 2018

Removed monkeypatchs to scope variants on inventory_unit and line_item decorators. We need to make the scoping somewhere else in spree2, see openfoodfoundation#2559
luisramos0
committed

Commits on Aug 22, 2018

Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
luisramos0
committed

Commits on Aug 25, 2018

Commits on Aug 28, 2018

Merge pull request openfoodfoundation#2574 from luisramos0/bulk_line_items_controller_spec_fix
mkllnk
authored

Commits on Aug 29, 2018

Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
luisramos0
committed

Commits on Aug 30, 2018

Commits on Aug 31, 2018

Merge pull request openfoodfoundation#2578 from luisramos0/spree2_fix_test_line_items
mkllnk
authored

Commits on Sep 4, 2018

Commits on Sep 5, 2018

Merge pull request openfoodfoundation#2639 from luisramos0/2-0-stable-sept
mkllnk
authored

Commits on Sep 8, 2018