Skip to content

Removed disabled products from low stock report grid #26862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,17 @@
<data key="quantity">1001</data>
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
</entity>
<entity name="SimpleProductDisabledStockQuantityZero" type="product">
<data key="sku" unique="suffix">testSku</data>
<data key="type_id">simple</data>
<data key="attribute_set_id">4</data>
<data key="name" unique="suffix">Simple Product Disabled Quantity Zero</data>
<data key="price">123.00</data>
<data key="visibility">4</data>
<data key="status">2</data>
<data key="quantity">0</data>
<requiredEntity type="product_extension_attribute">EavStock0</requiredEntity>
</entity>
<entity name="SimpleProductNotVisibleIndividually" type="product">
<data key="sku" unique="suffix">simple_product_not_visible_individually</data>
<data key="type_id">simple</data>
Expand Down
32 changes: 23 additions & 9 deletions app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Reports\Block\Adminhtml\Product\Lowstock;

use Magento\Backend\Block\Template\Context;
use Magento\Backend\Helper\Data;
use Magento\Catalog\Model\Product\Attribute\Source\Status;
use Magento\Framework\Data\Collection as DataCollection;
use Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection;
use Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory;

/**
* Adminhtml low stock products report grid block
*
Expand All @@ -15,27 +24,29 @@
class Grid extends \Magento\Backend\Block\Widget\Grid
{
/**
* @var \Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory
* @var CollectionFactory
*/
protected $_lowstocksFactory;

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory $lowstocksFactory
* @param Context $context
* @param Data $backendHelper
* @param CollectionFactory $lowstocksFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Reports\Model\ResourceModel\Product\Lowstock\CollectionFactory $lowstocksFactory,
Context $context,
Data $backendHelper,
CollectionFactory $lowstocksFactory,
array $data = []
) {
$this->_lowstocksFactory = $lowstocksFactory;
parent::__construct($context, $backendHelper, $data);
}

/**
* @inheritDoc
*
* @return \Magento\Backend\Block\Widget\Grid
*/
protected function _prepareCollection()
Expand All @@ -56,7 +67,7 @@ protected function _prepareCollection()
$storeId = null;
}

/** @var $collection \Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection */
/** @var $collection Collection */
$collection = $this->_lowstocksFactory->create()->addAttributeToSelect(
'*'
)->filterByIsQtyProductTypes()->joinInventoryItem(
Expand All @@ -67,7 +78,10 @@ protected function _prepareCollection()
$storeId
)->setOrder(
'qty',
\Magento\Framework\Data\Collection::SORT_ORDER_ASC
DataCollection::SORT_ORDER_ASC
)->addAttributeToFilter(
'status',
Status::STATUS_ENABLED
);

if ($storeId) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminLowStockReportFilterProductActionGroup">
<annotations>
<description>Filter in "Low Stock" report with by product SKU.</description>
</annotations>
<arguments>
<argument name="sku" type="string" defaultValue="{{_defaultProduct.sku}}"/>
</arguments>

<fillField selector="{{LowStockReportFilterSection.productSku}}" userInput="{{sku}}" stepKey="fillSkuFilterField" />
<click selector="{{LowStockReportFilterSection.searchButton}}" stepKey="clickSearch"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminReportsLowStockDisableProductTest">
<annotations>
<features value="Reports"/>
<group value="reports"/>
<title value="The disabled product doesn't present on 'Low Stock' report."/>
<description value="A product must don't presents on 'Low Stock' report if the product is disabled."/>
</annotations>
<before>
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

<!-- Created disabled simple product with stock quantity zero -->
<createData entity="SimpleProductDisabledStockQuantityZero" stepKey="createProduct"/>
</before>
<after>
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
<actionGroup ref="logout" stepKey="logout"/>
</after>

<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsLowStockPage">
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
<argument name="submenuUiId" value="{{AdminMenuReportsProductsLowStock.dataUiId}}"/>
</actionGroup>
<actionGroup ref="AdminLowStockReportFilterProductActionGroup" stepKey="assertProductInReport">
<argument name="sku" value="{{SimpleProductDisabledStockQuantityZero.sku}}"/>
</actionGroup>

<!-- Verify doesn't present in the report -->
<dontSeeElement selector="{{LowStockProductGridSection.productSku}}" stepKey="assertSelector"/>
</test>
</tests>