Skip to content

Commit 0be6cc5

Browse files
author
Roman Leshchenko
committed
Merge branch '2.1.15-develop' of github.com:magento-qwerty/magento2ce into MAGETWO-93150
2 parents 5d114e0 + 484cfcf commit 0be6cc5

File tree

85 files changed

+454
-4158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+454
-4158
lines changed

‎app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,18 @@ protected function _toHtml()
120120
if (!$this->_depends) {
121121
return '';
122122
}
123-
return '<script>
124-
require(["mage/adminhtml/form"], function(){
125-
new FormElementDependenceController(' .
126-
$this->_getDependsJson() .
127-
($this->_configOptions ? ', ' .
128-
$this->_jsonEncoder->encode(
129-
$this->_configOptions
130-
) : '') . '); });</script>';
123+
124+
$params = $this->_getDependsJson();
125+
126+
if ($this->_configOptions) {
127+
$params .= ', ' . $this->_jsonEncoder->encode($this->_configOptions);
128+
}
129+
130+
return "<script>
131+
require(['mage/adminhtml/form'], function(){
132+
new FormElementDependenceController({$params});
133+
});
134+
</script>";
131135
}
132136

133137
/**

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,12 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
497497

498498
foreach ($selections as $selection) {
499499
if ($selection->getProductId() == $optionProduct->getId()) {
500-
foreach ($options as &$option) {
501-
if ($option->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
500+
foreach ($options as $quoteItemOption) {
501+
if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
502502
if ($optionUpdateFlag) {
503-
$option->setValue(intval($option->getValue()));
503+
$quoteItemOption->setValue(intval($quoteItemOption->getValue()));
504504
} else {
505-
$option->setValue($value);
505+
$quoteItemOption->setValue($value);
506506
}
507507
}
508508
}

‎app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'default.phtml';
18+
protected $_template = 'Magento_Captcha::default.phtml';
1919

2020
/**
2121
* @var string

‎app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
1313
*
1414
* @var string
1515
*/
16-
protected $_template = 'catalog/category/edit/assign_products.phtml';
16+
protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';
1717

1818
/**
1919
* @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
@@ -87,6 +87,7 @@ public function getProductsJson()
8787
}
8888
return '{}';
8989
}
90+
9091
/**
9192
* Retrieve current category instance
9293
*

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
2727
/**
2828
* @var string
2929
*/
30-
protected $_template = 'catalog/category/tree.phtml';
30+
protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';
3131

3232
/**
3333
* @var \Magento\Backend\Model\Auth\Session

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
2424
*
2525
* @var string
2626
*/
27-
protected $_template = 'catalog/category/widget/tree.phtml';
27+
protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
2828

2929
/**
3030
* @return void

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Main extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'catalog/product/attribute/set/main.phtml';
21+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml';
2222

2323
/**
2424
* Core registry

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template
1414
/**
1515
* @var string
1616
*/
17-
protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
17+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml';
1818
}

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
21+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml';
2222

2323
/**
2424
* @return AbstractBlock

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Main extends \Magento\Backend\Block\Template
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
19+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml';
2020

2121
/**
2222
* @return $this

0 commit comments

Comments
 (0)