Skip to content

Commit 4ca68a9

Browse files
agorbivskyiagorbivskyi
authored
1.1.34 Release (#137)
* 1.1.34 Release * 1.1.34 Release - Updated constraints for ACSD-50625 - Added patches descriptions * 1.1.34 Release - Updated ACSD-48448 patch * 1.1.34 Release - Updated ACSD-46988 patch - added requirements * 1.1.34 Release - Removed ACSD-50625 patch * 1.1.34 Release - Added metadata for ACSD-51636, ACSD-51739
1 parent f3ca91f commit 4ca68a9

18 files changed

+1022
-2
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.33",
5+
"version": "1.1.34",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches-info.json‎

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

‎patches/commerce/ACSD-50813_2.4.5-p1.patch‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/vendor/magento/module-advanced-checkout/Plugin/Escaper.php b/vendor/magento/module-advanced-checkout/Plugin/Escaper.php
2+
new file mode 100644
3+
index 000000000000..e69de29bb2d1
4+
diff --git a/vendor/magento/module-advanced-checkout/view/adminhtml/web/addbysku.js b/vendor/magento/module-advanced-checkout/view/adminhtml/web/addbysku.js
5+
index 3caf47812723..f3485cad2b10 100644
6+
--- a/vendor/magento/module-advanced-checkout/view/adminhtml/web/addbysku.js
7+
+++ b/vendor/magento/module-advanced-checkout/view/adminhtml/web/addbysku.js
8+
@@ -466,7 +466,7 @@ define([
9+
*/
10+
configure: function (id, sku) {
11+
// eslint-disable-next-line jquery-no-input-event-shorthand
12+
- var productRow = $('sku_errors_table').select('div[id=sku_' + sku + ']')[0],
13+
+ var productRow = $('sku_errors_table').select('div[id="sku_' + sku + '"]')[0],
14+
noticeElement = productRow.select('.message-notice'),
15+
productQtyElement = productRow.up('tr').select('input[name=qty]')[0],
16+
productPriceElement = productRow.up('tr').select('td.col-price')[0];

‎patches/commerce/ACSD-51636_2.4.5-p2.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/vendor/magento/module-login-as-customer-logging/Observer/LogSaveCustomerObserver.php b/vendor/magento/module-login-as-customer-logging/Observer/LogSaveCustomerObserver.php
2+
index beac2bf1813..e64d57304d7 100644
3+
--- a/vendor/magento/module-login-as-customer-logging/Observer/LogSaveCustomerObserver.php
4+
+++ b/vendor/magento/module-login-as-customer-logging/Observer/LogSaveCustomerObserver.php
5+
@@ -120,7 +120,8 @@ class LogSaveCustomerObserver implements ObserverInterface
6+
$this->eventResource->save($event);
7+
8+
$customerData = $this->getFilteredData($observer->getEvent()->getCustomerDataObject()->__toArray());
9+
- $customerOrigData = $this->getFilteredData($observer->getEvent()->getOrigCustomerDataObject()->__toArray());
10+
+ $customerOrigData = $observer->getEvent()->getOrigCustomerDataObject() ?
11+
+ $this->getFilteredData($observer->getEvent()->getOrigCustomerDataObject()->__toArray()) : [];
12+
13+
$this->processChanges($customerData, $customerOrigData, (int)$event->getId());
14+
}

‎patches/commerce/ACSD-51739_1.3.5.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/vendor/magento/module-company-graph-ql/Model/Company/Structure.php b/vendor/magento/module-company-graph-ql/Model/Company/Structure.php
2+
index 6f9cbc215c..d72fc49fa8 100644
3+
--- a/vendor/magento/module-company-graph-ql/Model/Company/Structure.php
4+
+++ b/vendor/magento/module-company-graph-ql/Model/Company/Structure.php
5+
@@ -163,6 +163,7 @@ class Structure
6+
'type' => HierarchyInterface::TYPE_TEAM,
7+
'id' => $this->idEncoder->encode($tree->getData(TeamInterface::TEAM_ID)),
8+
'name' => $tree->getData(TeamInterface::NAME),
9+
+ 'structure_id' => $this->idEncoder->encode($tree->getData(StructureInterface::STRUCTURE_ID)),
10+
'description' => $tree->getData(TeamInterface::DESCRIPTION)
11+
];
12+
}

‎patches/os/ACSD-48448_2.4.2-p2.patch‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
diff --git a/vendor/magento/module-sales/Model/Service/OrderService.php b/vendor/magento/module-sales/Model/Service/OrderService.php
2+
index 2e062caca9a2..a73716f096e6 100644
3+
--- a/vendor/magento/module-sales/Model/Service/OrderService.php
4+
+++ b/vendor/magento/module-sales/Model/Service/OrderService.php
5+
@@ -5,8 +5,10 @@
6+
*/
7+
namespace Magento\Sales\Model\Service;
8+
9+
-use Magento\Sales\Api\OrderManagementInterface;
10+
+use Magento\Framework\App\ObjectManager;
11+
use Magento\Payment\Gateway\Command\CommandException;
12+
+use Magento\Sales\Api\OrderManagementInterface;
13+
+use Magento\Sales\Model\OrderMutexInterface;
14+
use Psr\Log\LoggerInterface;
15+
16+
/**
17+
@@ -61,6 +63,11 @@ class OrderService implements OrderManagementInterface
18+
*/
19+
private $logger;
20+
21+
+ /**
22+
+ * @var OrderMutexInterface
23+
+ */
24+
+ private $orderMutex;
25+
+
26+
/**
27+
* Constructor
28+
*
29+
@@ -73,6 +80,8 @@ class OrderService implements OrderManagementInterface
30+
* @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
31+
* @param \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures
32+
* @param LoggerInterface $logger
33+
+ * @param OrderMutexInterface|null $orderMutex
34+
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
35+
*/
36+
public function __construct(
37+
\Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
38+
@@ -83,7 +92,8 @@ public function __construct(
39+
\Magento\Framework\Event\ManagerInterface $eventManager,
40+
\Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender,
41+
\Magento\Sales\Api\PaymentFailuresInterface $paymentFailures,
42+
- LoggerInterface $logger
43+
+ LoggerInterface $logger,
44+
+ ?OrderMutexInterface $orderMutex = null
45+
) {
46+
$this->orderRepository = $orderRepository;
47+
$this->historyRepository = $historyRepository;
48+
@@ -94,6 +104,7 @@ public function __construct(
49+
$this->orderCommentSender = $orderCommentSender;
50+
$this->paymentFailures = $paymentFailures;
51+
$this->logger = $logger;
52+
+ $this->orderMutex = $orderMutex ?: ObjectManager::getInstance()->get(OrderMutexInterface::class);
53+
}
54+
55+
/**
56+
@@ -103,6 +114,22 @@ public function __construct(
57+
* @return bool
58+
*/
59+
public function cancel($id)
60+
+ {
61+
+ return $this->orderMutex->execute(
62+
+ (int) $id,
63+
+ \Closure::fromCallable([$this, 'cancelOrder']),
64+
+ [$id]
65+
+ );
66+
+ }
67+
+
68+
+ /**
69+
+ * Order cancel
70+
+ *
71+
+ * @param int $id
72+
+ * @return bool
73+
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
74+
+ */
75+
+ private function cancelOrder($id): bool
76+
{
77+
$order = $this->orderRepository->get($id);
78+
if ($order->canCancel()) {
79+

‎patches/os/ACSD-51630_2.4.5-p2.patch‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
diff --git a/vendor/magento/module-asynchronous-operations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php b/vendor/magento/module-asynchronous-operations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
2+
index bd357e10132..de66d1df2d1 100644
3+
--- a/vendor/magento/module-asynchronous-operations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
4+
+++ b/vendor/magento/module-asynchronous-operations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
5+
@@ -10,6 +10,7 @@ namespace Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Coll
6+
*/
7+
class Plugin
8+
{
9+
+ public const MESSAGES_LIMIT = 5;
10+
/**
11+
* @var \Magento\AdminNotification\Model\System\MessageFactory
12+
*/
13+
@@ -95,27 +96,32 @@ class Plugin
14+
$this->bulkNotificationManagement->getAcknowledgedBulksByUser($userId)
15+
);
16+
$bulkMessages = [];
17+
+ $messagesCount = 0;
18+
+ $data = [];
19+
foreach ($userBulks as $bulk) {
20+
$bulkUuid = $bulk->getBulkId();
21+
if (!in_array($bulkUuid, $acknowledgedBulks)) {
22+
- $details = $this->operationDetails->getDetails($bulkUuid);
23+
- $text = $this->getText($details);
24+
- $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
25+
- if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
26+
- $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
27+
+ if ($messagesCount < self::MESSAGES_LIMIT) {
28+
+ $details = $this->operationDetails->getDetails($bulkUuid);
29+
+ $text = $this->getText($details);
30+
+ $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
31+
+ if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
32+
+ $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
33+
+ }
34+
+ $data = [
35+
+ 'data' => [
36+
+ 'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
37+
+ 'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
38+
+ // md5() here is not for cryptographic use.
39+
+ // phpcs:ignore Magento2.Security.InsecureFunction
40+
+ 'identity' => md5('bulk' . $bulkUuid),
41+
+ 'uuid' => $bulkUuid,
42+
+ 'status' => $bulkStatus,
43+
+ 'created_at' => $bulk->getStartTime()
44+
+ ]
45+
+ ];
46+
+ $messagesCount++;
47+
}
48+
- $data = [
49+
- 'data' => [
50+
- 'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
51+
- 'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
52+
- // md5() here is not for cryptographic use.
53+
- // phpcs:ignore Magento2.Security.InsecureFunction
54+
- 'identity' => md5('bulk' . $bulkUuid),
55+
- 'uuid' => $bulkUuid,
56+
- 'status' => $bulkStatus,
57+
- 'created_at' => $bulk->getStartTime()
58+
- ]
59+
- ];
60+
$bulkMessages[] = $this->messageFactory->create($data)->toArray();
61+
}
62+
}

‎patches/os/ACSD-51853_2.2.3-p1.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/text/preview.js b/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/text/preview.js
2+
index 298b689548..aafdb29431 100644
3+
--- a/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/text/preview.js
4+
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/text/preview.js
5+
@@ -135,7 +135,6 @@ define(["jquery", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBu
6+
}
7+
8+
var wysiwygConfig = this.config.additional_data.wysiwygConfig.wysiwygConfigData;
9+
- wysiwygConfig.adapter.settings.paste_as_text = true;
10+
11+
if (focus) {
12+
wysiwygConfig.adapter.settings.auto_focus = this.element.id;
13+
diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/text/preview.ts b/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/text/preview.ts
14+
index bff3546342..ec30828221 100644
15+
--- a/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/text/preview.ts
16+
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/text/preview.ts
17+
@@ -155,8 +155,6 @@ export default class Preview extends BasePreview {
18+
19+
const wysiwygConfig = this.config.additional_data.wysiwygConfig.wysiwygConfigData;
20+
21+
- wysiwygConfig.adapter.settings.paste_as_text = true;
22+
-
23+
if (focus) {
24+
wysiwygConfig.adapter.settings.auto_focus = this.element.id;
25+
wysiwygConfig.adapter.settings.init_instance_callback = () => {

0 commit comments

Comments
 (0)