Skip to content

Commit d67c819

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-4523: Fixed : Additional addresses DataTable Pagination count displaying wrong #21399
- Merge Pull Request #21399 from Dharmeshvaja91/magento2:fixed-issue-21396 - Merged commits: 1. f1e2fff 2. 8a872be 3. 69aac2c 4. 7320e1b 5. 0fcf041 6. 3ccc867 7. 5552b3e 8. dcff5d1 9. 0ab0e03 10. 6584286 11. c39751f 12. 7127e16 13. be076d5 14. 2f42295 15. fa9b420 16. 7436f30 17. 50ce1f5
2 parents cbbc79f + 50ce1f5 commit d67c819

File tree

124 files changed

+2850
-81
lines changed

Some content is hidden

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

124 files changed

+2850
-81
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<h2>Welcome</h2>
66
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
77

8-
## Magento system requirements
9-
[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
8+
## Magento System Requirements
9+
[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
1010

1111
## Install Magento
1212

13-
* [Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
13+
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
1414

15-
<h2>Contributing to the Magento 2 code base</h2>
15+
<h2>Contributing to the Magento 2 Code Base</h2>
1616
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
1717

1818
To learn about how to make a contribution, click [here][1].
@@ -39,11 +39,11 @@ Magento is thankful for any contribution that can improve our code base, documen
3939
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
4040
</a>
4141

42-
### Labels applied by the Magento team
42+
### Labels Applied by the Magento Team
4343
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
4444
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
4545

46-
## Reporting security issues
46+
## Reporting Security Issues
4747

4848
To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
4949

‎app/code/Magento/Authorizenet/Model/Directpost/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function setDataFromOrder(
194194
/**
195195
* Set sign hash into the request object.
196196
*
197-
* All needed fields should be placed in the object fist.
197+
* All needed fields should be placed in the object first.
198198
*
199199
* @return $this
200200
*/

‎app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
?>
1010
<?php if ($block->getChildHtml()):?>
11-
<div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
11+
<div data-mage-init='{"floatingHeader": {}}' class="page-actions floating-header" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
1212
<?= $block->getChildHtml() ?>
1313
</div>
1414
<?php endif; ?>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
2020
<waitForPageLoad stepKey="waitForConfirmWindowToAppear"/>
2121
<see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
22+
<waitForPageLoad stepKey="waitForSubmitAction"/>
2223
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
2324
<dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
2425
</actionGroup>
25-
2626
</actionGroups>

‎app/code/Magento/Bundle/view/base/web/js/price-bundle.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,17 @@ define([
374374
function applyTierPrice(oneItemPrice, qty, optionConfig) {
375375
var tiers = optionConfig.tierPrice,
376376
magicKey = _.keys(oneItemPrice)[0],
377+
tiersFirstKey = _.keys(optionConfig)[0],
377378
lowest = false;
378379

380+
if (!tiers) {//tiers is undefined when options has only one option
381+
tiers = optionConfig[tiersFirstKey].tierPrice;
382+
}
383+
384+
tiers.sort(function (a, b) {//sorting based on "price_qty"
385+
return a['price_qty'] - b['price_qty'];
386+
});
387+
379388
_.each(tiers, function (tier, index) {
380389
if (tier['price_qty'] > qty) {
381390
return;

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,4 +302,18 @@
302302
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
303303
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveProductMessage"/>
304304
</actionGroup>
305+
<actionGroup name="FillCategoryNameAndUrlKeyAndSave">
306+
<arguments>
307+
<argument name="categoryName" type="string"/>
308+
<argument name="categoryUrlKey" type="string"/>
309+
</arguments>
310+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="enterCategoryName"/>
311+
<scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
312+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
313+
<waitForPageLoad stepKey="waitForPageToLoad"/>
314+
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryUrlKey}}" stepKey="enterURLKey"/>
315+
<scrollToTopOfPage stepKey="scrollToTheTopOfPage"/>
316+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
317+
<waitForPageLoad stepKey="waitForPageToLoad1"/>
318+
</actionGroup>
305319
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
2121
</actionGroup>
2222

23-
<!--Fill main fields in create product form-->
23+
<!-- Fill main fields in create product form using a product entity -->
2424
<actionGroup name="fillMainProductForm">
2525
<arguments>
2626
<argument name="product" defaultValue="_defaultProduct"/>
@@ -34,6 +34,25 @@
3434
<fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
3535
</actionGroup>
3636

37+
<!-- Fill main fields in create product form using strings for flexibility -->
38+
<actionGroup name="FillMainProductFormByString">
39+
<arguments>
40+
<argument name="productName" type="string"/>
41+
<argument name="productSku" type="string"/>
42+
<argument name="productPrice" type="string"/>
43+
<argument name="productQuantity" type="string"/>
44+
<argument name="productStatus" type="string"/>
45+
<argument name="productWeight" type="string"/>
46+
</arguments>
47+
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
48+
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
49+
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{productPrice}}" stepKey="fillProductPrice"/>
50+
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQuantity}}" stepKey="fillProductQty"/>
51+
<selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{productStatus}}" stepKey="selectStockStatus"/>
52+
<selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
53+
<fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{productWeight}}" stepKey="fillProductWeight"/>
54+
</actionGroup>
55+
3756
<!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
3857
<actionGroup name="fillMainProductFormNoWeight">
3958
<arguments>
@@ -77,6 +96,11 @@
7796
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
7897
</actionGroup>
7998

99+
<!-- Save product but do not expect a success message -->
100+
<actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
101+
<remove keyForRemoval="seeSaveConfirmation"/>
102+
</actionGroup>
103+
80104
<!--Upload image for product-->
81105
<actionGroup name="addProductImage">
82106
<arguments>
@@ -389,6 +413,22 @@
389413
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
390414
<fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
391415
</actionGroup>
416+
417+
<actionGroup name="SetProductUrlKeyByString">
418+
<arguments>
419+
<argument name="urlKey" type="string"/>
420+
</arguments>
421+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
422+
<fillField userInput="{{urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
423+
</actionGroup>
424+
425+
<actionGroup name="SetCategoryByName">
426+
<arguments>
427+
<argument name="categoryName" type="string"/>
428+
</arguments>
429+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
430+
</actionGroup>
431+
392432
<actionGroup name="expandAdminProductSection">
393433
<arguments>
394434
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertProductInfoOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
12+
<arguments>
13+
<argument name="product" type="entity"/>
14+
</arguments>
15+
<waitForPageLoad stepKey="waitForProductToLoad"/>
16+
<seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
17+
<seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
18+
<seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="seeProductPrice"/>
19+
<seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="seeProductQuantity"/>
20+
<seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="seeProductStockStatus"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertProductOnAdminGridActionGroup" extends="viewProductInAdminGrid">
12+
<arguments>
13+
<argument name="product" defaultValue="_defaultProduct"/>
14+
</arguments>
15+
<remove keyForRemoval="clickClearFiltersAfter"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,9 @@
1212
<data key="store_id">0</data>
1313
<var key="sku" entityType="product2" entityKey="sku" />
1414
</entity>
15+
<entity name="specialProductPrice2" type="catalogSpecialPrice">
16+
<data key="price">55.55</data>
17+
<data key="store_id">0</data>
18+
<var key="sku" entityType="product" entityKey="sku" />
19+
</entity>
1520
</entities>

0 commit comments

Comments
 (0)