From 84bca457e7340dc00848e5074a23574296375c43 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Mon, 29 Aug 2016 16:12:38 +0300
Subject: [PATCH] MAGETWO-55908: Prepare PR
---
.../Backend/GroupPrice/AbstractGroupPrice.php | 13 ++++++++-----
.../Magento/Catalog/Model/Product/TierPrice.php | 9 ---------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 9edb3e81c8f..3c5cef0e6ce 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -339,6 +339,8 @@ abstract class AbstractGroupPrice extends Price
}
/**
+ * Perform price modification
+ *
* @param \Magento\Catalog\Model\Product $object
* @param array $data
* @return array
@@ -346,12 +348,13 @@ abstract class AbstractGroupPrice extends Price
*/
protected function modifyPriceData($object, $data)
{
- foreach ($data as $k => $v) {
- if (isset($v['price']) && $v['price'] > 0) {
- $data[$k]['website_price'] = $v['price'];
+ /** @var array $priceItem */
+ foreach ($data as $key => $priceItem) {
+ if (isset($priceItem['price']) && $priceItem['price'] > 0) {
+ $data[$key]['website_price'] = $priceItem['price'];
}
- if ($v['all_groups']) {
- $data[$k]['cust_group'] = $this->_groupManagement->getAllCustomersGroup()->getId();
+ if ($priceItem['all_groups']) {
+ $data[$key]['cust_group'] = $this->_groupManagement->getAllCustomersGroup()->getId();
}
}
return $data;
diff --git a/app/code/Magento/Catalog/Model/Product/TierPrice.php b/app/code/Magento/Catalog/Model/Product/TierPrice.php
index 985853314c4..e40b2463135 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPrice.php
@@ -1,14 +1,11 @@
<?php
/**
- *
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Catalog\Model\Product;
-use Magento\Framework\App\ObjectManager;
-
/**
* @codeCoverageIgnore
*/
@@ -83,12 +80,6 @@ class TierPrice extends \Magento\Framework\Model\AbstractExtensibleModel impleme
*/
public function getExtensionAttributes()
{
- if (empty($this->_getExtensionAttributes())) {
- $this->setExtensionAttributes(
- ObjectManager::getInstance()->get(\Magento\Framework\Api\ExtensionAttributesFactory::class)
- ->create(\Magento\Catalog\Api\Data\ProductTierPriceInterface::class)
- );
- }
return $this->_getExtensionAttributes();
}
--
GitLab