Merge commit 'refs/pull/12/head' of https://github.com/magento/magento2ce into epam-4

Author: Andrey Konosov

app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php

@@ -289,7 +289,7 @@ protected function cleanOverriddenUrlKey()
             return $this;
         }
         $select = $this->connection->select()
-            ->from($this->urlKeyAttributeBackendTable, 'store_id, entity_id')
+            ->from($this->urlKeyAttributeBackendTable, ['store_id', 'entity_id'])
             ->where('attribute_id = ?', $this->urlKeyAttributeId)
             ->where(implode(' OR ', $this->entityStoresToCheckOverridden));
         $entityStoresToClean = $this->connection->fetchAll($select);

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php

@@ -616,7 +616,7 @@ public function testCleanOverriddenUrlKey()
             ->method('from')
             ->with(
                 $urlKeyAttributeBackendTable,
-                'store_id, entity_id'
+                ['store_id', 'entity_id']
             )
             ->will($this->returnSelf());
         $this->select

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Controller\Adminhtml\Import;
+
+use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Download sample file controller
+ */
+class Download extends ImportController
+{
+    const SAMPLE_FILES_DIRECTORY = 'Magento/ImportExport/Files/Sample/';
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    protected $fileDirectory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\Filesystem $filesystem
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\Filesystem $filesystem
+    ) {
+        parent::__construct(
+            $context
+        );
+        $this->fileFactory = $fileFactory;
+        $this->resultRawFactory = $resultRawFactory;
+        $this->fileDirectory = $filesystem->getDirectoryWrite(DirectoryList::MODULES);
+    }
+
+    /**
+     * Download sample file action
+     *
+     * @return \Magento\Framework\Controller\Result\Raw
+     */
+    public function execute()
+    {
+        $fileName = $this->getRequest()->getParam('filename') . '.csv';
+        $filePath = self::SAMPLE_FILES_DIRECTORY . $fileName;
+
+        if (!$this->fileDirectory->isFile($filePath)) {
+            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+            $this->messageManager->addError(__('There is no sample file for this entity.'));
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setPath('*/import');
+            return $resultRedirect;
+        }
+
+        $fileSize = isset($this->fileDirectory->stat($filePath)['size'])
+            ? $this->fileDirectory->stat($filePath)['size'] : null;
+
+        $this->fileFactory->create(
+            $fileName,
+            null,
+            DirectoryList::VAR_DIR,
+            'application/octet-stream',
+            $fileSize
+        );
+
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setContents($this->fileDirectory->readFile($filePath));
+        return $resultRaw;
+    }
+}

pub/advanced_pricing.csv renamed to app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv

@@ -712,11 +712,18 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
                 $fileName = $result['name'];
             } elseif (!is_null($extension)) {
                 $fileName = $entity . $extension;
+            } else {
+                $fileName = basename($sourceFileRelative);
             }
             $copyName = $this->localeDate->gmtTimestamp() . '_' . $fileName;
             $copyFile = self::IMPORT_HISTORY_DIR . $copyName;
             try {
-                $this->_varDirectory->copyFile($sourceFileRelative, $copyFile);
+                if ($this->_varDirectory->isExist($sourceFileRelative)) {
+                    $this->_varDirectory->copyFile($sourceFileRelative, $copyFile);
+                } else {
+                    $content = $this->_varDirectory->getDriver()->fileGetContents($sourceFileRelative);
+                    $this->_varDirectory->writeFile($copyFile, $content);
+                }
             } catch (\Magento\Framework\Exception\FileSystemException $e) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Source file coping failed'));
             }

pub/catalog_product.csv renamed to app/code/Magento/ImportExport/Files/Sample/catalog_product.csv

@@ -677,7 +677,7 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)
         return $this->validateRow($rowData, $rowNumber) && !isset($this->_skippedRows[$rowNumber]);
     }
 
-    /*
+    /**
     * Is import need to log in history.
     *
     * @return bool

app/code/Magento/ImportExport/Model/Import.php

@@ -35,7 +35,7 @@ require(['jquery', 'prototype'], function(jQuery){
          * Base url
          * @type {string}
          */
-        sampleFilesBaseUrl: '<?php echo $block->getBaseUrl() ?>' + 'pub/',
+        sampleFilesBaseUrl: '<?php echo $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
 
         /**
          * Reset selected index
@@ -105,7 +105,7 @@ require(['jquery', 'prototype'], function(jQuery){
         showSampleFile: function(entityId) {
             var sampleFileSpan = jQuery('#sample-file-span');
             if (entityId) {
-                var sampleFileLink = this.sampleFilesBaseUrl + entityId + '.csv';
+                var sampleFileLink = this.sampleFilesBaseUrl.replace('entity-name', entityId);
                 jQuery('#sample-file-link').attr('href', sampleFileLink);
                 if (sampleFileSpan.is(':hidden')) {
                     sampleFileSpan.show();