Merge pull request #83 from magento-nord/merchant_beta

[Merchant beta] [Nord] Bug fix
magento · Oct 30, 2015 · 6007e86 · 6007e86
2 parents a1873db + db9565a
commit 6007e86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1958,12 +1958,14 @@ protected function _saveStockItem()
  } else {
  $row['qty'] = 0;
  }
- $stockData[] = $row;
+ if (!isset($stockData[$rowData[self::COL_SKU]])) {
+ $stockData[$rowData[self::COL_SKU]] = $row;
+ }
  }
 
  // Insert rows
  if (!empty($stockData)) {
- $this->_connection->insertOnDuplicate($entityTable, $stockData);
+ $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));
  }
 
  if ($productIdsToReindex) {

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -155,7 +155,7 @@ public function move($fileName, $renameFileOff = false)
 
  $filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);
  $this->_setUploadFile($filePath);
- $result = $this->save($this->getDestDir());
+ $result = $this->save($this->_directory->getAbsolutePath($this->getDestDir()));
  $result['name'] = self::getCorrectFileName($result['name']);
  return $result;
  }

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
@@ -71,7 +71,7 @@ protected function setUp()
  ->getMock();
 
  $this->directoryMock = $this->getMockBuilder('\Magento\Framework\Filesystem\Directory\Writer')
- ->setMethods(['writeFile', 'getRelativePath'])
+ ->setMethods(['writeFile', 'getRelativePath', 'getAbsolutePath'])
  ->disableOriginalConstructor()
  ->getMock();