Merge branch '2.4-develop' into ACP2E-3350

Author: lakshmana49

app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml

@@ -3,26 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Backend\Block\Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <div class="page-actions">
     <div class="page-actions-inner">
         <div class="page-actions-buttons">
             <?= $block->getChildHtml() ?>
 
+            <?php if ($block->getAuthorization()->isAllowed('Magento_Reports::statistics')): ?>
             <form class="action-element"
-                  action="<?= $block->escapeUrl($block->getUrl('*/*/refreshStatistics')) ?>"
+                  action="<?= $escaper->escapeUrl($block->getUrl('*/*/refreshStatistics')) ?>"
                   method="post">
                 <input
                     name="form_key"
                     type="hidden"
-                    value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>"/>
+                    value="<?= $escaper->escapeHtmlAttr($block->getFormKey()) ?>"/>
                 <button
                     class="action-primary"
                     type="submit"
-                    title="<?= $block->escapeHtmlAttr(__('Reload Data')) ?>">
-                    <?= $block->escapeHtml(__('Reload Data')) ?>
+                    title="<?= $escaper->escapeHtmlAttr(__('Reload Data')) ?>">
+                    <?= $escaper->escapeHtml(__('Reload Data')) ?>
                 </button>
             </form>
+            <?php endif; ?>
         </div>
     </div>
 </div>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityAcceptLowerThanStockQuantityAfterChangingStockInBackendTest.xml

@@ -14,7 +14,7 @@
             <description value="Verify if lower than stock product quantity is accepted after changing stock qty in backend"/>
             <severity value="CRITICAL"/>
             <testCaseId value="AC-5987"/>
-            <group value="mtf_migrated"/> 
+            <group value="mtf_migrated"/>
         </annotations>
 
         <before>
@@ -61,14 +61,14 @@
         <waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
 
         <!--Assert "The requested qty is not available"-->
-        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="The requested qty is not available" stepKey="seeTheErrorMessageDisplayed"/>
+        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="Not enough items for sale" stepKey="seeTheErrorMessageDisplayed"/>
 
         <fillField selector="{{CheckoutCartProductSection.qty($$simpleProduct.sku$$)}}" userInput="8" stepKey="updateProductQty"/>
         <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
         <waitForAjaxLoad stepKey="waitForAjaxLoad2"/>
         <waitForAjaxLoad stepKey="waitForPageLoad2"/>
 
-        <dontSee userInput="The requested qty is not available" stepKey="dontSeeTheErrorMessageDisplayed"/>
+        <dontSee userInput="Not enough items for sale" stepKey="dontSeeTheErrorMessageDisplayed"/>
 
     </test>
 </tests>

app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml

@@ -50,7 +50,7 @@
         <actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addProductToCart"/>
         <!-- Check that error remains -->
         <actionGroup ref="StorefrontAssertProductAddToCartErrorMessageActionGroup" stepKey="assertFailure">
-            <argument name="message" value="The requested qty is not available"/>
+            <argument name="message" value="Not enough items for sale"/>
         </actionGroup>
     </test>
 </tests>

app/code/Magento/Developer/Console/Command/DiInfoCommand.php

@@ -7,15 +7,26 @@
 namespace Magento\Developer\Console\Command;
 
 use Magento\Developer\Model\Di\Information;
+use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\Area;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DiInfoCommand extends Command
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private ObjectManagerInterface $objectManager;
+
     /**
      * Command name
      */
@@ -26,18 +37,34 @@ class DiInfoCommand extends Command
      */
     public const CLASS_NAME = 'class';
 
+    /**
+     * Area name
+     */
+    public const AREA_CODE = 'area';
+
     /**
      * @var Information
      */
-    private $diInformation;
+    private Information $diInformation;
+
+    /**
+     * @var AreaList
+     */
+    private AreaList $areaList;
 
     /**
      * @param Information $diInformation
+     * @param ObjectManagerInterface $objectManager
+     * @param AreaList|null $areaList
      */
     public function __construct(
-        Information $diInformation
+        Information            $diInformation,
+        ObjectManagerInterface $objectManager,
+        ?AreaList              $areaList = null
     ) {
         $this->diInformation = $diInformation;
+        $this->objectManager = $objectManager;
+        $this->areaList = $areaList ?? \Magento\Framework\App\ObjectManager::getInstance()->get(AreaList::class);
         parent::__construct();
     }
 
@@ -49,10 +76,11 @@ public function __construct(
     protected function configure()
     {
         $this->setName(self::COMMAND_NAME)
-             ->setDescription('Provides information on Dependency Injection configuration for the Command.')
-             ->setDefinition([
-                new InputArgument(self::CLASS_NAME, InputArgument::REQUIRED, 'Class name')
-             ]);
+            ->setDescription('Provides information on Dependency Injection configuration for the Command.')
+            ->setDefinition([
+                new InputArgument(self::CLASS_NAME, InputArgument::REQUIRED, 'Class name'),
+                new InputArgument(self::AREA_CODE, InputArgument::OPTIONAL, 'Area Code')
+            ]);
 
         parent::configure();
     }
@@ -154,10 +182,14 @@ private function printPlugins($className, $output, $label)
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $area = $input->getArgument(self::AREA_CODE) ?? Area::AREA_GLOBAL;
+        if ($area !== Area::AREA_GLOBAL) {
+            $this->setDiArea($area);
+        }
         $className = $input->getArgument(self::CLASS_NAME);
         $output->setDecorated(true);
         $output->writeln('');
-        $output->writeln(sprintf('DI configuration for the class %s in the GLOBAL area', $className));
+        $output->writeln(sprintf('DI configuration for the class %s in the %s area', $className, strtoupper($area)));
 
         if ($this->diInformation->isVirtualType($className)) {
             $output->writeln(
@@ -173,4 +205,39 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Set Area for DI Configuration
+     *
+     * @param string $area
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    private function setDiArea(string $area): void
+    {
+        if ($this->validateAreaCodeFromInput($area)) {
+            $areaOmConfiguration = $this->objectManager
+                ->get(\Magento\Framework\App\ObjectManager\ConfigLoader::class)
+                ->load($area);
+
+            $this->objectManager->configure($areaOmConfiguration);
+
+            $this->objectManager->get(\Magento\Framework\Config\ScopeInterface::class)
+                ->setCurrentScope($area);
+        } else {
+            throw new InvalidArgumentException(sprintf('The "%s" area code does not exist', $area));
+        }
+    }
+
+    /**
+     * Validate Input
+     *
+     * @param string $area
+     * @return bool
+     */
+    private function validateAreaCodeFromInput($area): bool
+    {
+        $availableAreaCodes = $this->areaList->getCodes();
+        return in_array($area, $availableAreaCodes, true);
+    }
 }

app/code/Magento/OrderCancellationGraphQl/Model/CancelOrderErrorCodes.php

@@ -19,18 +19,17 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\OrderCancellationGraphQl\Model\CancelOrderErrorCodes;
 
 /**
  * Resolver to return the description of a CancellationReason with error code
  */
 class CancelOrderError implements ResolverInterface
 {
     /**
-     * @param CancelOrderErrorCodes $cancelOrderErrorCodes
+     * @param array $errorMessageCodesMapper
      */
     public function __construct(
-        private readonly CancelOrderErrorCodes $cancelOrderErrorCodes
+        private readonly array $errorMessageCodesMapper
     ) {
     }
 
@@ -50,7 +49,7 @@ public function resolve(
 
         return [
             'message' => $value['error'],
-            'code' => $this->cancelOrderErrorCodes->getErrorCodeFromMapper((string) $value['error']),
+            'code' => $this->errorMessageCodesMapper[strtolower((string) $value['error'])] ?? 'UNDEFINED',
         ];
     }
 }

app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrderError.php

@@ -23,4 +23,15 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\OrderCancellationGraphQl\Model\Resolver\CancelOrderError">
+        <arguments>
+            <argument name="errorMessageCodesMapper" xsi:type="array">
+                <item name="order cancellation is not enabled for requested store." xsi:type="string">ORDER_CANCELLATION_DISABLED</item>
+                <item name="current user is not authorized to cancel this order" xsi:type="string">UNAUTHORISED</item>
+                <item name="the entity that was requested doesn't exist. verify the entity and try again." xsi:type="string">ORDER_NOT_FOUND</item>
+                <item name="order with one or more items shipped cannot be cancelled" xsi:type="string">PARTIAL_ORDER_ITEM_SHIPPED</item>
+                <item name="order already closed, complete, cancelled or on hold" xsi:type="string">INVALID_ORDER_STATUS</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/OrderCancellationGraphQl/etc/graphql/di.xml

@@ -33,6 +33,8 @@ class AddProductsToCartError
         'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The requested qty is not available' => self::ERROR_INSUFFICIENT_STOCK,
+        'Not enough items for sale' => self::ERROR_INSUFFICIENT_STOCK,
+        'Only %s of %s available' => self::ERROR_INSUFFICIENT_STOCK,
     ];
 
     /**
@@ -59,6 +61,7 @@ public function create(string $message, int $cartItemPosition = 0): Data\Error
      */
     private function getErrorCode(string $message): string
     {
+        $message = preg_replace('/\d+/', '%s', $message);
         foreach (self::MESSAGE_CODES as $codeMessage => $code) {
             if (false !== stripos($message, $codeMessage)) {
                 return $code;

app/code/Magento/Quote/Model/Cart/AddProductsToCartError.php

@@ -104,6 +104,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      */
     private function getErrorCode(string $message): string
     {
+        $message = preg_replace('/\d+/', '%s', $message);
         foreach ($this->messageCodesMapper as $key => $code) {
             if (str_contains($message, $key)) {
                 return $code;

app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php

@@ -86,6 +86,8 @@
                 <item name="Could not find cart item" xsi:type="string">COULD_NOT_FIND_CART_ITEM</item>
                 <item name="Required parameter" xsi:type="string">REQUIRED_PARAMETER_MISSING</item>
                 <item name="The fewest you may purchase" xsi:type="string">INVALID_PARAMETER_VALUE</item>
+                <item name="Not enough items for sale" xsi:type="string">INSUFFICIENT_STOCK</item>
+                <item name="Only %s of %s available" xsi:type="string">INSUFFICIENT_STOCK</item>
             </argument>
         </arguments>
     </type>