Skip to content

Commit 46c25f0

Browse files
author
Oleksandr Gorkun
committed
MAGETWO-85206: SKUs are unassigned from Catalog Price Rule conditions
1 parent 929eade commit 46c25f0

File tree

1 file changed

+14
-6
lines changed
  • app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © 2013-2018 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tab;
77

88
use Magento\Backend\Block\Widget\Form;
99
use Magento\Backend\Block\Widget\Form\Generic;
1010
use Magento\Ui\Component\Layout\Tabs\TabInterface;
11+
use Magento\CatalogRule\Api\Data\RuleInterface;
12+
use Magento\Rule\Model\Condition\AbstractCondition;
1113

1214
class Conditions extends Generic implements TabInterface
1315
{
@@ -134,7 +136,7 @@ protected function _prepareForm()
134136
}
135137

136138
/**
137-
* @param \Magento\CatalogRule\Api\Data\RuleInterface $model
139+
* @param RuleInterface $model
138140
* @param string $fieldsetId
139141
* @param string $formName
140142
* @return \Magento\Framework\Data\Form
@@ -180,17 +182,23 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
180182
}
181183

182184
/**
183-
* @param \Magento\Rule\Model\Condition\AbstractCondition $conditions
185+
* @param RuleInterface $rule
186+
* @param AbstractCondition $conditions
184187
* @param string $formName
185188
* @return void
186189
*/
187-
private function setConditionFormName(\Magento\CatalogRule\Api\Data\RuleInterface $rule, \Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
188-
{
190+
private function setConditionFormName(
191+
RuleInterface $rule,
192+
AbstractCondition $conditions,
193+
$formName
194+
) {
189195
$conditions->setFormName($formName);
196+
//For every fieldset there's a different form object.
190197
$conditions->setJsFormObject(
191198
$rule->getConditionsFieldSetId($formName)
192199
);
193-
if ($conditions->getConditions() && is_array($conditions->getConditions())) {
200+
$childConditions = $conditions->getCondition();
201+
if ($childConditions && is_array($childConditions)) {
194202
foreach ($conditions->getConditions() as $condition) {
195203
$this->setConditionFormName($rule, $condition, $formName);
196204
}

0 commit comments

Comments
 (0)