Skip to content

Commit 7efad5c

Browse files
katmoonkatmoon
authored
Merge pull request #94 from magento-commerce/1.1.15
1.1.15 Release
2 parents 9549002 + ae2796a commit 7efad5c

17 files changed

+4349
-13
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.1.14",
5+
"version": "1.1.15",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎magento_releases.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,6 @@
308308
"2.3.0": {
309309
"magento/magento2-base": "2.3.0",
310310
"magento/magento2-ee-base": "2.3.0",
311-
"magento/magento2-b2b-base": "1.1.1"
311+
"magento/magento2-b2b-base": "1.1.0"
312312
}
313313
}

‎patches-info.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎patches/commerce/MDVA-38559_2.4.1-p1.patch‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
diff --git a/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php b/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
2+
index 6bdaa40019f..d3f8bcb8765 100644
3+
--- a/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
4+
+++ b/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
5+
@@ -244,11 +244,21 @@ class CustomerPlugin
6+
*/
7+
public function afterGetList(CustomerRepositoryInterface $subject, SearchResults $searchResults): SearchResults
8+
{
9+
+ $customerEmails = [];
10+
+
11+
+ foreach ($searchResults->getItems() as $customer) {
12+
+ $customerEmails[] = $customer->getEmail();
13+
+ }
14+
+
15+
+ $collection = $this->collectionFactory->create();
16+
+ $collection->addFieldToFilter('subscriber_email', ['in' => $customerEmails]);
17+
+
18+
foreach ($searchResults->getItems() as $customer) {
19+
/** @var CustomerExtensionInterface $extensionAttributes */
20+
$extensionAttributes = $customer->getExtensionAttributes();
21+
-
22+
- $isSubscribed = (int) $extensionAttributes->getIsSubscribed() === Subscriber::STATUS_SUBSCRIBED ?: false;
23+
+ /** @var Subscriber $subscribe */
24+
+ $subscribe = $collection->getItemByColumnValue('subscriber_email', $customer->getEmail());
25+
+ $isSubscribed = $subscribe && (int) $subscribe->getStatus() === Subscriber::STATUS_SUBSCRIBED;
26+
$extensionAttributes->setIsSubscribed($isSubscribed);
27+
}
28+
29+
diff --git a/vendor/magento/module-newsletter/etc/extension_attributes.xml b/vendor/magento/module-newsletter/etc/extension_attributes.xml
30+
index 09925024e97..5c38c02c032 100644
31+
--- a/vendor/magento/module-newsletter/etc/extension_attributes.xml
32+
+++ b/vendor/magento/module-newsletter/etc/extension_attributes.xml
33+
@@ -8,10 +8,6 @@
34+
35+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
36+
<extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
37+
- <attribute code="is_subscribed" type="boolean" >
38+
- <join reference_table="newsletter_subscriber" reference_field="customer_id" join_on_field="entity_id">
39+
- <field>subscriber_status</field>
40+
- </join>
41+
- </attribute>
42+
+ <attribute code="is_subscribed" type="boolean"/>
43+
</extension_attributes>
44+
</config>
45+

‎patches/commerce/MDVA-40961_1.3.2.patch‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/vendor/magento/module-bundle-requisition-list/view/frontend/layout/requisition_list_item_configure_type_bundle.xml b/vendor/magento/module-bundle-requisition-list/view/frontend/layout/requisition_list_item_configure_type_bundle.xml
2+
index cf98eaf52fe7..f4e56332b325 100644
3+
--- a/vendor/magento/module-bundle-requisition-list/view/frontend/layout/requisition_list_item_configure_type_bundle.xml
4+
+++ b/vendor/magento/module-bundle-requisition-list/view/frontend/layout/requisition_list_item_configure_type_bundle.xml
5+
@@ -43,12 +43,14 @@
6+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select">
7+
<arguments>
8+
<argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
9+
+ <argument name="validateQuantityViewModel" xsi:type="object">Magento\Bundle\ViewModel\ValidateQuantity</argument>
10+
</arguments>
11+
</block>
12+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
13+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio">
14+
<arguments>
15+
<argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
16+
+ <argument name="validateQuantityViewModel" xsi:type="object">Magento\Bundle\ViewModel\ValidateQuantity</argument>
17+
</arguments>
18+
</block>
19+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox">
20+

‎patches/commerce/MDVA-43718_2.4.1.patch‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
diff --git a/vendor/magento/module-shared-catalog/etc/webapi.xml b/vendor/magento/module-shared-catalog/etc/webapi.xml
2+
index 5f06bc13cf..035874b695 100644
3+
--- a/vendor/magento/module-shared-catalog/etc/webapi.xml
4+
+++ b/vendor/magento/module-shared-catalog/etc/webapi.xml
5+
@@ -10,85 +10,85 @@
6+
<route url="/V1/sharedCatalog/:sharedCatalogId" method="GET">
7+
<service class="Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface" method="get"/>
8+
<resources>
9+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
10+
+ <resource ref="Magento_SharedCatalog::list"/>
11+
</resources>
12+
</route>
13+
<route url="/V1/sharedCatalog" method="POST">
14+
<service class="Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface" method="save"/>
15+
<resources>
16+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
17+
+ <resource ref="Magento_SharedCatalog::manage"/>
18+
</resources>
19+
</route>
20+
<route url="/V1/sharedCatalog/:id" method="PUT">
21+
<service class="Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface" method="save"/>
22+
<resources>
23+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
24+
+ <resource ref="Magento_SharedCatalog::manage"/>
25+
</resources>
26+
</route>
27+
<route url="/V1/sharedCatalog/:sharedCatalogId" method="DELETE">
28+
<service class="Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface" method="deleteById"/>
29+
<resources>
30+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
31+
+ <resource ref="Magento_SharedCatalog::manage"/>
32+
</resources>
33+
</route>
34+
<route url="/V1/sharedCatalog/" method="GET">
35+
<service class="Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface" method="getList"/>
36+
<resources>
37+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
38+
+ <resource ref="Magento_SharedCatalog::list"/>
39+
</resources>
40+
</route>
41+
<route url="/V1/sharedCatalog/:sharedCatalogId/companies" method="GET">
42+
<service class="Magento\SharedCatalog\Api\CompanyManagementInterface" method="getCompanies"/>
43+
<resources>
44+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
45+
+ <resource ref="Magento_SharedCatalog::list"/>
46+
</resources>
47+
</route>
48+
<route url="/V1/sharedCatalog/:sharedCatalogId/assignCompanies" method="POST">
49+
<service class="Magento\SharedCatalog\Api\CompanyManagementInterface" method="assignCompanies"/>
50+
<resources>
51+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
52+
+ <resource ref="Magento_SharedCatalog::manage"/>
53+
</resources>
54+
</route>
55+
<route url="/V1/sharedCatalog/:sharedCatalogId/unassignCompanies" method="POST">
56+
<service class="Magento\SharedCatalog\Api\CompanyManagementInterface" method="unassignCompanies"/>
57+
<resources>
58+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
59+
+ <resource ref="Magento_SharedCatalog::manage"/>
60+
</resources>
61+
</route>
62+
<route url="/V1/sharedCatalog/:id/products" method="GET">
63+
<service class="Magento\SharedCatalog\Api\ProductManagementInterface" method="getProducts"/>
64+
<resources>
65+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
66+
+ <resource ref="Magento_SharedCatalog::list"/>
67+
</resources>
68+
</route>
69+
<route url="/V1/sharedCatalog/:id/assignProducts" method="POST">
70+
<service class="Magento\SharedCatalog\Api\ProductManagementInterface" method="assignProducts"/>
71+
<resources>
72+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
73+
+ <resource ref="Magento_SharedCatalog::manage"/>
74+
</resources>
75+
</route>
76+
<route url="/V1/sharedCatalog/:id/unassignProducts" method="POST">
77+
<service class="Magento\SharedCatalog\Api\ProductManagementInterface" method="unassignProducts"/>
78+
<resources>
79+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
80+
+ <resource ref="Magento_SharedCatalog::manage"/>
81+
</resources>
82+
</route>
83+
<route url="/V1/sharedCatalog/:id/categories" method="GET">
84+
<service class="Magento\SharedCatalog\Api\CategoryManagementInterface" method="getCategories"/>
85+
<resources>
86+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
87+
+ <resource ref="Magento_SharedCatalog::list"/>
88+
</resources>
89+
</route>
90+
<route url="/V1/sharedCatalog/:id/assignCategories" method="POST">
91+
<service class="Magento\SharedCatalog\Api\CategoryManagementInterface" method="assignCategories"/>
92+
<resources>
93+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
94+
+ <resource ref="Magento_SharedCatalog::manage"/>
95+
</resources>
96+
</route>
97+
<route url="/V1/sharedCatalog/:id/unassignCategories" method="POST">
98+
<service class="Magento\SharedCatalog\Api\CategoryManagementInterface" method="unassignCategories"/>
99+
<resources>
100+
- <resource ref="Magento_SharedCatalog::sharedCatalog"/>
101+
+ <resource ref="Magento_SharedCatalog::manage"/>
102+
</resources>
103+
</route>
104+
</routes>

‎patches/os/MDVA-38559_2.4.1-p1.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
diff --git a/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php b/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
2+
index 6bdaa40019f..d3f8bcb8765 100644
3+
--- a/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
4+
+++ b/vendor/magento/module-newsletter/Model/Plugin/CustomerPlugin.php
5+
@@ -244,11 +244,21 @@ class CustomerPlugin
6+
*/
7+
public function afterGetList(CustomerRepositoryInterface $subject, SearchResults $searchResults): SearchResults
8+
{
9+
+ $customerEmails = [];
10+
+
11+
+ foreach ($searchResults->getItems() as $customer) {
12+
+ $customerEmails[] = $customer->getEmail();
13+
+ }
14+
+
15+
+ $collection = $this->collectionFactory->create();
16+
+ $collection->addFieldToFilter('subscriber_email', ['in' => $customerEmails]);
17+
+
18+
foreach ($searchResults->getItems() as $customer) {
19+
/** @var CustomerExtensionInterface $extensionAttributes */
20+
$extensionAttributes = $customer->getExtensionAttributes();
21+
-
22+
- $isSubscribed = (int) $extensionAttributes->getIsSubscribed() === Subscriber::STATUS_SUBSCRIBED ?: false;
23+
+ /** @var Subscriber $subscribe */
24+
+ $subscribe = $collection->getItemByColumnValue('subscriber_email', $customer->getEmail());
25+
+ $isSubscribed = $subscribe && (int) $subscribe->getStatus() === Subscriber::STATUS_SUBSCRIBED;
26+
$extensionAttributes->setIsSubscribed($isSubscribed);
27+
}
28+
29+
diff --git a/vendor/magento/module-newsletter/etc/extension_attributes.xml b/vendor/magento/module-newsletter/etc/extension_attributes.xml
30+
index 09925024e97..5c38c02c032 100644
31+
--- a/vendor/magento/module-newsletter/etc/extension_attributes.xml
32+
+++ b/vendor/magento/module-newsletter/etc/extension_attributes.xml
33+
@@ -8,10 +8,6 @@
34+
35+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
36+
<extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
37+
- <attribute code="is_subscribed" type="boolean" >
38+
- <join reference_table="newsletter_subscriber" reference_field="customer_id" join_on_field="entity_id">
39+
- <field>subscriber_status</field>
40+
- </join>
41+
- </attribute>
42+
+ <attribute code="is_subscribed" type="boolean"/>
43+
</extension_attributes>
44+
</config>

‎patches/os/MDVA-40896_2.4.3.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/vendor/magento/module-re-captcha-webapi-rest/Plugin/RestValidationPlugin.php b/vendor/magento/module-re-captcha-webapi-rest/Plugin/RestValidationPlugin.php
2+
index fe434c8..3e85ef0 100644
3+
--- a/vendor/magento/module-re-captcha-webapi-rest/Plugin/RestValidationPlugin.php
4+
+++ b/vendor/magento/module-re-captcha-webapi-rest/Plugin/RestValidationPlugin.php
5+
@@ -71,15 +71,17 @@ class RestValidationPlugin
6+
* Validate ReCaptcha if needed.
7+
*
8+
* @param RequestValidator $subject
9+
+ * @param callable $proceed
10+
* @throws WebapiException
11+
* @return void
12+
*
13+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
14+
*/
15+
- public function afterValidate(RequestValidator $subject): void
16+
+ public function aroundValidate(RequestValidator $subject, callable $proceed): void
17+
{
18+
- $route = $this->restRouter->match($this->request);
19+
- /** @var Endpoint $endpoint */
20+
+ $request = clone $this->request;
21+
+ $proceed();
22+
+ $route = $this->restRouter->match($request);
23+
$endpoint = $this->endpointFactory->create([
24+
'class' => $route->getServiceClass(),
25+
'method' => $route->getServiceMethod(),
26+

0 commit comments

Comments
 (0)