LYNX-547: Insufficient and unavailable quantity notifications

deepak-soni1 · web-flow · commit 92bcdf19146f · 2024-09-27T11:32:44.000+02:00
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Source/NotAvailableMessage.php b/app/code/Magento/CatalogInventory/Model/Config/Source/NotAvailableMessage.php
@@ -30,11 +30,11 @@ public function toOptionArray(): array
         $options = [];
         $options[] = [
             'value' => self::VALUE_ONLY_X_OF_Y,
-            'label' => __('Only X available for sale. Please adjust the quantity to continue'),
+            'label' => __('Only X of Y available'),
         ];
         $options[] = [
             'value' => self::VALUE_NOT_ENOUGH_ITEMS,
-            'label' => __('Not enough items for sale. Please adjust the quantity to continue'),
+            'label' => __('Not enough items for sale'),
         ];
         return $options;
     }
@@ -47,8 +47,8 @@ public function toOptionArray(): array
     public function toArray(): array
     {
         return [
-            self::VALUE_ONLY_X_OF_Y => __('Only X available for sale. Please adjust the quantity to continue'),
-            self::VALUE_NOT_ENOUGH_ITEMS => __('Not enough items for sale. Please adjust the quantity to continue')
+            self::VALUE_ONLY_X_OF_Y => __('Only X of Y available'),
+            self::VALUE_NOT_ENOUGH_ITEMS => __('Not enough items for sale')
         ];
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -167,14 +167,15 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         }
 
         if (!$this->checkQty($stockItem, $summaryQty) || !$this->checkQty($stockItem, $qty)) {
-            $message = __('The requested qty is not available');
+            $message = __('The requested qty. is not available');
             if ((int) $this->scopeConfig->getValue('cataloginventory/options/not_available_message') === 1) {
                 $itemMessage = (__(sprintf(
-                    'Only %s available for sale. Please adjust the quantity to continue',
-                    $stockItem->getQty() - $stockItem->getMinQty()
+                    'Only %s of %s available',
+                    $stockItem->getQty() - $stockItem->getMinQty(),
+                    $this->localeFormat->getNumber($qty)
                 )));
             } else {
-                $itemMessage = (__('Not enough items for sale. Please adjust the quantity to continue'));
+                $itemMessage = (__('Not enough items for sale'));
             }
             $result->setHasError(true)
                 ->setErrorCode('qty_available')
@@ -231,7 +232,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
                         }
                     } elseif ($stockItem->getShowDefaultNotificationMessage()) {
                         $result->setMessage(
-                            __('The requested qty is not available')
+                            __('The requested qty. is not available')
                         );
                     }
                 }
diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -73,6 +73,7 @@ Stock,Stock
 "Done","Done"
 "The requested qty exceeds the maximum qty allowed in shopping cart","The requested qty exceeds the maximum qty allowed in shopping cart"
 "You cannot use decimal quantity for this product.","You cannot use decimal quantity for this product."
-"Not enough items for sale. Please adjust the quantity to continue","Not enough items for sale. Please adjust the quantity to continue"
-"Only X available for sale. Please adjust the quantity to continue","Only X available for sale. Please adjust the quantity to continue"
-"Only %s available for sale. Please adjust the quantity to continue","Only %s available for sale. Please adjust the quantity to continue"
+"Only X of Y available","Only X of Y available"
+"Only %s of %s available","Only %s of %s available"
+"Not enough items for sale","Not enough items for sale"
+"The requested qty. is not available","The requested qty. is not available"
diff --git a/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/NotAvailableMessageResolver.php b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/NotAvailableMessageResolver.php
@@ -47,12 +47,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         if ((int) $this->scopeConfig->getValue('cataloginventory/options/not_available_message') === 1) {
+            $requiredItemQty = ($cartItem->getQtyToAdd() ?? $cartItem->getQty()) + ($cartItem->getPreviousQty() ?? 0);
             return sprintf(
-                'Only %s available for sale. Please adjust the quantity to continue',
-                (string) $this->productStock->getProductSaleableQty($cartItem)
+                'Only %s of %s available',
+                (string) $this->productStock->getProductSaleableQty($cartItem),
+                (string) $requiredItemQty
             );
         }
 
-        return 'Not enough items for sale. Please adjust the quantity to continue';
+        return 'Not enough items for sale';
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -64,6 +64,11 @@ public function execute(Quote $cart, array $cartItemData): void
         try {
             $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
         } catch (Exception $e) {
+
+            if (str_contains($e->getMessage(), 'The requested qty is not available')) {
+                throw new GraphQlInputException(__('The requested qty. is not available'));
+            }
+
             throw new GraphQlInputException(
                 __(
                     'Could not add the product with SKU %sku to the shopping cart: %message',
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php b/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
@@ -16,9 +16,6 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Item;
 
-/**
- * Update cart item
- */
 class UpdateCartItem
 {
     /**
@@ -129,6 +126,9 @@ private function validateCartItem(Item $cartItem): void
         if ($cartItem->getHasError()) {
             $errors = [];
             foreach ($cartItem->getMessage(false) as $message) {
+                if (str_contains($message, 'The requested qty is not available')) {
+                    throw new GraphQlInputException(__('The requested qty. is not available'));
+                }
                 $errors[] = $message;
             }
             if (!empty($errors)) {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
@@ -79,8 +79,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 $this->cartRepository->get((int)$cart->getId())
             );
         } catch (NoSuchEntityException | LocalizedException $e) {
+            $message = (str_contains($e->getMessage(), 'The requested qty is not available'))
+                ? 'The requested qty. is not available'
+                : $e->getMessage();
             $errors[] = [
-                'message' => __($e->getMessage()),
+                'message' => __($message),
                 'code' => $this->getErrorCode($e->getMessage())
             ];
         }
diff --git a/app/code/Magento/QuoteGraphQl/i18n/en_US.csv b/app/code/Magento/QuoteGraphQl/i18n/en_US.csv
@@ -1 +1,2 @@
 """model"" value should be specified","""model"" value should be specified"
+"The requested qty. is not available","The requested qty. is not available"
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('The requested qty. is not available');
 
         $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
@@ -80,7 +80,7 @@ public function testUpdateCartItemSetUnavailableQuantity()
 
         $responseError = $response['updateCartItems']['errors'][0];
         $this->assertEquals(
-            "Could not update the product with SKU simple_product: The requested qty is not available",
+            "The requested qty. is not available",
             $responseError['message']
         );
         $this->assertEquals('INSUFFICIENT_STOCK', $responseError['code']);
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('The requested qty. is not available');
 
         $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
         $product = current($searchResponse['products']['items']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/StockAvailabilityTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/StockAvailabilityTest.php
@@ -79,7 +79,7 @@ public function testStockStatusUnavailableSimpleProduct(): void
             $responseDataObject->getData('cart/itemsV2/items/0/is_available')
         );
         self::assertEquals(
-            'Not enough items for sale. Please adjust the quantity to continue',
+            'Not enough items for sale',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -128,7 +128,7 @@ public function testStockStatusUnavailableSimpleProductOption1(): void
         );
         self::assertEquals(10, $responseDataObject->getData('cart/itemsV2/items/0/product/only_x_left_in_stock'));
         self::assertEquals(
-            'Only 10 available for sale. Please adjust the quantity to continue',
+            'Only 10 of 20 available',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -197,7 +197,7 @@ public function testStockStatusUnavailableBundleProduct(): void
             $responseDataObject->getData('cart/itemsV2/items/0/is_available')
         );
         self::assertEquals(
-            'Not enough items for sale. Please adjust the quantity to continue',
+            'Not enough items for sale',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -246,7 +246,7 @@ public function testStockStatusUnavailableBundleProductOption1(): void
             $responseDataObject->getData('cart/itemsV2/items/0/is_available')
         );
         self::assertEquals(
-            'Only 90 available for sale. Please adjust the quantity to continue',
+            'Only 90 of 100 available',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -358,7 +358,7 @@ public function testStockStatusUnavailableConfigurableProduct(): void
             $responseDataObject->getData('cart/itemsV2/items/0/is_available')
         );
         self::assertEquals(
-            'Not enough items for sale. Please adjust the quantity to continue',
+            'Not enough items for sale',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -400,7 +400,7 @@ public function testStockStatusUnavailableConfigurableProductOption1(): void
         self::assertEquals(90, $responseDataObject->getData('cart/itemsV2/items/0/product/only_x_left_in_stock'));
 
         self::assertEquals(
-            'Only 90 available for sale. Please adjust the quantity to continue',
+            'Only 90 of 100 available',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }
@@ -548,7 +548,7 @@ public function testNotAvailableMessageOption1(): void
         self::assertEquals(90, $responseDataObject->getData('cart/itemsV2/items/0/product/only_x_left_in_stock'));
 
         self::assertEquals(
-            'Only 90 available for sale. Please adjust the quantity to continue',
+            'Only 90 of 100 available',
             $responseDataObject->getData('cart/itemsV2/items/0/not_available_message')
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ public function toOptionArray(): array`
`30`	`30`	`$options = [];`
`31`	`31`	`$options[] = [`
`32`	`32`	`'value' => self::VALUE_ONLY_X_OF_Y,`
`33`		`- 'label' => __('Only X available for sale. Please adjust the quantity to continue'),`
	`33`	`+ 'label' => __('Only X of Y available'),`
`34`	`34`	`];`
`35`	`35`	`$options[] = [`
`36`	`36`	`'value' => self::VALUE_NOT_ENOUGH_ITEMS,`
`37`		`- 'label' => __('Not enough items for sale. Please adjust the quantity to continue'),`
	`37`	`+ 'label' => __('Not enough items for sale'),`
`38`	`38`	`];`
`39`	`39`	`return $options;`
`40`	`40`	`}`
`@@ -47,8 +47,8 @@ public function toOptionArray(): array`
`47`	`47`	`public function toArray(): array`
`48`	`48`	`{`
`49`	`49`	`return [`
`50`		`- self::VALUE_ONLY_X_OF_Y => __('Only X available for sale. Please adjust the quantity to continue'),`
`51`		`- self::VALUE_NOT_ENOUGH_ITEMS => __('Not enough items for sale. Please adjust the quantity to continue')`
	`50`	`+ self::VALUE_ONLY_X_OF_Y => __('Only X of Y available'),`
	`51`	`+ self::VALUE_NOT_ENOUGH_ITEMS => __('Not enough items for sale')`
`52`	`52`	`];`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,14 +167,15 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if (!$this->checkQty($stockItem, $summaryQty) \|\| !$this->checkQty($stockItem, $qty)) {`
`170`		`- $message = __('The requested qty is not available');`
	`170`	`+ $message = __('The requested qty. is not available');`
`171`	`171`	`if ((int) $this->scopeConfig->getValue('cataloginventory/options/not_available_message') === 1) {`
`172`	`172`	`$itemMessage = (__(sprintf(`
`173`		`- 'Only %s available for sale. Please adjust the quantity to continue',`
`174`		`- $stockItem->getQty() - $stockItem->getMinQty()`
	`173`	`+ 'Only %s of %s available',`
	`174`	`+ $stockItem->getQty() - $stockItem->getMinQty(),`
	`175`	`+ $this->localeFormat->getNumber($qty)`
`175`	`176`	`)));`
`176`	`177`	`} else {`
`177`		`- $itemMessage = (__('Not enough items for sale. Please adjust the quantity to continue'));`
	`178`	`+ $itemMessage = (__('Not enough items for sale'));`
`178`	`179`	`}`
`179`	`180`	`$result->setHasError(true)`
`180`	`181`	`->setErrorCode('qty_available')`
`@@ -231,7 +232,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ`
`231`	`232`	`}`
`232`	`233`	`} elseif ($stockItem->getShowDefaultNotificationMessage()) {`
`233`	`234`	`$result->setMessage(`
`234`		`- __('The requested qty is not available')`
	`235`	`+ __('The requested qty. is not available')`
`235`	`236`	`);`
`236`	`237`	`}`
`237`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if ((int) $this->scopeConfig->getValue('cataloginventory/options/not_available_message') === 1) {`
	`50`	`+ $requiredItemQty = ($cartItem->getQtyToAdd() ?? $cartItem->getQty()) + ($cartItem->getPreviousQty() ?? 0);`
`50`	`51`	`return sprintf(`
`51`		`- 'Only %s available for sale. Please adjust the quantity to continue',`
`52`		`- (string) $this->productStock->getProductSaleableQty($cartItem)`
	`52`	`+ 'Only %s of %s available',`
	`53`	`+ (string) $this->productStock->getProductSaleableQty($cartItem),`
	`54`	`+ (string) $requiredItemQty`
`53`	`55`	`);`
`54`	`56`	`}`
`55`	`57`
`56`		`- return 'Not enough items for sale. Please adjust the quantity to continue';`
	`58`	`+ return 'Not enough items for sale';`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`"""model"" value should be specified","""model"" value should be specified"`
	`2`	`+"The requested qty. is not available","The requested qty. is not available"`
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('The requested qty. is not available');`
`41`	`41`
`42`	`42`	`$sku = 'simple';`
`43`	`43`	`$quantity = 200;`