Skip to content

Commit ab5120a

Browse files
zakdmazakdma
authored
Merge pull request #5836 from magento-tsg/MC-35316
[TSG] MC-35316: Pagination products not work in admin create order page
2 parents efd2032 + 8f1c695 commit ab5120a

File tree

4 files changed

+151
-4
lines changed

4 files changed

+151
-4
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
101101
'onclick',
102102
/* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
103103
/* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
104-
'button.action-previous'
104+
'div#' . $block->escapeJs($block->getId()) .
105+
' .admin__data-grid-pager button.action-previous:not(.disabled)'
105106
) ?>
106107
<?php else: ?>
107108
<button type="button" class="action-previous disabled">
@@ -137,7 +138,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
137138
'onclick',
138139
/* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
139140
/* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
140-
'button.action-next'
141+
'div#' . $block->escapeJs($block->getId()) .
142+
' .admin__data-grid-pager button.action-next:not(.disabled)'
141143
) ?>
142144
<?php else: ?>
143145
<button type="button" class="action-next disabled">

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ $numColumns = count($block->getColumns());
116116
'onclick',
117117
/* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
118118
/* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
119-
'.admin__data-grid-pager button.action-previous'
119+
'div#' . $block->escapeJs($block->getId()) .
120+
' .admin__data-grid-pager button.action-previous:not(.disabled)'
120121
) ?>
121122
<?php else: ?>
122123
<button type="button" class="action-previous disabled">
@@ -150,7 +151,8 @@ $numColumns = count($block->getColumns());
150151
'onclick',
151152
/* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
152153
/* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
153-
'.admin__data-grid-pager button.action-next'
154+
'div#' . $block->escapeJs($block->getId()) .
155+
' .admin__data-grid-pager button.action-next:not(.disabled)'
154156
) ?>
155157
<?php else: ?>
156158
<button type="button" class="action-next disabled">

‎app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminOrderPagerTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Admin order pager"/>
15+
<title value="Check pager is working"/>
16+
<description value="Check Pager in order add products grid"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="MC-35349"/>
19+
<useCaseId value="MC-35316"/>
20+
<group value="sales"/>
21+
</annotations>
22+
<before>
23+
<!-- 21 products created and category -->
24+
<createData entity="_defaultCategory" stepKey="createCategory"/>
25+
<createData entity="SimpleProduct" stepKey="createProduct01">
26+
<requiredEntity createDataKey="createCategory"/>
27+
</createData>
28+
<createData entity="SimpleProduct" stepKey="createProduct02">
29+
<requiredEntity createDataKey="createCategory"/>
30+
</createData>
31+
<createData entity="SimpleProduct" stepKey="createProduct03">
32+
<requiredEntity createDataKey="createCategory"/>
33+
</createData>
34+
<createData entity="SimpleProduct" stepKey="createProduct04">
35+
<requiredEntity createDataKey="createCategory"/>
36+
</createData>
37+
<createData entity="_defaultProduct" stepKey="createProduct05">
38+
<requiredEntity createDataKey="createCategory"/>
39+
</createData>
40+
<createData entity="_defaultProduct" stepKey="createProduct06">
41+
<requiredEntity createDataKey="createCategory"/>
42+
</createData>
43+
<createData entity="_defaultProduct" stepKey="createProduct07">
44+
<requiredEntity createDataKey="createCategory"/>
45+
</createData>
46+
<createData entity="_defaultProduct" stepKey="createProduct08">
47+
<requiredEntity createDataKey="createCategory"/>
48+
</createData>
49+
<createData entity="_defaultProduct" stepKey="createProduct09">
50+
<requiredEntity createDataKey="createCategory"/>
51+
</createData>
52+
<createData entity="SimpleProduct" stepKey="createProduct10">
53+
<requiredEntity createDataKey="createCategory"/>
54+
</createData>
55+
<createData entity="SimpleProduct" stepKey="createProduct11">
56+
<requiredEntity createDataKey="createCategory"/>
57+
</createData>
58+
<createData entity="SimpleProduct" stepKey="createProduct12">
59+
<requiredEntity createDataKey="createCategory"/>
60+
</createData>
61+
<createData entity="ApiSimpleProduct" stepKey="createProduct13">
62+
<requiredEntity createDataKey="createCategory"/>
63+
</createData>
64+
<createData entity="ApiSimpleProduct" stepKey="createProduct14">
65+
<requiredEntity createDataKey="createCategory"/>
66+
</createData>
67+
<createData entity="ApiSimpleProduct" stepKey="createProduct15">
68+
<requiredEntity createDataKey="createCategory"/>
69+
</createData>
70+
<createData entity="ApiSimpleProduct" stepKey="createProduct16">
71+
<requiredEntity createDataKey="createCategory"/>
72+
</createData>
73+
<createData entity="ApiSimpleProduct" stepKey="createProduct17">
74+
<requiredEntity createDataKey="createCategory"/>
75+
</createData>
76+
<createData entity="ApiSimpleProduct" stepKey="createProduct18">
77+
<requiredEntity createDataKey="createCategory"/>
78+
</createData>
79+
<createData entity="ApiSimpleProduct" stepKey="createProduct19">
80+
<requiredEntity createDataKey="createCategory"/>
81+
</createData>
82+
<createData entity="ApiSimpleProduct" stepKey="createProduct20">
83+
<requiredEntity createDataKey="createCategory"/>
84+
</createData>
85+
<createData entity="SimpleProduct" stepKey="createProduct21">
86+
<requiredEntity createDataKey="createCategory"/>
87+
</createData>
88+
89+
<!-- Customer is created -->
90+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
91+
<!-- Login to Admin -->
92+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
93+
</before>
94+
<after>
95+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
96+
<!-- Delete products -->
97+
<deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
98+
<deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>
99+
<deleteData createDataKey="createProduct03" stepKey="deleteProduct3"/>
100+
<deleteData createDataKey="createProduct04" stepKey="deleteProduct4"/>
101+
<deleteData createDataKey="createProduct05" stepKey="deleteProduct5"/>
102+
<deleteData createDataKey="createProduct06" stepKey="deleteProduct6"/>
103+
<deleteData createDataKey="createProduct07" stepKey="deleteProduct7"/>
104+
<deleteData createDataKey="createProduct08" stepKey="deleteProduct8"/>
105+
<deleteData createDataKey="createProduct09" stepKey="deleteProduct9"/>
106+
<deleteData createDataKey="createProduct10" stepKey="deleteProduct10"/>
107+
<deleteData createDataKey="createProduct11" stepKey="deleteProduct11"/>
108+
<deleteData createDataKey="createProduct12" stepKey="deleteProduct12"/>
109+
<deleteData createDataKey="createProduct13" stepKey="deleteProduct13"/>
110+
<deleteData createDataKey="createProduct14" stepKey="deleteProduct14"/>
111+
<deleteData createDataKey="createProduct15" stepKey="deleteProduct15"/>
112+
<deleteData createDataKey="createProduct16" stepKey="deleteProduct16"/>
113+
<deleteData createDataKey="createProduct17" stepKey="deleteProduct17"/>
114+
<deleteData createDataKey="createProduct18" stepKey="deleteProduct18"/>
115+
<deleteData createDataKey="createProduct19" stepKey="deleteProduct19"/>
116+
<deleteData createDataKey="createProduct20" stepKey="deleteProduct20"/>
117+
<deleteData createDataKey="createProduct21" stepKey="deleteProduct21"/>
118+
119+
<!-- Delete Category -->
120+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
121+
122+
<!-- Delete Customer -->
123+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
124+
</after>
125+
126+
<!-- Initiate create new order -->
127+
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
128+
<argument name="customer" value="$createCustomer$"/>
129+
</actionGroup>
130+
131+
<waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductsButtonAppeared"/>
132+
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
133+
<dontSee selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="previousPageDisabled"/>
134+
<click selector="{{AdminDataGridPaginationSection.nextPageActive}}" stepKey="clickNextPage"/>
135+
<seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="2" stepKey="seeSecondPageOrderGrid"/>
136+
<click selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="clickPreviousPage"/>
137+
<seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="1" stepKey="seeFirstPageOrderGrid"/>
138+
<dontSee selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="prevPageDisabled"/>
139+
</test>
140+
</tests>

‎app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
<element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
2222
<element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
2323
<element name="perPageDropDownValue" type="input" selector=".selectmenu-value input" timeout="30"/>
24+
<element name="selectedPage" type="input" selector="#sales_order_create_search_grid_page-current" timeout="30"/>
25+
<element name="nextPageActive" type="button" selector="div.admin__data-grid-pager > button.action-next:not(.disabled)" timeout="30"/>
26+
<element name="prevPageActive" type="button" selector="div.admin__data-grid-pager > button.action-previous:not(.disabled)" timeout="30"/>
2427
</section>
2528
</sections>

0 commit comments

Comments
 (0)