Merge branch 'ACP2E-3425' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-11-14-2024

chittima · chittima · commit 13a69c68efd1 · 2024-11-14T12:25:13.000-06:00
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.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\Sales\Model\AdminOrder;
@@ -12,6 +12,8 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Model\Checks\SpecificationFactory;
+use Magento\Payment\Model\MethodInterface;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\CustomAttributeListInterface;
 use Magento\Quote\Model\Quote\Item;
@@ -271,6 +273,26 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      */
     private $request;
 
+    /**
+     * @var SpecificationFactory
+     */
+    private $paymentMethodSpecificationFactory;
+
+    /**
+     * List of payment method specifications
+     *
+     * array(
+     *    array(
+     *       'type' => 'zero_total',
+     *       'sortOrder' => 100,
+     *       'disabled' => false
+     *   )
+     * )
+     *
+     * @var array
+     */
+    private $paymentMethodSpecifications;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -306,6 +328,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * @param CustomAttributeListInterface|null $customAttributeList
      * @param OrderRepositoryInterface|null $orderRepositoryInterface
      * @param HttpRequest|null $request
+     * @param SpecificationFactory|null $paymentMethodSpecificationFactory
+     * @param array $paymentMethodSpecifications
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -342,7 +366,9 @@ public function __construct(
         StoreManagerInterface $storeManager = null,
         CustomAttributeListInterface $customAttributeList = null,
         OrderRepositoryInterface $orderRepositoryInterface = null,
-        HttpRequest $request = null
+        HttpRequest $request = null,
+        ?SpecificationFactory $paymentMethodSpecificationFactory = null,
+        array $paymentMethodSpecifications = []
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -383,6 +409,9 @@ public function __construct(
             ->get(OrderRepositoryInterface::class);
         $this->request = $request ?: ObjectManager::getInstance()
             ->get(HttpRequest::class);
+        $this->paymentMethodSpecificationFactory = $paymentMethodSpecificationFactory ?: ObjectManager::getInstance()
+            ->get(SpecificationFactory::class);
+        $this->paymentMethodSpecifications = $paymentMethodSpecifications;
     }
 
     /**
@@ -2185,7 +2214,7 @@ protected function _validate()
             $this->_errors[] = __("The payment method isn't selected. Enter the payment method and try again.");
         } else {
             $method = $this->getQuote()->getPayment()->getMethodInstance();
-            if (!$method->isAvailable($this->getQuote())) {
+            if (!$this->isPaymentMethodApplicable($method, $this->getQuote())) {
                 $this->_errors[] = __('This payment method is not available.');
             } else {
                 try {
@@ -2351,4 +2380,49 @@ private function removeCartTransferredItemsAndUpdateQty(int|null|Item $cartItem,
             $this->getSession()->setTransferredItems($removeCartTransferredItems);
         }
     }
+
+    /**
+     * Check if payment method is applicable to quote
+     *
+     * @param MethodInterface $method
+     * @param Quote $quote
+     * @return bool
+     * @throws LocalizedException
+     */
+    private function isPaymentMethodApplicable(MethodInterface $method, Quote $quote): bool
+    {
+        if (!$method->isAvailable($this->getQuote())) {
+            return false;
+        }
+
+        $specifications = $this->getPaymentMethodSpecifications();
+
+        if (!empty($specifications)) {
+            return $this->paymentMethodSpecificationFactory->create($specifications)->isApplicable($method, $quote);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get payment method specifications
+     *
+     * @return array
+     */
+    private function getPaymentMethodSpecifications(): array
+    {
+        $specifications = array_filter(
+            $this->paymentMethodSpecifications,
+            fn (array $spec) => !isset($spec['disabled']) || $spec['disabled'] === false
+        );
+
+        usort(
+            $specifications,
+            fn (array $a, array $b) => ($a['sortOrder'] ?? 0) <=> ($b['sortOrder'] ?? 0)
+        );
+
+        $specifications = array_column($specifications, 'type', 'type');
+
+        return array_values($specifications);
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductWithoutPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductWithoutPaymentTest.xml
@@ -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.
   */
 -->
 
@@ -51,7 +51,7 @@
         <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
 
         <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder"/>
-        <see selector="{{AdminOrderFormMessagesSection.error}}" userInput="The payment method you requested is not available." stepKey="seeErrorMessage"/>
+        <see selector="{{AdminOrderFormMessagesSection.error}}" userInput="This payment method is not available." stepKey="seeErrorMessage"/>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <!-- Enable payment method one of "Check/Money Order" and  "Zero Subtotal Checkout" -->
diff --git a/app/code/Magento/Sales/etc/adminhtml/di.xml b/app/code/Magento/Sales/etc/adminhtml/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -57,4 +57,36 @@
             <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\AdminOrder\Create">
+        <arguments>
+            <!-- Default specifications according to Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method\Form::_canUseMethod -->
+            <argument name="paymentMethodSpecifications" xsi:type="array">
+                <item name="internal" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Payment\Model\MethodInterface::CHECK_USE_INTERNAL</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                </item>
+                <item name="country" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Payment\Model\MethodInterface::CHECK_USE_FOR_COUNTRY</item>
+                    <item name="sortOrder" xsi:type="number">20</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                </item>
+                <item name="currency" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Payment\Model\MethodInterface::CHECK_USE_FOR_CURRENCY</item>
+                    <item name="sortOrder" xsi:type="number">30</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                </item>
+                <item name="total" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Payment\Model\MethodInterface::CHECK_ORDER_TOTAL_MIN_MAX</item>
+                    <item name="sortOrder" xsi:type="number">40</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                </item>
+                <item name="zero_total" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Payment\Model\MethodInterface::CHECK_ZERO_TOTAL</item>
+                    <item name="sortOrder" xsi:type="number">50</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 use Magento\Framework\Escaper;
@@ -92,13 +92,5 @@ script;
     <?= /* @noEscape */
     $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php else: ?>
-    <div class="admin__message-empty"><?= $escaper->escapeHtml(__('No Payment Methods')); ?>
-        <span class="no-display">
-            <input id="p_method"
-                   value=""
-                   type="text"
-                   name="payment[method]" class="admin__control-radio"
-                   checked="checked"/>
-        </span>
-    </div>
+    <div class="admin__message-empty"><?= $escaper->escapeHtml(__('No Payment Methods')); ?></div>
 <?php endif; ?>
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Model\AdminOrder;
 
@@ -781,6 +781,12 @@ private function preparePreconditionsForCreateOrder(
             $session->setCustomerId(0);
         }
 
+        /** Save changes and reload the quote to make sure future changes to the quote trigger collectTotals */
+        $quoteRepository = $this->objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $quoteRepository->save($this->model->getQuote());
+        $quote = $quoteRepository->get($this->model->getQuote()->getId(), [$this->model->getQuote()->getStoreId()]);
+        $this->model->setQuote($quote);
+
         /** Emulate availability of shipping method (all are disabled by default) */
         /** @var $rate Quote\Address\Rate */
         $rate = $this->objectManager->create(Quote\Address\Rate::class);
