MAGETWO-90591: Add Selected Button shouldn't be enabled if there are no images available

- resolve merge conflict

Author: Joan He

app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php

@@ -17,8 +17,6 @@ class TransactionRefund extends AbstractTransaction
     protected function process(array $data)
     {
         $storeId = $data['store_id'] ?? null;
-        // sending store id and other additional keys are restricted by Braintree API
-        unset($data['store_id']);
 
         return $this->adapterFactory->create($storeId)
             ->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);

app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php

@@ -19,8 +19,6 @@ class TransactionSubmitForSettlement extends AbstractTransaction
     protected function process(array $data)
     {
         $storeId = $data['store_id'] ?? null;
-        // sending store id and other additional keys are restricted by Braintree API
-        unset($data['store_id']);
 
         return  $this->adapterFactory->create($storeId)
             ->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);

app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php

@@ -15,8 +15,6 @@ class TransactionVoid extends AbstractTransaction
     protected function process(array $data)
     {
         $storeId = $data['store_id'] ?? null;
-        // sending store id and other additional keys are restricted by Braintree API
-        unset($data['store_id']);
 
         return $this->adapterFactory->create($storeId)->void($data['transaction_id']);
     }

app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

@@ -29,6 +29,7 @@ $config = [
        class="action-braintree-paypal-logo" disabled>
         <img class="braintree-paypal-button-hidden"
              src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
-             alt="Pay with PayPal"/>
+             alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
+             title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
     </button>
 </div>

app/code/Magento/Catalog/Controller/Product/Compare/Add.php

@@ -36,7 +36,14 @@ public function execute()
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
                 )->escapeHtml($product->getName());
-                $this->messageManager->addSuccess(__('You added product %1 to the comparison list.', $productName));
+                $this->messageManager->addComplexSuccessMessage(
+                    'addCompareSuccessMessage',
+                    [
+                        'product_name' => $productName,
+                        'compare_list_url' => $this->_url->getUrl('catalog/product_compare')
+                    ]
+                );
+
                 $this->_eventManager->dispatch('catalog_product_compare_add_product', ['product' => $product]);
             }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -456,7 +456,7 @@ protected function getSelect($entityIds = null, $type = null)
         $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
         $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
         $specialPriceExpr = $connection->getCheckSql(
-            "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
             $specialPrice,
             $maxUnsignedBigint
         );
@@ -547,7 +547,7 @@ protected function _prepareCustomOptionPriceTable()
      * @param IndexTableStructure $finalPriceTable
      * @return void
      */
-    private function modifyPriceIndex(IndexTableStructure $finalPriceTable)
+    private function modifyPriceIndex(IndexTableStructure $finalPriceTable) : void
     {
         foreach ($this->priceModifiers as $priceModifier) {
             $priceModifier->modifyPrice($finalPriceTable);
@@ -862,6 +862,11 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
         );
     }
 
+    /**
+     * @param string $tableAlias
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
     private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
     {
         return $this->getConnection()->getCheckSql(

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml

@@ -12,6 +12,7 @@
         <element name="qtyInput" type="button" selector="input.input-text.qty"/>
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success"/>
+        <element name="errorMsg" type="button" selector="div.message-error"/>
         <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
         <element name="messagesBlock" type="text" selector=".page.messages"/>
         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>

app/code/Magento/Catalog/etc/frontend/di.xml

@@ -79,6 +79,18 @@
             <argument name="typeId" xsi:type="string">recently_compared_product</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="addCompareSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Catalog::messages/addCompareSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Block\Product\View\Gallery">
         <arguments>
             <argument name="galleryImagesConfig" xsi:type="array">

app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__(
+    'You added product %1 to the <a href="%2">comparison list</a>.',
+    $block->getData('product_name'),
+    $block->getData('compare_list_url')),
+    ['a']
+);

app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php

@@ -36,7 +36,7 @@ public function __construct(Processor $priceIndexProcessor)
      * @return Item
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(Item $subject, Item $result, AbstractModel $model)
+    public function afterSave(Item $subject, Item $result, AbstractModel $model): Item
     {
         $fields = [
             'is_in_stock',
@@ -55,7 +55,7 @@ public function afterSave(Item $subject, Item $result, AbstractModel $model)
 
     /**
      * @param Item $subject
-     * @param $result
+     * @param mixed $result
      * @param int $websiteId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -67,7 +67,7 @@ public function afterUpdateSetOutOfStock(Item $subject, $result, int $websiteId)
 
     /**
      * @param Item $subject
-     * @param $result
+     * @param mixed $result
      * @param int $websiteId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)