Update to work with Spree 2 OrderPopulator API:

Adding variants directly to order object is now deprecated. This PR makes the extension compatible with both the new Spree 2 api and the deprecated 1.x api

cc @BDQ