Merge branch '2.4-develop' into magento#39641

Author: engcom-Dash

.github/app-projects-boards-automation.config.yaml

@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch7
+- Magento_Elasticsearch8
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
 

app/code/Magento/AdvancedSearch/README.md

@@ -117,6 +117,9 @@ public function getFrontName($checkHost = false)
     /**
      * Return whether the host from request is the backend host
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return bool
      */
     public function isHostBackend()
@@ -128,10 +131,11 @@ public function isHostBackend()
         if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
             $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
         } else {
-            $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);
+            $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
+            $backendUrl = $this->config->getValue($xmlPath);
             if ($backendUrl === null) {
                 $backendUrl = $this->scopeConfig->getValue(
-                    Store::XML_PATH_UNSECURE_BASE_URL,
+                    $xmlPath,
                     ScopeInterface::SCOPE_STORE
                 );
             }

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -1,11 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Backend grid item renderer currency
  *
@@ -82,7 +84,6 @@ public function render(\Magento\Framework\DataObject $row)
     {
         if ($data = (string)$this->_getValue($row)) {
             $currency_code = $this->_getCurrencyCode($row);
-            $data = (float)$data * $this->_getRate($row);
             $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -103,11 +104,28 @@ protected function _getCurrencyCode($row)
             return $code;
         }
         $currency = $this->getColumn()->getCurrency();
-
         if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
-
+        $storeId = $row->getData('store_id');
+        if ($storeId) {
+            try {
+                $store = $this->_storeManager->getStore($storeId);
+                // Check if the currency is set at the store level
+                $currencyCode = $store->getCurrentCurrencyCode();
+                if ($currencyCode) {
+                    return $currencyCode;
+                }
+                $website = $store->getWebsite();
+                // Check if the currency is set at the website level
+                $currencyCode = $website->getBaseCurrencyCode();
+                if ($currencyCode) {
+                    return $currencyCode;
+                }
+            } catch (NoSuchEntityException $e) {
+                $this->_logger->warning('Failed to get website currency: ' . $e->getMessage());
+            }
+        }
         return $this->_currencyLocator->getDefaultCurrency($this->_request);
     }
 
@@ -128,6 +146,17 @@ protected function _getRate($row)
             return (float) $rate;
         }
 
+        $storeId = $row->getData('store_id');
+        if ($storeId) {
+            try {
+                $store = $this->_storeManager->getStore($storeId);
+                return $store->getBaseCurrency()->getRate($store->getCurrentCurrencyCode());
+            } catch (NoSuchEntityException $e) {
+                $this->_logger->warning('Failed to get website currency: ' . $e->getMessage());
+            }
+
+        }
+
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Cron;
+
+use Magento\Framework\Lock\Backend\FileLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Psr\Log\LoggerInterface;
+
+class CleanLocks
+{
+    /**
+     * @param LockBackendFactory $lockFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        private readonly LockBackendFactory $lockFactory,
+        private readonly LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * Cron job to cleanup old locks
+     */
+    public function execute(): void
+    {
+        $locker = $this->lockFactory->create();
+
+        if ($locker instanceof FileLock) {
+            $numberOfLockFilesDeleted = $locker->cleanupOldLocks();
+
+            $this->logger->info(sprintf('Deleted %d old lock files', $numberOfLockFilesDeleted));
+        }
+    }
+}

app/code/Magento/Backend/Cron/CleanLocks.php

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  *  All Rights Reserved.
   */
 -->
 
@@ -25,5 +25,7 @@
         <element name="noticeMessage" type="text" selector=".message-notice"/>
         <element name="assertCacheManagementConfigurationStatus" type="button" selector="//td[@data-column='tags' and contains(text(),'CONFIG')]/following-sibling::td//span[@class='grid-severity-notice']//span"/>
         <element name="assertCacheManagementLayoutsStatus" type="button" selector="//td[@data-column='tags' and contains(text(),'LAYOUT_GENERAL_CACHE_TAG')]/following-sibling::td//span[@class='grid-severity-notice']//span"/>
+        <element name="assertCacheManagementStatusEnabled" type="button" selector="//td[@data-column='tags' and contains(text(),'{{cache}}')]/following-sibling::td//span[@class='grid-severity-notice']//span" parameterized="true"/>
+        <element name="assertCacheManagementStatusInvalidated" type="button" selector="//td[@data-column='tags' and contains(text(),'{{cacheType}}')]/following-sibling::td//span[@class='grid-severity-minor']//span" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml

@@ -129,6 +129,7 @@ public function testIsHostBackend(
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
+                    [Store::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
                     [
                         FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,
                         ScopeInterface::SCOPE_STORE,
@@ -160,7 +161,6 @@ public function testIsHostBackend(
                     ->setHost(parse_url($url, PHP_URL_HOST))
                     ->setPort(parse_url($url, PHP_URL_PORT))
             );
-
         $this->assertEquals($expectedValue, $this->model->isHostBackend());
     }