Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-39729

Author: Yushkin, Dmytro

app/code/Magento/Catalog/Model/Product.php

@@ -1159,11 +1159,10 @@ public function setFinalPrice($price)
      */
     public function getFinalPrice($qty = null)
     {
-        $price = $this->_getData('final_price');
-        if ($price !== null) {
-            return $price;
+        if ($this->_getData('final_price') === null) {
+            $this->setFinalPrice($this->getPriceModel()->getFinalPrice($qty, $this));
         }
-        return $this->getPriceModel()->getFinalPrice($qty, $this);
+        return $this->_getData('final_price');
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1370,4 +1370,41 @@ protected function getPropertyValue(&$object, $property)
 
         return $reflectionProperty->getValue($object);
     }
+
+    public function testGetFinalPrice()
+    {
+        $finalPrice = 11;
+        $qty = 1;
+        $this->model->setQty($qty);
+        $productTypePriceMock = $this->getMock(
+            'Magento\Catalog\Model\Product\Type\Price',
+            ['getFinalPrice'],
+            [],
+            '',
+            false
+        );
+        
+        $productTypePriceMock->expects($this->any())
+            ->method('getFinalPrice')
+            ->with($qty, $this->model)
+            ->will($this->returnValue($finalPrice));
+
+        $this->productTypeInstanceMock->expects($this->any())
+            ->method('priceFactory')
+            ->with($this->model->getTypeId())
+            ->will($this->returnValue($productTypePriceMock));
+
+        $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty));
+        $this->model->setFinalPrice(9.99);
+    }
+
+    public function testGetFinalPricePreset()
+    {
+        $finalPrice = 9.99;
+        $qty = 1;
+        $this->model->setQty($qty);
+        $this->model->setFinalPrice($finalPrice);
+        $this->productTypeInstanceMock->expects($this->never())->method('priceFactory');
+        $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty));
+    }
 }

app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php

@@ -140,8 +140,8 @@ protected function _prepareForm()
             'stop_rules_processing',
             'select',
             [
-                'label' => __('Subsequent rules'),
-                'title' => __('Subsequent rules'),
+                'label' => __('Discard subsequent rules'),
+                'title' => __('Discard subsequent rules'),
                 'name' => 'stop_rules_processing',
                 'options' => ['1' => __('Yes'), '0' => __('No')]
             ]

app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php

@@ -7,8 +7,9 @@
 
 use Magento\Framework\Mview\ActionInterface as MviewActionInterface;
 use Magento\Indexer\Model\ActionInterface as IndexerActionInterface;
+use Magento\Framework\Object\IdentityInterface as IdentityInterface;
 
-abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface
+abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
 {
     /**
      * @var IndexBuilder

app/code/Magento/CatalogRule/etc/webapi_rest/events.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
+    <event name="catalog_product_get_final_price">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Model\Observer" method="processFrontFinalPrice" />
+    </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Model\Observer" method="prepareCatalogProductCollectionPrices" />
+    </event>
+</config>

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php

@@ -154,8 +154,8 @@ protected function _prepareForm()
             'stop_rules_processing',
             'select',
             [
-                'label' => __('Subsequent rules'),
-                'title' => __('Subsequent rules'),
+                'label' => __('Discard subsequent rules'),
+                'title' => __('Discard subsequent rules'),
                 'name' => 'stop_rules_processing',
                 'options' => ['1' => __('Yes'), '0' => __('No')]
             ]