From a9f0d0ab4aec2b5e39d52328254ee29eff064d3b Mon Sep 17 00:00:00 2001 From: Geeta Date: Sat, 4 May 2019 15:51:46 +0530 Subject: [PATCH 1/5] Fixed issue #21650 --- .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php index 86f1db2022cc9..4b1cfc6c5e5c9 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php @@ -922,9 +922,6 @@ protected function getPriceFieldConfig($sortOrder) 'addbefore' => $this->getCurrencySymbol(), 'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(), 'sortOrder' => $sortOrder, - 'validation' => [ - 'validate-number' => true - ], ], ], ], From cd3c187e3e37955c27167113d33baa27314ce38e Mon Sep 17 00:00:00 2001 From: Geeta Date: Tue, 7 May 2019 12:26:50 +0530 Subject: [PATCH 2/5] Fixed issue #21650 --- .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php index 4b1cfc6c5e5c9..d503ecb843dad 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php @@ -922,6 +922,9 @@ protected function getPriceFieldConfig($sortOrder) 'addbefore' => $this->getCurrencySymbol(), 'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(), 'sortOrder' => $sortOrder, + 'validation' => [ + 'validate-zero-or-greater' => true + ], ], ], ], From 87fee0a198a47e598532abd6e9a2780c921c2bff Mon Sep 17 00:00:00 2001 From: Geeta Date: Wed, 8 May 2019 10:13:55 +0530 Subject: [PATCH 3/5] Fix(21650): As per orlangur comments, change validation for custom option price --- .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php index d503ecb843dad..385182af4922e 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php @@ -923,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder) 'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(), 'sortOrder' => $sortOrder, 'validation' => [ - 'validate-zero-or-greater' => true + 'validate-zero-or-greater' => true ], ], ], From eeae4b240ec62d69ed5848afa505c88539ff1314 Mon Sep 17 00:00:00 2001 From: Geeta Date: Sun, 19 May 2019 18:00:21 +0530 Subject: [PATCH 4/5] Fixed issue #18337 --- app/code/Magento/Search/view/frontend/web/js/form-mini.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js index 86d430041d7a8..c604d3351ad0e 100644 --- a/app/code/Magento/Search/view/frontend/web/js/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js @@ -71,8 +71,7 @@ define([ this.isExpandable = true; }.bind(this), exit: function () { - this.isExpandable = false; - this.element.removeAttr('aria-expanded'); + this.isExpandable = true; }.bind(this) }); From 72b8cc101e16f3c1f6e040483726559018b33b48 Mon Sep 17 00:00:00 2001 From: Geeta Date: Fri, 7 Jun 2019 12:40:05 +0530 Subject: [PATCH 5/5] Fix(21650): Remove extra space as per coding standard --- .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php index 385182af4922e..d503ecb843dad 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php @@ -923,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder) 'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(), 'sortOrder' => $sortOrder, 'validation' => [ - 'validate-zero-or-greater' => true + 'validate-zero-or-greater' => true ], ], ],