MAGETWO-57129: Identity Service fix

Author: irenelagno

Gruntfile.js.sample

@@ -5,14 +5,19 @@
 
 // For performance use one level down: 'name/{,*/}*.js'
 // If you want to recursively match all subfolders, use: 'name/**/*.js'
+
 module.exports = function (grunt) {
     'use strict';
 
     var _ = require('underscore'),
         path = require('path'),
-        themes = require('./dev/tools/grunt/configs/themes'),
+        filesRouter = require('./dev/tools/grunt/tools/files-router'),
         configDir = './dev/tools/grunt/configs',
-        tasks = grunt.file.expand('./dev/tools/grunt/tasks/*');
+        tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
+        themes;
+
+        filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
+        themes = filesRouter.get('themes');
 
     tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
     tasks.push('time-grunt');

app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php

@@ -12,7 +12,6 @@
 interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface
 {
     const ENTITY_TYPE_CODE = 'catalog_product';
-    const CODE_TIER_PRICE_FIELD_PRICE = 'price';
     const CODE_HAS_WEIGHT = 'product_has_weight';
     const CODE_SPECIAL_PRICE = 'special_price';
     const CODE_PRICE = 'price';
@@ -27,6 +26,9 @@ interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttribu
     const CODE_COST = 'cost';
     const CODE_SEO_FIELD_URL_KEY = 'url_key';
     const CODE_TIER_PRICE = 'tier_price';
+    const CODE_TIER_PRICE_FIELD_PRICE = 'price';
+    const CODE_TIER_PRICE_FIELD_PERCENTAGE_VALUE = 'percentage_value';
+    const CODE_TIER_PRICE_FIELD_VALUE_TYPE = 'value_type';
     const CODE_SEO_FIELD_META_DESCRIPTION = 'meta_description';
     const CODE_WEIGHT = 'weight';
 }

app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php

@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @deprecated use ScopedProductTierPriceManagementInterface instead
  */
 interface ProductTierPriceManagementInterface
 {

app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Api;
+
+/**
+ * @api
+ */
+interface ScopedProductTierPriceManagementInterface
+{
+    /**
+     * Create tier price for product
+     *
+     * @param string $sku
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     */
+    public function add($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice);
+
+    /**
+     * Remove tier price from product
+     *
+     * @param string $sku
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     */
+    public function remove($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice);
+
+    /**
+     * Get tier price of product
+     *
+     * @param string $sku
+     * @param string $customerGroupId 'all' can be used to specify 'ALL GROUPS'
+     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getList($sku, $customerGroupId);
+}

app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php

@@ -5,12 +5,14 @@
  */
 namespace Magento\Catalog\Model\Config\Source\Product\Options;
 
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+
 /**
  * Price types mode source
  *
  * @author     Magento Core Team <[email protected]>
  */
-class Price implements \Magento\Framework\Option\ArrayInterface
+class Price implements ProductPriceOptionsInterface
 {
     /**
      * {@inheritdoc}
@@ -20,8 +22,8 @@ class Price implements \Magento\Framework\Option\ArrayInterface
     public function toOptionArray()
     {
         return [
-            ['value' => 'fixed', 'label' => __('Fixed')],
-            ['value' => 'percent', 'label' => __('Percent')]
+            ['value' => self::VALUE_FIXED, 'label' => __('Fixed')],
+            ['value' => self::VALUE_PERCENT, 'label' => __('Percent')],
         ];
     }
 }

app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Interface ProductPriceOptionsInterface
+ */
+interface ProductPriceOptionsInterface extends OptionSourceInterface
+{
+    /**#@+
+     * Values
+     */
+    const VALUE_FIXED = 'fixed';
+    const VALUE_PERCENT = 'percent';
+    /**#@-*/
+}

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -70,6 +70,11 @@ abstract class AbstractAction
      */
     protected $_indexers;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product
+     */
+    private $productResource;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -213,12 +218,19 @@ protected function _prepareTierPriceIndex($entityIds = null)
         $table = $this->_defaultIndexerResource->getTable('catalog_product_index_tier_price');
         $this->_emptyTable($table);
 
+        $tierPriceExpression = $this->_connection->getCheckSql(
+            'tp.value = 0',
+            'product_price.value * (1 - tp.percentage_value / 100)',
+            'tp.value'
+        );
         $websiteExpression = $this->_connection->getCheckSql(
             'tp.website_id = 0',
-            'ROUND(tp.value * cwd.rate, 4)',
-            'tp.value'
+            'ROUND(' . $tierPriceExpression . ' * cwd.rate, 4)',
+            $tierPriceExpression
         );
         $linkField = $this->getProductIdFieldName();
+        $priceAttribute = $this->getProductResource()->getAttribute('price');
+
         $select = $this->_connection->select()->from(
             ['cpe' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
             ['cpe.entity_id']
@@ -238,8 +250,15 @@ protected function _prepareTierPriceIndex($entityIds = null)
             ['cwd' => $this->_defaultIndexerResource->getTable('catalog_product_index_website')],
             'cw.website_id = cwd.website_id',
             []
+        )->join(
+            ['product_price' => $priceAttribute->getBackend()->getTable()],
+            'tp.' . $linkField . ' = product_price.' . $linkField,
+            []
         )->where(
             'cw.website_id != 0'
+        )->where(
+            'product_price.attribute_id = ?',
+            $priceAttribute->getAttributeId()
         )->columns(
             new \Zend_Db_Expr("MIN({$websiteExpression})")
         )->group(
@@ -462,4 +481,17 @@ protected function getProductIdFieldName()
         $indexList = $this->_connection->getIndexList($table);
         return $indexList[$this->_connection->getPrimaryKeyName($table)]['COLUMNS_LIST'][0];
     }
+
+    /**
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @deprecated
+     */
+    private function getProductResource()
+    {
+        if (null === $this->productResource) {
+            $this->productResource = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        }
+        return $this->productResource;
+    }
 }