1.1.56 Release (#176)

* 1.1.56 Release

Author: agorbivskyi

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/quality-patches",
     "description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
     "type": "magento2-component",
-    "version": "1.1.55",
+    "version": "1.1.56",
     "license": "proprietary",
     "repositories": {
         "repo": {

patches-info.json

@@ -0,0 +1,16 @@
+diff --git a/vendor/magento/module-negotiable-quote/Controller/Adminhtml/Quote/Update.php b/vendor/magento/module-negotiable-quote/Controller/Adminhtml/Quote/Update.php
+index 2f870f27b51a..780fd39edf76 100644
+--- a/vendor/magento/module-negotiable-quote/Controller/Adminhtml/Quote/Update.php
++++ b/vendor/magento/module-negotiable-quote/Controller/Adminhtml/Quote/Update.php
+@@ -94,9 +94,10 @@ public function execute()
+         }
+
+         $data = $this->getQuoteData();
++
+         /** @var \Magento\Framework\Controller\Result\Json $response */
+         $response = $this->getResultJson();
+-        $response->setJsonData(json_encode($data, JSON_NUMERIC_CHECK));
++        $response->setJsonData(json_encode($data));
+         return $response;
+     }
+

patches/commerce/ACSD-55339_1.3.4-p1.patch

@@ -0,0 +1,38 @@
+diff --git a/vendor/magento/module-gift-registry/Block/View.php b/vendor/magento/module-gift-registry/Block/View.php
+index 58e77dc21f0d..04159bc2a531 100644
+--- a/vendor/magento/module-gift-registry/Block/View.php
++++ b/vendor/magento/module-gift-registry/Block/View.php
+@@ -1,7 +1,21 @@
+ <?php
+-/**
+- * Copyright © Magento, Inc. All rights reserved.
+- * See COPYING.txt for license details.
++/************************************************************************
++ *
++ * ADOBE CONFIDENTIAL
++ * ___________________
++ *
++ * Copyright 2014 Adobe
++ * All Rights Reserved.
++ *
++ * NOTICE: All information contained herein is, and remains
++ * the property of Adobe and its suppliers, if any. The intellectual
++ * and technical concepts contained herein are proprietary to Adobe
++ * and its suppliers and are protected by all applicable intellectual
++ * property laws, including trade secret and copyright laws.
++ * Dissemination of this information or reproduction of this material
++ * is strictly forbidden unless prior written permission is obtained
++ * from Adobe.
++ * ************************************************************************
+  */
+ namespace Magento\GiftRegistry\Block;
+
+@@ -68,7 +82,7 @@ public function getEntity()
+     public function getFormattedDate($date)
+     {
+         if ($date) {
+-            return $this->formatDate($date, \IntlDateFormatter::MEDIUM);
++            return $this->formatDate($date, \IntlDateFormatter::MEDIUM, false, 'UTC');
+         }
+         return '';
+     }

patches/commerce/ACSD-62952_2.4.6-p3.patch

@@ -0,0 +1,48 @@
+diff --git a/vendor/magento/module-sales/Controller/Adminhtml/Order/AddComment.php b/vendor/magento/module-sales/Controller/Adminhtml/Order/AddComment.php
+index 4e47343c3d994..350a47b8facde 100644
+--- a/vendor/magento/module-sales/Controller/Adminhtml/Order/AddComment.php
++++ b/vendor/magento/module-sales/Controller/Adminhtml/Order/AddComment.php
+@@ -6,7 +6,7 @@
+ namespace Magento\Sales\Controller\Adminhtml\Order;
+
+ use Magento\Framework\App\Action\HttpPostActionInterface;
+-use Magento\Sales\Model\Order;
++use Magento\Sales\Api\Data\OrderInterface;
+ use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
+
+ /**
+@@ -45,7 +45,7 @@ public function execute()
+                     throw new \Magento\Framework\Exception\LocalizedException(__($error));
+                 }
+
+-                $orderStatus = $this->getOrderStatus($order->getDataByKey('status'), $data['status']);
++                $orderStatus = $this->getOrderStatus($order, $data['status']);
+                 $order->setStatus($orderStatus);
+                 $notify = $data['is_customer_notified'] ?? false;
+                 $visible = $data['is_visible_on_front'] ?? false;
+@@ -85,13 +85,21 @@ public function execute()
+     /**
+      * Get order status to set
+      *
+-     * @param string $orderStatus
++     * @param OrderInterface $order
+      * @param string $historyStatus
+      * @return string
+      */
+-    private function getOrderStatus(string $orderStatus, string $historyStatus): string
++    private function getOrderStatus(OrderInterface $order, string $historyStatus): string
+     {
+-        return ($orderStatus === Order::STATE_PROCESSING || $orderStatus === Order::STATUS_FRAUD) ? $historyStatus
+-            : $orderStatus;
++        $config = $order->getConfig();
++        if ($config === null) {
++            return $historyStatus;
++        }
++        $statuses = $config->getStateStatuses($order->getState());
++
++        if (!isset($statuses[$historyStatus])) {
++            return $order->getDataByKey('status');
++        }
++        return $historyStatus;
+     }
+ }