Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR-02-28-2025

Author: chittima

app/code/Magento/Customer/Model/Address.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model;
 
@@ -371,7 +371,9 @@ public function reindex()
  {
  /** @var \Magento\Framework\Indexer\IndexerInterface $indexer */
  $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
- $indexer->reindexRow($this->getCustomerId());
+ if (!$indexer->isScheduled()) {
+ $indexer->reindexRow($this->getCustomerId());
+ }
  }
 
  /**

app/code/Magento/Customer/Model/Customer.php

@@ -1126,7 +1126,9 @@ public function afterDeleteCommit()
  */
  public function reindex()
  {
- $this->getIndexer()->reindexRow($this->getId());
+ if (!$this->getIndexer()->isScheduled()) {
+ $this->getIndexer()->reindexRow($this->getId());
+ }
  }
 
  /**

app/code/Magento/Customer/etc/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -593,4 +593,9 @@
  type="Magento\Customer\Plugin\AsyncRequestCustomerGroupAuthorization"
  />
  </type>
+ <virtualType name="Magento\Customer\Model\MviewAction" type="\Magento\Framework\Mview\View\BaseAction">
+ <arguments>
+ <argument name="indexerId" xsi:type="string">customer_grid</argument>
+ </arguments>
+ </virtualType>
 </config>

app/code/Magento/Customer/etc/mview.xml

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Mview/etc/mview.xsd">
- <view id="customer_dummy" class="Magento\Framework\Indexer\Action\Dummy" group="indexer"/>
+ <view id="customer_dummy" class="Magento\Customer\Model\MviewAction" group="indexer">
+ <subscriptions>
+ <table name="customer_entity" entity_column="entity_id" />
+ <table name="customer_entity_datetime" entity_column="entity_id" />
+ <table name="customer_entity_decimal" entity_column="entity_id" />
+ <table name="customer_entity_int" entity_column="entity_id" />
+ <table name="customer_address_entity" entity_column="parent_id" />
+ </subscriptions>
+ </view>
 </config>

app/code/Magento/GiftMessageGraphQl/Model/Resolver/Product/GiftMessage.php

@@ -33,8 +33,8 @@ public function resolve(
  Field $field,
  $context,
  ResolveInfo $info,
- array $value = null,
- array $args = null
+ ?array $value = null,
+ ?array $args = null
  ): bool {
  if (!isset($value['model']) || !$value['model'] instanceof ProductInterface) {
  throw new LocalizedException(__('The product model is not available.'));

app/code/Magento/Paypal/Controller/Express/AbstractExpress.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Controller\Express;
 
@@ -151,6 +151,9 @@ public function __construct(
  protected function _initCheckout(?CartInterface $quoteObject = null)
  {
  $quote = $quoteObject ? $quoteObject : $this->_getQuote();
+ if ($quote->getId()) {
+ $this->_getCheckoutSession()->setPayPalQuoteId($quote->getId());
+ }
  if (!$quote->hasItems() || $quote->getHasError()) {
  $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
  throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
@@ -248,6 +251,9 @@ protected function _getQuote()
  $this->_getCheckoutSession()->replaceQuote($this->_quote);
  } else {
  $this->_quote = $this->_getCheckoutSession()->getQuote();
+ if (!$this->_quote->getId() && $this->_getCheckoutSession()->getPayPalQuoteId()) {
+ $this->_quote = $this->quoteRepository->get($this->_getCheckoutSession()->getPayPalQuoteId());
+ }
  }
  }
  return $this->_quote;

app/code/Magento/Paypal/Plugin/PayflowSilentPost.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All rights reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Plugin;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Paypal\Controller\Payflow\ReturnUrl as Subject;
+use Magento\Paypal\Model\PayflowlinkFactory;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+use Psr\Log\LoggerInterface;
+
+class PayflowSilentPost
+{
+ /**
+ * @var array
+ */
+ protected array $allowedOrderStates = [
+ Order::STATE_PROCESSING,
+ Order::STATE_COMPLETE,
+ Order::STATE_PAYMENT_REVIEW
+ ];
+
+ /**
+ * @param RequestInterface $request
+ * @param OrderFactory $orderFactory
+ * @param PayflowlinkFactory $payflowlinkFactory
+ * @param LoggerInterface $logger
+ */
+ public function __construct(
+ private readonly RequestInterface $request,
+ private readonly OrderFactory $orderFactory,
+ private readonly PayflowlinkFactory $payflowlinkFactory,
+ private readonly LoggerInterface $logger,
+ ) {
+ }
+
+ /**
+ * Process payment if not already done via silent post
+ *
+ * @param Subject $subject
+ * @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
+ public function beforeExecute(Subject $subject): void
+ {
+ $data = $this->request->getParams();
+ if (!array_key_exists('INVNUM', $data)
+ || !array_key_exists('RESPMSG', $data)
+ || !array_key_exists('RESULT', $data)) {
+ return;
+ }
+
+ $orderId = (string)$data['INVNUM'];
+ if (!$orderId) {
+ return;
+ }
+
+ $order = $this->orderFactory->create()->loadByIncrementId($orderId);
+ $payment = $order->getPayment();
+ if (in_array($order->getState(), $this->allowedOrderStates) || $payment->getLastTransId()
+ || trim((string)$data['RESPMSG']) !== 'Approved' || (int)$data['RESULT'] !== 0) {
+ return;
+ }
+
+ $paymentModel = $this->payflowlinkFactory->create();
+ try {
+ $paymentModel->process($data);
+ } catch (\Exception $e) {
+ $this->logger->critical($e);
+ }
+ }
+}

app/code/Magento/Paypal/etc/di.xml

@@ -291,4 +291,7 @@
  </argument>
  </arguments>
  </type>
+ <type name="Magento\Paypal\Controller\Payflow\ReturnUrl">
+ <plugin name="payflow_silentpost" type="Magento\Paypal\Plugin\PayflowSilentPost"/>
+ </type>
 </config>

app/code/Magento/Sales/Helper/Reorder.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Sales\Helper;
@@ -11,12 +11,7 @@
  */
 class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 {
- const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
-
- /**
- * @var \Magento\Customer\Model\Session
- */
- protected $customerSession;
+ public const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
 
  /**
  * @var \Magento\Sales\Api\OrderRepositoryInterface
@@ -25,22 +20,21 @@ class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 
  /**
  * @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Customer\Model\Session $customerSession
  * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
  */
  public function __construct(
  \Magento\Framework\App\Helper\Context $context,
- \Magento\Customer\Model\Session $customerSession,
  \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
  ) {
  $this->orderRepository = $orderRepository;
- $this->customerSession = $customerSession;
  parent::__construct(
  $context
  );
  }
 
  /**
+ * Check if reorder is allowed
+ *
  * @return bool
  */
  public function isAllow()
@@ -78,10 +72,6 @@ public function canReorder($orderId)
  if (!$this->isAllowed($order->getStore())) {
  return false;
  }
- if ($this->customerSession->isLoggedIn()) {
- return $order->canReorder();
- } else {
- return true;
- }
+ return $order->canReorder();
  }
 }

app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php

@@ -1,13 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Helper;
 
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
@@ -40,11 +39,6 @@ class ReorderTest extends TestCase
  */
  protected $orderMock;
 
- /**
- * @var MockObject|Session
- */
- protected $customerSessionMock;
-
  /**
  * @var OrderRepositoryInterface|MockObject
  */
@@ -66,15 +60,10 @@ protected function setUp(): void
  ->method('getScopeConfig')
  ->willReturn($this->scopeConfigMock);
 
- $this->customerSessionMock = $this->getMockBuilder(Session::class)
- ->disableOriginalConstructor()
- ->getMock();
-
  $this->repositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
  ->getMockForAbstractClass();
  $this->helper = new Reorder(
  $contextMock,
- $this->customerSessionMock,
  $this->repositoryMock
  );
 
@@ -156,40 +145,17 @@ public function testCanReorderStoreNotAllowed()
  $this->assertFalse($this->helper->canReorder(1));
  }
 
- /**
- * Tests what happens if the customer is not logged in and the store does allow re-orders.
- *
- * @return void
- */
- public function testCanReorderCustomerNotLoggedIn()
- {
- $this->setupOrderMock(true);
-
- $this->customerSessionMock->expects($this->once())
- ->method('isLoggedIn')
- ->willReturn(false);
- $this->repositoryMock->expects($this->once())
- ->method('get')
- ->with(1)
- ->willReturn($this->orderMock);
- $this->assertTrue($this->helper->canReorder(1));
- }
-
  /**
  * Tests what happens if the customer is logged in and the order does or does not allow reorders.
  *
  * @param bool $orderCanReorder
  * @return void
  * @dataProvider getOrderCanReorder
  */
- public function testCanReorderCustomerLoggedInAndOrderCanReorder($orderCanReorder)
+ public function testCanReorder($orderCanReorder)
  {
  $this->setupOrderMock(true);
 
- $this->customerSessionMock->expects($this->once())
- ->method('isLoggedIn')
- ->willReturn(true);
-
  $this->orderMock->expects($this->once())
  ->method('canReorder')
  ->willReturn($orderCanReorder);