-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
…o ASI-1487
- Loading branch information
Showing
233 changed files
with
4,111 additions
and
1,539 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
<?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="AdminCheckAnalyticsTrackingTest"> | ||
<annotations> | ||
<stories value="AdminAnalytics Check Tracking."/> | ||
<title value="AdminAnalytics Check Tracking."/> | ||
<description value="AdminAnalytics Check Tracking."/> | ||
<severity value="MINOR"/> | ||
<testCaseId value="MC-36869"/> | ||
</annotations> | ||
<before> | ||
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/> | ||
<magentoCLI command="config:set admin/usage/enabled 1" stepKey="enableAdminUsageTracking"/> | ||
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches"> | ||
<argument name="tags" value="config full_page"/> | ||
</actionGroup> | ||
<reloadPage stepKey="pageReload"/> | ||
</before> | ||
<after> | ||
<magentoCLI command="config:set admin/usage/enabled 0" stepKey="disableAdminUsageTracking"/> | ||
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
</after> | ||
|
||
<waitForPageLoad stepKey="waitForPageReloaded"/> | ||
<seeInPageSource html="var adminAnalyticsMetadata =" stepKey="seeInPageSource"/> | ||
</test> | ||
</tests> |
15 changes: 15 additions & 0 deletions
15
...Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToEmailToFriendSettingsActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?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="AdminNavigateToEmailToFriendSettingsActionGroup"> | ||
<amOnPage url="{{AdminConfigurationEmailToFriendPage.url}}" stepKey="navigateToPersistencePage"/> | ||
<conditionalClick selector="{{AdminEmailToFriendSection.DefaultLayoutsTab}}" dependentSelector="{{AdminEmailToFriendSection.CheckIfTabExpand}}" visible="true" stepKey="clickTab"/> | ||
</actionGroup> | ||
</actionGroups> |
18 changes: 18 additions & 0 deletions
18
...nto/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?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="AssertAdminEmailToFriendOptionsAvailableActionGroup"> | ||
<seeElement stepKey="seeEmailTemplateInput" selector="{{AdminEmailToFriendSection.emailTemplate}}"/> | ||
<seeElement stepKey="seeAllowForGuestsInput" selector="{{AdminEmailToFriendSection.allowForGuests}}"/> | ||
<seeElement stepKey="seeMaxRecipientsInput" selector="{{AdminEmailToFriendSection.maxRecipients}}"/> | ||
<seeElement stepKey="seeMaxPerHourInput" selector="{{AdminEmailToFriendSection.maxPerHour}}"/> | ||
<seeElement stepKey="seeLimitSendingBy" selector="{{AdminEmailToFriendSection.limitSendingBy}}"/> | ||
</actionGroup> | ||
</actionGroups> |
18 changes: 18 additions & 0 deletions
18
app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?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="AssertAdminPageIs404ActionGroup"> | ||
<annotations> | ||
<description>Validates that the '404 Error' message is present in the current Admin Page Header.</description> | ||
</annotations> | ||
|
||
<see userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="see404PageHeading"/> | ||
</actionGroup> | ||
</actionGroups> |
14 changes: 14 additions & 0 deletions
14
app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationEmailToFriendPage.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
--> | ||
|
||
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd"> | ||
<page name="AdminConfigurationEmailToFriendPage" url="admin/system_config/edit/section/sendfriend/" module="Catalog" area="admin"> | ||
<section name="AdminEmailToFriendSection"/> | ||
</page> | ||
</pages> |
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<?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="AdminCatalogEmailToFriendSettingsTest"> | ||
<annotations> | ||
<features value="Backend"/> | ||
<stories value="Enable Email To A Friend Functionality"/> | ||
<title value="Admin should be able to manage settings of Email To A Friend Functionality"/> | ||
<description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/> | ||
<group value="backend"/> | ||
<severity value="MINOR"></severity> | ||
<testCaseId value="MC-35895"/> | ||
</annotations> | ||
|
||
<before> | ||
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
<magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/> | ||
<magentoCLI stepKey="cacheClean" command="cache:clean config"/> | ||
</before> | ||
<after> | ||
<magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/> | ||
<magentoCLI stepKey="cacheClean" command="cache:clean config"/> | ||
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
</after> | ||
|
||
<actionGroup ref="AdminNavigateToEmailToFriendSettingsActionGroup" stepKey="navigateToSendFriendSettings"/> | ||
<actionGroup ref="AssertAdminEmailToFriendOptionsAvailableActionGroup" stepKey="assertOptions"/> | ||
</test> | ||
</tests> |
144 changes: 144 additions & 0 deletions
144
app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\Bundle\Model\Product; | ||
|
||
use Magento\Bundle\Helper\Catalog\Product\Configuration; | ||
use Magento\Bundle\Model\Option; | ||
use Magento\Catalog\Model\Product; | ||
use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface; | ||
use Magento\Framework\Pricing\Helper\Data; | ||
use Magento\Framework\Serialize\SerializerInterface; | ||
|
||
/** | ||
* Data provider for bundled product options | ||
*/ | ||
class BundleOptionDataProvider | ||
{ | ||
/** | ||
* @var Data | ||
*/ | ||
private $pricingHelper; | ||
|
||
/** | ||
* @var SerializerInterface | ||
*/ | ||
private $serializer; | ||
|
||
/** | ||
* @var Configuration | ||
*/ | ||
private $configuration; | ||
|
||
/** | ||
* @param Data $pricingHelper | ||
* @param SerializerInterface $serializer | ||
* @param Configuration $configuration | ||
*/ | ||
public function __construct( | ||
Data $pricingHelper, | ||
SerializerInterface $serializer, | ||
Configuration $configuration | ||
) { | ||
$this->pricingHelper = $pricingHelper; | ||
$this->serializer = $serializer; | ||
$this->configuration = $configuration; | ||
} | ||
|
||
/** | ||
* Extract data for a bundled item | ||
* | ||
* @param ItemInterface $item | ||
* | ||
* @return array | ||
*/ | ||
public function getData(ItemInterface $item): array | ||
{ | ||
$options = []; | ||
$product = $item->getProduct(); | ||
$optionsQuoteItemOption = $item->getOptionByCode('bundle_option_ids'); | ||
$bundleOptionsIds = $optionsQuoteItemOption | ||
? $this->serializer->unserialize($optionsQuoteItemOption->getValue()) | ||
: []; | ||
|
||
/** @var Type $typeInstance */ | ||
$typeInstance = $product->getTypeInstance(); | ||
|
||
if ($bundleOptionsIds) { | ||
$selectionsQuoteItemOption = $item->getOptionByCode('bundle_selection_ids'); | ||
$optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $product); | ||
$bundleSelectionIds = $this->serializer->unserialize($selectionsQuoteItemOption->getValue()); | ||
|
||
if (!empty($bundleSelectionIds)) { | ||
$selectionsCollection = $typeInstance->getSelectionsByIds($bundleSelectionIds, $product); | ||
$bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true); | ||
|
||
$options = $this->buildBundleOptions($bundleOptions, $item); | ||
} | ||
} | ||
|
||
return $options; | ||
} | ||
|
||
/** | ||
* Build bundle product options based on current selection | ||
* | ||
* @param Option[] $bundleOptions | ||
* @param ItemInterface $item | ||
* | ||
* @return array | ||
*/ | ||
private function buildBundleOptions(array $bundleOptions, ItemInterface $item): array | ||
{ | ||
$options = []; | ||
foreach ($bundleOptions as $bundleOption) { | ||
if (!$bundleOption->getSelections()) { | ||
continue; | ||
} | ||
|
||
$options[] = [ | ||
'id' => $bundleOption->getId(), | ||
'label' => $bundleOption->getTitle(), | ||
'type' => $bundleOption->getType(), | ||
'values' => $this->buildBundleOptionValues($bundleOption->getSelections(), $item), | ||
]; | ||
} | ||
|
||
return $options; | ||
} | ||
|
||
/** | ||
* Build bundle product option values based on current selection | ||
* | ||
* @param Product[] $selections | ||
* @param ItemInterface $item | ||
* | ||
* @return array | ||
*/ | ||
private function buildBundleOptionValues(array $selections, ItemInterface $item): array | ||
{ | ||
$product = $item->getProduct(); | ||
$values = []; | ||
|
||
foreach ($selections as $selection) { | ||
$qty = (float) $this->configuration->getSelectionQty($product, $selection->getSelectionId()); | ||
if (!$qty) { | ||
continue; | ||
} | ||
|
||
$selectionPrice = $this->configuration->getSelectionFinalPrice($item, $selection); | ||
$values[] = [ | ||
'label' => $selection->getName(), | ||
'id' => $selection->getSelectionId(), | ||
'quantity' => $qty, | ||
'price' => $this->pricingHelper->currency($selectionPrice, false, false), | ||
]; | ||
} | ||
|
||
return $values; | ||
} | ||
} |
54 changes: 54 additions & 0 deletions
54
app/code/Magento/BundleGraphQl/Model/Wishlist/BundleOptions.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\BundleGraphQl\Model\Wishlist; | ||
|
||
use Magento\Bundle\Model\Product\BundleOptionDataProvider; | ||
use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface; | ||
use Magento\Framework\Exception\LocalizedException; | ||
use Magento\Framework\GraphQl\Config\Element\Field; | ||
use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
|
||
/** | ||
* Fetches the selected bundle options | ||
*/ | ||
class BundleOptions implements ResolverInterface | ||
{ | ||
/** | ||
* @var BundleOptionDataProvider | ||
*/ | ||
private $bundleOptionDataProvider; | ||
|
||
/** | ||
* @param BundleOptionDataProvider $bundleOptionDataProvider | ||
*/ | ||
public function __construct( | ||
BundleOptionDataProvider $bundleOptionDataProvider | ||
) { | ||
$this->bundleOptionDataProvider = $bundleOptionDataProvider; | ||
} | ||
|
||
/** | ||
* @inheritdoc | ||
*/ | ||
public function resolve( | ||
Field $field, | ||
$context, | ||
ResolveInfo $info, | ||
array $value = null, | ||
array $args = null | ||
) { | ||
if (!$value['itemModel'] instanceof ItemInterface) { | ||
throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [ | ||
'instance' => ItemInterface::class | ||
])); | ||
} | ||
|
||
return $this->bundleOptionDataProvider->getData($value['itemModel']); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.