Merge branch '2.4-develop' into L3_PR_21-10-10

Author: veloraven

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94176"/>
             <group value="backup"/>
+            <skip>
+                <issueId value="DEPRECATED">Magento backup functionality is deprecated</issueId>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{EnableBackupFunctionality.path}} {{EnableBackupFunctionality.value}}" stepKey="setEnableBackup"/>

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php

@@ -19,8 +19,6 @@
 class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer
 {
     /**
-     * Serializer
-     *
      * @var Json
      */
     private $serializer;
@@ -211,7 +209,7 @@ public function getValueHtml($item)
         if (!$this->isChildCalculated($item)) {
             $attributes = $this->getSelectionAttributes($item);
             if ($attributes) {
-                $result .= " " . $this->getItem()->getOrder()->formatPrice($attributes['price']);
+                $result .= " " . $this->getItem()->getOrder()->formatBasePrice($attributes['price']);
             }
         }
         return $result;

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php

@@ -16,8 +16,6 @@
 class Renderer extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
 {
     /**
-     * Serializer
-     *
      * @var Json
      */
     private $serializer;
@@ -43,7 +41,10 @@ public function __construct(
     }
 
     /**
+     * Check if shipment type (invoice etc) is separate
+     *
      * @param mixed $item
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -79,7 +80,10 @@ public function isShipmentSeparately($item = null)
     }
 
     /**
+     * Check if sub product calculations are present
+     *
      * @param mixed $item
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -117,7 +121,10 @@ public function isChildCalculated($item = null)
     }
 
     /**
+     * Get bundle selection attributes
+     *
      * @param mixed $item
+     *
      * @return mixed|null
      */
     public function getSelectionAttributes($item)
@@ -134,14 +141,17 @@ public function getSelectionAttributes($item)
     }
 
     /**
+     * Get html of bundle selection attributes
+     *
      * @param mixed $item
+     *
      * @return string
      */
     public function getValueHtml($item)
     {
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "
-                . $this->getOrder()->formatPrice($attributes['price']);
+                . $this->getOrder()->formatBasePrice($attributes['price']);
         }
         return $this->escapeHtml($item->getName());
     }
@@ -183,7 +193,10 @@ public function getChildren($item)
     }
 
     /**
+     * Check if price info can be shown
+     *
      * @param mixed $item
+     *
      * @return bool
      */
     public function canShowPriceInfo($item)

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToProductAttributeEditPageActionGroup.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminNavigateToProductAttributeEditPageActionGroup">
+        <annotations>
+            <description>Navigate to the given product attribute edit page by attribute label</description>
+        </annotations>
+        <arguments>
+            <argument name="ProductAttributeLabel" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{ProductAttributeLabel}}" stepKey="fillTheAttributesFilterByLabel"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickTheSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchToComplete"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnTheFirstSearchResultRow"/>
+        <waitForPageLoad stepKey="waitForAttribiteEditPageToLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdminScopeSelectionShouldBeDisabledOnMediaGalleryProductAttributeEditTest.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminScopeSelectionShouldBeDisabledOnMediaGalleryProductAttributeEditTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Attributes Updating"/>
+            <group value="Catalog"/>
+            <title value="Admin should not able to change Scope of Media Gallery product attribute"/>
+            <description value="Admin should not able to change Scope of Media Gallery product attribute"/>
+            <severity value="MAJOR"/>
+            <useCaseId value="MC-38156"/>
+            <testCaseId value="AC-1337"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminNavigateToProductAttributeEditPageActionGroup" stepKey="navigateToMediaGalleryProductAttribute">
+            <argument name="ProductAttributeLabel" value="Media Gallery"/>
+        </actionGroup>
+
+        <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" stepKey="clickAdvancedAttributePropertiesSectionToggle"/>
+
+        <assertElementContainsAttribute stepKey="assertTheScopeSelectionIsDisabled">
+            <expectedResult selector="{{AdvancedAttributePropertiesSection.Scope}}" attribute="disabled" type="string"></expectedResult>
+        </assertElementContainsAttribute>
+
+    </test>
+</tests>
+

app/code/Magento/CompareListGraphQl/Model/Service/Collection/GetComparableItemsCollection.php

@@ -78,9 +78,7 @@ public function execute(int $listId, ContextInterface $context): Collection
         $this->items->useProductItem()->setStoreId($context->getExtensionAttributes()->getStore()->getStoreId());
         $this->items->addAttributeToSelect(
             $this->catalogConfig->getProductAttributes()
-        )->loadComparableAttributes()->addMinimalPrice()->addTaxPercents()->setVisibility(
-            $this->catalogProductVisibility->getVisibleInSiteIds()
-        );
+        )->loadComparableAttributes()->addMinimalPrice()->addTaxPercents();
 
         return $this->items;
     }

app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php

@@ -17,12 +17,12 @@
 class Alert extends \Magento\Framework\App\Config\Value
 {
     /**
-     * Cron string path
+     * Cron expression config path
      */
     const CRON_STRING_PATH = 'crontab/default/jobs/catalog_product_alert/schedule/cron_expr';
 
     /**
-     * Cron model path
+     * Cron model config path
      */
     const CRON_MODEL_PATH = 'crontab/default/jobs/catalog_product_alert/run/model';
 
@@ -71,8 +71,16 @@ public function __construct(
      */
     public function afterSave()
     {
-        $time = $this->getData('groups/productalert_cron/fields/time/value');
-        $frequency = $this->getData('groups/productalert_cron/fields/frequency/value');
+        $time = $this->getData('groups/productalert_cron/fields/time/value') ?:
+            explode(
+                ',',
+                $this->_config->getValue(
+                    'catalog/productalert_cron/time',
+                    $this->getScope(),
+                    $this->getScopeId()
+                ) ?: '0,0,0'
+            );
+        $frequency = $this->getValue();
 
         $cronExprArray = [
             (int)$time[1], //Minute
@@ -102,6 +110,7 @@ public function afterSave()
                 self::CRON_MODEL_PATH
             )->save();
         } catch (\Exception $e) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(__('We can\'t save the cron expression.'));
         }
 

app/code/Magento/Customer/Model/Address/CustomerAddressDataProvider.php

@@ -7,6 +7,10 @@
 
 namespace Magento\Customer\Model\Address;
 
+use Magento\Customer\Model\Config\Share;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Provides customer address data.
  */
@@ -24,13 +28,31 @@ class CustomerAddressDataProvider
      */
     private $customerAddressDataFormatter;
 
+    /**
+     * @var \Magento\Customer\Model\Config\Share
+     */
+    private $shareConfig;
+
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountryReader;
+
     /**
      * @param CustomerAddressDataFormatter $customerAddressDataFormatter
+     * @param Share|null $share
+     * @param AllowedCountries|null $allowedCountryReader
      */
     public function __construct(
-        CustomerAddressDataFormatter $customerAddressDataFormatter
+        CustomerAddressDataFormatter $customerAddressDataFormatter,
+        ?Share $share = null,
+        ?AllowedCountries $allowedCountryReader = null
     ) {
         $this->customerAddressDataFormatter = $customerAddressDataFormatter;
+        $this->shareConfig = $share ?: ObjectManager::getInstance()
+            ->get(Share::class);
+        $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
+            ->get(AllowedCountries::class);
     }
 
     /**
@@ -52,8 +74,14 @@ public function getAddressDataByCustomer(
             return [];
         }
 
+        $allowedCountries = $this->allowedCountryReader->getAllowedCountries();
         $customerAddresses = [];
         foreach ($customerOriginAddresses as $address) {
+            // Checks if a country id present in the allowed countries list.
+            if ($this->shareConfig->isGlobalScope() && !in_array($address->getCountryId(), $allowedCountries)) {
+                continue;
+            }
+
             $customerAddresses[$address->getId()] = $this->customerAddressDataFormatter->prepareAddress($address);
         }