Merge pull request #507 from magento-lynx/graphql-api-enhancements

svera · web-flow · commit e9d6e33ccbbb · 2024-10-17T12:56:12.000+02:00
diff --git a/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml
@@ -115,7 +115,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add configurable to cart with proper quantity-->
         <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCartWithProperQty">
             <argument name="urlKey" value="$configurableProduct.custom_attributes[url_key]$" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderDownloadableProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderDownloadableProductCustomStockTest.xml
@@ -83,7 +83,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add downloadable product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQty.value}}"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderSimpleProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderSimpleProductCustomStockTest.xml
@@ -87,7 +87,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add simple product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQty.value}}"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterOrderPlacementSimpleProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterOrderPlacementSimpleProductCustomStockTest.xml
@@ -79,7 +79,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{defaultProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add simple product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQtyBoughtWith5Pieces.value}}"/>
diff --git a/InventoryGraphQl/Model/Resolver/StockStatusProvider.php b/InventoryGraphQl/Model/Resolver/StockStatusProvider.php
@@ -14,6 +14,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\InventoryCatalog\Model\GetStockIdForCurrentWebsite;
 use Magento\InventorySalesApi\Api\AreProductsSalableInterface;
+use Magento\Catalog\Model\Product\Type;
 
 /**
  * @inheritdoc
@@ -54,7 +55,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         /* @var $product ProductInterface */
         $product = $value['model'];
 
-        $productSku = ($product->getTypeId() === "bundle") ? $value['sku'] : $product->getSku();
+        $productSku = ($product->getTypeId() === TYPE::TYPE_BUNDLE || !empty($product->getOptions()))
+            ? $value['sku'] : $product->getSku();
         $stockId = $this->getStockIdForCurrentWebsite->execute();
         $result = $this->areProductsSalable->execute([$productSku], $stockId);
         $result = current($result);
diff --git a/InventorySales/Model/IsProductSalableForRequestedQtyCondition/IsSalableWithReservationsCondition.php b/InventorySales/Model/IsProductSalableForRequestedQtyCondition/IsSalableWithReservationsCondition.php
@@ -7,72 +7,34 @@
 
 namespace Magento\InventorySales\Model\IsProductSalableForRequestedQtyCondition;
 
-use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
+use Magento\CatalogInventory\Model\Config\Source\NotAvailableMessage;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\InventorySalesApi\Model\GetSalableQtyInterface;
 use Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface;
 use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
 use Magento\InventorySalesApi\Api\Data\ProductSalableResultInterface;
 use Magento\InventorySalesApi\Api\Data\ProductSalableResultInterfaceFactory;
 use Magento\InventorySalesApi\Api\Data\ProductSalabilityErrorInterfaceFactory;
-use Magento\InventoryConfigurationApi\Api\GetStockItemConfigurationInterface;
 
 /**
  * @inheritdoc
  */
 class IsSalableWithReservationsCondition implements IsProductSalableForRequestedQtyInterface
 {
-    /**
-     * @var GetStockItemDataInterface
-     */
-    private $getStockItemData;
-
-    /**
-     * @var GetReservationsQuantityInterface
-     */
-    private $getReservationsQuantity;
-
-    /**
-     * @var GetStockItemConfigurationInterface
-     */
-    private $getStockItemConfiguration;
-
-    /**
-     * @var ProductSalabilityErrorInterfaceFactory
-     */
-    private $productSalabilityErrorFactory;
-
-    /**
-     * @var ProductSalableResultInterfaceFactory
-     */
-    private $productSalableResultFactory;
-
-    /**
-     * @var GetSalableQtyInterface
-     */
-    private $getProductQtyInStock;
-
     /**
      * @param GetStockItemDataInterface $getStockItemData
-     * @param GetReservationsQuantityInterface $getReservationsQuantity
-     * @param GetStockItemConfigurationInterface $getStockItemConfiguration
      * @param ProductSalabilityErrorInterfaceFactory $productSalabilityErrorFactory
      * @param ProductSalableResultInterfaceFactory $productSalableResultFactory
      * @param GetSalableQtyInterface $getProductQtyInStock
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        GetStockItemDataInterface $getStockItemData,
-        GetReservationsQuantityInterface $getReservationsQuantity,
-        GetStockItemConfigurationInterface $getStockItemConfiguration,
-        ProductSalabilityErrorInterfaceFactory $productSalabilityErrorFactory,
-        ProductSalableResultInterfaceFactory $productSalableResultFactory,
-        GetSalableQtyInterface $getProductQtyInStock
+        private readonly GetStockItemDataInterface $getStockItemData,
+        private readonly ProductSalabilityErrorInterfaceFactory $productSalabilityErrorFactory,
+        private readonly ProductSalableResultInterfaceFactory $productSalableResultFactory,
+        private readonly GetSalableQtyInterface $getProductQtyInStock,
+        private readonly ScopeConfigInterface $scopeConfig,
     ) {
-        $this->getStockItemData = $getStockItemData;
-        $this->getReservationsQuantity = $getReservationsQuantity;
-        $this->getStockItemConfiguration = $getStockItemConfiguration;
-        $this->productSalabilityErrorFactory = $productSalabilityErrorFactory;
-        $this->productSalableResultFactory = $productSalableResultFactory;
-        $this->getProductQtyInStock = $getProductQtyInStock;
     }
 
     /**
@@ -96,10 +58,20 @@ public function execute(string $sku, int $stockId, float $requestedQty): Product
         $isEnoughQty = bccomp((string)$qtyLeftInStock, (string)$requestedQty, 4) >= 0;
 
         if (!$isEnoughQty) {
+            $message = __('Not enough items for sale');
+            if ((int)$this->scopeConfig->getValue(
+                'cataloginventory/options/not_available_message'
+            ) === NotAvailableMessage::VALUE_ONLY_X_OF_Y) {
+                $message = (__(sprintf(
+                    'Only %s of %s available',
+                    $qtyLeftInStock,
+                    $requestedQty
+                )));
+            }
             $errors = [
                 $this->productSalabilityErrorFactory->create([
                     'code' => 'is_salable_with_reservations-not_enough_qty',
-                    'message' => __('The requested qty is not available')
+                    'message' => $message
                 ])
             ];
             return $this->productSalableResultFactory->create(['errors' => $errors]);
diff --git a/InventorySales/i18n/en_US.csv b/InventorySales/i18n/en_US.csv
@@ -13,7 +13,7 @@
 "Condition have to implement IsProductSalableForRequestedQtyInterface.","Condition have to implement IsProductSalableForRequestedQtyInterface."
 "The requested sku is not assigned to given stock.","The requested sku is not assigned to given stock."
 "The requested sku is not assigned to given stock","The requested sku is not assigned to given stock"
-"The requested qty is not available","The requested qty is not available"
+"Not enough items for sale","Not enough items for sale"
 "Manage stock is enabled","Manage stock is enabled"
 "Condition must implement %1","Condition must implement %1"
 """%field"" can not be empty.","""%field"" can not be empty."
diff --git a/InventorySalesAdminUi/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml b/InventorySalesAdminUi/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml
@@ -12,6 +12,7 @@
         <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
             <argument name="productName" value="$simpleProduct.name$"/>
             <argument name="messageType" value="error"/>
+            <argument name="message" value="Not enough items for sale"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/InventorySalesAdminUi/Test/Mftf/Test/AdminEditOrderWithOutOfStockConfigurableProductTest.xml b/InventorySalesAdminUi/Test/Mftf/Test/AdminEditOrderWithOutOfStockConfigurableProductTest.xml
@@ -139,7 +139,7 @@
         </actionGroup>
 
         <!-- Check error message is absent -->
-        <dontSee selector="{{AdminOrderEditMessagesSection.error}}" userInput="The requested qty is not available" stepKey="verifyErrorMessageIsAbsent"/>
+        <dontSee selector="{{AdminOrderEditMessagesSection.error}}" userInput="Not enough items for sale" stepKey="verifyErrorMessageIsAbsent"/>
 
         <!-- Update customer address -->
         <actionGroup ref="FillOrderCustomerInformationActionGroup" stepKey="updateCustomerInformation">
diff --git a/InventorySalesAdminUi/Test/Mftf/Test/AdminEditOrderWithOutOfStockProductTest.xml b/InventorySalesAdminUi/Test/Mftf/Test/AdminEditOrderWithOutOfStockProductTest.xml
@@ -73,7 +73,7 @@
         </actionGroup>
 
         <!-- Check error message is absent -->
-        <dontSee selector="{{AdminOrderEditMessagesSection.error}}" userInput="The requested qty is not available" stepKey="verifyErrorMessageIsAbsent"/>
+        <dontSee selector="{{AdminOrderEditMessagesSection.error}}" userInput="Not enough items for sale" stepKey="verifyErrorMessageIsAbsent"/>
 
         <!-- Update customer address -->
         <actionGroup ref="FillOrderCustomerInformationActionGroup" stepKey="updateCustomerInformation">
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/SimpleProductWithOptionsCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/SimpleProductWithOptionsCartTest.php
