LYNX-530 - Insufficient stock error message shown according to configuration (#294)

cod40403 · web-flow · commit 8493a4546773 · 2024-10-04T11:21:27.000+02:00
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityAcceptLowerThanStockQuantityAfterChangingStockInBackendTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityAcceptLowerThanStockQuantityAfterChangingStockInBackendTest.xml
@@ -14,7 +14,7 @@
             <description value="Verify if lower than stock product quantity is accepted after changing stock qty in backend"/>
             <severity value="CRITICAL"/>
             <testCaseId value="AC-5987"/>
-            <group value="mtf_migrated"/> 
+            <group value="mtf_migrated"/>
         </annotations>
 
         <before>
@@ -61,14 +61,14 @@
         <waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
 
         <!--Assert "The requested qty is not available"-->
-        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="The requested qty is not available" stepKey="seeTheErrorMessageDisplayed"/>
+        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="Not enough items for sale" stepKey="seeTheErrorMessageDisplayed"/>
 
         <fillField selector="{{CheckoutCartProductSection.qty($$simpleProduct.sku$$)}}" userInput="8" stepKey="updateProductQty"/>
         <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
         <waitForAjaxLoad stepKey="waitForAjaxLoad2"/>
         <waitForAjaxLoad stepKey="waitForPageLoad2"/>
 
-        <dontSee userInput="The requested qty is not available" stepKey="dontSeeTheErrorMessageDisplayed"/>
+        <dontSee userInput="Not enough items for sale" stepKey="dontSeeTheErrorMessageDisplayed"/>
 
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml
@@ -50,7 +50,7 @@
         <actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addProductToCart"/>
         <!-- Check that error remains -->
         <actionGroup ref="StorefrontAssertProductAddToCartErrorMessageActionGroup" stepKey="assertFailure">
-            <argument name="message" value="The requested qty is not available"/>
+            <argument name="message" value="Not enough items for sale"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCartError.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCartError.php
@@ -33,6 +33,8 @@ class AddProductsToCartError
         'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The requested qty is not available' => self::ERROR_INSUFFICIENT_STOCK,
+        'Not enough items for sale' => self::ERROR_INSUFFICIENT_STOCK,
+        'Only %s of %s available' => self::ERROR_INSUFFICIENT_STOCK,
     ];
 
     /**
@@ -59,6 +61,7 @@ public function create(string $message, int $cartItemPosition = 0): Data\Error
      */
     private function getErrorCode(string $message): string
     {
+        $message = preg_replace('/\d+/', '%s', $message);
         foreach (self::MESSAGE_CODES as $codeMessage => $code) {
             if (false !== stripos($message, $codeMessage)) {
                 return $code;
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
@@ -104,6 +104,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      */
     private function getErrorCode(string $message): string
     {
+        $message = preg_replace('/\d+/', '%s', $message);
         foreach ($this->messageCodesMapper as $key => $code) {
             if (str_contains($message, $key)) {
                 return $code;
diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
@@ -86,6 +86,8 @@
                 <item name="Could not find cart item" xsi:type="string">COULD_NOT_FIND_CART_ITEM</item>
                 <item name="Required parameter" xsi:type="string">REQUIRED_PARAMETER_MISSING</item>
                 <item name="The fewest you may purchase" xsi:type="string">INVALID_PARAMETER_VALUE</item>
+                <item name="Not enough items for sale" xsi:type="string">INSUFFICIENT_STOCK</item>
+                <item name="Only %s of %s available" xsi:type="string">INSUFFICIENT_STOCK</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Sales/Model/Reorder/Reorder.php b/app/code/Magento/Sales/Model/Reorder/Reorder.php
@@ -64,6 +64,8 @@ class Reorder
         'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The requested qty is not available' => self::ERROR_INSUFFICIENT_STOCK,
+        'Not enough items for sale' => self::ERROR_INSUFFICIENT_STOCK,
+        'Only %s of %s available' => self::ERROR_INSUFFICIENT_STOCK,
     ];
 
     /**
@@ -358,7 +360,7 @@ private function addError(string $message, string $code = null): void
     private function getErrorCode(string $message): string
     {
         $code = self::ERROR_UNDEFINED;
-
+        $message = preg_replace('/\d+/', '%s', $message);
         $matchedCodes = array_filter(
             self::MESSAGE_CODES,
             function ($key) use ($message) {
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml
@@ -71,6 +71,6 @@
             <argument name="productQty" value="1"/>
         </actionGroup>
         <!-- Check that error remains -->
-        <see userInput="The requested qty is not available" stepKey="assertProductErrorRemains"/>
+        <see userInput="Not enough items for sale" stepKey="assertProductErrorRemains"/>
     </test>
 </tests>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
     public function testAddProductIfQuantityIsNotAvailable()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The requested qty. is not available');
+        $this->expectExceptionMessage('Not enough items for sale');
 
         $sku = 'simple';
         $quantity = 200;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/UpdateCartItemsTest.php
@@ -47,7 +47,7 @@ public function testUpdateCartItemDecimalQuantity()
         $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
         $quantity = 0.5;
-        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
+        $query = $this->getMutation($maskedQuoteId, $itemId, $quantity);
         $response = $this->graphQlMutation($query);
 
         $this->assertArrayHasKey('updateCartItems', $response);
@@ -72,15 +72,14 @@ public function testUpdateCartItemSetUnavailableQuantity()
         $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
         $quantity = 100;
-        $query = $this->getQuery($maskedQuoteId, $itemId, $quantity);
+        $query = $this->getMutation($maskedQuoteId, $itemId, $quantity);
         $response = $this->graphQlMutation($query);
-
         $this->assertArrayHasKey('updateCartItems', $response);
         $this->assertArrayHasKey('errors', $response['updateCartItems']);
 
         $responseError = $response['updateCartItems']['errors'][0];
         $this->assertEquals(
-            "The requested qty. is not available",
+            "Could not update the product with SKU simple_product: Not enough items for sale",
             $responseError['message']
         );
         $this->assertEquals('INSUFFICIENT_STOCK', $responseError['code']);
@@ -92,9 +91,9 @@ public function testUpdateCartItemSetUnavailableQuantity()
      * @param float $quantity
      * @return string
      */
-    private function getQuery(string $maskedQuoteId, int $itemId, float $quantity): string
+    private function getMutation(string $maskedQuoteId, int $itemId, float $quantity): string
     {
-        return <<<QUERY
+        return <<<MUTATION
 mutation {
   updateCartItems(input: {
     cart_id: "{$maskedQuoteId}"
@@ -117,6 +116,6 @@ private function getQuery(string $maskedQuoteId, int $itemId, float $quantity):
     }
   }
 }
-QUERY;
+MUTATION;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -155,7 +155,7 @@ public function testAddProductIfQuantityIsNotAvailable(): void
         $response = $this->graphQlMutation($query);
 
         self::assertEquals(
-            'The requested qty is not available',
+            'Not enough items for sale',
             $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -206,7 +206,7 @@ public function testAddVariationFromAnotherConfigurableProductWithDifferentSuper
     public function testAddProductIfQuantityIsNotAvailable()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The requested qty. is not available');
+        $this->expectExceptionMessage('Not enough items for sale');
 
         $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
         $product = current($searchResponse['products']['items']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddProductsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddProductsToCartTest.php
@@ -26,11 +26,14 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Test\Fixture\GuestCart as GuestCartFixture;
+use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorage;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Test\Fixture\ProductStock as ProductStockFixture;
+use Magento\Quote\Test\Fixture\QuoteIdMask as QuoteMaskFixture;
 
 /**
  * Get add to cart through GraphQl query and variables
@@ -85,6 +88,54 @@ public function testAddProductsToCartWithSKUCaseInsensitive(string $sku): void
         self::assertEquals(1, $cartItem['quantity']);
     }
 
+    /**
+     * @throws Exception
+     */
+    #[
+        Config('cataloginventory/options/not_available_message', 2),
+        DataFixture(ProductFixture::class, ['sku' => 'simple_10', 'price' => 100.00], as: 'product'),
+        DataFixture(GuestCartFixture::class, as: 'cart'),
+        DataFixture(QuoteMaskFixture::class, ['cart_id' => '$cart.id$'], 'quoteIdMask'),
+        DataFixture(ProductStockFixture::class, ['prod_id' => '$product.id$', 'prod_qty' => 90], 'prodStock')
+    ]
+    public function testAddSimpleProductNotAvailableMessageInError()
+    {
+        $maskedQuoteId = $this->fixtures->get('quoteIdMask')->getMaskedId();
+        $query = $this->getAddToCartMutation($maskedQuoteId, 'simple_10', 100);
+        $response = $this->graphQlMutation($query);
+        self::assertEquals(
+            [
+                'code' => 'INSUFFICIENT_STOCK',
+                'message' => 'Not enough items for sale'
+            ],
+            $response['addProductsToCart']['user_errors'][0]
+        );
+    }
+
+    /**
+     * @throws Exception
+     */
+    #[
+        Config('cataloginventory/options/not_available_message', 1),
+        DataFixture(ProductFixture::class, ['sku' => 'simple_10', 'price' => 100.00], as: 'product'),
+        DataFixture(GuestCartFixture::class, as: 'cart'),
+        DataFixture(QuoteMaskFixture::class, ['cart_id' => '$cart.id$'], 'quoteIdMask'),
+        DataFixture(ProductStockFixture::class, ['prod_id' => '$product.id$', 'prod_qty' => 90], 'prodStock')
+    ]
+    public function testAddSimpleProductNotAvailableMessageInErrorWithQtyShown()
+    {
+        $maskedQuoteId = $this->fixtures->get('quoteIdMask')->getMaskedId();
+        $query = $this->getAddToCartMutation($maskedQuoteId, 'simple_10', 100);
+        $response = $this->graphQlMutation($query);
+        self::assertEquals(
+            [
+                'code' => 'INSUFFICIENT_STOCK',
+                'message' => 'Only 90 of 100 available'
+            ],
+            $response['addProductsToCart']['user_errors'][0]
+        );
+    }
+
     /**
      * Data provider with sku in uppercase and lowercase
      *
@@ -103,9 +154,10 @@ public static function skuDataProvider(): array
      *
      * @param string $maskedQuoteId
      * @param string $sku
+     * @param int $qty
      * @return string
      */
-    private function getAddToCartMutation(string $maskedQuoteId, string $sku): string
+    private function getAddToCartMutation(string $maskedQuoteId, string $sku, int $qty = 1): string
     {
         return <<<MUTATION
 mutation {
@@ -114,7 +166,7 @@ private function getAddToCartMutation(string $maskedQuoteId, string $sku): strin
         cartItems: [
             {
                 sku: "{$sku}"
-                quantity: 1
+                quantity: $qty
             }
         ]
     ) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -190,7 +190,7 @@ public function testAddToCartWithQtyPlusOne()
 
         self::assertArrayHasKey('user_errors', $response['addProductsToCart']);
         self::assertEquals(
-            'The requested qty is not available',
+            'Not enough items for sale',
             $response['addProductsToCart']['user_errors'][0]['message']
         );
         self::assertEquals(100, $response['addProductsToCart']['cart']['total_quantity']);
@@ -429,7 +429,7 @@ public static function wrongQuantityDataProvider(): array
         return [
             'More quantity than in stock' => [
                 101,
-                'The requested qty is not available'
+                'Not enough items for sale'
             ],
             'Quantity equals zero' => [
                 0,
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php
@@ -337,7 +337,7 @@ public static function updateItemDataProvider(): array
                     'use_config_backorders' => 0,
                     'backorders' => Stock::BACKORDERS_NO,
                 ],
-                'The requested qty is not available'
+                'Not enough items for sale'
             ]
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php
@@ -172,7 +172,7 @@ public function testAddProductWithUnavailableQty(): void
         $product = $this->productRepository->get('simple-1');
         $postData = ['product' => $product->getId(), 'qty' => '1000'];
         $this->dispatchAddToCartRequest($postData);
-        $message = (string)__('The requested qty is not available');
+        $message = (string)__('Not enough items for sale');
         $this->assertSessionMessages($this->containsEqual($message), MessageInterface::TYPE_ERROR);
         $this->assertRedirect($this->stringContains($product->getProductUrl()));
     }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/UpdateItemQtyTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/UpdateItemQtyTest.php
@@ -133,7 +133,7 @@ public static function requestDataProvider(): array
                 'requestQuantity' => ['qty' => 230],
                 'expectedResponse' => [
                     'success' => false,
-                    'error_message' => '[{"error":"The requested qty is not available","itemId":3}]']
+                    'error_message' => '[{"error":"Not enough items for sale","itemId":3}]']
             ],
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/UpdateTest.php
@@ -270,7 +270,7 @@ public static function bundleOptionQuantityProvider(): array
             ],
             'Quantity, greater than available' => [
                 '1000',
-                'The requested qty is not available',
+                'Not enough items for sale',
             ],
             'Quantity, greater than allowed in the Shopping Cart' => [
                 '100000',
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/Checkout/CheckItemsTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/Checkout/CheckItemsTest.php
@@ -163,7 +163,7 @@ public static function requestDataProvider(): array
                 'requestQuantity' => ['qty' => 101],
                 'expectedResponse' => [
                     'success' => false,
-                    'error_message' => 'The requested qty is not available']
+                    'error_message' => 'Not enough items for sale']
             ],
             [
                 'requestQuantity' => ['qty' => 230],
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php
@@ -166,7 +166,7 @@ public function testUpdateQuoteItemMoreQty(): void
         $quoteItem = current($quote->getItems());
         $item = $this->itemFactory->create();
         $item->setQty(9999)->setSku($quoteItem->getSku())->setItemId($quoteItem->getItemId());
-        $this->expectExceptionObject(new LocalizedException(__('The requested qty is not available')));
+        $this->expectExceptionObject(new LocalizedException(__('Not enough items for sale')));
         $this->model->save($quote, $item);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -564,7 +564,7 @@ public function testAddProductWithMoreQty(): void
     {
         $quote = $this->quoteFactory->create();
         $product = $this->productRepository->get('simple-1');
-        $this->expectExceptionObject(new LocalizedException(__('The requested qty is not available')));
+        $this->expectExceptionObject(new LocalizedException(__('Not enough items for sale')));
         $quote->addProduct($product, 1500);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`104`	`104`	`*/`
`105`	`105`	`private function getErrorCode(string $message): string`
`106`	`106`	`{`
	`107`	`+ $message = preg_replace('/\d+/', '%s', $message);`
`107`	`108`	`foreach ($this->messageCodesMapper as $key => $code) {`
`108`	`109`	`if (str_contains($message, $key)) {`
`109`	`110`	`return $code;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function setUp(): void`
`37`	`37`	`public function testAddProductIfQuantityIsNotAvailable()`
`38`	`38`	`{`
`39`	`39`	`$this->expectException(\Exception::class);`
`40`		`- $this->expectExceptionMessage('The requested qty. is not available');`
	`40`	`+ $this->expectExceptionMessage('Not enough items for sale');`
`41`	`41`
`42`	`42`	`$sku = 'simple';`
`43`	`43`	`$quantity = 200;`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function testAddProductIfQuantityIsNotAvailable(): void`
`155`	`155`	`$response = $this->graphQlMutation($query);`
`156`	`156`
`157`	`157`	`self::assertEquals(`
`158`		`- 'The requested qty is not available',`
	`158`	`+ 'Not enough items for sale',`
`159`	`159`	`$response['addProductsToCart']['user_errors'][0]['message']`
`160`	`160`	`);`
`161`	`161`	`}`