Skip to content

Commit 6f9aa0d

Browse files
prabhuram93prabhuram93
committed
Merge remote-tracking branch 'origin/28581_refund_details' into 241-customer-orders
2 parents c7a6e77 + c4e51f3 commit 6f9aa0d

File tree

173 files changed

+2927
-890
lines changed

Some content is hidden

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

173 files changed

+2927
-890
lines changed

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
7171
</arguments>
7272
</block>
73-
7473
</container>
7574
</container>
7675
</referenceContainer>

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9-
'mediaUploader': 'Magento_Backend/js/media-uploader',
10-
'mage/translate': 'Magento_Backend/js/translate'
9+
'mediaUploader': 'Magento_Backend/js/media-uploader'
1110
}
1211
}
1312
};

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminAssertBackupLinkAbsentInMenuActionGroup">
12+
<annotations>
13+
<description>Verify 'Backup' link is absent in admin menu.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminMenuSection.menuItem('magento-backend-system')}}" stepKey="clickSystem"/>
17+
<dontSeeElement selector="{{AdminMenuSection.menuItem('magento-backup-system-tools-backup')}}" stepKey="dontSeeBackup"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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="AdminSystemBackupMenuTest">
12+
<annotations>
13+
<features value="Backup"/>
14+
<stories value="Backup menu not visible if config disabled"/>
15+
<title value="Backup menu not visible if backup config disabled"/>
16+
<description value="Disable backup config and check backup menu isn't visible"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="MC-36292"/>
19+
<group value="backup"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminAssertBackupLinkAbsentInMenuActionGroup" stepKey="verifyBackupLinkAbsentInMenu"/>
29+
</test>
30+
</tests>

‎app/code/Magento/Backup/etc/adminhtml/menu.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
10+
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup" dependsOnConfig="system/backup/functionality_enabled"/>
1111
</menu>
1212
</config>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163

164164
<!-- Save the settings -->
165165
<scrollToTopOfPage stepKey="scrollToTop"/>
166-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
167-
<waitForPageLoad stepKey="waitForTaxSaved"/>
166+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
167+
168168
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
169169

170170
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -192,8 +192,7 @@
192192

193193
<!-- Save the settings -->
194194
<scrollToTopOfPage stepKey="scrollToTop"/>
195-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
196-
<waitForPageLoad stepKey="waitForTaxSaved"/>
195+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
197196
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
198197

199198
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Magento\Sales\Api\Data\InvoiceItemInterface;
1717
use Magento\Sales\Api\Data\OrderItemInterface;
1818
use Magento\Sales\Api\Data\ShipmentItemInterface;
19+
use Magento\Sales\Api\Data\CreditmemoItemInterface;
1920

2021
/**
2122
* Resolve bundle options items for order item
@@ -56,12 +57,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
5657
throw new LocalizedException(__('"model" value should be specified'));
5758
}
5859
if ($value['model'] instanceof OrderItemInterface) {
59-
/** @var OrderItemInterface $item */
6060
$item = $value['model'];
6161
return $this->getBundleOptions($item, $value);
6262
}
63-
if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
64-
/** @var InvoiceItemInterface|ShipmentItemInterface $item */
63+
if ($value['model'] instanceof InvoiceItemInterface
64+
|| $value['model'] instanceof ShipmentItemInterface
65+
|| $value['model'] instanceof CreditmemoItemInterface) {
6566
$item = $value['model'];
6667
// Have to pass down order and item to map to avoid refetching all data
6768
return $this->getBundleOptions($item->getOrderItem(), $value);

‎app/code/Magento/BundleGraphQl/etc/schema.graphqls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ type BundleShipmentItem implements ShipmentItemInterface {
101101
}
102102

103103
type BundleCreditMemoItem implements CreditMemoItemInterface {
104-
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
104+
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
105105
}
106106

107107
type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {

‎app/code/Magento/Captcha/etc/adminhtml/system.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<depends>
5858
<field id="enable">1</field>
5959
</depends>
60-
<frontend_class>required-entry</frontend_class>
60+
<frontend_class>required-entry validate-range range-1-8</frontend_class>
6161
</field>
6262
<field id="symbols" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
6363
<label>Symbols Used in CAPTCHA</label>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
</annotations>
1717

1818
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
19+
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
1920
</actionGroup>
2021
</actionGroups>

0 commit comments

Comments
 (0)