Skip to content

Commit 89dc98b

Browse files
nishant04412nishant04412
committed
Merge remote-tracking branch 'origin/ACP2E-414' into L3_Arrows_PR_20220221
2 parents 8783c1a + 3a9ea74 commit 89dc98b

File tree

14 files changed

+403
-30
lines changed

14 files changed

+403
-30
lines changed

‎app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@
2323
<element name="collapsibleSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
2424
<element name="expandedSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config active'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
2525
<element name="errorElement" type="text" selector="#{{inputId}}-error" parameterized="true" />
26+
<element name="defaultCurrency" type="select" selector="#currency_options_default" />
27+
<element name="allowedCurrencies" type="multiselect" selector="#currency_options_allow" />
28+
<element name="defaultCurrencyCheckbox" type="checkbox" selector="#currency_options_default_inherit"/>
29+
<element name="allowedCurrencyCheckbox" type="checkbox" selector="#currency_options_allow_inherit"/>
2630
</section>
2731
</sections>

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
2121
protected $_columnGroupBy = 'period';
2222

2323
/**
24-
* {@inheritdoc}
24+
* @inheritdoc
2525
* @codeCoverageIgnore
2626
*/
2727
protected function _construct()
@@ -32,7 +32,7 @@ protected function _construct()
3232
}
3333

3434
/**
35-
* {@inheritdoc}
35+
* @inheritdoc
3636
*/
3737
public function getResourceCollectionName()
3838
{
@@ -44,7 +44,7 @@ public function getResourceCollectionName()
4444
}
4545

4646
/**
47-
* {@inheritdoc}
47+
* @inheritdoc
4848
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
4949
*/
5050
protected function _prepareColumns()
@@ -100,9 +100,7 @@ protected function _prepareColumns()
100100
]
101101
);
102102

103-
if ($this->getFilterData()->getStoreIds()) {
104-
$this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
105-
}
103+
$this->setStoreIds($this->_getStoreIds());
106104
$currencyCode = $this->getCurrentCurrencyCode();
107105
$rate = $this->getRate($currencyCode);
108106

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
2222
protected $_columnGroupBy = 'period';
2323

2424
/**
25-
* {@inheritdoc}
25+
* @inheritdoc
2626
* @codeCoverageIgnore
2727
*/
2828
protected function _construct()
@@ -32,7 +32,7 @@ protected function _construct()
3232
}
3333

3434
/**
35-
* {@inheritdoc}
35+
* @inheritdoc
3636
*/
3737
public function getResourceCollectionName()
3838
{
@@ -42,7 +42,7 @@ public function getResourceCollectionName()
4242
}
4343

4444
/**
45-
* {@inheritdoc}
45+
* @inheritdoc
4646
*/
4747
protected function _prepareColumns()
4848
{
@@ -87,9 +87,7 @@ protected function _prepareColumns()
8787
]
8888
);
8989

90-
if ($this->getFilterData()->getStoreIds()) {
91-
$this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
92-
}
90+
$this->setStoreIds($this->_getStoreIds());
9391
$currencyCode = $this->getCurrentCurrencyCode();
9492
$rate = $this->getRate($currencyCode);
9593

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
2222
protected $_columnGroupBy = 'period';
2323

2424
/**
25-
* {@inheritdoc}
25+
* @inheritdoc
2626
* @codeCoverageIgnore
2727
*/
2828
protected function _construct()
@@ -32,7 +32,7 @@ protected function _construct()
3232
}
3333

3434
/**
35-
* {@inheritdoc}
35+
* @inheritdoc
3636
*/
3737
public function getResourceCollectionName()
3838
{
@@ -42,7 +42,7 @@ public function getResourceCollectionName()
4242
}
4343

4444
/**
45-
* {@inheritdoc}
45+
* @inheritdoc
4646
*/
4747
protected function _prepareColumns()
4848
{
@@ -74,9 +74,7 @@ protected function _prepareColumns()
7474
]
7575
);
7676

77-
if ($this->getFilterData()->getStoreIds()) {
78-
$this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
79-
}
77+
$this->setStoreIds($this->_getStoreIds());
8078
$currencyCode = $this->getCurrentCurrencyCode();
8179
$rate = $this->getRate($currencyCode);
8280

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
2222
protected $_columnGroupBy = 'period';
2323

2424
/**
25-
* {@inheritdoc}
25+
* @inheritdoc
2626
* @codeCoverageIgnore
2727
*/
2828
protected function _construct()
@@ -33,7 +33,7 @@ protected function _construct()
3333
}
3434

3535
/**
36-
* {@inheritdoc}
36+
* @inheritdoc
3737
*/
3838
public function getResourceCollectionName()
3939
{
@@ -43,7 +43,7 @@ public function getResourceCollectionName()
4343
}
4444

4545
/**
46-
* {@inheritdoc}
46+
* @inheritdoc
4747
*/
4848
protected function _prepareColumns()
4949
{
@@ -87,10 +87,7 @@ protected function _prepareColumns()
8787
]
8888
);
8989

90-
if ($this->getFilterData()->getStoreIds()) {
91-
$this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
92-
}
93-
90+
$this->setStoreIds($this->_getStoreIds());
9491
$currencyCode = $this->getCurrentCurrencyCode();
9592
$rate = $this->getRate($currencyCode);
9693

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
2222
protected $_columnGroupBy = 'period';
2323

2424
/**
25-
* Config factory
26-
*
2725
* @var \Magento\Sales\Model\Order\ConfigFactory
2826
*/
2927
protected $_configFactory;
@@ -131,9 +129,7 @@ protected function _prepareColumns()
131129
]
132130
);
133131

134-
if ($this->getFilterData()->getStoreIds()) {
135-
$this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
136-
}
132+
$this->setStoreIds($this->_getStoreIds());
137133
$currencyCode = $this->getCurrentCurrencyCode();
138134

139135
$this->addColumn(

‎app/code/Magento/Reports/Test/Mftf/Page/CouponReportPage.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="CouponReportPage" url="reports/report_sales/coupons/" area="admin" module="Reports">
10+
<section name="OrderReportFilterSection"/>
11+
<section name="OrderReportMainSection"/>
12+
<section name="GeneratedReportSection" />
13+
</page>
14+
</pages>

‎app/code/Magento/Reports/Test/Mftf/Page/InvoiceReportPage.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="InvoiceReportPage" url="reports/report_sales/invoiced/" area="admin" module="Reports">
10+
<section name="OrderReportFilterSection"/>
11+
<section name="OrderReportMainSection"/>
12+
<section name="GeneratedReportSection" />
13+
</page>
14+
</pages>

‎app/code/Magento/Reports/Test/Mftf/Page/RefundReportPage.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="RefundReportPage" url="reports/report_sales/refunded/" area="admin" module="Reports">
10+
<section name="OrderReportFilterSection"/>
11+
<section name="OrderReportMainSection"/>
12+
<section name="GeneratedReportSection" />
13+
</page>
14+
</pages>

‎app/code/Magento/Reports/Test/Mftf/Page/ShipmentReportPage.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="ShipmentReportPage" url="reports/report_sales/shipping/" area="admin" module="Reports">
10+
<section name="OrderReportFilterSection"/>
11+
<section name="OrderReportMainSection"/>
12+
<section name="GeneratedReportSection" />
13+
</page>
14+
</pages>

0 commit comments

Comments
 (0)