Merge pull request magento#4 from magento-nord/develop

[Sample Data] [Nord] Bug fixing

Author: Onischenko, Yaroslav(yonischenko)

app/code/Magento/ConfigurableSampleData/Setup/Installer.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright � 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ConfigurableSampleData\Setup;
@@ -29,6 +29,11 @@ class Installer implements Setup\SampleData\InstallerInterface
      */
     protected $productLinkSetup;
 
+    /**
+     * @var \Magento\SalesSampleData\Model\Order
+     */
+    protected $order;
+
     /**
      * @param \Magento\CatalogSampleData\Model\Attribute $attribute
      * @param \Magento\CatalogSampleData\Model\Category $category
@@ -39,12 +44,14 @@ public function __construct(
         \Magento\CatalogSampleData\Model\Attribute $attribute,
         \Magento\CatalogSampleData\Model\Category $category,
         \Magento\ConfigurableSampleData\Model\Product $configurableProduct,
-        \Magento\ProductLinksSampleData\Model\ProductLink $productLinkSetup
+        \Magento\ProductLinksSampleData\Model\ProductLink $productLinkSetup,
+        \Magento\SalesSampleData\Model\Order $order
     ) {
         $this->attribute = $attribute;
         $this->category = $category;
         $this->configurableProduct = $configurableProduct;
         $this->productLinkSetup = $productLinkSetup;
+        $this->order = $order;
     }
 
     /**
@@ -60,5 +67,6 @@ public function install()
             ['Magento_ConfigurableSampleData::fixtures/Links/upsell.csv'],
             ['Magento_ConfigurableSampleData::fixtures/Links/crossell.csv']
         );
+        $this->order->install(['Magento_ConfigurableSampleData::fixtures/orders.csv']);
     }
-}
+}

app/code/Magento/ConfigurableSampleData/composer.json

@@ -5,7 +5,8 @@
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-configurable-product": "1.0.0-beta",
         "magento/module-sample-data": "1.0.0-beta",
-        "magento/module-product-links-sample-data": "1.0.0-beta"
+        "magento/module-product-links-sample-data": "1.0.0-beta",
+        "magento/module-sales-sample-data": "1.0.0-beta"
     },
     "type": "magento2-module",
     "version": "1.0.0-beta",

app/code/Magento/ConfigurableSampleData/fixtures/orders.csv

@@ -1,3 +1,3 @@
-customer_email,currency,shipping_method,payment,product,refund,increment_id
-"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS03"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:12:""size_general"";s:2:""XS"";s:5:""color"";s:3:""Red"";}}",no,000000001
-"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS08"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:12:""size_general"";s:2:""XS"";s:5:""color"";s:4:""Blue"";}}",yes,000000002
+customer_email,currency,shipping_method,payment,product,refund
+"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS03"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:4:""size"";s:2:""XS"";s:5:""color"";s:3:""Red"";}}",no
+"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS08"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:4:""size"";s:2:""XS"";s:5:""color"";s:4:""Blue"";}}",yes