Skip to content

Commit 664b273

Browse files
author
Oleksandr Rykh
authored
Release 1.0.16 (#27)
* Release 1.0.16
1 parent b7aa11c commit 664b273

11 files changed

+694
-3
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/quality-patches",
33
"description": "Provides quality patches for Magento 2",
44
"type": "magento2-component",
5-
"version": "1.0.15",
5+
"version": "1.0.16",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches.json‎

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@
13141314
"MDVA-33482": {
13151315
"magento/magento2-base": {
13161316
"Fixes the issue where generating a Credit Memo against a partial invoice results in tax for the total order instead of tax for that partial invoice.": {
1317-
">=2.3.5 <2.3.7 || >=2.4.0 <2.4.3": {
1317+
"^2.3.5": {
13181318
"file": "os/MDVA-33482__fixes_issue_where_partial_credit_memo_tax_totals_are_not_calculated_correctly__2.4.0_v1.patch"
13191319
}
13201320
}
@@ -1383,7 +1383,8 @@
13831383
"magento/magento2-base": {
13841384
"Fixes the issue in the customer registration form causing an error to display: \"ERROR - The Date of Birth should not be greater than today\".": {
13851385
">=2.3.4 <2.3.6": {
1386-
"file": "os/MDVA-27664__fixes_error_The_Date_of_Birth_should_not_be_greater_than_today__2.3.4-p2_v2.patch"
1386+
"file": "os/MDVA-27664__fixes_error_The_Date_of_Birth_should_not_be_greater_than_today__2.3.4-p2_v2.patch",
1387+
"replaced-with": "MDVA-34192"
13871388
}
13881389
}
13891390
}
@@ -1429,5 +1430,72 @@
14291430
}
14301431
}
14311432
}
1433+
},
1434+
"MDVA-33453": {
1435+
"magento/magento2-base": {
1436+
"Fixes the issue where Page Builder Products content type preview breaks if matching products have different prices for each website.": {
1437+
">=2.3.6 <2.4.3": {
1438+
"file": "os/MDVA-33453__fixes_the_issue_page_builder_products_have_different_prices_for_each_website___2.4.1.patch"
1439+
}
1440+
}
1441+
},
1442+
"magento/module-page-builder": {
1443+
"Fixes the issue where Page Builder Products content type preview breaks if matching products have different prices for each website.": {
1444+
">=1.3.3 <2.2.1": {
1445+
"file": "commerce/MDVA-33453__fixes_the_issue_page_builder_products_have_different_prices_for_each_website___2.2.0.patch"
1446+
}
1447+
}
1448+
}
1449+
},
1450+
"MDVA-32634": {
1451+
"magento/magento2-base": {
1452+
"Fixes the issue when url_path of the category assigned to all store remains unchanged after moving the category in the hierarchy.": {
1453+
"^2.3.1": {
1454+
"file": "os/MDVA-32634__fixes_the_issue_when_url_path_assigned_to_all_store_after_moving_the_category_in_hierarchy__2.3.4-p2.patch"
1455+
}
1456+
}
1457+
}
1458+
},
1459+
"MDVA-33344": {
1460+
"magento/magento2-ee-base": {
1461+
"Fixes the issue where hard coded rma_item entity default attribute set ID is used instead of the value from the database.": {
1462+
"^2.3.0": {
1463+
"file": "commerce/MDVA-33344__fixes_the_issue_where_hard_coded_rma_item_entity_default_attribute_set_ID__2.3.4.patch"
1464+
}
1465+
}
1466+
}
1467+
},
1468+
"MDVA-34192": {
1469+
"magento/magento2-base": {
1470+
"Fixes the issue where it is impossible to modify/specify customer date of birth using dd/mm/yyyy format.": {
1471+
">=2.3.6 <2.4.0": {
1472+
"file": "os/MDVA-34192__fixes_impossible_to_modify_customer_date_of_birth__2.3.6.patch"
1473+
},
1474+
">=2.3.4 <2.3.6": {
1475+
"file": "os/MDVA-34192__fixes_impossible_to_modify_customer_date_of_birth__2.3.4-p2.patch"
1476+
},
1477+
">=2.4.0 <2.4.3": {
1478+
"file": "os/MDVA-34551__fixes_impossible_to_modify_customer_date_of_birth__2.4.0.patch"
1479+
}
1480+
}
1481+
}
1482+
},
1483+
"MDVA-34847": {
1484+
"magento/magento2-ee-base": {
1485+
"Fixes store IDs type conversion to integer for SQL condition in Admin collections for Admin User with custom permissions.": {
1486+
"^2.3.0": {
1487+
"file": "commerce/MDVA-34847__store_id_type_conversion_to_integer__2.3.3.patch"
1488+
}
1489+
}
1490+
}
1491+
},
1492+
"MDVA-34886": {
1493+
"magento/magento2-base": {
1494+
"Fixes the issue where search does not return results if 'weight' product attribute is configured as searchable.": {
1495+
"^2.3.2": {
1496+
"file": "os/MDVA-34886__fixes_the_issue_where_search_does_not_return_results_if_weigh_is_configured_as_searchable__2.3.3.patch"
1497+
}
1498+
}
1499+
}
14321500
}
14331501
}

‎patches/commerce/MDVA-33344__fixes_the_issue_where_hard_coded_rma_item_entity_default_attribute_set_ID__2.3.4.patch‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
diff --git a/vendor/magento/module-rma/Api/RmaAttributesManagementInterface.php b/vendor/magento/module-rma/Api/RmaAttributesManagementInterface.php
2+
index db6349a4a4f..4ed00e10ba8 100644
3+
--- a/vendor/magento/module-rma/Api/RmaAttributesManagementInterface.php
4+
+++ b/vendor/magento/module-rma/Api/RmaAttributesManagementInterface.php
5+
@@ -13,17 +13,20 @@ namespace Magento\Rma\Api;
6+
interface RmaAttributesManagementInterface extends \Magento\Customer\Api\MetadataInterface
7+
{
8+
/**
9+
- * Attribute set id
10+
+ * Default attribute set id
11+
+ *
12+
+ * @deprecated This value should be retrieved from database
13+
+ * @see \Magento\Eav\Model\Entity\Type::getDefaultAttributeSetId
14+
*/
15+
const ATTRIBUTE_SET_ID = 9;
16+
17+
/**
18+
- * Entity type
19+
+ * Item entity type
20+
*/
21+
const ENTITY_TYPE = 'rma_item';
22+
23+
/**
24+
- * Data object class name
25+
+ * Item data object class name
26+
*/
27+
const DATA_OBJECT_CLASS_NAME = \Magento\Rma\Api\Data\ItemInterface::class;
28+
29+
diff --git a/vendor/magento/module-rma/Model/Service/RmaAttributesManagement.php b/vendor/magento/module-rma/Model/Service/RmaAttributesManagement.php
30+
index d29c2695855..4d5d91e7d1b 100644
31+
--- a/vendor/magento/module-rma/Model/Service/RmaAttributesManagement.php
32+
+++ b/vendor/magento/module-rma/Model/Service/RmaAttributesManagement.php
33+
@@ -5,7 +5,9 @@
34+
*/
35+
namespace Magento\Rma\Model\Service;
36+
37+
+use Magento\Eav\Model\Config;
38+
use Magento\Framework\Api\SimpleDataObjectConverter;
39+
+use Magento\Framework\App\ObjectManager;
40+
use Magento\Rma\Api\RmaAttributesManagementInterface;
41+
use Magento\Customer\Model\AttributeMetadataConverter;
42+
use Magento\Framework\Exception\NoSuchEntityException;
43+
@@ -13,7 +15,7 @@ use Magento\Customer\Model\AttributeMetadataDataProvider;
44+
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
45+
46+
/**
47+
- * Class RmaAttributesManagement
48+
+ * Rma attributes management service
49+
*/
50+
class RmaAttributesManagement implements RmaAttributesManagementInterface
51+
{
52+
@@ -38,18 +40,26 @@ class RmaAttributesManagement implements RmaAttributesManagementInterface
53+
*/
54+
protected $metadataConverter;
55+
56+
+ /**
57+
+ * @var Config
58+
+ */
59+
+ private $eavConfig;
60+
+
61+
/**
62+
* Constructor
63+
*
64+
* @param AttributeMetadataDataProvider $metadataDataProvider
65+
* @param AttributeMetadataConverter $metadataConverter
66+
+ * @param Config|null $eavConfig
67+
*/
68+
public function __construct(
69+
AttributeMetadataDataProvider $metadataDataProvider,
70+
- AttributeMetadataConverter $metadataConverter
71+
+ AttributeMetadataConverter $metadataConverter,
72+
+ ?Config $eavConfig = null
73+
) {
74+
$this->metadataDataProvider = $metadataDataProvider;
75+
$this->metadataConverter = $metadataConverter;
76+
+ $this->eavConfig = $eavConfig ?? ObjectManager::getInstance()->get(Config::class);
77+
}
78+
79+
/**
80+
@@ -107,10 +117,12 @@ class RmaAttributesManagement implements RmaAttributesManagementInterface
81+
*/
82+
public function getAllAttributesMetadata()
83+
{
84+
+ $attributeSetId = (int) $this->eavConfig->getEntityType(self::ENTITY_TYPE)
85+
+ ->getDefaultAttributeSetId();
86+
/** @var AbstractAttribute[] $attribute */
87+
$attributeCodes = $this->metadataDataProvider->getAllAttributeCodes(
88+
self::ENTITY_TYPE,
89+
- self::ATTRIBUTE_SET_ID
90+
+ $attributeSetId
91+
);
92+
93+
$attributesMetadata = [];
94+
@@ -118,7 +130,7 @@ class RmaAttributesManagement implements RmaAttributesManagementInterface
95+
try {
96+
$attributesMetadata[] = $this->getAttributeMetadata($attributeCode);
97+
} catch (NoSuchEntityException $e) {
98+
- // If no such entity, skip
99+
+ continue;
100+
}
101+
}
102+

‎patches/commerce/MDVA-33453__fixes_the_issue_page_builder_products_have_different_prices_for_each_website___2.2.0.patch‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/vendor/magento/module-page-builder/Ui/DataProvider/Product/ProductCollection.php b/vendor/magento/module-page-builder/Ui/DataProvider/Product/ProductCollection.php
2+
index 87c4d2b78..1bdda9c00 100644
3+
--- a/vendor/magento/module-page-builder/Ui/DataProvider/Product/ProductCollection.php
4+
+++ b/vendor/magento/module-page-builder/Ui/DataProvider/Product/ProductCollection.php
5+
@@ -29,4 +29,13 @@ class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Col
6+
7+
return $this;
8+
}
9+
+
10+
+ /**
11+
+ * @inheritdoc
12+
+ */
13+
+ protected function _productLimitationJoinPrice()
14+
+ {
15+
+ $this->_productLimitationFilters->setUsePriceIndex($this->getStoreId() !== Store::DEFAULT_STORE_ID);
16+
+ return $this->_productLimitationPrice(false);
17+
+ }
18+
}

‎patches/commerce/MDVA-34847__store_id_type_conversion_to_integer__2.3.3.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/vendor/magento/module-admin-gws/Observer/RolePermissionAssigner.php b/vendor/magento/module-admin-gws/Observer/RolePermissionAssigner.php
2+
index ecb36760548..9f1379ef151 100644
3+
--- a/vendor/magento/module-admin-gws/Observer/RolePermissionAssigner.php
4+
+++ b/vendor/magento/module-admin-gws/Observer/RolePermissionAssigner.php
5+
@@ -115,7 +115,7 @@ class RolePermissionAssigner
6+
if (empty($storeGroupIds) && count($object->getGwsWebsites())) {
7+
foreach ($storeGroupCollection as $storeGroup) {
8+
if (in_array($storeGroup->getWebsiteId(), $object->getGwsWebsites())) {
9+
- $storeGroupIds[] = $storeGroup->getId();
10+
+ $storeGroupIds[] = (int)$storeGroup->getId();
11+
}
12+
}
13+
}
14+
@@ -126,7 +126,7 @@ class RolePermissionAssigner
15+
$storeIds = [];
16+
foreach ($this->storeManager->getStores() as $store) {
17+
if (in_array($store->getGroupId(), $object->getGwsStoreGroups())) {
18+
- $storeIds[] = $store->getId();
19+
+ $storeIds[] = (int)$store->getId();
20+
}
21+
}
22+
$object->setGwsStores($storeIds);
23+
@@ -135,7 +135,7 @@ class RolePermissionAssigner
24+
$relevantWebsites = [];
25+
foreach ($storeGroupCollection as $storeGroup) {
26+
if (in_array($storeGroup->getId(), $object->getGwsStoreGroups())) {
27+
- $relevantWebsites[] = $storeGroup->getWebsite()->getId();
28+
+ $relevantWebsites[] = (int)$storeGroup->getWebsite()->getId();
29+
}
30+
}
31+
$object->setGwsRelevantWebsites(array_values(array_unique($relevantWebsites)));

‎patches/os/MDVA-32634__fixes_the_issue_when_url_path_assigned_to_all_store_after_moving_the_category_in_hierarchy__2.3.4-p2.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/vendor/magento/module-catalog-url-rewrite/Model/Category/Plugin/Category/Move.php b/vendor/magento/module-catalog-url-rewrite/Model/Category/Plugin/Category/Move.php
2+
index f3984bf7d62..5a5b805ba18 100644
3+
--- a/vendor/magento/module-catalog-url-rewrite/Model/Category/Plugin/Category/Move.php
4+
+++ b/vendor/magento/module-catalog-url-rewrite/Model/Category/Plugin/Category/Move.php
5+
@@ -67,13 +67,11 @@ class Move
6+
$categoryStoreId = $category->getStoreId();
7+
foreach ($category->getStoreIds() as $storeId) {
8+
$category->setStoreId($storeId);
9+
- if (!$this->isGlobalScope($storeId)) {
10+
- $this->updateCategoryUrlKeyForStore($category);
11+
- $category->unsUrlPath();
12+
- $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
13+
- $category->getResource()->saveAttribute($category, 'url_path');
14+
- $this->updateUrlPathForChildren($category);
15+
- }
16+
+ $this->updateCategoryUrlKeyForStore($category);
17+
+ $category->unsUrlPath();
18+
+ $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
19+
+ $category->getResource()->saveAttribute($category, 'url_path');
20+
+ $this->updateUrlPathForChildren($category);
21+
}
22+
$category->setStoreId($categoryStoreId);
23+

‎patches/os/MDVA-33453__fixes_the_issue_page_builder_products_have_different_prices_for_each_website___2.4.1.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php b/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
2+
index f9340a495de..e4bb0a8a66b 100644
3+
--- a/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
4+
+++ b/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
5+
@@ -149,6 +149,8 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
6+
$attributes[$attributeCode] = true;
7+
$this->getRule()->setCollectedAttributes($attributes);
8+
}
9+
+ } else {
10+
+ $this->joinedAttributes['price'] ='price_index.min_price';
11+
}
12+
13+
return $this;
14+
@@ -244,8 +246,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
15+
$result = parent::getMappedSqlField();
16+
} elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
17+
$result = $this->joinedAttributes[$this->getAttribute()];
18+
- } elseif ($this->getAttribute() === 'price') {
19+
- $result = 'price_index.min_price';
20+
} elseif ($this->getAttributeObject()->isStatic()) {
21+
$result = $this->getAttributeObject()->getAttributeCode();
22+
} elseif ($this->getValueParsed()) {

0 commit comments

Comments
 (0)