Merge pull request #1384 from magento-engcom/develop-prs

Public Pull Requests

#10433
#10430
#10435

Author: Oleksii Korshenko

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -6,12 +6,35 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+use Magento\Backend\App\Action;
+use Magento\Framework\Controller\ResultFactory;
+
 class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+    /**
+     * @var \Magento\AdminNotification\Model\NotificationService
+     */
+    private $notificationService;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\AdminNotification\Model\NotificationService|null $notificationService
+     * @throws \RuntimeException
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\AdminNotification\Model\NotificationService $notificationService = null
+    ) {
+        parent::__construct($context);
+        $this->notificationService = $notificationService?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\AdminNotification\Model\NotificationService::class);
+    }
+
     /**
      * Mark notification as read (AJAX action)
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Json|void
+     * @throws \InvalidArgumentException
      */
     public function execute()
     {
@@ -21,17 +44,15 @@ public function execute()
         $notificationId = (int)$this->getRequest()->getPost('id');
         $responseData = [];
         try {
-            $this->_objectManager->create(
-                \Magento\AdminNotification\Model\NotificationService::class
-            )->markAsRead(
-                $notificationId
-            );
+            $this->notificationService->markAsRead($notificationId);
             $responseData['success'] = true;
         } catch (\Exception $e) {
             $responseData['success'] = false;
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
-        );
+
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($responseData);
+        return $resultJson;
     }
 }

app/code/Magento/Sales/etc/fieldset.xml

@@ -279,7 +279,7 @@
                 <aspect name="to_order" />
             </field>
             <field name="base_shipping_discount_tax_compensation_amount">
-                <aspect name="to_order" />
+                <aspect name="to_order" targetField="base_shipping_discount_tax_compensation_amnt" />
             </field>
             <field name="prefix">
                 <aspect name="to_order_address" />

lib/web/mage/menu.js

@@ -323,6 +323,7 @@ define([
 
             $(this.element).off('mouseenter mouseleave');
             this._on({
+
                 /**
                  * @param {jQuery.Event} event
                  */
@@ -372,7 +373,9 @@ define([
         _toggleDesktopMode: function () {
             var categoryParent, html;
 
+            $(this.element).off('click mousedown mouseenter mouseleave');
             this._on({
+
                 /**
                  * Prevent focus from sticking to links inside menu after clicking
                  * them (focus should always stay on UL during navigation).