[Backport] Issue in adding the wishlist of "zero price" product

app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html

@@ -45,7 +45,7 @@
                 </span>
                 <div class="field-tooltip-content"
                      data-target="dropdown"
-                     translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
+                     translate="'We store your payment information securely on Braintree servers via SSL.'"></div>
             </div>
         </div>
         <!-- /ko -->

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

@@ -22,14 +22,14 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
     /**
      * Get price value
      *
-     * @return float|bool
+     * @return float
      */
     public function getValue()
     {
         if ($this->value === null) {
             $price = $this->product->getPrice();
             $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
-            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
+            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : 0;
         }
         return $this->value;
     }

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

@@ -164,20 +164,19 @@ protected function getFieldConfig(
 
         $element = [
             'component' => isset($additionalConfig['component']) ? $additionalConfig['component'] : $uiComponent,
-            'config' => [
-                // customScope is used to group elements within a single form (e.g. they can be validated separately)
-                'customScope' => $dataScopePrefix,
-                'customEntry' => isset($additionalConfig['config']['customEntry'])
-                    ? $additionalConfig['config']['customEntry']
-                    : null,
-                'template' => 'ui/form/field',
-                'elementTmpl' => isset($additionalConfig['config']['elementTmpl'])
-                    ? $additionalConfig['config']['elementTmpl']
-                    : $elementTemplate,
-                'tooltip' => isset($additionalConfig['config']['tooltip'])
-                    ? $additionalConfig['config']['tooltip']
-                    : null
-            ],
+            'config' => $this->mergeConfigurationNode(
+                'config',
+                $additionalConfig,
+                [
+                    'config' => [
+                        // customScope is used to group elements within a single
+                        // form (e.g. they can be validated separately)
+                        'customScope' => $dataScopePrefix,
+                        'template' => 'ui/form/field',
+                        'elementTmpl' => $elementTemplate,
+                    ],
+                ]
+            ),
             'dataScope' => $dataScopePrefix . '.' . $attributeCode,
             'label' => $attributeConfig['label'],
             'provider' => $providerName,

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -77,8 +77,10 @@ define([
                         confirm: function () {
                             self._removeItem($(event.currentTarget));
                         },
-                        always: function (event) {
-                            event.stopImmediatePropagation();
+
+                        /** @inheritdoc */
+                        always: function (e) {
+                            e.stopImmediatePropagation();
                         }
                     }
                 });

app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

@@ -9,7 +9,7 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-hasrequired="* Required Fields">
-        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}" class="fieldset address">
+        <fieldset class="fieldset address" data-form="billing-new-address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->

app/code/Magento/Cookie/view/frontend/web/js/notices.js

@@ -25,7 +25,7 @@ define([
                 });
 
                 if ($.mage.cookies.get(this.options.cookieName)) {
-                    window.location.reload();
+                    this.element.hide();
                 } else {
                     window.location.href = this.options.noCookiesUrl;
                 }

app/code/Magento/Customer/Block/Widget/Dob.php

@@ -127,7 +127,8 @@ protected function getFormFilter()
     protected function applyOutputFilter($value)
     {
         $filter = $this->getFormFilter();
-        if ($filter) {
+        if ($filter && $value) {
+            $value = date('Y-m-d', $this->getTime());
             $value = $filter->outputFilter($value);
         }
         return $value;

app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php

@@ -47,7 +47,7 @@ public function aroundExecute(FlushFormKey $subject, callable $proceed, Observer
         $currentFormKey = $this->dataFormKey->getFormKey();
         $proceed($observer);
         $beforeParams = $this->session->getBeforeRequestParams();
-        if ($beforeParams['form_key'] == $currentFormKey) {
+        if (isset($beforeParams['form_key']) && $beforeParams['form_key'] === $currentFormKey) {
             $beforeParams['form_key'] = $this->dataFormKey->getFormKey();
             $this->session->setBeforeRequestParams($beforeParams);
         }

app/code/Magento/Customer/etc/frontend/page_types.xml

@@ -11,7 +11,7 @@
     <type id="customer_account_createpassword" label="Reset a Password"/>
     <type id="customer_account_edit" label="Customer Account Edit Form"/>
     <type id="customer_account_forgotpassword" label="Customer Forgot Password Form"/>
-    <type id="customer_account_index" label="Customer My Account Dashboard"/>
+    <type id="customer_account_index" label="Customer My Account"/>
     <type id="customer_account_login" label="Customer Account Login Form"/>
     <type id="customer_account_logoutsuccess" label="Customer Account Logout Success"/>
     <type id="customer_address_form" label="Customer My Account Address Edit Form"/>

app/code/Magento/Customer/i18n/en_US.csv

@@ -512,10 +512,8 @@ Type,Type
 "Send Welcome Email From","Send Welcome Email From"
 Addresses,Addresses
 "Are you sure you want to delete this item?","Are you sure you want to delete this item?"
-"Account Dashboard","Account Dashboard"
 "Edit Account Information","Edit Account Information"
 "Password forgotten","Password forgotten"
-"My Dashboard","My Dashboard"
 "You are signed out","You are signed out"
 "No Password","No Password"
 "Weak","Weak"

app/code/Magento/Customer/view/frontend/layout/customer_account.xml

@@ -15,7 +15,7 @@
             <block class="Magento\Framework\View\Element\Html\Links" name="customer_account_navigation" before="-" template="Magento_Customer::account/navigation.phtml">
                 <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-account-link">
                     <arguments>
-                        <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                        <argument name="label" xsi:type="string" translate="true">My Account</argument>
                         <argument name="path" xsi:type="string">customer/account</argument>
                     </arguments>
                 </block>

app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml

@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">My Dashboard</argument>
+                <argument translate="true" name="title" xsi:type="string">My Account</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">

app/code/Magento/Email/Model/Source/Variables.php

@@ -49,6 +49,7 @@ public function __construct()
             ['value' => 'general/store_information/city', 'label' => __('City')],
             ['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
             ['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+            ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
         ];
     }
 

app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php

@@ -53,6 +53,7 @@ protected function setup()
             ['value' => 'general/store_information/city', 'label' => __('City')],
             ['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
             ['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+            ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
         ];
     }
 

app/code/Magento/Email/i18n/en_US.csv

@@ -54,6 +54,7 @@ Region/State,Region/State
 City,City
 "Street Address 1","Street Address 1"
 "Street Address 2","Street Address 2"
+"VAT Number","VAT Number"
 "Store Contact Information","Store Contact Information"
 %1,%1
 "Template Variables","Template Variables"

app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php

@@ -206,7 +206,7 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
+     * Return template name for JS
      *
      * @return string
      */

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

@@ -417,7 +417,6 @@ public function subscribe($email)
             self::XML_PATH_CONFIRMATION_FLAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == 1 ? true : false;
-        $isOwnSubscribes = false;
 
         $isSubscribeOwnEmail = $this->_customerSession->isLoggedIn()
             && $this->_customerSession->getCustomerDataObject()->getEmail() == $email;
@@ -426,13 +425,7 @@ public function subscribe($email)
             || $this->getStatus() == self::STATUS_NOT_ACTIVE
         ) {
             if ($isConfirmNeed === true) {
-                // if user subscribes own login email - confirmation is not needed
-                $isOwnSubscribes = $isSubscribeOwnEmail;
-                if ($isOwnSubscribes == true) {
-                    $this->setStatus(self::STATUS_SUBSCRIBED);
-                } else {
-                    $this->setStatus(self::STATUS_NOT_ACTIVE);
-                }
+                $this->setStatus(self::STATUS_NOT_ACTIVE);
             } else {
                 $this->setStatus(self::STATUS_SUBSCRIBED);
             }
@@ -458,9 +451,7 @@ public function subscribe($email)
         try {
             /* Save model before sending out email */
             $this->save();
-            if ($isConfirmNeed === true
-                && $isOwnSubscribes === false
-            ) {
+            if ($isConfirmNeed === true) {
                 $this->sendConfirmationRequestEmail();
             } else {
                 $this->sendConfirmationSuccessEmail();

app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Newsletter\Test\Unit\Model;
 
+use Magento\Newsletter\Model\Subscriber;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -134,7 +136,7 @@ public function testSubscribe()
         $email = 'subscriber_email@magento.com';
         $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -151,15 +153,15 @@ public function testSubscribe()
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(1, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testSubscribeNotLoggedIn()
     {
         $email = 'subscriber_email@magento.com';
         $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -176,7 +178,7 @@ public function testSubscribeNotLoggedIn()
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(2, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testUpdateSubscription()
@@ -193,7 +195,7 @@ public function testUpdateSubscription()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -228,7 +230,7 @@ public function testUnsubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -254,7 +256,7 @@ public function testSubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -280,7 +282,7 @@ public function testSubscribeCustomerById1()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -294,7 +296,7 @@ public function testSubscribeCustomerById1()
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->subscribeCustomerById($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
     }
 
     public function testSubscribeCustomerByIdAfterConfirmation()
@@ -311,7 +313,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 4
+                    'subscriber_status' => Subscriber::STATUS_UNCONFIRMED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -323,7 +325,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->updateSubscription($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
     }
 
     public function testUnsubscribe()

app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php

@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
      *
      * @var string
      */
-    protected $_template = 'form/banktransfer.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
 }

app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php

@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
      *
      * @var string
      */
-    protected $_template = 'form/cashondelivery.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
 }

app/code/Magento/Payment/Block/Info/Instructions.php

@@ -20,7 +20,7 @@ class Instructions extends \Magento\Payment\Block\Info
     /**
      * @var string
      */
-    protected $_template = 'info/instructions.phtml';
+    protected $_template = 'Magento_Payment::info/instructions.phtml';
 
     /**
      * Get instructions text from order payment

app/code/Magento/ProductAlert/Block/Email/Price.php

@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/price.phtml';
+    protected $_template = 'Magento_ProductAlert::email/price.phtml';
 
     /**
      * Retrieve unsubscribe url for product

app/code/Magento/ProductAlert/Block/Email/Stock.php

@@ -16,7 +16,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/stock.phtml';
+    protected $_template = 'Magento_ProductAlert::email/stock.phtml';
 
     /**
      * Retrieve unsubscribe url for product

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -272,6 +272,10 @@ protected function _assignProducts()
      */
     private function removeItemsWithAbsentProducts()
     {
+        if (count($this->_productIds) === 0) {
+            return;
+        }
+
         $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
         $existingProductsIds = $productCollection->getAllIds();
         $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);

app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php

@@ -138,7 +138,6 @@ public function setStoreFilter($storeId)
                 'main_table.rating_id = store.rating_id',
                 []
             );
-            //        ->group('main_table.rating_id')
             $this->_isStoreJoined = true;
         }
         $inCondition = $connection->prepareSqlCondition('store.store_id', ['in' => $storeId]);

app/code/Magento/Rss/Block/Feeds.php

@@ -14,7 +14,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'feeds.phtml';
+    protected $_template = 'Magento_Rss::feeds.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\RssManagerInterface