Skip to content

Commit 83f626c

Browse files
agorbivskyiagorbivskyi
authored
1.1.72 Release (#213)
* 1.1.72 Release - updated constraints for ACSD-68118 - removed ACSD-67594 - updated test template for 2.4.8 - Adjust QPT for 2.4.8-p3, 2.4.7-p8, 2.4.6-p13, 2.4.5-p15, 2.4.4-p16 -- Updated constraints for ACSD-67659, ACSD-62965, ACSD-49737 -- Updated constraints for ACSD-53750, ACSD-66139 -- Updated constraints for ACSD-65127 -- Updated constraints for ACSD-65127 -- Updated constraints for ACSD-66301, ACSD-63325
1 parent 4da2e69 commit 83f626c

33 files changed

+6408
-48
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 AdobeCommerce & Magento OpenSource",
44
"type": "magento2-component",
5-
"version": "1.1.71",
5+
"version": "1.1.72",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎magento_releases.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
{
2+
"2.4.8-p3": {
3+
"magento/magento2-base": "2.4.8-p3",
4+
"magento/magento2-ee-base": "2.4.8-p3",
5+
"magento/magento2-b2b-base": "1.5.2-p3",
6+
"magento/inventory-metapackage": "1.2.8-p3",
7+
"magento/module-page-builder": "2.2.6-p3",
8+
"magento/page-builder-commerce": "1.7.5-p3",
9+
"magento/security-package": "1.1.7-p3",
10+
"magento/security-package-ee": "1.0.3-p3",
11+
"magento/security-package-b2b": "1.0.6",
12+
"paypal/module-braintree-core": "4.7.0"
13+
},
214
"2.4.8-p2": {
315
"magento/magento2-base": "2.4.8-p2",
416
"magento/magento2-ee-base": "2.4.8-p2",
@@ -35,6 +47,18 @@
3547
"magento/security-package-b2b": "1.0.6",
3648
"paypal/module-braintree-core": "4.7.0"
3749
},
50+
"2.4.7-p8": {
51+
"magento/magento2-base": "2.4.7-p8",
52+
"magento/magento2-ee-base": "2.4.7-p8",
53+
"magento/magento2-b2b-base": "1.5.2-p3",
54+
"magento/inventory-metapackage": "1.2.7-p8",
55+
"magento/module-page-builder": "2.2.5-p8",
56+
"magento/page-builder-commerce": "1.7.4-p8",
57+
"magento/security-package": "1.1.6-p8",
58+
"magento/security-package-ee": "1.0.2-p8",
59+
"magento/security-package-b2b": "1.0.6",
60+
"paypal/module-braintree-core": "4.6.1-p5"
61+
},
3862
"2.4.7-p7": {
3963
"magento/magento2-base": "2.4.7-p7",
4064
"magento/magento2-ee-base": "2.4.7-p7",
@@ -131,6 +155,18 @@
131155
"magento/security-package-b2b": "1.0.4",
132156
"paypal/module-braintree-core": "4.6.1"
133157
},
158+
"2.4.6-p13": {
159+
"magento/magento2-base": "2.4.6-p13",
160+
"magento/magento2-ee-base": "2.4.6-p13",
161+
"magento/magento2-b2b-base": "1.5.2-p3",
162+
"magento/inventory-metapackage": "1.2.6-p13",
163+
"magento/module-page-builder": "2.2.4-p13",
164+
"magento/page-builder-commerce": "1.7.3-p13",
165+
"magento/security-package": "1.1.5-p13",
166+
"magento/security-package-ee": "1.0.1-p13",
167+
"magento/security-package-b2b": "1.0.6",
168+
"paypal/module-braintree-core": "4.5.0-p10"
169+
},
134170
"2.4.6-p12": {
135171
"magento/magento2-base": "2.4.6-p12",
136172
"magento/magento2-ee-base": "2.4.6-p12",
@@ -287,6 +323,18 @@
287323
"magento/security-package-b2b": "1.0.3",
288324
"paypal/module-braintree-core": "4.5.0"
289325
},
326+
"2.4.5-p15": {
327+
"magento/magento2-base": "2.4.5-p15",
328+
"magento/magento2-ee-base": "2.4.5-p15",
329+
"magento/magento2-b2b-base": "1.3.4-p15",
330+
"magento/inventory-metapackage": "1.2.5-p15",
331+
"magento/module-page-builder": "2.2.3-p15",
332+
"magento/page-builder-commerce": "1.7.2-p15",
333+
"magento/security-package": "1.1.4-p15",
334+
"magento/security-package-ee": "1.0.0-p15",
335+
"magento/security-package-b2b": "1.0.2-p15",
336+
"paypal/module-braintree-core": "4.4.0-p12"
337+
},
290338
"2.4.5-p14": {
291339
"magento/magento2-base": "2.4.5-p14",
292340
"magento/magento2-ee-base": "2.4.5-p14",
@@ -467,6 +515,17 @@
467515
"magento/security-package-b2b": "1.0.2",
468516
"paypal/module-braintree-core": "4.4.0"
469517
},
518+
"2.4.4-p16": {
519+
"magento/magento2-base": "2.4.4-p16",
520+
"magento/magento2-ee-base": "2.4.4-p16",
521+
"magento/magento2-b2b-base": "1.3.3-p16",
522+
"magento/inventory-metapackage": "1.2.4-p16",
523+
"magento/module-page-builder": "2.2.2-p16",
524+
"magento/page-builder-commerce": "1.7.1-p16",
525+
"magento/security-package": "1.1.3-p16",
526+
"magento/security-package-b2b": "1.0.1-p16",
527+
"paypal/module-braintree-core": "4.3.0-p13"
528+
},
470529
"2.4.4-p15": {
471530
"magento/magento2-base": "2.4.4-p15",
472531
"magento/magento2-ee-base": "2.4.4-p15",

‎patches-info.json‎

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

‎patches/commerce/ACSD-67187_1.5.2.patch‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
diff --git a/vendor/magento/module-shared-catalog/Plugin/Company/Controller/Adminhtml/Index/IndexPlugin.php b/vendor/magento/module-shared-catalog/Plugin/Company/Controller/Adminhtml/Index/IndexPlugin.php
2+
deleted file mode 100644
3+
index 58d9b07836ad..000000000000
4+
--- a/vendor/magento/module-shared-catalog/Plugin/Company/Controller/Adminhtml/Index/IndexPlugin.php
5+
+++ /dev/null
6+
@@ -1,61 +0,0 @@
7+
-<?php
8+
-/**
9+
- * Copyright © Magento, Inc. All rights reserved.
10+
- * See COPYING.txt for license details.
11+
- */
12+
-namespace Magento\SharedCatalog\Plugin\Company\Controller\Adminhtml\Index;
13+
-
14+
-/**
15+
- * Class IndexPlugin
16+
- */
17+
-class IndexPlugin
18+
-{
19+
- /**
20+
- * @var \Magento\Framework\Message\ManagerInterface
21+
- */
22+
- protected $messageManager;
23+
-
24+
- /**
25+
- * @var \Magento\Framework\UrlInterface
26+
- */
27+
- protected $urlBuilder;
28+
-
29+
- /**
30+
- * @var \Magento\SharedCatalog\Api\SharedCatalogManagementInterface
31+
- */
32+
- protected $sharedCatalogManagement;
33+
-
34+
- /**
35+
- * @param \Magento\Framework\Message\ManagerInterface $messageManager
36+
- * @param \Magento\Framework\UrlInterface $urlBuilder
37+
- * @param \Magento\SharedCatalog\Api\SharedCatalogManagementInterface $sharedCatalogManagement
38+
- */
39+
- public function __construct(
40+
- \Magento\Framework\Message\ManagerInterface $messageManager,
41+
- \Magento\Framework\UrlInterface $urlBuilder,
42+
- \Magento\SharedCatalog\Api\SharedCatalogManagementInterface $sharedCatalogManagement
43+
- ) {
44+
- $this->messageManager = $messageManager;
45+
- $this->urlBuilder = $urlBuilder;
46+
- $this->sharedCatalogManagement = $sharedCatalogManagement;
47+
- }
48+
-
49+
- /**
50+
- * Before index controller execute
51+
- *
52+
- * @param \Magento\Company\Controller\Adminhtml\Index\Index $subject
53+
- * @return void
54+
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
55+
- */
56+
- public function beforeExecute(\Magento\Company\Controller\Adminhtml\Index\Index $subject)
57+
- {
58+
- if (!$this->sharedCatalogManagement->isPublicCatalogExist()) {
59+
- $this->messageManager->addError(
60+
- __(
61+
- 'Please <a href="%1">create</a> at least a public shared catalog to proceed.',
62+
- $this->urlBuilder->getUrl('shared_catalog/sharedCatalog/create')
63+
- )
64+
- );
65+
- }
66+
- }
67+
-}
68+
diff --git a/vendor/magento/module-shared-catalog/Plugin/SharedCatalog/CollectionFilter.php b/vendor/magento/module-shared-catalog/Plugin/SharedCatalog/CollectionFilter.php
69+
index e427a40c44ad..d66d4d0861c1 100644
70+
--- a/vendor/magento/module-shared-catalog/Plugin/SharedCatalog/CollectionFilter.php
71+
+++ b/vendor/magento/module-shared-catalog/Plugin/SharedCatalog/CollectionFilter.php
72+
@@ -161,13 +161,17 @@ private function filterSharedCatalogsByAllowedStoreGroupIdsAndAdminUser(Collecti
73+
$adminUserId = $this->getAdminId();
74+
//filter by allowed store group ids when store_id is assigned to shared catalog,
75+
//or by created_by for shared catalog without assigned store group
76+
- $collection->getSelect()
77+
- ->where('main_table.store_id IN (?)', $allowedStoreGroupIds, \Zend_Db::INT_TYPE)
78+
- ->orWhere(
79+
- '(main_table.store_id IS NULL AND main_table.created_by = ?)',
80+
- $adminUserId,
81+
- \Zend_Db::INT_TYPE
82+
- );
83+
+ $collection->addFieldToFilter(
84+
+ [
85+
+ 'main_table.store_id',
86+
+ 'main_table.created_by'
87+
+ ],
88+
+ [
89+
+ ['in' => array_map(fn($value) => (int)$value, $allowedStoreGroupIds)],
90+
+ // OR
91+
+ ['eq' => (int)$adminUserId]
92+
+ ]
93+
+ );
94+
}
95+
}
96+
97+
diff --git a/vendor/magento/module-shared-catalog/etc/di.xml b/vendor/magento/module-shared-catalog/etc/di.xml
98+
index 98293d0c8635..77ae7eef6b3b 100644
99+
--- a/vendor/magento/module-shared-catalog/etc/di.xml
100+
+++ b/vendor/magento/module-shared-catalog/etc/di.xml
101+
@@ -92,10 +92,6 @@
102+
<argument name="sharedCatalogRepository" xsi:type="object" shared="false">\Magento\SharedCatalog\Api\SharedCatalogRepositoryInterface\Proxy</argument>
103+
</arguments>
104+
</type>
105+
- <!-- Company list controller -->
106+
- <type name="Magento\Company\Controller\Adminhtml\Index\Index">
107+
- <plugin name="shared_catalog_validate" type="Magento\SharedCatalog\Plugin\Company\Controller\Adminhtml\Index\IndexPlugin"/>
108+
- </type>
109+
<type name="Magento\Framework\MessageQueue\MergerFactory">
110+
<arguments>
111+
<argument name="mergers" xsi:type="array">
112+
diff --git a/vendor/magento/module-shared-catalog/view/adminhtml/ui_component/company_listing.xml b/vendor/magento/module-shared-catalog/view/adminhtml/ui_component/company_listing.xml
113+
index e88c7b835f22..3850419c7483 100644
114+
--- a/vendor/magento/module-shared-catalog/view/adminhtml/ui_component/company_listing.xml
115+
+++ b/vendor/magento/module-shared-catalog/view/adminhtml/ui_component/company_listing.xml
116+
@@ -6,13 +6,6 @@
117+
*/
118+
-->
119+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
120+
- <settings>
121+
- <buttons>
122+
- <button name="add">
123+
- <param name="class_name" xsi:type="string">Magento\SharedCatalog\Ui\Component\Control\Button\Company\Add</param>
124+
- </button>
125+
- </buttons>
126+
- </settings>
127+
<columns name="company_columns">
128+
<column name="customer_group_id" class="Magento\SharedCatalog\Ui\Component\Company\Listing\Columns\CustomerGroupId">
129+
<settings>

‎patches/commerce/ACSD-67424_1.5.1.patch‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
diff --git a/vendor/magento/module-negotiable-quote/Model/Plugin/Quote/UpdateNegotiableQuotePlugin.php b/vendor/magento/module-negotiable-quote/Model/Plugin/Quote/UpdateNegotiableQuotePlugin.php
2+
new file mode 100644
3+
index 000000000000..5d733bcc0fd2
4+
--- /dev/null
5+
+++ b/vendor/magento/module-negotiable-quote/Model/Plugin/Quote/UpdateNegotiableQuotePlugin.php
6+
@@ -0,0 +1,97 @@
7+
+<?php
8+
+/**
9+
+ * ADOBE CONFIDENTIAL
10+
+ *
11+
+ * Copyright 2025 Adobe
12+
+ * All Rights Reserved.
13+
+ *
14+
+ * NOTICE: All information contained herein is, and remains
15+
+ * the property of Adobe and its suppliers, if any. The intellectual
16+
+ * and technical concepts contained herein are proprietary to Adobe
17+
+ * and its suppliers and are protected by all applicable intellectual
18+
+ * property laws, including trade secret and copyright laws.
19+
+ * Dissemination of this information or reproduction of this material
20+
+ * is strictly forbidden unless prior written permission is obtained
21+
+ * from Adobe.
22+
+ */
23+
+declare(strict_types=1);
24+
+
25+
+namespace Magento\NegotiableQuote\Model\Plugin\Quote;
26+
+
27+
+use Magento\Framework\Exception\CouldNotSaveException;
28+
+use Magento\Framework\Exception\InputException;
29+
+use Magento\Quote\Model\QuoteRepository\SaveHandler;
30+
+use Magento\Quote\Api\Data\CartInterface;
31+
+use Magento\NegotiableQuote\Model\NegotiableQuoteRepository;
32+
+use Magento\NegotiableQuote\Api\Data\NegotiableQuoteInterface;
33+
+
34+
+class UpdateNegotiableQuotePlugin
35+
+{
36+
+ /**
37+
+ * @param NegotiableQuoteRepository $negotiableQuoteRepository
38+
+ */
39+
+ public function __construct(
40+
+ private readonly NegotiableQuoteRepository $negotiableQuoteRepository
41+
+ ) {
42+
+ }
43+
+
44+
+ /**
45+
+ * Update negotiable quote items on quote save.
46+
+ *
47+
+ * @param SaveHandler $subject
48+
+ * @param CartInterface $quoteResult
49+
+ * @param CartInterface $quote
50+
+ * @throws CouldNotSaveException
51+
+ * @throws InputException
52+
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
53+
+ */
54+
+ public function afterSave(SaveHandler $subject, CartInterface $quoteResult, CartInterface $quote)
55+
+ {
56+
+ if ($quote->getIsActive()) {
57+
+ return $quoteResult;
58+
+ }
59+
+
60+
+ $negotiableQuoteToUpdate = $this->getNegotiableQuoteToBeUpdated($quote);
61+
+ if (empty($quote->getUpdatedAt()) || !$negotiableQuoteToUpdate) {
62+
+ return $quoteResult;
63+
+ }
64+
+
65+
+ if (!method_exists($negotiableQuoteToUpdate, 'getSnapshot') ||
66+
+ empty($negotiableQuoteToUpdate->getSnapshot())
67+
+ ) {
68+
+ return $quoteResult;
69+
+ }
70+
+
71+
+ $snapshot = json_decode($negotiableQuoteToUpdate->getSnapshot(), true);
72+
+ if (empty($snapshot)) {
73+
+ return $quoteResult;
74+
+ }
75+
+
76+
+ $snapshot['quote']['updated_at'] = $quote->getUpdatedAt();
77+
+ $negotiableQuoteToUpdate->setSnapshot(json_encode($snapshot));
78+
+ $this->negotiableQuoteRepository->save($negotiableQuoteToUpdate);
79+
+
80+
+ return $quoteResult;
81+
+ }
82+
+
83+
+ /**
84+
+ * Return negotiable quotes that needs to be updated.
85+
+ *
86+
+ * @param CartInterface $quote
87+
+ *
88+
+ * @return NegotiableQuoteInterface|bool $negotiableQuoteToUpdate
89+
+ */
90+
+ private function getNegotiableQuoteToBeUpdated(CartInterface $quote)
91+
+ {
92+
+ $negotiableQuoteToUpdate = false;
93+
+ $extensionAttributes = $quote->getExtensionAttributes();
94+
+
95+
+ if ($extensionAttributes && $extensionAttributes->getNegotiableQuote()) {
96+
+ $negotiableQuoteToUpdate = $extensionAttributes->getNegotiableQuote();
97+
+ if (!$negotiableQuoteToUpdate->getQuoteId() && $negotiableQuoteToUpdate->getIsRegularQuote()) {
98+
+ $negotiableQuoteToUpdate->setQuoteId($quote->getId());
99+
+ }
100+
+ }
101+
+ return $negotiableQuoteToUpdate;
102+
+ }
103+
+}
104+
diff --git a/vendor/magento/module-negotiable-quote/etc/di.xml b/vendor/magento/module-negotiable-quote/etc/di.xml
105+
index 256ea510cd2b..51c0f122ab95 100644
106+
--- a/vendor/magento/module-negotiable-quote/etc/di.xml
107+
+++ b/vendor/magento/module-negotiable-quote/etc/di.xml
108+
@@ -515,4 +515,7 @@
109+
</argument>
110+
</arguments>
111+
</type>
112+
+ <type name="Magento\Quote\Model\QuoteRepository\SaveHandler">
113+
+ <plugin name="update-negotiable-quote" type="Magento\NegotiableQuote\Model\Plugin\Quote\UpdateNegotiableQuotePlugin"/>
114+
+ </type>
115+
</config>

0 commit comments

Comments
 (0)