ENGCOM-1226: [Forwardport] Issue #13582 show message for qty minAllowed, maxAllowed, qtyIncremen… #14508

Author: Stanislav Idolov

app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php

@@ -39,8 +39,8 @@ public function afterGetQuantityValidators(
 
         $params = [];
         $params['minAllowed']  = (float)$stockItem->getMinSaleQty();
-        if ($stockItem->getQtyMaxAllowed()) {
-            $params['maxAllowed'] = $stockItem->getQtyMaxAllowed();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
         }
         if ($stockItem->getQtyIncrements() > 0) {
             $params['qtyIncrements'] = (float)$stockItem->getQtyIncrements();

app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php

@@ -28,7 +28,7 @@ protected function setUp()
 
         $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Model\Stock\Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getMinSaleQty', 'getQtyMaxAllowed', 'getQtyIncrements'])
+            ->setMethods(['getMinSaleQty', 'getMaxSaleQty', 'getQtyIncrements'])
             ->getMock();
 
         $this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
@@ -48,8 +48,8 @@ public function testAfterGetQuantityValidators()
             'validate-item-quantity' =>
                 [
                     'minAllowed' => 0.5,
-                    'maxAllowed' => 5,
-                    'qtyIncrements' => 3
+                    'maxAllowed' => 5.0,
+                    'qtyIncrements' => 3.0
                 ]
         ];
         $validators = [];
@@ -74,7 +74,7 @@ public function testAfterGetQuantityValidators()
             ->with('productId', 'websiteId')
             ->willReturn($this->stockItem);
         $this->stockItem->expects($this->once())->method('getMinSaleQty')->willReturn(0.5);
-        $this->stockItem->expects($this->any())->method('getQtyMaxAllowed')->willReturn(5);
+        $this->stockItem->expects($this->any())->method('getMaxSaleQty')->willReturn(5);
         $this->stockItem->expects($this->any())->method('getQtyIncrements')->willReturn(3);
 
         $this->assertEquals($result, $this->block->afterGetQuantityValidators($productViewBlock, $validators));

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -909,18 +909,53 @@ define([
         ],
         'validate-item-quantity': [
             function (value, params) {
-                // obtain values for validation
-                var qty = utils.parseNumber(value),
+                var validator = this,
+                    result = false,
+                    // obtain values for validation
+                    qty = utils.parseNumber(value),
                     isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
                         qty >= utils.parseNumber(params.minAllowed),
                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
                         qty <= utils.parseNumber(params.maxAllowed),
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
                         qty % utils.parseNumber(params.qtyIncrements) === 0;
 
-                return isMaxAllowedValid && isMinAllowedValid && isQtyIncrementsValid && qty > 0;
-            },
-            ''
+                result = qty > 0;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('Please enter a quantity greater than 0.');//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMinAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The fewest you may purchase is %1.').replace('%1', params.minAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMaxAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isQtyIncrementsValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('You can buy this product only in quantities of %1 at a time.').replace('%1', params.qtyIncrements);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                return result;
+            }, function () {
+                return this.itemQtyErrorMessage;
+            }
         ],
         'equalTo': [
             function (value, param) {

lib/web/mage/validation.js

@@ -1566,18 +1566,53 @@
         ],
         'validate-item-quantity': [
             function (value, element, params) {
-                // obtain values for validation
-                var qty = $.mage.parseNumber(value),
+                var validator = this,
+                    result = false,
+                    // obtain values for validation
+                    qty = $.mage.parseNumber(value),
                     isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
                         qty >= $.mage.parseNumber(params.minAllowed),
                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
                         qty <= $.mage.parseNumber(params.maxAllowed),
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
                         qty % $.mage.parseNumber(params.qtyIncrements) === 0;
 
-                return isMaxAllowedValid && isMinAllowedValid && isQtyIncrementsValid && qty > 0;
-            },
-            ''
+                result = qty > 0;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('Please enter a quantity greater than 0.');//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMinAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The fewest you may purchase is %1.').replace('%1', params.minAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMaxAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isQtyIncrementsValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('You can buy this product only in quantities of %1 at a time.').replace('%1', params.qtyIncrements);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                return result;
+            }, function () {
+                return this.itemQtyErrorMessage;
+            }
         ],
         'password-not-equal-to-user-name': [
             function (value, element, params) {