Merge branch '2.4-develop' into aprilcomprs

Author: magento-devops-queue-mgr-svc

app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/QuantityResolver.php

@@ -1,15 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\StockState;
 use Magento\CatalogInventory\Model\Config\Source\NotAvailableMessage;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,16 +35,16 @@ class QuantityResolver implements ResolverInterface
     private const CONFIG_PATH_NOT_AVAILABLE_MESSAGE = "cataloginventory/options/not_available_message";
 
     /**
+     * QuantityResolver Constructor
+     *
      * @param ProductRepositoryInterface $productRepositoryInterface
      * @param ScopeConfigInterface $scopeConfig
-     * @param StockState $stockState
      * @param ProductStock $productStock
      */
     public function __construct(
         private readonly ProductRepositoryInterface $productRepositoryInterface,
         private readonly ScopeConfigInterface $scopeConfig,
-        private readonly StockState $stockState,
-        private readonly ProductStock $productStock,
+        private readonly ProductStock $productStock
     ) {
     }
 
@@ -69,7 +68,7 @@ public function resolve(
         }
 
         if (isset($value['cart_item']) && $value['cart_item'] instanceof Item) {
-            return $this->productStock->getProductAvailableStock($value['cart_item']);
+            return $this->productStock->getSaleableQtyByCartItem($value['cart_item'], null);
         }
 
         if (!isset($value['model'])) {
@@ -82,6 +81,7 @@ public function resolve(
         if ($product->getTypeId() === self::PRODUCT_TYPE_CONFIGURABLE) {
             $product = $this->productRepositoryInterface->get($product->getSku());
         }
-        return $this->stockState->getStockQty($product->getId());
+
+        return $this->productStock->getSaleableQty($product, null);
     }
 }

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Quote\Model;
 
@@ -1563,6 +1563,12 @@ public function removeItem($itemId)
         $item = $this->getItemById($itemId);
 
         if ($item) {
+
+            // Remove gift message from cart
+            if ((int)$this->getItemsCount() === 1) {
+                $this->setGiftMessageId(0);
+            }
+
             $item->setQuote($this);
             $item->isDeleted(true);
             if ($item->getHasChildren()) {
@@ -1596,6 +1602,10 @@ public function removeAllItems()
                 $item->isDeleted(true);
             }
         }
+
+        // Remove gift message from cart
+        $this->setGiftMessageId(0);
+
         return $this;
     }
 

app/code/Magento/QuoteGraphQl/Model/CartItem/ProductStock.php

@@ -202,10 +202,10 @@ private function getLowestStockValueOfBundleProduct(Item $cartItem): float
      * Returns the lowest stock value of bundle product
      *
      * @param Item $cartItem
-     * @param float $thresholdQty
+     * @param float|null $thresholdQty
      * @return float
      */
-    private function getLowestSaleableQtyOfBundleProduct(Item $cartItem, float $thresholdQty): float
+    private function getLowestSaleableQtyOfBundleProduct(Item $cartItem, ?float $thresholdQty): float
     {
         $bundleStock = [];
         foreach ($cartItem->getQtyOptions() as $qtyOption) {
@@ -231,7 +231,20 @@ public function getProductSaleableQty(Item $cartItem): float
         if ($thresholdQty === 0.0) {
             return $this->getProductAvailableStock($cartItem);
         }
-        
+
+        return $this->getSaleableQtyByCartItem($cartItem, $thresholdQty);
+    }
+
+    /**
+     * Returns the saleable qty value by cart item
+     *
+     * @param Item $cartItem
+     * @param float|null $thresholdQty
+     * @return float
+     * @throws NoSuchEntityException
+     */
+    public function getSaleableQtyByCartItem(Item $cartItem, ?float $thresholdQty): float
+    {
         if ($cartItem->getProductType() === self::PRODUCT_TYPE_BUNDLE) {
             return $this->getLowestSaleableQtyOfBundleProduct($cartItem, $thresholdQty);
         }
@@ -248,15 +261,18 @@ public function getProductSaleableQty(Item $cartItem): float
      * Get product saleable qty when "Catalog > Inventory > Stock Options > Only X left Threshold" is greater than 0
      *
      * @param ProductInterface $product
-     * @param float $thresholdQty
+     * @param float|null $thresholdQty
      * @return float
      */
-    private function getSaleableQty(ProductInterface $product, float $thresholdQty): float
+    public function getSaleableQty(ProductInterface $product, ?float $thresholdQty): float
     {
-        $stockItem = $this->stockRegistry->getStockItem($product->getId());
         $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $product->getStore()->getWebsiteId());
-        $stockCurrentQty = $stockStatus->getQty();
-        $stockLeft = $stockCurrentQty - $stockItem->getMinQty();
-        return ($stockCurrentQty >= 0 && $stockLeft <= $thresholdQty) ? (float)$stockCurrentQty : 0.0;
+        $stockQty = (float)$stockStatus->getQty();
+        if ($thresholdQty === null) {
+            return $stockQty;
+        }
+        $stockLeft = $stockQty - $this->stockRegistry->getStockItem($product->getId())->getMinQty();
+
+        return ($stockQty >= 0 && $stockLeft <= $thresholdQty) ? $stockQty : 0.0;
     }
 }

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

@@ -8,75 +8,80 @@
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
 use Magento\Checkout\Api\Data\TotalsInformationInterface;
-use Magento\Checkout\Api\Data\TotalsInformationInterfaceFactory;
 use Magento\Checkout\Api\TotalsInformationManagementInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
-use Magento\Quote\Model\Quote\Address;
-use Magento\Quote\Model\Quote\AddressFactory;
+use Magento\QuoteGraphQl\Model\Cart\AssignShippingMethodToCart;
 use Magento\QuoteGraphQl\Model\ErrorMapper;
+use Magento\QuoteGraphQl\Model\TotalsBuilder;
+use Psr\Log\LoggerInterface;
 
 /**
  * Apply address and shipping method to totals estimate and return the quote
  */
 class EstimateTotals implements ResolverInterface
 {
     /**
+     * EstimateTotals Constructor
+     *
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param CartRepositoryInterface $cartRepository
-     * @param AddressFactory $addressFactory
      * @param TotalsInformationManagementInterface $totalsInformationManagement
-     * @param TotalsInformationInterfaceFactory $totalsInformationFactory
      * @param ErrorMapper $errorMapper
+     * @param AssignShippingMethodToCart $assignShippingMethodToCart
+     * @param LoggerInterface $logger
+     * @param TotalsBuilder $totalsBuilder
      */
     public function __construct(
         private readonly MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         private readonly CartRepositoryInterface $cartRepository,
-        private readonly AddressFactory $addressFactory,
         private readonly TotalsInformationManagementInterface $totalsInformationManagement,
-        private readonly TotalsInformationInterfaceFactory $totalsInformationFactory,
-        private readonly ErrorMapper $errorMapper
+        private readonly ErrorMapper $errorMapper,
+        private readonly AssignShippingMethodToCart $assignShippingMethodToCart,
+        private readonly LoggerInterface $logger,
+        private readonly TotalsBuilder $totalsBuilder
     ) {
     }
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
     {
-        if (empty($args['input']['cart_id'])) {
+        $input = $args['input'] ?? [];
+
+        if (empty($input['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
 
         try {
-            $cartId = $this->maskedQuoteIdToQuoteId->execute($args['input']['cart_id']);
+            $cartId = $this->maskedQuoteIdToQuoteId->execute($input['cart_id']);
         } catch (NoSuchEntityException $exception) {
             throw new GraphQlInputException(
                 __(
                     'Could not find a cart with ID "%masked_id"',
                     [
-                        'masked_id' => $args['input']['cart_id']
+                        'masked_id' => $input['cart_id']
                     ]
                 ),
                 $exception,
                 $this->errorMapper->getErrorMessageId('Could not find a cart with ID')
             );
         }
 
-        if (empty($args['input']['address']['country_code'])) {
+        $addressData = $input['address'] ?? [];
+        if (empty($addressData['country_code'])) {
             throw new GraphQlInputException(__('Required parameter "country_code" is missing'));
         }
 
-        $data = $this->getTotalsInformation($args['input']);
-        $this->totalsInformationManagement->calculate($cartId, $data);
+        $totalsInfo = $this->totalsBuilder->execute($addressData, $input['shipping_method'] ?? []);
+        $this->totalsInformationManagement->calculate($cartId, $totalsInfo);
+        $this->updateShippingMethod($totalsInfo, $cartId);
 
         return [
             'cart' => [
@@ -86,41 +91,26 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
     }
 
     /**
-     * Retrieve an instance of totals information based on input data
+     * Update shipping method if provided
      *
-     * @param array $input
-     * @return TotalsInformationInterface
+     * @param TotalsInformationInterface $totalsInfo
+     * @param int $cartId
+     * @return void
+     * @throws GraphQlInputException
      */
-    private function getTotalsInformation(array $input): TotalsInformationInterface
+    private function updateShippingMethod(TotalsInformationInterface $totalsInfo, int $cartId): void
     {
-        $data = [TotalsInformationInterface::ADDRESS => $this->getAddress($input['address'])];
-
-        $shippingMethod = $input['shipping_method'] ?? [];
-
-        if (isset($shippingMethod['carrier_code']) && isset($shippingMethod['method_code'])) {
-            $data[TotalsInformationInterface::SHIPPING_CARRIER_CODE] = $shippingMethod['carrier_code'];
-            $data[TotalsInformationInterface::SHIPPING_METHOD_CODE] = $shippingMethod['method_code'];
+        try {
+            if ($totalsInfo->getShippingCarrierCode() && $totalsInfo->getShippingMethodCode()) {
+                $this->assignShippingMethodToCart->execute(
+                    $this->cartRepository->get($cartId),
+                    $totalsInfo->getAddress(),
+                    $totalsInfo->getShippingCarrierCode(),
+                    $totalsInfo->getShippingMethodCode()
+                );
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->logger->error($e->getMessage());
         }
-
-        return $this->totalsInformationFactory->create(['data' => $data]);
-    }
-
-    /**
-     * Retrieve an instance of address based on address data
-     *
-     * @param array $data
-     * @return AddressInterface
-     */
-    private function getAddress(array $data): AddressInterface
-    {
-        /** @var Address $address */
-        $address = $this->addressFactory->create();
-        $address->setCountryId($data['country_code']);
-        $address->setRegion($data['region'][AddressInterface::KEY_REGION] ?? null);
-        $address->setRegionId($data['region'][AddressInterface::KEY_REGION_ID] ?? null);
-        $address->setRegionCode($data['region'][AddressInterface::KEY_REGION_CODE] ?? null);
-        $address->setPostcode($data[AddressInterface::KEY_POSTCODE] ?? null);
-
-        return $address;
     }
 }