Merge pull request #6878 from magento-tsg/2.4-develop-pr147

[Arrows] Fixes for 2.4 (pr147) (2.4-develop)

Author: zakdma

app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetRealtimeModeActionGroup.xml

@@ -0,0 +1,17 @@
+<?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="CliIndexerSetRealtimeModeActionGroup">
+        <annotations>
+            <description>Set indexers to realtime mode.</description>
+        </annotations>
+
+        <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeIndexerMode"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetScheduleModeActionGroup.xml

@@ -0,0 +1,17 @@
+<?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="CliIndexerSetScheduleModeActionGroup">
+        <annotations>
+            <description>Set indexers to schedule mode.</description>
+        </annotations>
+
+        <magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setScheduleIndexerMode"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Sales/Model/Order.php

@@ -31,6 +31,8 @@
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\Collection as HistoryCollection;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Area;
+use Magento\Sales\Model\Order\StatusLabel;
 
 /**
  * Order model
@@ -324,6 +326,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $regionResource;
 
+    /**
+     * @var StatusLabel
+     */
+    private $statusLabel;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -395,7 +402,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder = null,
         ScopeConfigInterface $scopeConfig = null,
         RegionFactory $regionFactory = null,
-        RegionResource $regionResource = null
+        RegionResource $regionResource = null,
+        StatusLabel $statusLabel = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -427,7 +435,7 @@ public function __construct(
         $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
         $this->regionResource = $regionResource ?: ObjectManager::getInstance()->get(RegionResource::class);
         $this->regionItems = [];
-
+        $this->statusLabel = $statusLabel ?: ObjectManager::getInstance()->get(StatusLabel::class);
         parent::__construct(
             $context,
             $registry,
@@ -1104,7 +1112,11 @@ public function setState($state)
      */
     public function getFrontendStatusLabel()
     {
-        return $this->getConfig()->getStatusFrontendLabel($this->getStatus());
+        return $this->statusLabel->getStatusFrontendLabel(
+            $this->getStatus(),
+            Area::AREA_FRONTEND,
+            $this->getStoreId()
+        );
     }
 
     /**
@@ -1115,7 +1127,7 @@ public function getFrontendStatusLabel()
      */
     public function getStatusLabel()
     {
-        return $this->getConfig()->getStatusLabel($this->getStatus());
+        return $this->statusLabel->getStatusLabel($this->getStatus());
     }
 
     /**

app/code/Magento/Sales/Model/Order/Address/Renderer.php

@@ -13,9 +13,11 @@
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Sales\Model\Order\Address;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Renderer used for formatting an order address
+ *
  * @api
  * @since 100.0.2
  */
@@ -37,20 +39,26 @@ class Renderer
     private $scopeConfig;
 
     /**
-     * Constructor
-     *
+     * @var StoreManagerInterface|null
+     */
+    private $storeManager;
+
+    /**
      * @param AddressConfig $addressConfig
      * @param EventManager $eventManager
      * @param ScopeConfigInterface|null $scopeConfig
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         AddressConfig $addressConfig,
         EventManager $eventManager,
-        ?ScopeConfigInterface $scopeConfig = null
+        ?ScopeConfigInterface $scopeConfig = null,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->addressConfig = $addressConfig;
         $this->eventManager = $eventManager;
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -62,15 +70,15 @@ public function __construct(
      */
     public function format(Address $address, $type)
     {
-        $storeId = $address->getOrder()->getStoreId();
-        $this->addressConfig->setStore($storeId);
+        $orderStore = $address->getOrder()->getStore();
+        $this->storeManager->setCurrentStore($orderStore);
         $formatType = $this->addressConfig->getFormatByCode($type);
         if (!$formatType || !$formatType->getRenderer()) {
             return null;
         }
         $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
         $addressData = $address->getData();
-        $addressData['locale'] = $this->getLocaleByStoreId((int) $storeId);
+        $addressData['locale'] = $this->getLocaleByStoreId((int) $orderStore->getId());
 
         return $formatType->getRenderer()->renderArray($addressData);
     }

app/code/Magento/Sales/Model/Order/Config.php

@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Order configuration model
@@ -51,27 +53,35 @@ class Config
      * @var array
      */
     protected $maskStatusesMapping = [
-        \Magento\Framework\App\Area::AREA_FRONTEND => [
+        Area::AREA_FRONTEND => [
             \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
             \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
         ]
     ];
 
+    /**
+     * @var StatusLabel
+     */
+    private $statusLabel;
+
     /**
      * Constructor
      *
      * @param \Magento\Sales\Model\Order\StatusFactory $orderStatusFactory
      * @param \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory $orderStatusCollectionFactory
      * @param \Magento\Framework\App\State $state
+     * @param StatusLabel|null $statusLabel
      */
     public function __construct(
         \Magento\Sales\Model\Order\StatusFactory $orderStatusFactory,
         \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory $orderStatusCollectionFactory,
-        \Magento\Framework\App\State $state
+        \Magento\Framework\App\State $state,
+        StatusLabel $statusLabel = null
     ) {
         $this->orderStatusFactory = $orderStatusFactory;
         $this->orderStatusCollectionFactory = $orderStatusCollectionFactory;
         $this->state = $state;
+        $this->statusLabel = $statusLabel ?: ObjectManager::getInstance()->get(StatusLabel::class);
     }
 
     /**
@@ -120,36 +130,19 @@ public function getStateDefaultStatus($state): ?string
         return $status;
     }
 
-    /**
-     * Get status label for a specified area
-     *
-     * @param string|null $code
-     * @param string $area
-     * @return string|null
-     */
-    private function getStatusLabelForArea(?string $code, string $area): ?string
-    {
-        $code = $this->maskStatusForArea($area, $code);
-        $status = $this->orderStatusFactory->create()->load($code);
-
-        if ($area === 'adminhtml') {
-            return $status->getLabel();
-        }
-
-        return $status->getStoreLabel();
-    }
 
     /**
      * Retrieve status label for detected area
      *
      * @param string|null $code
      * @return string|null
      * @throws LocalizedException
+     * @deprecated Functionality moved to separate class
+     * @see \Magento\Sales\Model\Order\StatusLabel::getStatusLabel
      */
     public function getStatusLabel($code)
     {
-        $area = $this->state->getAreaCode() ?: \Magento\Framework\App\Area::AREA_FRONTEND;
-        return $this->getStatusLabelForArea($code, $area);
+        return $this->statusLabel->getStatusLabel($code);
     }
 
     /**
@@ -158,10 +151,12 @@ public function getStatusLabel($code)
      * @param string|null $code
      * @return string|null
      * @since 102.0.1
+     * @deprecated Functionality moved to separate class
+     * @see \Magento\Sales\Model\Order\StatusLabel::getStatusFrontendLabel
      */
     public function getStatusFrontendLabel(?string $code): ?string
     {
-        return $this->getStatusLabelForArea($code, \Magento\Framework\App\Area::AREA_FRONTEND);
+        return $this->statusLabel->getStatusFrontendLabel($code, Area::AREA_FRONTEND);
     }
 
     /**
@@ -170,13 +165,12 @@ public function getStatusFrontendLabel(?string $code): ?string
      * @param string $area
      * @param string $code
      * @return string
+     * @deprecated Functionality moved to separate class
+     * @see \Magento\Sales\Model\Order\StatusLabel::maskStatusForArea
      */
     protected function maskStatusForArea($area, $code)
     {
-        if (isset($this->maskStatusesMapping[$area][$code])) {
-            return $this->maskStatusesMapping[$area][$code];
-        }
-        return $code;
+        return $this->statusLabel->maskStatusForArea($area, $code);
     }
 
     /**

app/code/Magento/Sales/Model/Order/StatusLabel.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\Sales\Model\Order\StatusFactory;
+
+/**
+ * Class StatusLabel is responsible for retrieving order status labels based on store of order
+ */
+class StatusLabel
+{
+    /**
+     * @var StatusFactory
+     */
+    private $orderStatusFactory;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @var array
+     */
+    private $maskStatusesMapping;
+
+    /**
+     * @param StatusFactory $orderStatusFactory
+     * @param State $state
+     * @param array $maskStatusesMapping
+     */
+    public function __construct(
+        StatusFactory $orderStatusFactory,
+        State $state,
+        array $maskStatusesMapping = []
+    ) {
+        $this->orderStatusFactory = $orderStatusFactory;
+        $this->state = $state;
+        $this->maskStatusesMapping = $maskStatusesMapping;
+    }
+
+    /**
+     * Get status label for a specified area
+     *
+     * @param string|null $code
+     * @param string $area
+     * @param int|null $storeId
+     * @return string|null
+     */
+    public function getStatusFrontendLabel(?string $code, string $area, int $storeId = null): ?string
+    {
+        $code = $this->maskStatusForArea($area, $code);
+        $status = $this->orderStatusFactory->create()->load($code);
+
+        if ($area === Area::AREA_ADMINHTML) {
+            return $status->getLabel();
+        }
+
+        return (string) $status->getStoreLabel($storeId);
+    }
+
+    /**
+     * Mask status for order for specified area
+     *
+     * @param string $area
+     * @param string|null $code
+     * @return string|null
+     */
+    public function maskStatusForArea(string $area, ?string $code): ?string
+    {
+        if (isset($this->maskStatusesMapping[$area][$code])) {
+            return $this->maskStatusesMapping[$area][$code];
+        }
+        return $code;
+    }
+
+    /**
+     * Retrieve status label for detected area
+     *
+     * @param $code
+     * @return string|null
+     */
+    public function getStatusLabel($code)
+    {
+        $area = $this->state->getAreaCode() ?: Area::AREA_FRONTEND;
+        return $this->getStatusFrontendLabel($code, $area);
+    }
+}