🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #18535: Fixed issues-18534: 2 wysiwyg on catalog category edit page (by @k1lAs)
 - #18643: Fix customer unsubscribed issue (by @janakbhimani)
 - #18597: [Backport] Fix empty cart button (by @luukschakenraad)
 - #18759: [Backport] Backend: add missing unit test for ModuleService class (by @dmytro-ch)
 - #18604: Fixed Issue: Special price of 0.0000 is not shown on frontend, but is calculated in cart (by @maheshWebkul721)


Fixed GitHub Issues:
 - #18534: Bug when 2 wysiwyg editors are on category edit page or product edit page (reported by @k1lAs) has been fixed in #18535 by @k1lAs in 2.2-develop branch
   Related commits:
     1. 07ee178
     2. b5e915f

 - #17954: Customer get unsubscribe to newsletter on password reset email request with Newsletter Need to Confirm Set to Yes on admin settings (reported by @matin73) has been fixed in #18643 by @janakbhimani in 2.2-develop branch
   Related commits:
     1. 332f88f
     2. 8c868c3
     3. 26e4dec

 - #18589: Empty cart button does not work (reported by @luukschakenraad) has been fixed in #18597 by @luukschakenraad in 2.2-develop branch
   Related commits:
     1. 7acc46a

 - #18268: M2.2.6 : Special price of 0.0000 is not shown on frontend, but is calculated in cart (reported by @kanduvisla) has been fixed in #18604 by @maheshWebkul721 in 2.2-develop branch
   Related commits:
     1. 8084aa9
     2. 8296637
     3. 4283936
     4. 899a8a3

Author: Stanislav Idolov

app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Service\V1;
+
+use Magento\Backend\Service\V1\ModuleService;
+use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Module List Service Test
+ *
+ * Covers \Magento\Sales\Model\ValidatorResultMerger
+ */
+class ModuleServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ModuleService
+     */
+    private $moduleService;
+
+    /**
+     * @var ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleListMock;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->moduleListMock = $this->createMock(ModuleListInterface::class);
+        $this->objectManager = new ObjectManager($this);
+        $this->moduleService = $this->objectManager->getObject(
+            ModuleService::class,
+            [
+                'moduleList' => $this->moduleListMock,
+            ]
+        );
+    }
+
+    /**
+     * Test getModules method
+     *
+     * @return void
+     */
+    public function testGetModules()
+    {
+        $moduleNames = ['Magento_Backend', 'Magento_Catalog', 'Magento_Customer'];
+        $this->moduleListMock->expects($this->once())->method('getNames')->willReturn($moduleNames);
+
+        $expected = $moduleNames;
+        $actual = $this->moduleService->getModules();
+        $this->assertEquals($expected, $actual);
+    }
+}

app/code/Magento/Catalog/Pricing/Price/BasePrice.php

@@ -30,7 +30,7 @@ public function getValue()
             $this->value = false;
             foreach ($this->priceInfo->getPrices() as $price) {
                 if ($price instanceof BasePriceProviderInterface && $price->getValue() !== false) {
-                    $this->value = min($price->getValue(), $this->value ?: $price->getValue());
+                    $this->value = min($price->getValue(), $this->value !== false ? $this->value: $price->getValue());
                 }
             }
         }

app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml

@@ -43,6 +43,7 @@ var catalogWysiwygEditor = {
 
         if (this.modal) {
             this.modal.html(jQuery(data).html());
+            this.modal.modal('option', 'firedElementId', elementId);
         } else {
             this.modal = jQuery(data).modal({
                 title: '<?= /* @escapeNotVerified */ __('WYSIWYG Editor') ?>',

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -24,7 +24,7 @@
         <?php endif ?>
         <table id="shopping-cart-table"
                class="cart items data table"
-               data-mage-init='{"shoppingCart":{"emptyCartButton": "action.clear",
+               data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
             <caption class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
             <thead>

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -594,6 +594,8 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
         } elseif (($this->getStatus() == self::STATUS_UNCONFIRMED) && ($customerData->getConfirmation() === null)) {
             $status = self::STATUS_SUBSCRIBED;
             $sendInformationEmail = true;
+        } elseif (($this->getStatus() == self::STATUS_NOT_ACTIVE) && ($customerData->getConfirmation() === null)) {
+            $status = self::STATUS_NOT_ACTIVE;
         } else {
             $status = self::STATUS_UNSUBSCRIBED;
         }