Merge branch 'MAGNIMEX-319-Update-products' into 'master'

Magnimex 319 update products

See merge request !160

Author: A-Komar

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1374,13 +1374,19 @@ protected function _saveProducts()
                     $dispersionPath =
                         \Magento\Framework\File\Uploader::getDispretionPath($rowData[self::COL_MEDIA_IMAGE]);
                     $imageName = preg_replace('/[^a-z0-9\._-]+/i', '', $rowData[self::COL_MEDIA_IMAGE]);
-                    $fullDispersionPath = $dispersionPath . '/' . $imageName;
+                    $fullDispersionPath = strtolower($dispersionPath . '/' . $imageName);
                     foreach ($this->cachedImages as $image) {
                         if (($image['sku'] == $rowData[self::COL_SKU])
-                            && (preg_replace('/_[0-9]+/', '', $image['value']) == $fullDispersionPath)
+                            && ($image['value'] == $fullDispersionPath)
                         ) {
                             $imageInProductIsSet = true;
-                            $imageFromProduct = preg_replace('/_[0-9]+/', '', $image['value']);
+                            $imageFromProduct = $image['value'];
+                            break;
+                        } elseif (($image['sku'] == $rowData[self::COL_SKU])
+                            && (preg_replace('/_[0-9]?\./', '.', $image['value']) == $fullDispersionPath)
+                        ) {
+                            $imageInProductIsSet = true;
+                            $imageFromProduct = preg_replace('/_[0-9]?\./', '.', $image['value']);
                             break;
                         } elseif (in_array($fullDispersionPath, $image)) {
                             $imageIsSet = true;
@@ -1775,7 +1781,7 @@ protected function _getUploader()
      * @param string $fileName
      * @return string
      */
-    protected function _uploadMediaFiles($fileName, $renameFileOff=false)
+    protected function _uploadMediaFiles($fileName, $renameFileOff = false)
     {
         try {
             $res = $this->_getUploader()->move($fileName, $renameFileOff);