Skip to content

Commit 3c696b6

Browse files
author
Oleksii Korshenko
committed
MAGETWO-67510: Remove zend json from weee #9261
- fixed incorrect constructor in Tax model
1 parent dcb574d commit 3c696b6

File tree

1 file changed

+14
-2
lines changed
  • app/code/Magento/Weee/Model/Attribute/Backend/Weee

1 file changed

+14
-2
lines changed

app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Weee\Model\Attribute\Backend\Weee;
77

88
use Magento\Framework\Exception\LocalizedException;
9+
use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
910

1011
class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
1112
{
@@ -25,13 +26,16 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
2526
protected $_directoryHelper;
2627

2728
/**
29+
* Initialize dependencies.
30+
*
2831
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
2932
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3033
* @param \Magento\Catalog\Helper\Data $catalogData
3134
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
3235
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
3336
* @param \Magento\Directory\Helper\Data $directoryHelper
3437
* @param \Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax $attributeTax
38+
* @param ScopeOverriddenValue|null $scopeOverriddenValue
3539
*/
3640
public function __construct(
3741
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -40,12 +44,20 @@ public function __construct(
4044
\Magento\Framework\App\Config\ScopeConfigInterface $config,
4145
\Magento\Framework\Locale\FormatInterface $localeFormat,
4246
\Magento\Directory\Helper\Data $directoryHelper,
43-
\Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax $attributeTax
47+
\Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax $attributeTax,
48+
ScopeOverriddenValue $scopeOverriddenValue = null
4449
) {
4550
$this->_directoryHelper = $directoryHelper;
4651
$this->_storeManager = $storeManager;
4752
$this->_attributeTax = $attributeTax;
48-
parent::__construct($currencyFactory, $storeManager, $catalogData, $config, $localeFormat);
53+
parent::__construct(
54+
$currencyFactory,
55+
$storeManager,
56+
$catalogData,
57+
$config,
58+
$localeFormat,
59+
$scopeOverriddenValue
60+
);
4961
}
5062

5163
/**

0 commit comments

Comments
 (0)