Merge remote-tracking branch 'origin/2.4-develop' into MC-37820

Author: OlgaVasyltsun

.github/PULL_REQUEST_TEMPLATE.md

@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Backend\Block\Store;
 
@@ -114,7 +115,8 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setUseConfirm(true);
+        $this->setUseConfirm($this->hasData('use_confirm') ? (bool)$this->getData('use_confirm') : true);
+
         $this->setUseAjax(true);
 
         $this->setShowManageStoresLink(0);

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Backend\Block\Media\Uploader */
 ?>
 

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -4,7 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Backend\Block\GlobalSearch */
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
+
+use Magento\Backend\Block\GlobalSearch;
+use Magento\Framework\Json\Helper\Data;
+
+/** @var $block GlobalSearch */
+/** @var Data $helper */
+$helper = $this->helper(Data::class);
+
 ?>
 <div class="search-global" data-mage-init='{"globalSearch": {}}'>
     <form action="#" id="form-search">
@@ -15,9 +23,7 @@
                     class="search-global-input"
                     id="search-global"
                     name="query"
-                    <?php //phpcs:disable ?>
-                    data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getWidgetInitOptions()) ?>'>
-                    <?php //phpcs:enable ?>
+                    data-mage-init='<?= /* @noEscape */ $helper->jsonEncode($block->getWidgetInitOptions()) ?>'>
             <button
                 type="submit"
                 class="search-global-action"

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -0,0 +1,127 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * @param {Object} storeSwitchConfig
+     */
+    return function (storeSwitchConfig) {
+        var scopeSwitcherHandler;
+
+        (function () {
+            var storesList = $('[data-role=stores-list]');
+
+            storesList.on('click', '[data-value]', function (event) {
+                var val = $(event.target).data('value'),
+                    role = $(event.target).data('role'),
+                    switcher = $('[data-role=' + role + ']');
+
+                event.preventDefault();
+
+                if (!switcher.val() || val !== switcher.val()) {
+
+                    /* Set the value & trigger event */
+                    switcher.val(val).trigger('change');
+                }
+            });
+        })($);
+
+        /**
+         * Switch store scope
+         *
+         * @param {Object} obj
+         * @return void
+         */
+        function switchScope(obj) {
+            var switcher = $(obj),
+                scopeId = switcher.val(),
+                scopeParams = '',
+                switcherParams = {};
+
+            if (scopeId) {
+                scopeParams = switcher.data('param') + '/' + scopeId + '/';
+            }
+
+            if (obj.switchParams) {
+                scopeParams += obj.switchParams;
+            }
+
+            /**
+             * Reload function for switcher
+             */
+            function reload() {
+                var url;
+
+                if (!storeSwitchConfig.isUsingIframe) {
+
+                    if (storeSwitchConfig.switchUrl && storeSwitchConfig.switchUrl.length > 0) {
+                        url = storeSwitchConfig.switchUrl + scopeParams;
+
+                        /* eslint-disable no-undef */
+                        setLocation(url);
+                    }
+
+                } else {
+                    $('#preview_selected_store').val(scopeId);
+                    $('#preview_form').submit();
+
+                    $('.store-switcher .dropdown-menu li a').each(function () {
+                        var $this = $(this);
+
+                        if ($this.data('role') === 'store-view-id' && $this.data('value') === scopeId) {
+                            $('#store-change-button').html($this.text());
+                        }
+                    });
+
+                    $('#store-change-button').click();
+                }
+            }
+
+            if (typeof scopeSwitcherHandler !== 'undefined') {
+                switcherParams = {
+                    scopeId: scopeId,
+                    scopeParams: scopeParams,
+                    useConfirm: storeSwitchConfig.useConfirm
+                };
+
+                scopeSwitcherHandler(switcherParams);
+            } else if (storeSwitchConfig.useConfirm) {
+                require([
+                    'Magento_Ui/js/modal/confirm',
+                    'mage/translate'
+                ], function (confirm, $t) {
+                    confirm({
+                        content: $t('Please confirm scope switching. All data that hasn\'t been saved will be lost.'),
+                        actions: {
+
+                            /**
+                             * Confirm action
+                             */
+                            confirm: function () {
+                                reload();
+                            },
+
+                            /**
+                             * Cancel action
+                             */
+                            cancel: function () {
+                                obj.value = storeSwitchConfig.storeId ? storeSwitchConfig.storeId : '';
+                            }
+                        }
+                    });
+                });
+            } else {
+                reload();
+            }
+        }
+
+        window.scopeSwitcherHandler = scopeSwitcherHandler;
+        window.switchScope = switchScope;
+    };
+});

app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml

@@ -3,10 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php
-    $_product = $block->getProduct();
+// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
+$_product = $block->getProduct();
 ?>
 <?php if ($_product->isSaleable() && $block->hasOptions()) : ?>
 <div id="bundleSummary"

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml

@@ -46,6 +46,12 @@
         <data key="label">Change password</data>
         <data key="value">user_edit</data>
     </entity>
+    <entity name="StorefrontCaptchaOnOnepageCheckoutConfigData">
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Checkout/Placing Order</data>
+        <data key="value">payment_processing_request</data>
+    </entity>
     <entity name="StorefrontCaptchaOnCustomerForgotPasswordConfigData">
         <!-- Magento default value -->
         <data key="path">customer/captcha/forms</data>