Merge remote-tracking branch 'origin/2.4-develop' into PWA-1311

Author: cspruiell

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -35,6 +35,9 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductZeroQty" type="product">
+        <requiredEntity type="product_extension_attribute">EavStock0</requiredEntity>
+    </entity>
     <entity name="ApiSimpleProductWithNoSpace" type="product" extends="ApiSimpleProduct">
         <data key="name">TestFooBar</data>
         <data key="sku" unique="suffix">foobar</data>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml

@@ -9,6 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerOrderViewSection">
         <element name="reorder" type="text" selector="a.action.order" timeout="30"/>
+        <element name="view" type="text" selector="a.action.view" timeout="30"/>
         <element name="orderTitle" type="text" selector=".page-title span"/>
         <element name="myOrdersTable" type="text" selector="#my-orders-table"/>
         <element name="subtotal" type="text" selector=".subtotal .amount"/>

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -18,6 +18,7 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Event\ManagerInterface;
@@ -274,7 +275,7 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
         $this->accountManagementMock = $this->getMockForAbstractClass(AccountManagementInterface::class);
 
         $this->quoteFactoryMock = $this->createPartialMock(QuoteFactory::class, ['create']);
@@ -737,11 +738,9 @@ public function testSubmit(): void
         $convertedShipping = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['setData']);
         $convertedPayment = $this->getMockForAbstractClass(OrderPaymentInterface::class);
         $convertedQuoteItem = $this->getMockForAbstractClass(OrderItemInterface::class);
-
         $addresses = [$convertedShipping, $convertedBilling];
         $quoteItems = [$quoteItem];
         $convertedItems = [$convertedQuoteItem];
-
         $quote = $this->getQuote(
             $isGuest,
             $isVirtual,
@@ -976,9 +975,6 @@ public function testPlaceOrder(): void
         $this->quoteMock->expects($this->once())
             ->method('getCheckoutMethod')
             ->willReturn(Onepage::METHOD_CUSTOMER);
-        $this->quoteMock->expects($this->never())
-            ->method('setCustomerIsGuest')
-            ->with(true);
 
         $this->remoteAddressMock
             ->method('getRemoteAddress')

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
@@ -32,6 +33,11 @@ class GetCartForUser
      */
     private $cartRepository;
 
+    /**
+     * @var CheckCartCheckoutAllowance
+     */
+    private $checkoutAllowance;
+
     /**
      * @var StoreRepositoryInterface
      */
@@ -40,15 +46,18 @@ class GetCartForUser
     /**
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param CartRepositoryInterface $cartRepository
+     * @param CheckCartCheckoutAllowance $checkoutAllowance
      * @param StoreRepositoryInterface $storeRepository
      */
     public function __construct(
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         CartRepositoryInterface $cartRepository,
+        CheckCartCheckoutAllowance $checkoutAllowance,
         StoreRepositoryInterface $storeRepository = null
     ) {
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
+        $this->checkoutAllowance = $checkoutAllowance;
         $this->storeRepository = $storeRepository ?: ObjectManager::getInstance()->get(StoreRepositoryInterface::class);
     }
 
@@ -107,6 +116,36 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
         return $cart;
     }
 
+    /**
+     * Gets the cart for the user validated and configured for guest checkout if applicable
+     *
+     * @param string $cartHash
+     * @param int|null $customerId
+     * @param int $storeId
+     * @return Quote
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function getCartForCheckout(string $cartHash, ?int $customerId, int $storeId): Quote
+    {
+        try {
+            $cart = $this->execute($cartHash, $customerId, $storeId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        }
+        $this->checkoutAllowance->execute($cart);
+
+        if ((null === $customerId || 0 === $customerId)) {
+            if (!$cart->getCustomerEmail()) {
+                throw new GraphQlInputException(__("Guest email for cart is missing."));
+            }
+            $cart->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
+        }
+
+        return $cart;
+    }
+
     /**
      * Sets cart currency based on specified store.
      *

app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart\Payment;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
+
+/**
+ * Build payment method objects
+ */
+class PaymentMethodBuilder
+{
+    /**
+     * @var PaymentInterfaceFactory
+     */
+    private $paymentFactory;
+
+    /**
+     * @var AdditionalDataProviderPool
+     */
+    private $paymentDataProvider;
+
+    /**
+     * @param PaymentInterfaceFactory $paymentFactory
+     * @param AdditionalDataProviderPool $paymentDataProvider
+     */
+    public function __construct(
+        PaymentInterfaceFactory $paymentFactory,
+        AdditionalDataProviderPool $paymentDataProvider
+    ) {
+        $this->paymentFactory = $paymentFactory;
+        $this->paymentDataProvider = $paymentDataProvider;
+    }
+
+    /**
+     * Build a PaymentInterface object from the supplied data array
+     *
+     * @param array $paymentData
+     * @return PaymentInterface
+     * @throws GraphQlInputException
+     */
+    public function build(array $paymentData): PaymentInterface
+    {
+        if (!isset($paymentData['code']) || empty($paymentData['code'])) {
+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
+        }
+        $paymentMethodCode = $paymentData['code'];
+
+        $poNumber = $paymentData['purchase_order_number'] ?? null;
+        $additionalData = $this->paymentDataProvider->getData($paymentMethodCode, $paymentData);
+
+        return $this->paymentFactory->create(
+            [
+                'data' => [
+                    PaymentInterface::KEY_METHOD => $paymentMethodCode,
+                    PaymentInterface::KEY_PO_NUMBER => $poNumber,
+                    PaymentInterface::KEY_ADDITIONAL_DATA => $additionalData,
+                ],
+            ]
+        );
+    }
+}

app/code/Magento/QuoteGraphQl/Model/Cart/Payment/PaymentMethodBuilder.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Place an order
+ */
+class PlaceOrder
+{
+    /**
+     * @var PaymentMethodManagementInterface
+     */
+    private $paymentManagement;
+
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @param PaymentMethodManagementInterface $paymentManagement
+     * @param CartManagementInterface $cartManagement
+     */
+    public function __construct(
+        PaymentMethodManagementInterface $paymentManagement,
+        CartManagementInterface $cartManagement
+    ) {
+        $this->paymentManagement = $paymentManagement;
+        $this->cartManagement = $cartManagement;
+    }
+
+    /**
+     * Place an order
+     *
+     * @param Quote $cart
+     * @param string $maskedCartId
+     * @param int $userId
+     * @return int
+     *
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(Quote $cart, string $maskedCartId, int $userId): int
+    {
+        $cartId = (int)$cart->getId();
+        $paymentMethod = $this->paymentManagement->get($cartId);
+
+        return (int)$this->cartManagement->placeOrder($cartId, $paymentMethod);
+    }
+}

app/code/Magento/QuoteGraphQl/Model/Cart/PlaceOrder.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Set payment method and place order
+ */
+class SetPaymentAndPlaceOrder
+{
+    /**
+     * @var SetPaymentMethodOnCart
+     */
+    private $setPaymentMethod;
+
+    /**
+     * @var PlaceOrder
+     */
+    private $placeOrder;
+
+    /**
+     * @param SetPaymentMethodOnCart $setPaymentMethod
+     * @param PlaceOrder $placeOrder
+     */
+    public function __construct(
+        SetPaymentMethodOnCart $setPaymentMethod,
+        PlaceOrder $placeOrder
+    ) {
+        $this->setPaymentMethod = $setPaymentMethod;
+        $this->placeOrder = $placeOrder;
+    }
+
+    /**
+     * Set payment method and place order
+     *
+     * @param Quote $cart
+     * @param string $maskedCartId
+     * @param int $userId
+     * @param array $paymentData
+     * @return int
+     *
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function execute(Quote $cart, string $maskedCartId, int $userId, array $paymentData): int
+    {
+        $this->setPaymentMethod->execute($cart, $paymentData);
+        return $this->placeOrder->execute($cart, $maskedCartId, $userId);
+    }
+}