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

Author: slopukhov

app/code/Magento/AdminNotification/Model/Observer.php renamed to app/code/Magento/AdminNotification/Observer/PredispathAdminActionControllerObserver.php

@@ -3,14 +3,16 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\AdminNotification\Model;
+namespace Magento\AdminNotification\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * AdminNotification observer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Observer
+class PredispathAdminActionControllerObserver implements ObserverInterface
 {
     /**
      * @var \Magento\AdminNotification\Model\FeedFactory
@@ -41,7 +43,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function preDispatch(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer)
     {
         if ($this->_backendAuthSession->isLoggedIn()) {
             $feedModel = $this->_feedFactory->create();

app/code/Magento/AdminNotification/etc/adminhtml/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
     <event name="controller_action_predispatch">
-        <observer name="adminnotification" instance="Magento\AdminNotification\Model\Observer" method="preDispatch" />
+        <observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" method="execute" />
     </event>
 </config>

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -47,19 +47,13 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      */
     protected $_passTierPrice = 0;
 
-    /**
-     * @var int
-     */
-    protected $_passGroupPrice = 0;
-
     /**
      * List of items websites
      *
      * @var array
      */
     protected $_priceWebsite = [
         ImportAdvancedPricing::COL_TIER_PRICE_WEBSITE,
-        ImportAdvancedPricing::COL_GROUP_PRICE_WEBSITE,
     ];
 
     /**
@@ -69,7 +63,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      */
     protected $_priceCustomerGroup = [
         ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP,
-        ImportAdvancedPricing::COL_GROUP_PRICE_CUSTOMER_GROUP,
     ];
 
     /**
@@ -79,9 +72,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      */
     protected $templateExportData = [
         ImportAdvancedPricing::COL_SKU => '',
-        ImportAdvancedPricing::COL_GROUP_PRICE_WEBSITE => '',
-        ImportAdvancedPricing::COL_GROUP_PRICE_CUSTOMER_GROUP => '',
-        ImportAdvancedPricing::COL_GROUP_PRICE => '',
         ImportAdvancedPricing::COL_TIER_PRICE_WEBSITE => '',
         ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => '',
         ImportAdvancedPricing::COL_TIER_PRICE_QTY => '',
@@ -246,14 +236,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\Resource\Entity\Att
                     ) {
                         $this->_passTierPrice = 1;
                     }
-                    if ($attribute->getAttributeCode() == ImportAdvancedPricing::COL_GROUP_PRICE
-                        && in_array(
-                            $attribute->getId(),
-                            $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP]
-                        )
-                    ) {
-                        $this->_passGroupPrice = 1;
-                    }
                 }
                 $collection->removeItemByKey($attribute->getId());
             }
@@ -277,16 +259,10 @@ protected function getExportData()
             $rawData = $this->collectRawData();
             $productIds = array_keys($rawData);
             if (isset($productIds)) {
-                if (!$this->_passGroupPrice) {
-                    $exportData = array_merge(
-                        $exportData,
-                        $this->getTierAndGroupPrices($productIds, ImportAdvancedPricing::TABLE_GROUPED_PRICE)
-                    );
-                }
                 if (!$this->_passTierPrice) {
                     $exportData = array_merge(
                         $exportData,
-                        $this->getTierAndGroupPrices($productIds, ImportAdvancedPricing::TABLE_TIER_PRICE)
+                        $this->getTierPrices($productIds, ImportAdvancedPricing::TABLE_TIER_PRICE)
                     );
                 }
             }
@@ -347,22 +323,12 @@ protected function correctExportData($exportData)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function getTierAndGroupPrices(array $listSku, $table)
+    protected function getTierPrices(array $listSku, $table)
     {
         if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
             $exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
         }
-        if ($table == ImportAdvancedPricing::TABLE_GROUPED_PRICE) {
-            $selectFields = [
-                ImportAdvancedPricing::COL_SKU => 'cpe.sku',
-                ImportAdvancedPricing::COL_GROUP_PRICE_WEBSITE => 'ap.website_id',
-                ImportAdvancedPricing::COL_GROUP_PRICE_CUSTOMER_GROUP => 'ap.customer_group_id',
-                ImportAdvancedPricing::COL_GROUP_PRICE => 'ap.value'
-            ];
-            if (isset($exportFilter) && !empty($exportFilter)) {
-                $price = $exportFilter['group_price'];
-            }
-        } elseif ($table == ImportAdvancedPricing::TABLE_TIER_PRICE) {
+        if ($table == ImportAdvancedPricing::TABLE_TIER_PRICE) {
             $selectFields = [
                 ImportAdvancedPricing::COL_SKU => 'cpe.sku',
                 ImportAdvancedPricing::COL_TIER_PRICE_WEBSITE => 'ap.website_id',

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -32,16 +32,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
 
     const COL_TIER_PRICE = 'tier_price';
 
-    const COL_GROUP_PRICE_WEBSITE = 'group_price_website';
-
-    const COL_GROUP_PRICE_CUSTOMER_GROUP = 'group_price_customer_group';
-
-    const COL_GROUP_PRICE = 'group_price';
-
     const TABLE_TIER_PRICE = 'catalog_product_entity_tier_price';
 
-    const TABLE_GROUPED_PRICE = 'catalog_product_entity_group_price';
-
     const DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE = '0';
 
     const ENTITY_TYPE_CODE = 'advanced_pricing';
@@ -50,7 +42,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
 
     const VALIDATOR_WEBSITE = 'validator_website';
 
-    const VALIDATOR_GROUP_PRICE = 'validator_group_price';
+    const VALIDATOR_TEAR_PRICE = 'validator_tear_price';
 
     /**
      * Validation failure message template definitions
@@ -65,9 +57,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
         ValidatorInterface::ERROR_INVALID_TIER_PRICE_SITE => 'Tier Price data website is invalid',
         ValidatorInterface::ERROR_INVALID_TIER_PRICE_GROUP => 'Tier Price customer group is invalid',
         ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete',
-        ValidatorInterface::ERROR_INVALID_GROUP_PRICE_SITE => 'Group Price data website is invalid',
-        ValidatorInterface::ERROR_INVALID_GROUP_PRICE_GROUP => 'Group Price customer group is invalid',
-        ValidatorInterface::ERROR_GROUP_PRICE_DATA_INCOMPLETE => 'Group Price data is incomplete',
         ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL =>
             'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
     ];
@@ -90,9 +79,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
         self::COL_TIER_PRICE_CUSTOMER_GROUP,
         self::COL_TIER_PRICE_QTY,
         self::COL_TIER_PRICE,
-        self::COL_GROUP_PRICE_WEBSITE,
-        self::COL_GROUP_PRICE_CUSTOMER_GROUP,
-        self::COL_GROUP_PRICE,
     ];
 
     /**
@@ -179,7 +165,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param ImportProduct $importProduct
      * @param AdvancedPricing\Validator $validator
      * @param AdvancedPricing\Validator\Website $websiteValidator
-     * @param AdvancedPricing\Validator\GroupPrice $groupPriceValidator
+     * @param AdvancedPricing\Validator\TierPrice $tierPriceValidator
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
@@ -199,7 +185,7 @@ public function __construct(
         ImportProduct $importProduct,
         AdvancedPricing\Validator $validator,
         AdvancedPricing\Validator\Website $websiteValidator,
-        AdvancedPricing\Validator\GroupPrice $groupPriceValidator
+        AdvancedPricing\Validator\TierPrice $tierPriceValidator
     ) {
         $this->_localeDate = $localeDate;
         $this->jsonHelper = $jsonHelper;
@@ -215,7 +201,7 @@ public function __construct(
         $this->_validators[self::VALIDATOR_MAIN] = $validator->init($this);
         $this->_oldSkus = $this->retrieveOldSkus();
         $this->_validators[self::VALIDATOR_WEBSITE] = $websiteValidator;
-        $this->_validators[self::VALIDATOR_GROUP_PRICE] = $groupPriceValidator;
+        $this->_validators[self::VALIDATOR_TEAR_PRICE] = $tierPriceValidator;
         $this->errorAggregator = $errorAggregator;
         $this->_catalogProductEntity = $this->_resourceFactory->create()->getTable('catalog_product_entity');
 
@@ -228,7 +214,7 @@ public function __construct(
      * Validator object getter.
      *
      * @param string $type
-     * @return AdvancedPricing\Validator|AdvancedPricing\Validator\Website|AdvancedPricing\Validator\GroupPrice
+     * @return AdvancedPricing\Validator|AdvancedPricing\Validator\Website
      */
     protected function _getValidator($type)
     {
@@ -333,8 +319,7 @@ public function deleteAdvancedPricing()
             }
         }
         if ($listSku) {
-            $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_GROUPED_PRICE);
-            $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_TIER_PRICE);
+            $this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE);
             $this->setUpdatedAt($listSku);
         }
         return $this;
@@ -367,7 +352,6 @@ protected function saveAndReplaceAdvancedPrices()
         $listSku = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $tierPrices = [];
-            $groupPrices = [];
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
                     $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
@@ -391,33 +375,19 @@ protected function saveAndReplaceAdvancedPrices()
                         'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
                 }
-                if (!empty($rowData[self::COL_GROUP_PRICE_WEBSITE])) {
-                    $groupPrices[$rowSku][] = [
-                        'all_groups' => self::DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE,
-                        'customer_group_id' => $this->getCustomerGroupId(
-                            $rowData[self::COL_GROUP_PRICE_CUSTOMER_GROUP]
-                        ),
-                        'value' => $rowData[self::COL_GROUP_PRICE],
-                        'website_id' => $this->getWebSiteId($rowData[self::COL_GROUP_PRICE_WEBSITE])
-                    ];
-                }
             }
             if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
                 if ($listSku) {
-                    $this->processCountNewPrices($tierPrices, $groupPrices);
-                    if ($this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_GROUPED_PRICE)
-                        && $this->deleteProductTierAndGroupPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
-                        $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE)
-                            ->saveProductPrices($groupPrices, self::TABLE_GROUPED_PRICE);
+                    $this->processCountNewPrices($tierPrices);
+                    if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
+                        $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
                         $this->setUpdatedAt($listSku);
                     }
                 }
             } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
                 $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
-                    ->processCountExistingPrices($groupPrices, self::TABLE_GROUPED_PRICE)
-                    ->processCountNewPrices($tierPrices, $groupPrices);
-                $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE)
-                    ->saveProductPrices($groupPrices, self::TABLE_GROUPED_PRICE);
+                    ->processCountNewPrices($tierPrices);
+                $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
                 if ($listSku) {
                     $this->setUpdatedAt($listSku);
                 }
@@ -457,13 +427,13 @@ protected function saveProductPrices(array $priceData, $table)
     }
 
     /**
-     * Deletes tier prices and group prices.
+     * Deletes tier prices prices.
      *
      * @param array $listSku
      * @param string $tableName
      * @return bool
      */
-    protected function deleteProductTierAndGroupPrices(array $listSku, $tableName)
+    protected function deleteProductTierPrices(array $listSku, $tableName)
     {
         if ($tableName && $listSku) {
             if (!$this->_cachedSkuToDelete) {
@@ -530,7 +500,7 @@ protected function getWebSiteId($websiteCode)
      */
     protected function getCustomerGroupId($customerGroup)
     {
-        $customerGroups = $this->_getValidator(self::VALIDATOR_GROUP_PRICE)->getCustomerGroups();
+        $customerGroups = $this->_getValidator(self::VALIDATOR_TEAR_PRICE)->getCustomerGroups();
         return $customerGroup == self::VALUE_ALL_GROUPS ? 0 : $customerGroups[$customerGroup];
     }
 
@@ -598,17 +568,13 @@ protected function incrementCounterUpdated($prices, $existingPrice)
      * Count new prices
      *
      * @param array $tierPrices
-     * @param array $groupPrices
      * @return $this
      */
-    protected function processCountNewPrices(array $tierPrices, array $groupPrices)
+    protected function processCountNewPrices(array $tierPrices)
     {
         foreach ($tierPrices as $productPrices) {
             $this->countItemsCreated += count($productPrices);
         }
-        foreach ($groupPrices as $productPrices) {
-            $this->countItemsCreated += count($productPrices);
-        }
         $this->countItemsCreated -= $this->countItemsUpdated;
 
         return $this;