Bug fixes

firebearstudio · Jan 3, 2016 · 6ac21aa · 6ac21aa
1 parent 188eac1
commit 6ac21aa
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 128 deletions.
diff --git a/Model/Source/Config/Reader.php b/Model/Source/Config/Reader.php
@@ -27,9 +27,9 @@ public function __construct(
         $this->_fileName = $fileName;
         $this->_idAttributes = array_replace($this->_idAttributes, $idAttributes);
         $this->_schemaFile = $schemaLocator->getSchema();
-        $this->_isValidated = $validationState->isValidated();
-        $this->_perFileSchema = $schemaLocator->getPerFileSchema() &&
-        $this->_isValidated ? $schemaLocator->getPerFileSchema() : null;
+        $this->validationState = $validationState;
+        $this->_perFileSchema = $schemaLocator->getPerFileSchema() && $validationState->isValidationRequired()
+            ? $schemaLocator->getPerFileSchema() : null;
         $this->_domDocumentClass = $domDocumentClass;
         $this->_defaultScope = $defaultScope;
     }

diff --git a/Model/Source/Type/AbstractType.php b/Model/Source/Type/AbstractType.php
@@ -8,7 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-abstract class AbstractType extends \Magento\Framework\Object {
+abstract class AbstractType extends \Magento\Framework\DataObject {
 
     const IMPORT_DIR = 'var/import';
 

diff --git a/Model/Source/Type/Ftp.php b/Model/Source/Type/Ftp.php
@@ -16,6 +16,11 @@ public function uploadSource()
             $sourceFilePath = $this->getData($this->_code . '_file_path');
             $fileName = basename($sourceFilePath);
             $filePath = $this->_directory->getAbsolutePath($this->getImportPath() . '/' . $fileName);
+
+            $filesystem = new \Magento\Framework\Filesystem\Io\File();
+            $filesystem->setAllowCreateFolders(true);
+            $filesystem->checkAndCreateFolder($this->_directory->getAbsolutePath($this->getImportPath()));
+
             $result = $client->read($sourceFilePath, $filePath);
 
             if($result) {

diff --git a/Plugin/Block/Import/Form.php b/Plugin/Block/Import/Form.php
@@ -28,7 +28,10 @@ public function beforeSetForm(\Magento\ImportExport\Block\Adminhtml\Import\Edit\
         $fileFieldset->setClass('source-fieldset ' . $oldClass);
 
         $types = $this->_config->get();
-        $sources = [['label' => __('-- Please Select --'), 'value' => '']];
+        $sources = [
+            ['label' => __('-- Please Select --'), 'value' => ''],
+            ['label' => __('File'), 'value' => 'file']
+        ];
         foreach ($types as $typeName => $type) {
             $sources[] = ['label' => $type['label'], 'value' => $typeName];
         }

diff --git a/Plugin/Model/Import.php b/Plugin/Model/Import.php
@@ -27,7 +27,6 @@ class Import extends \Magento\ImportExport\Model\Import {
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\ImportExport\Model\Import\ConfigInterface $importConfig
      * @param \Magento\ImportExport\Model\Import\Entity\Factory $entityFactory
-     * @param \Magento\ImportExport\Model\Resource\Import\Data $importData
      * @param \Magento\ImportExport\Model\Export\Adapter\CsvFactory $csvFactory
      * @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
@@ -47,12 +46,12 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         \Magento\ImportExport\Model\Import\ConfigInterface $importConfig,
         \Magento\ImportExport\Model\Import\Entity\Factory $entityFactory,
-        \Magento\ImportExport\Model\Resource\Import\Data $importData,
+        \Magento\ImportExport\Model\ResourceModel\Import\Data $importData,
         \Magento\ImportExport\Model\Export\Adapter\CsvFactory $csvFactory,
         \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory,
         \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory,
         \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory,
-        \Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
+        \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\ImportExport\Model\History $importHistoryModel,
         \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
         array $data = []
@@ -88,7 +87,8 @@ public function uploadSource()
     {
         $result = null;
 
-        if($sourceType = $this->getImportSource()) {
+        if($this->getImportSource() && $this->getImportSource() != 'file') {
+            $sourceType = $this->getImportSource();
             $source = $this->_helper->getSourceModelByType($sourceType);
             $source->setData($this->getData());
 

diff --git a/Plugin/Model/Import/Product.php b/Plugin/Model/Import/Product.php
diff --git a/etc/import.xml b/etc/import.xml
@@ -5,6 +5,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Magento/ImportExport/etc/import.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_ImportExport:etc/import.xsd">
     <entity name="catalog_product" label="Products" model="Firebear\ImportExport\Model\Import\Product" behaviorModel="Magento\ImportExport\Model\Source\Import\Behavior\Basic" />
 </config>
diff --git a/view/adminhtml/templates/import/form/before.phtml b/view/adminhtml/templates/import/form/before.phtml
@@ -8,7 +8,7 @@
 /** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
 ?>
 <script>
-require(['jquery', 'prototype'], function(jQuery){
+require(['jquery', 'Magento_Ui/js/modal/alert', 'prototype'], function(jQuery){
 
 //<![CDATA[
     // Temporary Class will be replaced after refactoring of import/export functionality