Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history 
Accepted Public Pull Requests:
 - magento-engcom/magento2ce#1296: [EngCom Team] Batch 11. Forwardports to 2.3-develop (by @magento-engcom-team)
 - magento-engcom/magento2ce#1285: [EngCom Team] Batch 4. Forwardports to 2.3-develop (by @magento-engcom-team)
 - magento-engcom/magento2ce#1283: [EngCom Team] Batch 2. Forwardports to 2.3-develop (by @magento-engcom-team)


Fixed GitHub Issues:
 - #9633: Web Setup Wizard 500 error when session storage is configured to use memcache (reported by @dotsoa) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. aefd089
     2. 0c799d2
     3. 0a28295
     4. d0d8d03
     5. 1623007
     6. 64f63b3
     7. eceb5eb
     8. e1db353
     9. 7b12d50
     10. 60285c4
     11. 2d910df
     12. 57c355a
     13. 4f9f40e
     14. ebd663b
     15. bdb62bb
     16. 76f6eed
     17. cd5c72e
     18. b035660
     19. 6217c00
     20. e07d040
     21. 47ea318

 - #9742: Default welcome message returns after being deleted (reported by @robgt) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. aefd089
     2. 0c799d2
     3. 0a28295
     4. d0d8d03
     5. 1623007
     6. 64f63b3
     7. eceb5eb
     8. e1db353
     9. 7b12d50
     10. 60285c4
     11. 2d910df
     12. 57c355a
     13. 4f9f40e
     14. ebd663b
     15. bdb62bb
     16. 76f6eed
     17. cd5c72e
     18. b035660
     19. 6217c00
     20. e07d040
     21. 47ea318

 - #11669: API salesRefundInvoiceV1 does no save invoice ID on credit memo (reported by @ajpevers) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. aefd089
     2. 0c799d2
     3. 0a28295
     4. d0d8d03
     5. 1623007
     6. 64f63b3
     7. eceb5eb
     8. e1db353
     9. 7b12d50
     10. 60285c4
     11. 2d910df
     12. 57c355a
     13. 4f9f40e
     14. ebd663b
     15. bdb62bb
     16. 76f6eed
     17. cd5c72e
     18. b035660
     19. 6217c00
     20. e07d040
     21. 47ea318

 - #12058: Can't save emoji in custom product options (reported by @archonkulis) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. aefd089
     2. 0c799d2
     3. 0a28295
     4. d0d8d03
     5. 1623007
     6. 64f63b3
     7. eceb5eb
     8. e1db353
     9. 7b12d50
     10. 60285c4
     11. 2d910df
     12. 57c355a
     13. 4f9f40e
     14. ebd663b
     15. bdb62bb
     16. 76f6eed
     17. cd5c72e
     18. b035660
     19. 6217c00
     20. e07d040
     21. 47ea318

 - #5015: Report error csv doesn't work when trying to import a csv file with semicolon delimiter (reported by @agoeurysky) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #8970: Cannot assign products to categories not under tree root (reported by @marius-bica) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #9566: Status label is wrong in admin (reported by @darkogoles1) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #10291: Magento 2 Loading custom option dropdown issue (reported by @NagarajuKasa) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #10908: [2.2.0-rc3.0] Language switcher is broken when using multiple times (reported by @hostep) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #11211: Store View switcher not working on front-end and it throws an error (reported by @latypatil) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #11365: "Ignore this notification" isn't working (reported by @sigismund) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #11868: "Add Products" button has been duplicated after the customer group was changed (reported by @OleksiyOleksiyovych) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. ad6c0af
     2. 6d3d70a
     3. 6b0c02c
     4. c8abb13
     5. c6a9b5f
     6. c867b81
     7. 88a3ad0
     8. d87e316
     9. c76b04c
     10. 5ae2109
     11. 931133a
     12. 4c927a0
     13. 060a8f9
     14. 4da2a7d
     15. 008ef55
     16. d3642e8
     17. d37ce08
     18. b22b232
     19. 6c02a2d
     20. f2ec2ea

 - #9783: Multiple <depends> parameters in widget.xml not allowed (reported by @milansimek) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70

 - #10941: Responsive Design Issue on Mobile with Magento 2.1.9 (reported by @rishabhchd19) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70

 - #11166: ReindexAll -> getState() is not correct if the Indexer broke with PHP fatal error   (reported by @larsroettig) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70

 - #11176: Configured table prefix is not recognized in CLI admin:user:create (reported by @crtl) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70

 - #11275: Call to a member function addCrumb() (reported by @lano-vargas) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70

 - #11310: Method "getChildren" sort ordering (reported by @EliasKotlyar) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch
   Related commits:
     1. 0742857
     2. fde512e
     3. e7d90de
     4. 6d4f36d
     5. 2e83a36
     6. 23b4aa1
     7. b50bfa8
     8. 04cd60d
     9. 75d5a05
     10. 5e02b15
     11. aad5ba6
     12. 3e32140
     13. 7898946
     14. a173e1c
     15. 41d0075
     16. dda19b2
     17. cba48cd
     18. 0c62caa
     19. 736f783
     20. 7569b70
  • Loading branch information
@magento-engcom-team
magento-engcom-team authored Jan 30, 2018
2 parents b48ec86 + 4ba9235 commit 8c705bf
Show file tree
Hide file tree
Showing 116 changed files with 1,030 additions and 207 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices()
? $rowData[self::COL_TIER_PRICE] : 0,
'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
? $rowData[self::COL_TIER_PRICE] : null,
'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
];
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase

protected function setUp()
{
$this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)
$this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)
->setMethods(['getBaseCurrency'])
->disableOriginalConstructor()
->getMock();
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function _prepareForm()
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
);

$this->_prepareStoreFieldSet($form);
$this->_prepareStoreFieldset($form);

$form->addField(
'store_type',
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public function execute()
$user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);

$user->setId($userId)
->setUsername($this->getRequest()->getParam('username', false))
->setFirstname($this->getRequest()->getParam('firstname', false))
->setLastname($this->getRequest()->getParam('lastname', false))
->setUserName($this->getRequest()->getParam('username', false))
->setFirstName($this->getRequest()->getParam('firstname', false))
->setLastName($this->getRequest()->getParam('lastname', false))
->setEmail(strtolower($this->getRequest()->getParam('email', false)));

if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()

public function testGetRowUrlIfUrlPathNotSet()
{
$this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
$this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
}

public function testGetRowUrl()
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public function testSetGetGrid()

$this->_block->setFilter('StdClass');

$grid = new \StdClass();
$grid = new \stdClass();
$this->_block->setGrid($grid);
$this->assertEquals($grid, $this->_block->getGrid());
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
data-mage-init='{"dropdown":{}}'
data-toggle="dropdown">
<span class="admin__action-dropdown-text">
<span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
<span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
</span>
</a>
<ul class="admin__action-dropdown-menu">
Expand All @@ -39,7 +39,7 @@
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
<?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
title="<?= $block->escapeHtml(__('Account Setting')) ?>">
<?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
<?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
</a>
</li>
<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
<script data-template="search-suggest" type="text/x-magento-template">
<ul class="search-global-menu">
<li class="item">
<a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
<a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
</li>
<li class="item">
<a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
<a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
</li>
<li class="item">
<a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
<a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
</li>
<li class="item">
<a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
<a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
</li>
<% if (data.items.length) { %>
<% _.each(data.items, function(value){ %>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
<?php if ($block->getPagerVisibility()): ?>
<div class="admin__data-grid-pager-wrap">
<select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
class="admin__control-select">
<option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
Expand All @@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
selected="selected"<?php endif; ?>>200
</option>
</select>
<label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
<label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>

<div class="admin__data-grid-pager">
Expand All @@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
<button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
<?php endif; ?>
<input type="text"
id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
value="<?= /* @escapeNotVerified */ $_curPage ?>"
class="admin__control-text"
onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
<label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
<label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
<?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
</label>
<?php if ($_curPage < $_lastPage): ?>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public function getValuesHtml()
]
);
if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
$select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
$select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
} else {
$select->setName('options[' . $_option->getid() . '][]');
$select->setName('options[' . $_option->getId() . '][]');
$select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
}
foreach ($_option->getValues() as $_value) {
Expand Down
7 changes: 5 additions & 2 deletions app/code/Magento/Catalog/Model/Category.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,11 +780,14 @@ public function getAllChildren($asArray = false)
/**
* Retrieve children ids comma separated
*
* @param boolean $recursive
* @param boolean $isActive
* @param boolean $sortByPosition
* @return string
*/
public function getChildren()
public function getChildren($recursive = false, $isActive = true, $sortByPosition = false)
{
return implode(',', $this->getResource()->getChildren($this, false));
return implode(',', $this->getResource()->getChildren($this, $recursive, $isActive, $sortByPosition));
}

/**
Expand Down
6 changes: 5 additions & 1 deletion app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,9 +602,10 @@ public function isInRootCategoryList($category)
* @param \Magento\Catalog\Model\Category $category
* @param bool $recursive
* @param bool $isActive
* @param bool $sortByPosition
* @return array
*/
public function getChildren($category, $recursive = true, $isActive = true)
public function getChildren($category, $recursive = true, $isActive = true, $sortByPosition = false)
{
$select = $this->getConnection()->select()->from(
$this->getMainStoreTable($category->getStoreId()),
Expand All @@ -619,6 +620,9 @@ public function getChildren($category, $recursive = true, $isActive = true)
if ($isActive) {
$select->where('is_active = ?', '1');
}
if ($sortByPosition) {
$select->order('position ASC');
}
$_categories = $this->getConnection()->fetchAll($select);
$categoriesIds = [];
foreach ($_categories as $_category) {
Expand Down
2 changes: 1 addition & 1 deletion ...ode/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected function setUp()
'scopeOverriddenValue' => $scopeOverriddenValue
]
);
$resource = $this->createPartialMock(\StdClass::class, ['getMainTable']);
$resource = $this->createPartialMock(\stdClass::class, ['getMainTable']);
$resource->expects($this->any())->method('getMainTable')->will($this->returnValue('table'));

$this->_model->expects($this->any())->method('_getResource')->will($this->returnValue($resource));
Expand Down
Loading

0 comments on commit 8c705bf

Please sign in to comment.