Merge pull request magento#15 from magento-firedrakes/CatalogStaging

[Firedrakes] Catalog staging

Author: mlogvin

app/code/Magento/CatalogSampleData/Model/Product/Gallery.php

@@ -152,7 +152,7 @@ protected function storeImage($product, $images)
                 $table = $imageAttribute->getBackend()->getTable();
                 /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter*/
                 $data = [
-                    $attribute->getBackend()->getEntityIdField() => $product->getId(),
+                    $attribute->getEntity()->getLinkField() => $product->getId(),
                     'attribute_id' => $attribute->getId(),
                     'value' => $baseImage,
                 ];

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

@@ -1,3 +1,3 @@
 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
+"[email protected]",USD,"flatrate_flatrate",checkmo,"a:2:{s:3:""sku"";s:7:""24-MB01"";s:3:""qty"";s:1:""1"";}",no
+"[email protected]",USD,"flatrate_flatrate",checkmo,"a:2:{s:3:""sku"";s:7:""24-MB04"";s:3:""qty"";s:1:""1"";}",yes