🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

Accepted Community Pull Requests:
 - #22800: fixed issue #22638 - Asterisk(*) sign position does not consistent in admin (by @sanjaychouhan-webkul)
 - #23367: #23346: 'Test Connection' button is over-spanned (by @konarshankar07)
 - #23366: Correct spelling (by @ravi-chandra3197)
 - #23338: Fix issue with incorrect payment translation in sales emails (by @alexeya-ven)
 - #23247: Fixed 23230 : Sticky header floating under top when there is no buttons in the toolbar (by @konarshankar07)
 - #22650: Fixes issue #13227  (by @atishgoswami)
 - #23218: Fixed #22266: 404 message for product alerts when not logged in (by @ArjenMiedema)
 - #22910: Do an empty check instead of isset check on image removed (by @arnoudhgz)


Fixed GitHub Issues:
 - #22638: Asterisk(*) sign position does not consistent in admin (reported by @magesanjay) has been fixed in #22800 by @sanjaychouhan-webkul in 2.3-develop branch
   Related commits:
     1. 4eab528

 - #23346: 'Test Connection' button is over-spanned (reported by @TomashKhamlai) has been fixed in #23367 by @konarshankar07 in 2.3-develop branch
   Related commits:
     1. e915796

 - #23333: Incorrect payment method translation in order emails (reported by @alexeya-ven) has been fixed in #23338 by @alexeya-ven in 2.3-develop branch
   Related commits:
     1. 292fa21

 - #23230: Sticky header floating under top when there is no buttons in the toolbar (reported by @OleksiiBulba) has been fixed in #23247 by @konarshankar07 in 2.3-develop branch
   Related commits:
     1. ce56c70
     2. f5a93b7
     3. a3fa8d1

 - #13227: Knockout Recently Viewed contains wrong product url (with category path), also not correct url <meta property="og:url"> on product view page (reported by @novakivskiy) has been fixed in #22650 by @atishgoswami in 2.3-develop branch
   Related commits:
     1. 50d8546
     2. d254b9f

 - #22266: Product Alert after login shows 404 page (reported by @ilnytskyi) has been fixed in #23218 by @ArjenMiedema in 2.3-develop branch
   Related commits:
     1. 361965b

Author: magento-engcom-team

app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml

@@ -11,5 +11,5 @@
     "successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
     "failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
     "fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
-    <span><span><span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
+    <span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
 </button>

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -7,7 +7,7 @@
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
 
 /**
- * Bundle Extended Attribures Block.
+ * Bundle Extended Attributes Block.
  *
  * @author Magento Core Team <[email protected]>
  */

app/code/Magento/Catalog/Model/Product/Url.php

@@ -162,11 +162,8 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
 
-                if ($categoryId) {
-                    $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId;
-                } elseif (!$useCategories) {
-                    $filterData[UrlRewrite::METADATA]['category_id'] = '';
-                }
+                $filterData[UrlRewrite::METADATA]['category_id']
+                    = $categoryId && $useCategories ? $categoryId : '';
 
                 $rewrite = $this->urlFinder->findOneByData($filterData);
 

app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php

@@ -231,7 +231,7 @@ private function processEntries(ProductInterface $product, array $newEntries, ar
     private function processMediaAttributes(ProductInterface $product, array $images): void
     {
         foreach ($images as $image) {
-            if (!isset($image['removed']) && !empty($image['types'])) {
+            if (empty($image['removed']) && !empty($image['types'])) {
                 $this->processor->setMediaAttribute($product, $image['types'], $image['file']);
             }
         }

app/code/Magento/ProductAlert/Controller/Add/Price.php

@@ -6,7 +6,7 @@
 
 namespace Magento\ProductAlert\Controller\Add;
 
-use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\ProductAlert\Controller\Add as AddController;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session as CustomerSession;
@@ -20,7 +20,7 @@
 /**
  * Controller for notifying about price.
  */
-class Price extends AddController implements HttpPostActionInterface
+class Price extends AddController implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface

app/code/Magento/ProductAlert/Controller/Add/Stock.php

@@ -6,7 +6,7 @@
 
 namespace Magento\ProductAlert\Controller\Add;
 
-use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\ProductAlert\Controller\Add as AddController;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session as CustomerSession;
@@ -19,7 +19,7 @@
 /**
  * Controller for notifying about stock.
  */
-class Stock extends AddController implements HttpPostActionInterface
+class Stock extends AddController implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface

app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml

@@ -6,7 +6,7 @@
 ?>
 <?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
 <div class="product alert <?= $block->getHtmlClass() ?>">
-    <a href="#" data-post='<?= /* @noEscape */ $block->getPostAction() ?>'
+    <a href="<?= $block->escapeUrl($block->getSignupUrl()) ?>"
        title="<?= $block->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
         <?= $block->escapeHtml(__($block->getSignupLabel())) ?>
     </a>

app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php

@@ -100,6 +100,8 @@ public function send(
         $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+            $this->identityContainer->setStore($order->getStore());
+
             $transport = [
                 'order' => $order,
                 'creditmemo' => $creditmemo,

app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php

@@ -63,6 +63,8 @@ public function __construct(
     public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
     {
         $order = $creditmemo->getOrder();
+        $this->identityContainer->setStore($order->getStore());
+
         $transport = [
             'order' => $order,
             'creditmemo' => $creditmemo,

app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

@@ -104,6 +104,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $creditmemo->getOrder();
+            $this->identityContainer->setStore($order->getStore());
 
             $transport = [
                 'order' => $order,