Merge remote-tracking branch 'mainline/2.2' into MC-18487

Author: Rrego6

CHANGELOG.md

@@ -7,15 +7,17 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginAsAdmin">
         <arguments>
             <argument name="adminUser" defaultValue="DefaultAdminUser"/>
         </arguments>
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <!-- It sometimes is loading too long for default 10s -->
+        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
         <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
         <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
         <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
         <closeAdminNotification stepKey="closeAdminNotification"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml

@@ -567,11 +567,6 @@
                     <label>Validate HTTP_USER_AGENT</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="use_frontend_sid" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Use SID on Storefront</label>
-                    <comment>Allows customers to stay logged in when switching between different stores.</comment>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
             </group>
         </section>
     </system>

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -246,8 +246,10 @@ define(
                             return;
                         }
 
-                        self.setPaymentPayload(payload);
-                        self.placeOrder();
+                        if (self.validateCardType()) {
+                            self.setPaymentPayload(payload);
+                            self.placeOrder();
+                        }
                     });
                 }
             },

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -23,7 +23,7 @@
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-        <form id="co-transparent-form-braintree" class="form" data-bind="" method="post" action="#" novalidate="novalidate">
+        <form id="co-transparent-form-braintree" class="form" data-bind="afterRender: initHostedFields" method="post" action="#" novalidate="novalidate">
             <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
                 <legend class="legend">
                     <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
@@ -87,7 +87,7 @@
                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                     </label>
                     <div class="control _with-tooltip">
-                        <div data-bind="afterRender: initHostedFields, attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
                         <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
 
                         <div class="field-tooltip toggle">

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -40,7 +40,7 @@ protected function _getCatalogConfig()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllOptions()
     {
@@ -49,7 +49,7 @@ public function getAllOptions()
             foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) {
                 $this->_options[] = [
                     'label' => __($attribute['frontend_label']),
-                    'value' => $attribute['attribute_code'],
+                    'value' => $attribute['attribute_code']
                 ];
             }
         }

app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php

@@ -217,7 +217,7 @@ public function getMeta()
     }
 
     /**
-     * Disable fields if they are using default values.
+     * Add 'use default checkbox' to attributes that can have it.
      *
      * @param Category $category
      * @param array $meta
@@ -357,6 +357,9 @@ public function getAttributesMeta(Type $entityType)
                 }
                 if ($attribute->usesSource()) {
                     $meta[$code]['options'] = $attribute->getSource()->getAllOptions();
+                    foreach ($meta[$code]['options'] as &$option) {
+                        $option['__disableTmpl'] = true;
+                    }
                 }
             }
 
@@ -542,7 +545,7 @@ public function getDefaultMetaData($result)
     }
 
     /**
-     * List of fields groups and fields.
+     * List form field sets and fields.
      *
      * @return array
      * @since 101.0.0

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -5,10 +5,13 @@
  */
 namespace Magento\Catalog\Model\Product\AttributeSet;
 
+/**
+ * Attribute Set Options
+ */
 class Options implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
-     * @var null|array
+     * @var array
      */
     protected $options;
 
@@ -25,15 +28,23 @@ public function __construct(
     }
 
     /**
-     * @return array|null
+     * @inheritDoc
      */
     public function toOptionArray()
     {
         if (null == $this->options) {
             $this->options = $this->collectionFactory->create()
                 ->setEntityTypeFilter($this->product->getTypeId())
                 ->toOptionArray();
+
+            array_walk(
+                $this->options,
+                function (&$option) {
+                    $option['__disableTmpl'] = true;
+                }
+            );
         }
+
         return $this->options;
     }
 }

app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Compare;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Product Compare List Model
@@ -51,6 +54,11 @@ class ListCompare extends \Magento\Framework\DataObject
      */
     protected $_compareItemFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -60,20 +68,23 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param array $data
+     * @param ProductRepository|null $productRepository
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        array $data = []
+        array $data = [],
+        ProductRepository $productRepository = null
     ) {
         $this->_compareItemFactory = $compareItemFactory;
         $this->_itemCollectionFactory = $itemCollectionFactory;
         $this->_catalogProductCompareItem = $catalogProductCompareItem;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
+        $this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
         parent::__construct($data);
     }
 
@@ -82,6 +93,7 @@ public function __construct(
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
+     * @throws \Exception
      */
     public function addProduct($product)
     {
@@ -90,14 +102,33 @@ public function addProduct($product)
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
 
-        if (!$item->getId()) {
+        if (!$item->getId() && $this->productExists($product)) {
             $item->addProductData($product);
             $item->save();
         }
 
         return $this;
     }
 
+    /**
+     * Check product exists.
+     *
+     * @param int|\Magento\Catalog\Model\Product $product
+     * @return bool
+     */
+    private function productExists($product)
+    {
+        if ($product instanceof \Magento\Catalog\Model\Product && $product->getId()) {
+            return true;
+        }
+        try {
+            $product = $this->productRepository->getById((int)$product);
+            return !empty($product->getId());
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Add products to compare list
      *

app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php

@@ -161,10 +161,10 @@ public function addImage(
         }
 
         $fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($pathinfo['basename']);
-        $dispretionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
-        $fileName = $dispretionPath . '/' . $fileName;
+        $dispersionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
+        $fileName = $dispersionPath . '/' . $fileName;
 
-        $fileName = $this->getNotDuplicatedFilename($fileName, $dispretionPath);
+        $fileName = $this->getNotDuplicatedFilename($fileName, $dispersionPath);
 
         $destinationFile = $this->mediaConfig->getTmpMediaPath($fileName);
 
@@ -458,27 +458,27 @@ protected function getUniqueFileName($file, $forTmp = false)
      * Get filename which is not duplicated with other files in media temporary and media directories
      *
      * @param string $fileName
-     * @param string $dispretionPath
+     * @param string $dispersionPath
      * @return string
      * @since 101.0.0
      */
-    protected function getNotDuplicatedFilename($fileName, $dispretionPath)
+    protected function getNotDuplicatedFilename($fileName, $dispersionPath)
     {
-        $fileMediaName = $dispretionPath . '/'
+        $fileMediaName = $dispersionPath . '/'
             . \Magento\MediaStorage\Model\File\Uploader::getNewFileName($this->mediaConfig->getMediaPath($fileName));
-        $fileTmpMediaName = $dispretionPath . '/'
+        $fileTmpMediaName = $dispersionPath . '/'
             . \Magento\MediaStorage\Model\File\Uploader::getNewFileName($this->mediaConfig->getTmpMediaPath($fileName));
 
         if ($fileMediaName != $fileTmpMediaName) {
             if ($fileMediaName != $fileName) {
                 return $this->getNotDuplicatedFilename(
                     $fileMediaName,
-                    $dispretionPath
+                    $dispersionPath
                 );
             } elseif ($fileTmpMediaName != $fileName) {
                 return $this->getNotDuplicatedFilename(
                     $fileTmpMediaName,
-                    $dispretionPath
+                    $dispersionPath
                 );
             }
         }