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

Magnimex 151 update products

See merge request !162

Author: kalashnikau-uladzimir

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -38,7 +38,7 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
     protected $_entityTypeCode;
 
     /**
-     * @var
+     * @var \Magento\Framework\App\Resource
      */
     protected $_resource;
 
@@ -72,6 +72,11 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
         ImportAdvancedPricing::COL_GROUP_PRICE_CUSTOMER_GROUP,
     ];
 
+    /**
+     * Template array for export data
+     *
+     * @var array
+     */
     protected $templateExportData = [
         ImportAdvancedPricing::COL_SKU => '',
         ImportAdvancedPricing::COL_GROUP_PRICE_WEBSITE => '',
@@ -298,7 +303,7 @@ protected function getExportData()
     }
 
     /**
-     * @param $exportData
+     * @param array $exportData
      * @return array
      */
     protected function correctExportData($exportData)
@@ -336,7 +341,7 @@ protected function correctExportData($exportData)
      * Get Tier and Group Pricing
      *
      * @param array $listSku
-     * @param $table
+     * @param string $table
      * @return array|bool
      */
     protected function getTierAndGroupPrices(array $listSku, $table)
@@ -413,7 +418,7 @@ protected function getTierAndGroupPrices(array $listSku, $table)
     /**
      * Get Website code
      *
-     * @param $websiteId
+     * @param int $websiteId
      * @return string
      */
     protected function _getWebsiteCode($websiteId)
@@ -434,7 +439,7 @@ protected function _getWebsiteCode($websiteId)
     /**
      * Get Customer Group By Id
      *
-     * @param $customerGroupId
+     * @param int $customerGroupId
      * @param null $allGroups
      * @return string
      */

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -119,6 +119,18 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      */
     protected $_permanentAttributes = [self::COL_SKU];
 
+    /**
+     * Catalog product entity
+     *
+     * @var string
+     */
+    protected $_catalogProductEntity;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    protected $_localeDate;
+
     /**
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
@@ -136,6 +148,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param AdvancedPricing\Validator\GroupPrice $groupPriceValidator
      */
     public function __construct(
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         \Magento\ImportExport\Helper\Data $importExportData,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
@@ -150,6 +163,7 @@ public function __construct(
         AdvancedPricing\Validator\Website $websiteValidator,
         AdvancedPricing\Validator\GroupPrice $groupPriceValidator
     ) {
+        $this->_localeDate = $localeDate;
         $this->jsonHelper = $jsonHelper;
         $this->_importExportData = $importExportData;
         $this->_resourceHelper = $resourceHelper;
@@ -164,6 +178,7 @@ public function __construct(
         $this->_oldSkus = $this->retrieveOldSkus();
         $this->websiteValidator = $websiteValidator;
         $this->groupPriceValidator = $groupPriceValidator;
+        $this->_catalogProductEntity = $this->_resourceFactory->create()->getTable('catalog_product_entity');
     }
 
     /**
@@ -262,6 +277,7 @@ public function deleteAdvancedPricing()
         if ($listSku) {
             $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_GROUPED_PRICE);
             $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_TIER_PRICE);
+            $this->setUpdatedAt($listSku);
         }
         return $this;
     }
@@ -287,8 +303,8 @@ protected function saveAndReplaceAdvancedPrices()
         $behavior = $this->getBehavior();
         if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
             $this->_cachedSkuToDelete = null;
-            $listSku = [];
         }
+        $listSku = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $tierPrices = [];
             $groupPrices = [];
@@ -298,9 +314,7 @@ protected function saveAndReplaceAdvancedPrices()
                     continue;
                 }
                 $rowSku = $rowData[self::COL_SKU];
-                if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
-                    $listSku[] = $rowSku;
-                }
+                $listSku[] = $rowSku;
                 if (!empty($rowData[self::COL_TIER_PRICE_WEBSITE])) {
                     $tierPrices[$rowSku][] = [
                         'all_groups' => $rowData[self::COL_TIER_PRICE_CUSTOMER_GROUP] == self::VALUE_ALL_GROUPS,
@@ -330,6 +344,7 @@ protected function saveAndReplaceAdvancedPrices()
                         && $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
                         $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE)
                             ->saveProductPrices($groupPrices, self::TABLE_GROUPED_PRICE);
+                        $this->setUpdatedAt($listSku);
                     }
                 }
             } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
@@ -338,6 +353,9 @@ protected function saveAndReplaceAdvancedPrices()
                     ->processCountNewPrices($tierPrices, $groupPrices);
                 $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE)
                     ->saveProductPrices($groupPrices, self::TABLE_GROUPED_PRICE);
+                if ($listSku) {
+                    $this->setUpdatedAt($listSku);
+                }
             }
         }
         return $this;
@@ -355,12 +373,14 @@ protected function saveProductPrices(array $priceData, $table)
         if ($priceData) {
             $tableName = $this->_resourceFactory->create()->getTable($table);
             $priceIn = [];
+            $entityIds = [];
             foreach ($priceData as $sku => $priceRows) {
                 if (isset($this->_oldSkus[$sku])) {
                     $productId = $this->_oldSkus[$sku];
                     foreach ($priceRows as $row) {
                         $row['entity_id'] = $productId;
                         $priceIn[] = $row;
+                        $entityIds[] = $productId;
                     }
                 }
             }
@@ -384,8 +404,8 @@ protected function deleteProductTierAndGroupPrices(array $listSku, $tableName)
             if (!$this->_cachedSkuToDelete) {
                 $this->_cachedSkuToDelete = $this->_connection->fetchCol(
                     $this->_connection->select()
-                    ->from($this->_connection->getTableName('catalog_product_entity'), 'entity_id')
-                    ->where('sku IN (?)', $listSku)
+                        ->from($this->_catalogProductEntity, 'entity_id')
+                        ->where('sku IN (?)', $listSku)
                 );
             }
             if ($this->_cachedSkuToDelete) {
@@ -407,6 +427,23 @@ protected function deleteProductTierAndGroupPrices(array $listSku, $tableName)
         }
     }
 
+    /**
+     * Set updated_at for product
+     *
+     * @param array $listSku
+     * @return $this
+     */
+    protected function setUpdatedAt(array $listSku)
+    {
+        $updatedAt = $this->_localeDate->date(null, null, false)->format('Y-m-d H:i:s');
+        $this->_connection->update(
+            $this->_catalogProductEntity,
+            [\Magento\Catalog\Model\Category::KEY_UPDATED_AT => $updatedAt],
+            $this->_connection->quoteInto('sku IN (?)', $listSku)
+        );
+        return $this;
+    }
+
     /**
      * Get website id by code
      *

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

@@ -1378,7 +1378,7 @@ 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 = strtolower($dispersionPath . '/' . $imageName);
+                    $fullDispersionPath = mb_strtolower($dispersionPath . '/' . $imageName);
                     foreach ($this->cachedImages as $image) {
                         if (($image['sku'] == $rowData[self::COL_SKU])
                             && ($image['value'] == $fullDispersionPath)