Merge pull request #4680 from magento-tango/BUGFIX-2.2-0823

[tango] BUGFIX 2.2 0823

Author: dhorytskyi

app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml

@@ -10,12 +10,15 @@
     //<![CDATA[
     require(
         [
-            'Magento_AuthorizenetAcceptjs/js/payment-form'
-        ], function(Authorizenet) {
+            'Magento_AuthorizenetAcceptjs/js/authorizenet',
+            'jquery',
+            'domReady!'
+        ], function(AuthorizenetAcceptjs, $) {
             var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
-                form = "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>";
+                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
 
-            new Authorizenet(config, form);
+            config.active = form.length > 0 && !form.is(':hidden');
+            new AuthorizenetAcceptjs(config);
         });
     //]]>
 </script>

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

@@ -284,6 +284,42 @@ private function initMediaGalleryResources()
         }
     }
 
+    /**
+     * Get the last media position for each product from the given list
+     *
+     * @param int $storeId
+     * @param array $productIds
+     * @return array
+     */
+    private function getLastMediaPositionPerProduct(int $storeId, array $productIds): array
+    {
+        $result = [];
+        if ($productIds) {
+            $productKeyName = $this->getProductEntityLinkField();
+            // this result could be achieved by using GROUP BY. But there is no index on position column, therefore
+            // it can be slower than the implementation below
+            $positions = $this->connection->fetchAll(
+                $this->connection
+                    ->select()
+                    ->from($this->mediaGalleryValueTableName, [$productKeyName, 'position'])
+                    ->where("$productKeyName IN (?)", $productIds)
+                    ->where('value_id is not null')
+                    ->where('store_id = ?', $storeId)
+            );
+            // Make sure the result contains all product ids even if the product has no media files
+            $result = array_fill_keys($productIds, 0);
+            // Find the largest position for each product
+            foreach ($positions as $record) {
+                $productId = $record[$productKeyName];
+                $result[$productId] = $result[$productId] < $record['position']
+                    ? $record['position']
+                    : $result[$productId];
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Save media gallery data per store.
      *
@@ -301,24 +337,30 @@ private function processMediaPerStore(
     ) {
         $multiInsertData = [];
         $dataForSkinnyTable = [];
+        $lastMediaPositionPerProduct = $this->getLastMediaPositionPerProduct(
+            $storeId,
+            array_unique(array_merge(...array_values($valueToProductId)))
+        );
+
         foreach ($mediaGalleryData as $mediaGalleryRows) {
             foreach ($mediaGalleryRows as $insertValue) {
-                foreach ($newMediaValues as $value_id => $values) {
+                foreach ($newMediaValues as $valueId => $values) {
                     if ($values['value'] == $insertValue['value']) {
-                        $insertValue['value_id'] = $value_id;
+                        $insertValue['value_id'] = $valueId;
                         $insertValue[$this->getProductEntityLinkField()]
                             = array_shift($valueToProductId[$values['value']]);
-                        unset($newMediaValues[$value_id]);
+                        unset($newMediaValues[$valueId]);
                         break;
                     }
                 }
                 if (isset($insertValue['value_id'])) {
+                    $productId = $insertValue[$this->getProductEntityLinkField()];
                     $valueArr = [
                         'value_id' => $insertValue['value_id'],
                         'store_id' => $storeId,
-                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
+                        $this->getProductEntityLinkField() => $productId,
                         'label' => $insertValue['label'],
-                        'position' => $insertValue['position'],
+                        'position' => $lastMediaPositionPerProduct[$productId] + $insertValue['position'],
                         'disabled' => $insertValue['disabled'],
                     ];
                     $multiInsertData[] = $valueArr;

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -275,12 +275,16 @@ protected function _populateForUrlGeneration($rowData)
      */
     private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
     {
-        if ((empty($newSku) || !isset($newSku['entity_id']))
-            || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
-                && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
-            || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
-                && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
-                && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
+        if ((
+                (empty($newSku) || !isset($newSku['entity_id']))
+                || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+                    && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+                || (array_key_exists(strtolower($rowData[ImportProduct::COL_SKU]), $oldSku)
+                    && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+                    && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)
+            )
+            && !isset($rowData["categories"])
+        ) {
             return false;
         }
         return true;

app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
-use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\Store;
 
@@ -67,13 +67,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var Category $category */
         $category = $observer->getEvent()->getCategory();
-        $useDefaultAttribute = !$category->isObjectNew() && !empty($category->getData('use_default')['url_key']);
+        $useDefaultAttribute = !empty($category->getData('use_default')['url_key']);
         if ($category->getUrlKey() !== false && !$useDefaultAttribute) {
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
             $this->updateUrlKey($category, $resultUrlKey);
-        } else if ($useDefaultAttribute) {
-            $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
-            $this->updateUrlKey($category, $resultUrlKey);
+        } elseif ($useDefaultAttribute) {
+            if (!$category->isObjectNew()) {
+                $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
+                $this->updateUrlKey($category, $resultUrlKey);
+            }
             $category->setUrlKey(null)->setUrlPath(null);
         }
     }