diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000000..17aa66c919eb5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Technical issue with the Magento 2 core components
+
+---
+
+
+
+### Preconditions
+
+1.
+2.
+
+### Steps to reproduce
+
+1.
+2.
+
+### Expected result
+
+1. [Screenshots, logs or description]
+2.
+
+### Actual result
+
+1. [Screenshots, logs or description]
+2.
diff --git a/.github/ISSUE_TEMPLATE/developer-experience-issue.md b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
new file mode 100644
index 0000000000000..a66b0c62ef8e2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
@@ -0,0 +1,18 @@
+---
+name: Developer experience issue
+about: Issues related to customization, extensibility, modularity
+
+---
+
+
+
+### Summary
+
+
+### Examples
+
+
+### Proposed solution
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000000..de85da43b70fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Please consider reporting directly to https://github.com/magento/community-features
+
+---
+
+
+
+### Description
+
+
+### Expected behavior
+
+
+### Benefits
+
+
+### Additional information
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 078b93bd7199c..cc722b6d61b33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.3.0
+=============
+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
+
2.1.0
=============
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
diff --git a/README.md b/README.md
index 6b2ac458eb403..50a20b55d4eb2 100644
--- a/README.md
+++ b/README.md
@@ -41,20 +41,8 @@ Magento is thankful for any contribution that can improve our code base, documen
Labels applied by the Magento team
-
-| Label | Description |
-| ------------- |-------------|
-|  | Affects Documentation domain. |
-|  | Affects the Product team (mostly feature requests or business logic change). |
-|  | Affects Architect Group (mostly to make decisions around technology changes). |
-|  | The pull request has been accepted and will be merged into mainline code. |
-|  | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
-|  | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
-|  | The Magento Team has validated the issue and an internal ticket has been created. |
-|  | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-|  | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
-
-To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
+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.
+Please review the Code Contributions guide for detailed information on labels used in Magento 2 repositories.
Reporting security issues
diff --git a/app/bootstrap.php b/app/bootstrap.php
index ba62b296bd49c..8e901cac9bfb8 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -31,8 +31,6 @@
// Sets default autoload mappings, may be overridden in Bootstrap::create
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
-require_once BP . '/app/functions.php';
-
/* Custom umask value may be provided in optional mage_umask file in root */
$umaskFile = BP . '/magento_umask';
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
@@ -54,8 +52,16 @@
&& isset($_SERVER['HTTP_ACCEPT'])
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
) {
- \Magento\Framework\Profiler::applyConfig(
- (isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
+ $profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
+ ? $_SERVER['MAGE_PROFILER']
+ : trim(file_get_contents(BP . '/var/profiler.flag'));
+
+ if ($profilerConfig) {
+ $profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
+ }
+
+ Magento\Framework\Profiler::applyConfig(
+ $profilerConfig,
BP,
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
);
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
index 125dba405b108..22eb3b30722f4 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
@@ -6,7 +6,9 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
-class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
{
/**
* @return void
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 3275de2a82fb7..24ef712c0f61f 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -37,7 +37,7 @@ public function __construct(
}
/**
- * Predispath admin action controller
+ * Predispatch admin action controller
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
index fbed5c0960b73..04d700b9f90ce 100644
--- a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
+++ b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
@@ -7,6 +7,6 @@
-->
-
diff --git a/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json
index df5e14e066636..b068ffffe9219 100644
--- a/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json
+++ b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json
@@ -1,32 +1,32 @@
{
- "adminnotification_inbox": {
- "column": {
- "notification_id": true,
- "severity": true,
- "date_added": true,
- "title": true,
- "description": true,
- "url": true,
- "is_read": true,
- "is_remove": true
+ "adminnotification_inbox": {
+ "column": {
+ "notification_id": true,
+ "severity": true,
+ "date_added": true,
+ "title": true,
+ "description": true,
+ "url": true,
+ "is_read": true,
+ "is_remove": true
+ },
+ "index": {
+ "ADMINNOTIFICATION_INBOX_SEVERITY": true,
+ "ADMINNOTIFICATION_INBOX_IS_READ": true,
+ "ADMINNOTIFICATION_INBOX_IS_REMOVE": true
+ },
+ "constraint": {
+ "PRIMARY": true
+ }
},
- "index": {
- "ADMINNOTIFICATION_INBOX_SEVERITY": true,
- "ADMINNOTIFICATION_INBOX_IS_READ": true,
- "ADMINNOTIFICATION_INBOX_IS_REMOVE": true
- },
- "constraint": {
- "PRIMARY": true
- }
- },
- "admin_system_messages": {
- "column": {
- "identity": true,
- "severity": true,
- "created_at": true
- },
- "constraint": {
- "PRIMARY": true
+ "admin_system_messages": {
+ "column": {
+ "identity": true,
+ "severity": true,
+ "created_at": true
+ },
+ "constraint": {
+ "PRIMARY": true
+ }
}
- }
}
\ No newline at end of file
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index 02413a1899cd7..d78266ab75311 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -5,12 +5,14 @@
*/
namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
use Magento\Framework\Controller\ResultFactory;
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
use Magento\Catalog\Model\Product as CatalogProduct;
-class GetFilter extends ExportController
+class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* Get grid-filter of entity attributes action.
@@ -37,10 +39,10 @@ public function execute()
);
return $resultLayout;
} catch (\Exception $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
}
} else {
- $this->messageManager->addError(__('Please correct the data sent.'));
+ $this->messageManager->addErrorMessage(__('Please correct the data sent.'));
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
index c2379e9dff062..b20872da2f8e7 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -6,18 +6,23 @@
namespace Magento\AdvancedSearch\Model\ResourceModel;
use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Model\ResourceModel\Db\Context;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Catalog\Api\Data\CategoryInterface;
use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
use Magento\Framework\Search\Request\Dimension;
use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
/**
* @api
* @since 100.1.0
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Index extends AbstractDb
{
@@ -38,25 +43,39 @@ class Index extends AbstractDb
*/
private $tableResolver;
+ /**
+ * @var DimensionCollectionFactory|null
+ */
+ private $dimensionCollectionFactory;
+
+ /**
+ * @var int|null
+ */
+ private $websiteId;
+
/**
* Index constructor.
* @param Context $context
* @param StoreManagerInterface $storeManager
* @param MetadataPool $metadataPool
- * @param null $connectionName
+ * @param string|null $connectionName
* @param TableResolver|null $tableResolver
+ * @param DimensionCollectionFactory|null $dimensionCollectionFactory
*/
public function __construct(
Context $context,
StoreManagerInterface $storeManager,
MetadataPool $metadataPool,
$connectionName = null,
- TableResolver $tableResolver = null
+ TableResolver $tableResolver = null,
+ DimensionCollectionFactory $dimensionCollectionFactory = null
) {
parent::__construct($context, $connectionName);
$this->storeManager = $storeManager;
$this->metadataPool = $metadataPool;
- $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
+ $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+ $this->dimensionCollectionFactory = $dimensionCollectionFactory
+ ?: ObjectManager::getInstance()->get(DimensionCollectionFactory::class);
}
/**
@@ -78,18 +97,27 @@ protected function _construct()
protected function _getCatalogProductPriceData($productIds = null)
{
$connection = $this->getConnection();
-
- $select = $connection->select()->from(
- $this->getTable('catalog_product_index_price'),
- ['entity_id', 'customer_group_id', 'website_id', 'min_price']
- );
-
- if ($productIds) {
- $select->where('entity_id IN (?)', $productIds);
+ $catalogProductIndexPriceSelect = [];
+
+ foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+ if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
+ $this->websiteId === null ||
+ $dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
+ $select = $connection->select()->from(
+ $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
+ ['entity_id', 'customer_group_id', 'website_id', 'min_price']
+ );
+ if ($productIds) {
+ $select->where('entity_id IN (?)', $productIds);
+ }
+ $catalogProductIndexPriceSelect[] = $select;
+ }
}
+ $catalogProductIndexPriceUnionSelect = $connection->select()->union($catalogProductIndexPriceSelect);
+
$result = [];
- foreach ($connection->fetchAll($select) as $row) {
+ foreach ($connection->fetchAll($catalogProductIndexPriceUnionSelect) as $row) {
$result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] = round($row['min_price'], 2);
}
@@ -106,9 +134,12 @@ protected function _getCatalogProductPriceData($productIds = null)
*/
public function getPriceIndexData($productIds, $storeId)
{
+ $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+
+ $this->websiteId = $websiteId;
$priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
+ $this->websiteId = null;
- $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
if (!isset($priceProductsIndexData[$websiteId])) {
return [];
}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php
index 185e932406e5b..1f37e40842f54 100644
--- a/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -15,6 +15,9 @@
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Select;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class IndexTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -59,10 +62,24 @@ protected function setUp()
$this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
$this->metadataPoolMock = $this->createMock(MetadataPool::class);
+ $indexScopeResolverMock = $this->createMock(
+ \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
+ );
+ $traversableMock = $this->createMock(\Traversable::class);
+ $dimensionsMock = $this->createMock(\Magento\Framework\Indexer\MultiDimensionProvider::class);
+ $dimensionsMock->method('getIterator')->willReturn($traversableMock);
+ $dimensionFactoryMock = $this->createMock(
+ \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+ );
+ $dimensionFactoryMock->method('create')->willReturn($dimensionsMock);
+
$this->model = new Index(
$this->resourceContextMock,
$this->storeManagerMock,
- $this->metadataPoolMock
+ $this->metadataPoolMock,
+ 'connectionName',
+ $indexScopeResolverMock,
+ $dimensionFactoryMock
);
}
@@ -71,11 +88,13 @@ public function testGetPriceIndexDataUsesFrontendPriceIndexerTable()
$storeId = 1;
$storeMock = $this->createMock(StoreInterface::class);
$storeMock->expects($this->any())->method('getId')->willReturn($storeId);
+ $storeMock->method('getWebsiteId')->willReturn(1);
$this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($storeMock);
$selectMock = $this->createMock(Select::class);
$selectMock->expects($this->any())->method('from')->willReturnSelf();
$selectMock->expects($this->any())->method('where')->willReturnSelf();
+ $selectMock->expects($this->any())->method('union')->willReturnSelf();
$this->adapterMock->expects($this->once())->method('select')->willReturn($selectMock);
$this->adapterMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn([]);
diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json b/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json
index eaf7f3d616736..8addf187744fd 100644
--- a/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json
+++ b/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json
@@ -1,14 +1,14 @@
{
- "catalogsearch_recommendations": {
- "column": {
- "id": true,
- "query_id": true,
- "relation_id": true
- },
- "constraint": {
- "PRIMARY": true,
- "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
- "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
+ "catalogsearch_recommendations": {
+ "column": {
+ "id": true,
+ "query_id": true,
+ "relation_id": true
+ },
+ "constraint": {
+ "PRIMARY": true,
+ "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
+ "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
+ }
}
- }
}
\ No newline at end of file
diff --git a/app/code/Magento/AdvancedSearch/etc/di.xml b/app/code/Magento/AdvancedSearch/etc/di.xml
index 9ec75f56bbf7b..21e19fd58825b 100644
--- a/app/code/Magento/AdvancedSearch/etc/di.xml
+++ b/app/code/Magento/AdvancedSearch/etc/di.xml
@@ -19,6 +19,12 @@
Did you mean
+
+
+ Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+
+
@@ -26,5 +32,12 @@
+
+
+
+ Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+
+
+
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
noreport
No
diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
index 71d8bdcd5994b..099cc71321b84 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
noreport
123123q
diff --git a/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
index 06186d2d10402..2e1e5f6f5a97d 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/x-www-form-urlencoded
diff --git a/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
index f52468807928e..9d0132453c798 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/x-www-form-urlencoded
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
index fefb7874ef736..ff89ca9b663ee 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
index 9fe5f54f1db3c..6f27b03e4df30 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
index b7b63c5d9a62e..fd353964bae9a 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
data
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
index a53938d534644..d1bf3c2cb2ed6 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
new file mode 100644
index 0000000000000..8c258accdf06c
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
index ca0797f7ded26..b68b9914186f6 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
index 75ef114ec64b6..713199771e824 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
@@ -7,6 +7,6 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
index dc512e66528ac..2ec25da461908 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
index 92b06878ab87f..441ce886f117b 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
index b65a969e334c4..3b10fac7bb9dc 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+
+
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index ff5e02397cbff..b1350d5dcc1d7 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT
@@ -169,4 +167,5 @@
Magento\Backend\Block\Template
+
Image Processing Settings
-
+
Image Adapter
Magento\Config\Model\Config\Source\Image\Adapter
Magento\Config\Model\Config\Backend\Image\Adapter
@@ -234,6 +234,7 @@
Top destinations
Magento\Directory\Model\Config\Source\Country
+ 1
@@ -314,11 +315,11 @@
Disable Email Communications
Magento\Config\Model\Config\Source\Yesno
-
+
Host
For Windows server only.
-
+
Port (25)
For Windows server only.
@@ -335,6 +336,19 @@
+
+ Images Upload Configuration
+
+ Maximum Width
+ validate-greater-than-zero validate-number required-entry
+ Maximum allowed width for uploaded image.
+
+
+ Maximum Height
+ validate-greater-than-zero validate-number required-entry
+ Maximum allowed height for uploaded image.
+
+
Admin
@@ -435,7 +449,7 @@
Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
-
+
Auto-redirect to Base URL
Magento\Config\Model\Config\Source\Web\Redirect
I.e. redirect from http://example.com/store/ to http://www.example.com/store/
@@ -448,7 +462,7 @@
Magento\Config\Model\Config\Source\Yesno
-
+
Base URLs
Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/
@@ -456,7 +470,7 @@
Magento\Config\Model\Config\Backend\Baseurl
Specify URL or {{base_url}} placeholder.
-
+
Base Link URL
Magento\Config\Model\Config\Backend\Baseurl
May start with {{unsecure_base_url}} placeholder.
@@ -466,13 +480,13 @@
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{unsecure_base_url}} placeholder.
-
+
Base URL for User Media Files
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{unsecure_base_url}} placeholder.
-
+
Base URLs (Secure)
Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/
@@ -480,7 +494,7 @@
Magento\Config\Model\Config\Backend\Baseurl
Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Secure Base Link URL
Magento\Config\Model\Config\Backend\Baseurl
May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.
@@ -490,24 +504,24 @@
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Secure Base URL for User Media Files
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Use Secure URLs on Storefront
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
Enter https protocol to use Secure URLs on Storefront.
-
+
Use Secure URLs in Admin
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
Enter https protocol to use Secure URLs in Admin.
-
+
Enable HTTP Strict Transport Security (HSTS)
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
@@ -517,7 +531,7 @@
1
-
+
Upgrade Insecure Requests
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
index b7aaf8bf20dba..45d283ad3ff22 100644
--- a/app/code/Magento/Backend/etc/config.xml
+++ b/app/code/Magento/Backend/etc/config.xml
@@ -28,6 +28,10 @@
1
+
+ 1920
+ 1200
+
diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
index 6d1691a0e5603..3a5cd8226753d 100644
--- a/app/code/Magento/Backend/etc/module.xml
+++ b/app/code/Magento/Backend/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
index 1e14dd837634a..966372773f295 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
@@ -13,8 +13,8 @@
data-mage-init='{
"Magento_Backend/js/media-uploader" : {
"maxFileSize": getFileSizeService()->getMaxFileSize() ?>,
- "maxWidth": ,
- "maxHeight":
+ "maxWidth":getImageUploadMaxWidth() ?> ,
+ "maxHeight": getImageUploadMaxHeight() ?>
}
}'
>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index c665c1095a549..fad8f5968009f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -107,7 +107,7 @@ $numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
' . $block->getCollection()->getLastPageNumber() . '') ?>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
new file mode 100644
index 0000000000000..4f34f24c3a806
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
new file mode 100644
index 0000000000000..ae97351cafcaf
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ systemBackup
+ System
+
+
+ mediaBackup
+ Database and Media
+
+
+ databaseBackup
+ Database
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
new file mode 100644
index 0000000000000..aad29e6e6d566
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
new file mode 100644
index 0000000000000..af88146bcfb4b
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
new file mode 100644
index 0000000000000..cca6b428a2820
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
new file mode 100644
index 0000000000000..72fb51684931f
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..11ba79f32b5db
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
new file mode 100644
index 0000000000000..496bb79343092
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
index 629028bfd6f15..abf5e63276afa 100644
--- a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
@@ -56,7 +56,7 @@ protected function setUp()
$this->_objectManager->expects(
$this->at(0)
)->method(
- 'get'
+ 'create'
)->with(
\Magento\Backup\Model\Fs\Collection::class
)->will(
@@ -65,7 +65,7 @@ protected function setUp()
$this->_objectManager->expects(
$this->at(1)
)->method(
- 'get'
+ 'create'
)->with(
\Magento\Backup\Model\Backup::class
)->will(
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
index 4c3f1e179d378..6d43929db7675 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
@@ -17,8 +17,6 @@ class TransactionRefund extends AbstractTransaction
protected function process(array $data)
{
$storeId = $data['store_id'] ?? null;
- // sending store id and other additional keys are restricted by Braintree API
- unset($data['store_id']);
return $this->adapterFactory->create($storeId)
->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
index 16ebd7a7a00c5..6760e724fd3a6 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
@@ -19,8 +19,6 @@ class TransactionSubmitForSettlement extends AbstractTransaction
protected function process(array $data)
{
$storeId = $data['store_id'] ?? null;
- // sending store id and other additional keys are restricted by Braintree API
- unset($data['store_id']);
return $this->adapterFactory->create($storeId)
->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
index e9a478a8bac23..0a940839fc154 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
@@ -15,8 +15,6 @@ class TransactionVoid extends AbstractTransaction
protected function process(array $data)
{
$storeId = $data['store_id'] ?? null;
- // sending store id and other additional keys are restricted by Braintree API
- unset($data['store_id']);
return $this->adapterFactory->create($storeId)->void($data['transaction_id']);
}
diff --git a/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
new file mode 100644
index 0000000000000..6dc40e76322df
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
@@ -0,0 +1,64 @@
+config = $config;
+ $this->subjectReader = $subjectReader;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function build(array $buildSubject): array
+ {
+ $paymentDO = $this->subjectReader->readPayment($buildSubject);
+ $order = $paymentDO->getOrder();
+
+ $result = [];
+ $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
+ if (!empty($merchantAccountId)) {
+ $result[self::$merchantAccountId] = $merchantAccountId;
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
index 85a0c64451398..fe75ce86cca2f 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -6,8 +6,8 @@
namespace Magento\Braintree\Gateway\Request;
use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Observer\DataAssignObserver;
use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
use Magento\Payment\Gateway\Request\BuilderInterface;
use Magento\Payment\Helper\Formatter;
@@ -36,9 +36,8 @@ class PaymentDataBuilder implements BuilderInterface
const PAYMENT_METHOD_NONCE = 'paymentMethodNonce';
/**
- * The merchant account ID used to create a transaction.
- * Currency is also determined by merchant account ID.
- * If no merchant account ID is specified, Braintree will use your default merchant account.
+ * @deprecated
+ * @see \Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
*/
const MERCHANT_ACCOUNT_ID = 'merchantAccountId';
@@ -47,25 +46,18 @@ class PaymentDataBuilder implements BuilderInterface
*/
const ORDER_ID = 'orderId';
- /**
- * @var Config
- */
- private $config;
-
/**
* @var SubjectReader
*/
private $subjectReader;
/**
- * Constructor
- *
* @param Config $config
* @param SubjectReader $subjectReader
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(Config $config, SubjectReader $subjectReader)
{
- $this->config = $config;
$this->subjectReader = $subjectReader;
}
@@ -87,11 +79,6 @@ public function build(array $buildSubject)
self::ORDER_ID => $order->getOrderIncrementId()
];
- $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
- if (!empty($merchantAccountId)) {
- $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
- }
-
return $result;
}
}
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index e06b913db8ef4..e6c5ee22c62b4 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
*/
public function getConfig()
{
+ $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+
return [
'payment' => [
self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
'vaultCode' => self::PAYPAL_VAULT_CODE,
'skipOrderReview' => $this->config->isSkipOrderReview(),
'paymentIcon' => $this->config->getPayPalIcon(),
+ 'isRequiredBillingAddress' =>
+ (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
]
]
];
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
new file mode 100644
index 0000000000000..e86d5403e11eb
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
new file mode 100644
index 0000000000000..23c322083773c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
new file mode 100644
index 0000000000000..27e2039fe526e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
new file mode 100644
index 0000000000000..a68042127ec48
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
new file mode 100644
index 0000000000000..ee7158c2b63f7
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
new file mode 100644
index 0000000000000..19de3e859ae9a
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
new file mode 100644
index 0000000000000..65eddc0d9e51a
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
new file mode 100644
index 0000000000000..724c6d92846c4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
new file mode 100644
index 0000000000000..bc6d6c2b46dc9
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
new file mode 100644
index 0000000000000..7c774a634b369
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
index 6e669a1b8bf4b..8f2588a6effa5 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
SampleTitle
SamplePaymentAction
@@ -35,6 +35,33 @@
somePrivateKey
+
+ BraintreeTitle
+ PaymentAction
+ Environment
+ MerchantId
+ PublicKey
+ PrivateKey
+
+
+ Credit Card (Braintree)
+
+
+ authorize
+
+
+ sandbox
+
+
+ d4pdjhxgjfrsmzbf
+
+
+ m7q4wmh43xrgyrst
+
+
+ 67de364080b1b4e2492d7a3de413a572
+
+
DefaultTitle
@@ -62,4 +89,62 @@
+
+
+ BraintreeValuteActive
+ EnableSolution
+
+
+ 1
+
+
+ 1
+
+
+
+ DefaultBraintreeValuteActive
+ DefaultEnableSolution
+
+
+ 0
+
+
+ 0
+
+
+
+ Website
+ new_website
+ Store
+ new_store
+ Block
+
+
+
+ Role
+
+
+ admin
+ John
+ Smith
+ admin123
+ mail@mail.com
+
+
+
+ 5105105105105100
+ 12
+ 20
+ 113
+
+
+
+ Credit Card (Braintree)
+ d4pdjhxgjfrsmzbf
+ m7q4wmh43xrgyrst
+ 67de364080b1b4e2492d7a3de413a572
+ Magneto
+ PayPal (Braintree)
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
new file mode 100644
index 0000000000000..772c1c39a04ca
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Abgar
+ Abgaryan
+ m@m.com
+ Abgar
+ Abgaryan
+ Street
+ Yerevan
+ 9999
+ 9999
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
new file mode 100644
index 0000000000000..72661ae94076f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ ProductTest
+ 100
+ 100
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
index e4d02a58b5bf4..5e3b870d65c67 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
@@ -42,4 +42,22 @@
+
+
+
+
+
+
+
+ integer
+
+
+ string
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
new file mode 100644
index 0000000000000..1158f471d51f0
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
new file mode 100644
index 0000000000000..98d748b5a30ea
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
new file mode 100644
index 0000000000000..220c9a444b02f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
new file mode 100644
index 0000000000000..bf2e2b44eb602
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
new file mode 100644
index 0000000000000..e37ce8f4738b3
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
new file mode 100644
index 0000000000000..e999413c96d74
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
new file mode 100644
index 0000000000000..2e5fcfb7b5c8d
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
new file mode 100644
index 0000000000000..660c7393b4061
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
new file mode 100644
index 0000000000000..63cbadc71d3d3
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
new file mode 100644
index 0000000000000..9564bc61f799c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
new file mode 100644
index 0000000000000..016af2e102744
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
new file mode 100644
index 0000000000000..d8e1b837a1d1b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
new file mode 100644
index 0000000000000..32f02a69f817e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
new file mode 100644
index 0000000000000..100407438eaae
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
new file mode 100644
index 0000000000000..885a45be721f1
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
new file mode 100644
index 0000000000000..e4a75b1b6a842
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
new file mode 100644
index 0000000000000..937afb83da96f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
new file mode 100644
index 0000000000000..d302f9c7d0cba
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
new file mode 100644
index 0000000000000..13f59ad2cf18e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
new file mode 100644
index 0000000000000..42e451940c91b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
new file mode 100644
index 0000000000000..267efdf3d0e5e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
new file mode 100644
index 0000000000000..f094baa9f3446
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
new file mode 100644
index 0000000000000..3a07cbc6dd145
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
new file mode 100644
index 0000000000000..7f6d862ada085
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
new file mode 100644
index 0000000000000..df2e98816f0d3
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
index 76ab8b8b53b3f..5620e8ffa92b8 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -5,14 +5,14 @@
*/
namespace Magento\Braintree\Test\Unit\Gateway\Request;
-use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
use Magento\Braintree\Observer\DataAssignObserver;
use Magento\Payment\Gateway\Data\OrderAdapterInterface;
use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
use Magento\Sales\Model\Order\Payment;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Braintree\Gateway\Config\Config;
/**
* Tests \Magento\Braintree\Gateway\Request\PaymentDataBuilder.
@@ -20,18 +20,12 @@
class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
{
const PAYMENT_METHOD_NONCE = 'nonce';
- const MERCHANT_ACCOUNT_ID = '245345';
/**
* @var PaymentDataBuilder
*/
private $builder;
- /**
- * @var Config|MockObject
- */
- private $configMock;
-
/**
* @var Payment|MockObject
*/
@@ -52,12 +46,12 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
*/
private $orderMock;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
- $this->configMock = $this->getMockBuilder(Config::class)
- ->disableOriginalConstructor()
- ->getMock();
$this->paymentMock = $this->getMockBuilder(Payment::class)
->disableOriginalConstructor()
->getMock();
@@ -66,13 +60,19 @@ protected function setUp()
->getMock();
$this->orderMock = $this->createMock(OrderAdapterInterface::class);
- $this->builder = new PaymentDataBuilder($this->configMock, $this->subjectReaderMock);
+ /** @var Config $config */
+ $config = $this->getMockBuilder(Config::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->builder = new PaymentDataBuilder($config, $this->subjectReaderMock);
}
/**
+ * @return void
* @expectedException \InvalidArgumentException
*/
- public function testBuildReadPaymentException()
+ public function testBuildReadPaymentException(): void
{
$buildSubject = [];
@@ -85,9 +85,10 @@ public function testBuildReadPaymentException()
}
/**
+ * @return void
* @expectedException \InvalidArgumentException
*/
- public function testBuildReadAmountException()
+ public function testBuildReadAmountException(): void
{
$buildSubject = [
'payment' => $this->paymentDOMock,
@@ -106,7 +107,10 @@ public function testBuildReadAmountException()
$this->builder->build($buildSubject);
}
- public function testBuild()
+ /**
+ * @return void
+ */
+ public function testBuild(): void
{
$additionalData = [
[
@@ -118,8 +122,7 @@ public function testBuild()
$expectedResult = [
PaymentDataBuilder::AMOUNT => 10.00,
PaymentDataBuilder::PAYMENT_METHOD_NONCE => self::PAYMENT_METHOD_NONCE,
- PaymentDataBuilder::ORDER_ID => '000000101',
- PaymentDataBuilder::MERCHANT_ACCOUNT_ID => self::MERCHANT_ACCOUNT_ID,
+ PaymentDataBuilder::ORDER_ID => '000000101'
];
$buildSubject = [
@@ -131,10 +134,6 @@ public function testBuild()
->method('getAdditionalInformation')
->willReturnMap($additionalData);
- $this->configMock->expects(self::once())
- ->method('getMerchantAccountId')
- ->willReturn(self::MERCHANT_ACCOUNT_ID);
-
$this->paymentDOMock->expects(self::once())
->method('getPayment')
->willReturn($this->paymentMock);
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php
new file mode 100644
index 0000000000000..2248aab1aad2e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php
@@ -0,0 +1,70 @@
+configMock = $this->createMock(Config::class);
+ $this->availabilityChecker = new AvailabilityChecker($this->configMock);
+ }
+
+ /**
+ * Test isAvailable method
+ *
+ * @dataProvider isAvailableDataProvider
+ *
+ * @param bool $isVerify3DSecure
+ * @param bool $expected
+ *
+ * @return void
+ */
+ public function testIsAvailable(bool $isVerify3DSecure, bool $expected)
+ {
+ $this->configMock->expects($this->once())->method('isVerify3DSecure')->willReturn($isVerify3DSecure);
+ $actual = $this->availabilityChecker->isAvailable();
+ self::assertEquals($expected, $actual);
+ }
+
+ /**
+ * Data provider for isAvailable method test
+ *
+ * @return array
+ */
+ public function isAvailableDataProvider()
+ {
+ return [
+ [true, false],
+ [false, true],
+ ];
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php
new file mode 100644
index 0000000000000..a5c7cd743d85f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php
@@ -0,0 +1,119 @@
+ 'visa',
+ 'maskedCC' => '1111************9999',
+ 'expirationDate' => '01-01-2020'
+ ];
+
+ /**
+ * Set Up
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
+ ->getMockForAbstractClass();
+
+ $this->creditCardTokenFormatter = new CreditCardTokenFormatter();
+ }
+
+ /**
+ * Testing the payment format with a known credit card type
+ *
+ * @return void
+ */
+ public function testFormatPaymentTokenWithKnownCardType()
+ {
+ $this->tokenDetails['type'] = key(CreditCardTokenFormatter::$baseCardTypes);
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+
+ $formattedString = sprintf(
+ '%s: %s, %s: %s (%s: %s)',
+ __('Credit Card'),
+ reset(CreditCardTokenFormatter::$baseCardTypes),
+ __('ending'),
+ $this->tokenDetails['maskedCC'],
+ __('expires'),
+ $this->tokenDetails['expirationDate']
+ );
+
+ self::assertEquals(
+ $formattedString,
+ $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
+ );
+ }
+
+ /**
+ * Testing the payment format with a unknown credit card type
+ *
+ * @return void
+ */
+ public function testFormatPaymentTokenWithUnknownCardType()
+ {
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+
+ $formattedString = sprintf(
+ '%s: %s, %s: %s (%s: %s)',
+ __('Credit Card'),
+ $this->tokenDetails['type'],
+ __('ending'),
+ $this->tokenDetails['maskedCC'],
+ __('expires'),
+ $this->tokenDetails['expirationDate']
+ );
+
+ self::assertEquals(
+ $formattedString,
+ $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
+ );
+ }
+
+ /**
+ * Testing the payment format with wrong card data
+ *
+ * @return void
+ */
+ public function testFormatPaymentTokenWithWrongData()
+ {
+ unset($this->tokenDetails['type']);
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+ self::expectException('\InvalidArgumentException');
+
+ $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock);
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
new file mode 100644
index 0000000000000..e4cd8fd58043b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
@@ -0,0 +1,104 @@
+ 'visa',
+ 'maskedCC' => '4444************9999',
+ 'expirationDate' => '07-07-2025'
+ ];
+
+ /**
+ * Test setup
+ */
+ protected function setUp()
+ {
+ $this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
+ ->getMockForAbstractClass();
+
+ $this->paypalTokenFormatter = new PaypalTokenFormatter();
+ }
+
+ /**
+ * testFormatPaymentTokenWithKnownCardType
+ */
+ public function testFormatPaymentTokenWithKnownCardType()
+ {
+ $this->tokenDetails['type'] = key(PaypalTokenFormatter::$baseCardTypes);
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+
+ $formattedString = sprintf(
+ '%s: %s, %s: %s (%s: %s)',
+ __('Credit Card'),
+ reset(PaypalTokenFormatter::$baseCardTypes),
+ __('ending'),
+ $this->tokenDetails['maskedCC'],
+ __('expires'),
+ $this->tokenDetails['expirationDate']
+ );
+
+ self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+ }
+
+ /**
+ * testFormatPaymentTokenWithUnknownCardType
+ */
+ public function testFormatPaymentTokenWithUnknownCardType()
+ {
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+
+ $formattedString = sprintf(
+ '%s: %s, %s: %s (%s: %s)',
+ __('Credit Card'),
+ $this->tokenDetails['type'],
+ __('ending'),
+ $this->tokenDetails['maskedCC'],
+ __('expires'),
+ $this->tokenDetails['expirationDate']
+ );
+
+ self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+ }
+
+ /**
+ * testFormatPaymentTokenWithWrongData
+ */
+ public function testFormatPaymentTokenWithWrongData()
+ {
+ unset($this->tokenDetails['type']);
+
+ $this->paymentTokenMock->expects($this->once())
+ ->method('getTokenDetails')
+ ->willReturn(json_encode($this->tokenDetails));
+ self::expectException('\InvalidArgumentException');
+
+ $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock);
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php
new file mode 100644
index 0000000000000..2631fcbe5f5b5
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php
@@ -0,0 +1,83 @@
+getPaymentNonceCommandMock = $this->createMock(GetPaymentNonceCommand::class);
+ $this->paymentTokenMock = $this->createMock(PaymentTokenInterface::class);
+ $this->arrayResultMock = $this->createMock(ArrayResult::class);
+ $this->paymentAdditionalInformationProvider = new PaymentAdditionalInformationProvider(
+ $this->getPaymentNonceCommandMock
+ );
+ }
+
+ /**
+ * Test getAdditionalInformation method
+ *
+ * @return void
+ */
+ public function testGetAdditionalInformation()
+ {
+ $customerId = 15;
+ $publicHash = '3n4b7sn48g';
+ $paymentMethodNonce = 'test';
+
+ $this->paymentTokenMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+ $this->paymentTokenMock->expects($this->once())->method('getPublicHash')->willReturn($publicHash);
+ $this->getPaymentNonceCommandMock->expects($this->once())->method('execute')->with([
+ PaymentTokenInterface::CUSTOMER_ID => $customerId,
+ PaymentTokenInterface::PUBLIC_HASH => $publicHash,
+ ])->willReturn($this->arrayResultMock);
+ $this->arrayResultMock->expects($this->once())->method('get')
+ ->willReturn(['paymentMethodNonce' => $paymentMethodNonce]);
+
+ $expected = [
+ 'payment_method_nonce' => $paymentMethodNonce,
+ ];
+ $actual = $this->paymentAdditionalInformationProvider->getAdditionalInformation($this->paymentTokenMock);
+ self::assertEquals($expected, $actual);
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
new file mode 100644
index 0000000000000..b6ef534c55c29
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
@@ -0,0 +1,138 @@
+configMock = $this->createMock(Config::class);
+ $this->resolverMock = $this->createMock(ResolverInterface::class);
+ $this->localeResolver = new LocaleResolver($this->resolverMock, $this->configMock);
+ }
+
+ /**
+ * Test getDefaultLocalePath method
+ *
+ * @return void
+ */
+ public function testGetDefaultLocalePath()
+ {
+ $expected = 'general/locale/code';
+ $this->resolverMock->expects($this->once())->method('getDefaultLocalePath')->willReturn($expected);
+ $actual = $this->localeResolver->getDefaultLocalePath();
+ self::assertEquals($expected, $actual);
+ }
+
+ /**
+ * Test setDefaultLocale method
+ *
+ * @return void
+ */
+ public function testSetDefaultLocale()
+ {
+ $defaultLocale = 'en_US';
+ $this->resolverMock->expects($this->once())->method('setDefaultLocale')->with($defaultLocale);
+ $this->localeResolver->setDefaultLocale($defaultLocale);
+ }
+
+ /**
+ * Test getDefaultLocale method
+ *
+ * @return void
+ */
+ public function testGetDefaultLocale()
+ {
+ $expected = 'fr_FR';
+ $this->resolverMock->expects($this->once())->method('getDefaultLocale')->willReturn($expected);
+ $actual = $this->localeResolver->getDefaultLocale();
+ self::assertEquals($expected, $actual);
+ }
+
+ /**
+ * Test setLocale method
+ *
+ * @return void
+ */
+ public function testSetLocale()
+ {
+ $locale = 'en_GB';
+ $this->resolverMock->expects($this->once())->method('setLocale')->with($locale);
+ $this->localeResolver->setLocale($locale);
+ }
+
+ /**
+ * Test getLocale method
+ *
+ * @return void
+ */
+ public function testGetLocale()
+ {
+ $locale = 'en_TEST';
+ $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL';
+ $this->resolverMock->expects($this->once())->method('getLocale')->willReturn($locale);
+ $this->configMock->expects($this->once())->method('getValue')->with('supported_locales')
+ ->willReturn($allowedLocales);
+
+ $expected = 'en_US';
+ $actual = $this->localeResolver->getLocale();
+ self::assertEquals($expected, $actual);
+ }
+
+ /**
+ * Test emulate method
+ *
+ * @return void
+ */
+ public function testEmulate()
+ {
+ $scopeId = 12;
+ $this->resolverMock->expects($this->once())->method('emulate')->with($scopeId);
+ $this->localeResolver->emulate($scopeId);
+ }
+
+ /**
+ * Test revert method
+ *
+ * @return void
+ */
+ public function testRevert()
+ {
+ $this->resolverMock->expects($this->once())->method('revert');
+ $this->localeResolver->revert();
+ }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index 76bf5b659bda3..62452228b6186 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
@@ -51,6 +51,9 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
*/
private $quoteUpdater;
+ /**
+ * @return void
+ */
protected function setUp()
{
$this->configMock = $this->getMockBuilder(Config::class)
@@ -99,6 +102,10 @@ protected function setUp()
);
}
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
public function testExecute()
{
$details = $this->getDetails();
@@ -121,6 +128,9 @@ public function testExecute()
$this->quoteUpdater->execute(self::TEST_NONCE, $details, $quoteMock);
}
+ /**
+ * @return void
+ */
private function disabledQuoteAddressValidationStep()
{
$this->billingAddressMock->expects(self::once())
@@ -300,7 +310,7 @@ private function getQuoteMock()
$cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
->setMethods(['setShippingAssignments'])
->disableOriginalConstructor()
- ->getMock();
+ ->getMockForAbstractClass();
$quoteMock->expects(self::any())
->method('getExtensionAttributes')
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
index 22f7f46bd98f1..42469fe0faf45 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
@@ -77,6 +77,9 @@ public function testGetConfig($expected)
'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
]);
+ $this->config->method('isRequiredBillingAddress')
+ ->willReturn(1);
+
self::assertEquals($expected, $this->configProvider->getConfig());
}
@@ -101,7 +104,8 @@ public function getConfigDataProvider()
'skipOrderReview' => false,
'paymentIcon' => [
'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
- ]
+ ],
+ 'isRequiredBillingAddress' => true
]
]
]
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index ba51a5436fedb..5af56a2afd3fe 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -6,7 +6,7 @@
},
"require": {
"php": "~7.1.3||~7.2.0",
- "braintree/braintree_php": "3.34.0",
+ "braintree/braintree_php": "3.35.0",
"magento/framework": "*",
"magento/magento-composer-installer": "*",
"magento/module-catalog": "*",
diff --git a/app/code/Magento/Braintree/etc/acl.xml b/app/code/Magento/Braintree/etc/acl.xml
index a188586cc0a26..066ccc818d4e6 100644
--- a/app/code/Magento/Braintree/etc/acl.xml
+++ b/app/code/Magento/Braintree/etc/acl.xml
@@ -11,7 +11,16 @@
-
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
index 7a803f803ae89..9de1ad48d2261 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
@@ -29,6 +29,7 @@
- Magento\Braintree\Gateway\Request\VaultDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
@@ -41,6 +42,7 @@
- Magento\Braintree\Gateway\Request\AddressDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
diff --git a/app/code/Magento/Braintree/etc/adminhtml/menu.xml b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
index 590d5b3dce008..ce4dd4844f3bc 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
@@ -10,6 +10,7 @@
Vault Title
payment/braintree_cc_vault/title
-
+
Merchant Account ID
If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.
payment/braintree/merchant_account_id
-
+
Advanced Fraud Protection
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section
payment/braintree/fraudprotection
-
+
Kount Merchant ID
accounts@braintreepayments.com to setup your Kount account.]]>
@@ -108,7 +108,7 @@
Magento\Config\Model\Config\Source\Yesno
payment/braintree/debug
-
+
CVV Verification
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.
@@ -149,7 +149,7 @@
PayPal through Braintree
Magento\Config\Block\System\Config\Form\Fieldset
-
+
Title
payment/braintree_paypal/title
It is recommended to set this value to "PayPal" per store views.
@@ -187,7 +187,7 @@
1
payment/braintree_paypal/specificcountry
-
+
Require Customer's Billing Address
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/require_billing_address
@@ -203,7 +203,7 @@
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/debug
-
+
Display on Shopping Cart
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/display_on_shopping_cart
@@ -239,14 +239,14 @@
payment/braintree/verify_specific_countries
-
+
Dynamic Descriptors
Braintree Support.]]>
Magento\Config\Block\System\Config\Form\Fieldset
-
+
Name
payment/braintree/descriptor_name
@@ -254,14 +254,14 @@
and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
-
+
Phone
payment/braintree/descriptor_phone
The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
-
+
URL
payment/braintree/descriptor_url
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index 290fb5be58f34..67c90e6991e28 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -233,6 +233,7 @@
- Magento\Braintree\Gateway\Request\KountPaymentDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
@@ -291,6 +292,7 @@
- Magento\Braintree\Gateway\Request\KountPaymentDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
@@ -325,6 +327,7 @@
- Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder
- Magento\Braintree\Gateway\Request\SettlementDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
@@ -347,6 +350,7 @@
- Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
@@ -380,6 +384,7 @@
- Magento\Braintree\Gateway\Request\AddressDataBuilder
- Magento\Braintree\Gateway\Request\DescriptorDataBuilder
- Magento\Braintree\Gateway\Request\StoreConfigBuilder
+ - Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
index 194ad14d49751..6bf677151ed0d 100644
--- a/app/code/Magento/Braintree/i18n/en_US.csv
+++ b/app/code/Magento/Braintree/i18n/en_US.csv
@@ -190,4 +190,5 @@ Currency,Currency
"Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
"Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
"Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
-"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
\ No newline at end of file
+"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
+"Braintree Settlement","Braintree Settlement"
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index 9c95b79196e9d..ab01565d7f1e5 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -24,6 +24,7 @@ define([
scriptLoaded: false,
braintree: null,
selectedCardType: null,
+ checkout: null,
imports: {
onActiveChange: 'active'
}
@@ -147,6 +148,12 @@ define([
this.disableEventListeners();
+ if (self.checkout) {
+ self.checkout.teardown(function () {
+ self.checkout = null;
+ });
+ }
+
self.braintree.setup(self.clientToken, 'custom', {
id: self.selector,
hostedFields: self.getHostedFields(),
@@ -154,7 +161,8 @@ define([
/**
* Triggered when sdk was loaded
*/
- onReady: function () {
+ onReady: function (checkout) {
+ self.checkout = checkout;
$('body').trigger('processStop');
self.enableEventListeners();
},
diff --git a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
index ab294f8e797b7..c4152e1c3ebf9 100644
--- a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
@@ -35,6 +35,9 @@
-
- false
+ -
+
- true
+
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
index 1d60d19458a28..c1ef461ecae7c 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -29,6 +29,7 @@ $config = [
class="action-braintree-paypal-logo" disabled>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+class Price implements DimensionalIndexerInterface
{
/**
- * @inheritdoc
+ * @var IndexTableStructureFactory
*/
- protected function reindex($entityIds = null)
+ private $indexTableStructureFactory;
+
+ /**
+ * @var TableMaintainer
+ */
+ private $tableMaintainer;
+
+ /**
+ * @var MetadataPool
+ */
+ private $metadataPool;
+
+ /**
+ * @var \Magento\Framework\App\ResourceConnection
+ */
+ private $resource;
+
+ /**
+ * @var bool
+ */
+ private $fullReindexAction;
+
+ /**
+ * @var string
+ */
+ private $connectionName;
+
+ /**
+ * @var \Magento\Framework\DB\Adapter\AdapterInterface
+ */
+ private $connection;
+
+ /**
+ * Mapping between dimensions and field in database
+ *
+ * @var array
+ */
+ private $dimensionToFieldMapper = [
+ WebsiteDimensionProvider::DIMENSION_NAME => 'pw.website_id',
+ CustomerGroupDimensionProvider::DIMENSION_NAME => 'cg.customer_group_id',
+ ];
+
+ /**
+ * @var BasePriceModifier
+ */
+ private $basePriceModifier;
+
+ /**
+ * @var JoinAttributeProcessor
+ */
+ private $joinAttributeProcessor;
+
+ /**
+ * @var \Magento\Framework\Event\ManagerInterface
+ */
+ private $eventManager;
+
+ /**
+ * @var \Magento\Framework\Module\Manager
+ */
+ private $moduleManager;
+
+ /**
+ * @param IndexTableStructureFactory $indexTableStructureFactory
+ * @param TableMaintainer $tableMaintainer
+ * @param MetadataPool $metadataPool
+ * @param \Magento\Framework\App\ResourceConnection $resource
+ * @param BasePriceModifier $basePriceModifier
+ * @param JoinAttributeProcessor $joinAttributeProcessor
+ * @param \Magento\Framework\Event\ManagerInterface $eventManager
+ * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param bool $fullReindexAction
+ * @param string $connectionName
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ */
+ public function __construct(
+ IndexTableStructureFactory $indexTableStructureFactory,
+ TableMaintainer $tableMaintainer,
+ MetadataPool $metadataPool,
+ \Magento\Framework\App\ResourceConnection $resource,
+ BasePriceModifier $basePriceModifier,
+ JoinAttributeProcessor $joinAttributeProcessor,
+ \Magento\Framework\Event\ManagerInterface $eventManager,
+ \Magento\Framework\Module\Manager $moduleManager,
+ $fullReindexAction = false,
+ $connectionName = 'indexer'
+ ) {
+ $this->indexTableStructureFactory = $indexTableStructureFactory;
+ $this->tableMaintainer = $tableMaintainer;
+ $this->connectionName = $connectionName;
+ $this->metadataPool = $metadataPool;
+ $this->resource = $resource;
+ $this->fullReindexAction = $fullReindexAction;
+ $this->basePriceModifier = $basePriceModifier;
+ $this->joinAttributeProcessor = $joinAttributeProcessor;
+ $this->eventManager = $eventManager;
+ $this->moduleManager = $moduleManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @param array $dimensions
+ * @param \Traversable $entityIds
+ * @throws \Exception
+ */
+ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
{
- $this->_prepareBundlePrice($entityIds);
+ $this->tableMaintainer->createMainTmpTable($dimensions);
+
+ $temporaryPriceTable = $this->indexTableStructureFactory->create([
+ 'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+ 'entityField' => 'entity_id',
+ 'customerGroupField' => 'customer_group_id',
+ 'websiteField' => 'website_id',
+ 'taxClassField' => 'tax_class_id',
+ 'originalPriceField' => 'price',
+ 'finalPriceField' => 'final_price',
+ 'minPriceField' => 'min_price',
+ 'maxPriceField' => 'max_price',
+ 'tierPriceField' => 'tier_price',
+ ]);
+
+ $entityIds = iterator_to_array($entityIds);
+
+ $this->prepareTierPriceIndex($dimensions, $entityIds);
+
+ $this->prepareBundlePriceTable();
+
+ $this->prepareBundlePriceByType(
+ \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED,
+ $dimensions,
+ $entityIds
+ );
+
+ $this->prepareBundlePriceByType(
+ \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC,
+ $dimensions,
+ $entityIds
+ );
+
+ $this->calculateBundleOptionPrice($temporaryPriceTable, $dimensions);
+
+ $this->basePriceModifier->modifyPrice($temporaryPriceTable, $entityIds);
}
/**
@@ -27,9 +178,9 @@ protected function reindex($entityIds = null)
*
* @return string
*/
- protected function _getBundlePriceTable()
+ private function getBundlePriceTable()
{
- return $this->tableStrategy->getTableName('catalog_product_index_price_bundle');
+ return $this->getTable('catalog_product_index_price_bundle_tmp');
}
/**
@@ -37,9 +188,9 @@ protected function _getBundlePriceTable()
*
* @return string
*/
- protected function _getBundleSelectionTable()
+ private function getBundleSelectionTable()
{
- return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_sel');
+ return $this->getTable('catalog_product_index_price_bundle_sel_tmp');
}
/**
@@ -47,9 +198,9 @@ protected function _getBundleSelectionTable()
*
* @return string
*/
- protected function _getBundleOptionTable()
+ private function getBundleOptionTable()
{
- return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_opt');
+ return $this->getTable('catalog_product_index_price_bundle_opt_tmp');
}
/**
@@ -57,9 +208,9 @@ protected function _getBundleOptionTable()
*
* @return $this
*/
- protected function _prepareBundlePriceTable()
+ private function prepareBundlePriceTable()
{
- $this->getConnection()->delete($this->_getBundlePriceTable());
+ $this->getConnection()->delete($this->getBundlePriceTable());
return $this;
}
@@ -68,9 +219,9 @@ protected function _prepareBundlePriceTable()
*
* @return $this
*/
- protected function _prepareBundleSelectionTable()
+ private function prepareBundleSelectionTable()
{
- $this->getConnection()->delete($this->_getBundleSelectionTable());
+ $this->getConnection()->delete($this->getBundleSelectionTable());
return $this;
}
@@ -79,9 +230,9 @@ protected function _prepareBundleSelectionTable()
*
* @return $this
*/
- protected function _prepareBundleOptionTable()
+ private function prepareBundleOptionTable()
{
- $this->getConnection()->delete($this->_getBundleOptionTable());
+ $this->getConnection()->delete($this->getBundleOptionTable());
return $this;
}
@@ -89,51 +240,58 @@ protected function _prepareBundleOptionTable()
* Prepare temporary price index data for bundle products by price type
*
* @param int $priceType
+ * @param array $dimensions
* @param int|array $entityIds the entity ids limitation
- * @return $this
+ * @return void
+ * @throws \Exception
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- protected function _prepareBundlePriceByType($priceType, $entityIds = null)
+ private function prepareBundlePriceByType($priceType, array $dimensions, $entityIds = null)
{
$connection = $this->getConnection();
- $table = $this->_getBundlePriceTable();
-
$select = $connection->select()->from(
['e' => $this->getTable('catalog_product_entity')],
['entity_id']
- )->join(
+ )->joinInner(
['cg' => $this->getTable('customer_group')],
- '',
+ array_key_exists(CustomerGroupDimensionProvider::DIMENSION_NAME, $dimensions)
+ ? sprintf(
+ '%s = %s',
+ $this->dimensionToFieldMapper[CustomerGroupDimensionProvider::DIMENSION_NAME],
+ $dimensions[CustomerGroupDimensionProvider::DIMENSION_NAME]->getValue()
+ ) : '',
['customer_group_id']
- );
- $this->_addWebsiteJoinToSelect($select, true);
- $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', "e.entity_id");
- $select->columns(
- 'website_id',
- 'cw'
- )->join(
- ['cwd' => $this->_getWebsiteDateTable()],
- 'cw.website_id = cwd.website_id',
+ )->joinInner(
+ ['pw' => $this->getTable('catalog_product_website')],
+ 'pw.product_id = e.entity_id',
+ ['pw.website_id']
+ )->joinInner(
+ ['cwd' => $this->getTable('catalog_product_index_website')],
+ 'pw.website_id = cwd.website_id',
[]
- )->joinLeft(
- ['tp' => $this->_getTierPriceIndexTable()],
- 'tp.entity_id = e.entity_id AND tp.website_id = cw.website_id' .
+ );
+ $select->joinLeft(
+ ['tp' => $this->getTable('catalog_product_index_tier_price')],
+ 'tp.entity_id = e.entity_id AND tp.website_id = pw.website_id' .
' AND tp.customer_group_id = cg.customer_group_id',
[]
)->where(
'e.type_id=?',
- $this->getTypeId()
+ \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
);
- // add enable products limitation
- $statusCond = $connection->quoteInto(
- '=?',
- \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
- );
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
- $this->_addAttributeToSelect($select, 'status', "e.$linkField", 'cs.store_id', $statusCond, true);
+ foreach ($dimensions as $dimension) {
+ if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+ throw new \LogicException(
+ 'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+ );
+ }
+ $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+ }
+
+ $this->joinAttributeProcessor->process($select, 'status', Status::STATUS_ENABLED);
if ($this->moduleManager->isEnabled('Magento_Tax')) {
- $taxClassId = $this->_addAttributeToSelect($select, 'tax_class_id', "e.$linkField", 'cs.store_id');
+ $taxClassId = $this->joinAttributeProcessor->process($select, 'tax_class_id');
} else {
$taxClassId = new \Zend_Db_Expr('0');
}
@@ -146,13 +304,12 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
);
}
- $priceTypeCond = $connection->quoteInto('=?', $priceType);
- $this->_addAttributeToSelect($select, 'price_type', "e.$linkField", 'cs.store_id', $priceTypeCond);
+ $this->joinAttributeProcessor->process($select, 'price_type', $priceType);
- $price = $this->_addAttributeToSelect($select, 'price', "e.$linkField", 'cs.store_id');
- $specialPrice = $this->_addAttributeToSelect($select, 'special_price', "e.$linkField", 'cs.store_id');
- $specialFrom = $this->_addAttributeToSelect($select, 'special_from_date', "e.$linkField", 'cs.store_id');
- $specialTo = $this->_addAttributeToSelect($select, 'special_to_date', "e.$linkField", 'cs.store_id');
+ $price = $this->joinAttributeProcessor->process($select, 'price');
+ $specialPrice = $this->joinAttributeProcessor->process($select, 'special_price');
+ $specialFrom = $this->joinAttributeProcessor->process($select, 'special_from_date');
+ $specialTo = $this->joinAttributeProcessor->process($select, 'special_to_date');
$currentDate = new \Zend_Db_Expr('cwd.website_date');
$specialFromDate = $connection->getDatePartSql($specialFrom);
@@ -205,39 +362,41 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
/**
* Add additional external limitation
*/
- $this->_eventManager->dispatch(
+ $this->eventManager->dispatch(
'catalog_product_prepare_index_select',
[
'select' => $select,
'entity_field' => new \Zend_Db_Expr('e.entity_id'),
- 'website_field' => new \Zend_Db_Expr('cw.website_id'),
- 'store_field' => new \Zend_Db_Expr('cs.store_id')
+ 'website_field' => new \Zend_Db_Expr('pw.website_id'),
+ 'store_field' => new \Zend_Db_Expr('cwd.default_store_id')
]
);
- $query = $select->insertFromSelect($table);
+ $query = $select->insertFromSelect($this->getBundlePriceTable());
$connection->query($query);
-
- return $this;
}
/**
* Calculate fixed bundle product selections price
*
- * @return $this
+ * @param IndexTableStructure $priceTable
+ * @param array $dimensions
+ *
+ * @return void
+ * @throws \Exception
*/
- protected function _calculateBundleOptionPrice()
+ private function calculateBundleOptionPrice($priceTable, $dimensions)
{
$connection = $this->getConnection();
- $this->_prepareBundleSelectionTable();
- $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
- $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
+ $this->prepareBundleSelectionTable();
+ $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
+ $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
- $this->_prepareBundleOptionTable();
+ $this->prepareBundleOptionTable();
$select = $connection->select()->from(
- $this->_getBundleSelectionTable(),
+ $this->getBundleSelectionTable(),
['entity_id', 'customer_group_id', 'website_id', 'option_id']
)->group(
['entity_id', 'customer_group_id', 'website_id', 'option_id']
@@ -254,24 +413,24 @@ protected function _calculateBundleOptionPrice()
]
);
- $query = $select->insertFromSelect($this->_getBundleOptionTable());
+ $query = $select->insertFromSelect($this->getBundleOptionTable());
$connection->query($query);
- $this->_prepareDefaultFinalPriceTable();
- $this->applyBundlePrice();
- $this->applyBundleOptionPrice();
-
- return $this;
+ $this->getConnection()->delete($priceTable->getTableName());
+ $this->applyBundlePrice($priceTable);
+ $this->applyBundleOptionPrice($priceTable);
}
/**
* Calculate bundle product selections price by product type
*
+ * @param array $dimensions
* @param int $priceType
- * @return $this
+ * @return void
+ * @throws \Exception
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- protected function _calculateBundleSelectionPrice($priceType)
+ private function calculateBundleSelectionPrice($dimensions, $priceType)
{
$connection = $this->getConnection();
@@ -334,9 +493,10 @@ protected function _calculateBundleSelectionPrice($priceType)
]);
}
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+ $linkField = $metadata->getLinkField();
$select = $connection->select()->from(
- ['i' => $this->_getBundlePriceTable()],
+ ['i' => $this->getBundlePriceTable()],
['entity_id', 'customer_group_id', 'website_id']
)->join(
['parent_product' => $this->getTable('catalog_product_entity')],
@@ -355,7 +515,7 @@ protected function _calculateBundleSelectionPrice($priceType)
'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
['']
)->join(
- ['idx' => $this->getIdxTable()],
+ ['idx' => $this->getMainTable($dimensions)],
'bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id' .
' AND i.website_id = idx.website_id',
[]
@@ -375,49 +535,26 @@ protected function _calculateBundleSelectionPrice($priceType)
]
);
- $query = $select->insertFromSelect($this->_getBundleSelectionTable());
+ $query = $select->insertFromSelect($this->getBundleSelectionTable());
$connection->query($query);
-
- return $this;
- }
-
- /**
- * Prepare temporary index price for bundle products
- *
- * @param int|array $entityIds the entity ids limitation
- * @return $this
- */
- protected function _prepareBundlePrice($entityIds = null)
- {
- if (!$this->hasEntity() && empty($entityIds)) {
- return $this;
- }
- $this->_prepareTierPriceIndex($entityIds);
- $this->_prepareBundlePriceTable();
- $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
- $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
-
- $this->_calculateBundleOptionPrice();
- $this->_applyCustomOption();
-
- $this->_movePriceDataToIndexTable();
-
- return $this;
}
/**
* Prepare percentage tier price for bundle products
*
- * @param int|array $entityIds
- * @return $this
+ * @param array $dimensions
+ * @param array $entityIds
+ * @return void
+ * @throws \Exception
*/
- protected function _prepareTierPriceIndex($entityIds = null)
+ private function prepareTierPriceIndex($dimensions, $entityIds)
{
$connection = $this->getConnection();
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+ $linkField = $metadata->getLinkField();
// remove index by bundle products
$select = $connection->select()->from(
- ['i' => $this->_getTierPriceIndexTable()],
+ ['i' => $this->getTable('catalog_product_index_tier_price')],
null
)->join(
['e' => $this->getTable('catalog_product_entity')],
@@ -425,7 +562,7 @@ protected function _prepareTierPriceIndex($entityIds = null)
[]
)->where(
'e.type_id=?',
- $this->getTypeId()
+ \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
);
$query = $select->deleteFromSelect('i');
$connection->query($query);
@@ -442,40 +579,47 @@ protected function _prepareTierPriceIndex($entityIds = null)
'tp.all_groups = 1 OR (tp.all_groups = 0 AND tp.customer_group_id = cg.customer_group_id)',
['customer_group_id']
)->join(
- ['cw' => $this->getTable('store_website')],
- 'tp.website_id = 0 OR tp.website_id = cw.website_id',
+ ['pw' => $this->getTable('store_website')],
+ 'tp.website_id = 0 OR tp.website_id = pw.website_id',
['website_id']
)->where(
- 'cw.website_id != 0'
+ 'pw.website_id != 0'
)->where(
'e.type_id=?',
- $this->getTypeId()
+ \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
)->columns(
new \Zend_Db_Expr('MIN(tp.value)')
)->group(
- ['e.entity_id', 'cg.customer_group_id', 'cw.website_id']
+ ['e.entity_id', 'cg.customer_group_id', 'pw.website_id']
);
if (!empty($entityIds)) {
$select->where('e.entity_id IN(?)', $entityIds);
}
+ foreach ($dimensions as $dimension) {
+ if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+ throw new \LogicException(
+ 'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+ );
+ }
+ $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+ }
- $query = $select->insertFromSelect($this->_getTierPriceIndexTable());
+ $query = $select->insertFromSelect($this->getTable('catalog_product_index_tier_price'));
$connection->query($query);
-
- return $this;
}
/**
* Create bundle price.
*
+ * @param IndexTableStructure $priceTable
* @return void
*/
- private function applyBundlePrice(): void
+ private function applyBundlePrice($priceTable): void
{
$select = $this->getConnection()->select();
$select->from(
- $this->_getBundlePriceTable(),
+ $this->getBundlePriceTable(),
[
'entity_id',
'customer_group_id',
@@ -486,11 +630,10 @@ private function applyBundlePrice(): void
'min_price',
'max_price',
'tier_price',
- 'base_tier',
]
);
- $query = $select->insertFromSelect($this->_getDefaultFinalPriceTable());
+ $query = $select->insertFromSelect($priceTable->getTableName());
$this->getConnection()->query($query);
}
@@ -498,13 +641,14 @@ private function applyBundlePrice(): void
* Make insert/update bundle option price.
*
* @return void
+ * @param IndexTableStructure $priceTable
*/
- private function applyBundleOptionPrice(): void
+ private function applyBundleOptionPrice($priceTable): void
{
$connection = $this->getConnection();
$subSelect = $connection->select()->from(
- $this->_getBundleOptionTable(),
+ $this->getBundleOptionTable(),
[
'entity_id',
'customer_group_id',
@@ -534,7 +678,47 @@ private function applyBundleOptionPrice(): void
]
);
- $query = $select->crossUpdateFromSelect(['i' => $this->_getDefaultFinalPriceTable()]);
+ $query = $select->crossUpdateFromSelect(['i' => $priceTable->getTableName()]);
$connection->query($query);
}
+
+ /**
+ * Get main table
+ *
+ * @param array $dimensions
+ * @return string
+ */
+ private function getMainTable($dimensions)
+ {
+ if ($this->fullReindexAction) {
+ return $this->tableMaintainer->getMainReplicaTable($dimensions);
+ }
+ return $this->tableMaintainer->getMainTable($dimensions);
+ }
+
+ /**
+ * Get connection
+ *
+ * return \Magento\Framework\DB\Adapter\AdapterInterface
+ * @throws \DomainException
+ */
+ private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+ {
+ if ($this->connection === null) {
+ $this->connection = $this->resource->getConnection($this->connectionName);
+ }
+
+ return $this->connection;
+ }
+
+ /**
+ * Get table
+ *
+ * @param string $tableName
+ * @return string
+ */
+ private function getTable($tableName)
+ {
+ return $this->resource->getTableName($tableName, $this->connectionName);
+ }
}
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index e9295b22674bd..5b88288ff72ca 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -5,10 +5,8 @@
*/
namespace Magento\Bundle\Model\ResourceModel\Selection;
-use Magento\Customer\Api\GroupManagementInterface;
use Magento\Framework\DataObject;
use Magento\Framework\DB\Select;
-use Magento\Framework\EntityManager\MetadataPool;
use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
use Magento\Framework\App\ObjectManager;
@@ -45,6 +43,95 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
*/
private $websiteScopePriceJoined = false;
+ /**
+ * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Item
+ */
+ private $stockItem;
+
+ /**
+ * Collection constructor.
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+ * @param \Psr\Log\LoggerInterface $logger
+ * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+ * @param \Magento\Framework\Event\ManagerInterface $eventManager
+ * @param \Magento\Eav\Model\Config $eavConfig
+ * @param \Magento\Framework\App\ResourceConnection $resource
+ * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
+ * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+ * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
+ * @param \Magento\Catalog\Model\ResourceModel\Url $catalogUrl
+ * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+ * @param \Magento\Customer\Model\Session $customerSession
+ * @param \Magento\Framework\Stdlib\DateTime $dateTime
+ * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+ * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
+ * @param ProductLimitationFactory|null $productLimitationFactory
+ * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+ * @param \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer|null $tableMaintainer
+ * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|null $stockItem
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ */
+ public function __construct(
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+ \Psr\Log\LoggerInterface $logger,
+ \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+ \Magento\Framework\Event\ManagerInterface $eventManager,
+ \Magento\Eav\Model\Config $eavConfig,
+ \Magento\Framework\App\ResourceConnection $resource,
+ \Magento\Eav\Model\EntityFactory $eavEntityFactory,
+ \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
+ \Magento\Framework\Validator\UniversalFactory $universalFactory,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Module\Manager $moduleManager,
+ \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
+ \Magento\Catalog\Model\ResourceModel\Url $catalogUrl,
+ \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+ \Magento\Customer\Model\Session $customerSession,
+ \Magento\Framework\Stdlib\DateTime $dateTime,
+ \Magento\Customer\Api\GroupManagementInterface $groupManagement,
+ \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+ ProductLimitationFactory $productLimitationFactory = null,
+ \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
+ \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer $tableMaintainer = null,
+ \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $stockItem = null
+ ) {
+ parent::__construct(
+ $entityFactory,
+ $logger,
+ $fetchStrategy,
+ $eventManager,
+ $eavConfig,
+ $resource,
+ $eavEntityFactory,
+ $resourceHelper,
+ $universalFactory,
+ $storeManager,
+ $moduleManager,
+ $catalogProductFlatState,
+ $scopeConfig,
+ $productOptionFactory,
+ $catalogUrl,
+ $localeDate,
+ $customerSession,
+ $dateTime,
+ $groupManagement,
+ $connection,
+ $productLimitationFactory,
+ $metadataPool,
+ $tableMaintainer
+ );
+
+ $this->stockItem = $stockItem
+ ?? ObjectManager::getInstance()->get(\Magento\CatalogInventory\Model\ResourceModel\Stock\Item::class);
+ }
+
/**
* Initialize collection
*
@@ -64,13 +151,7 @@ protected function _construct()
*/
public function _afterLoad()
{
- parent::_afterLoad();
- if ($this->getStoreId() && $this->_items) {
- foreach ($this->_items as $item) {
- $item->setStoreId($this->getStoreId());
- }
- }
- return $this;
+ return parent::_afterLoad();
}
/**
@@ -170,28 +251,30 @@ public function setPositionOrder()
*/
public function addQuantityFilter()
{
- $stockItemTable = $this->getTable('cataloginventory_stock_item');
- $stockStatusTable = $this->getTable('cataloginventory_stock_status');
+ $manageStockExpr = $this->stockItem->getManageStockExpr('stock_item');
+ $backordersExpr = $this->stockItem->getBackordersExpr('stock_item');
+ $minQtyExpr = $this->getConnection()->getCheckSql(
+ 'selection.selection_can_change_qty',
+ $this->stockItem->getMinSaleQtyExpr('stock_item'),
+ 'selection.selection_qty'
+ );
+
+ $where = $manageStockExpr . ' = 0';
+ $where .= ' OR ('
+ . 'stock_item.is_in_stock = ' . \Magento\CatalogInventory\Model\Stock::STOCK_IN_STOCK
+ . ' AND ('
+ . $backordersExpr . ' != ' . \Magento\CatalogInventory\Model\Stock::BACKORDERS_NO
+ . ' OR '
+ . $minQtyExpr . ' <= stock_item.qty'
+ . ')'
+ . ')';
+
$this->getSelect()
->joinInner(
- ['stock' => $stockStatusTable],
- 'selection.product_id = stock.product_id',
- []
- )->joinInner(
- ['stock_item' => $stockItemTable],
+ ['stock_item' => $this->stockItem->getMainTable()],
'selection.product_id = stock_item.product_id',
[]
- )
- ->where(
- '('
- . 'selection.selection_can_change_qty > 0'
- . ' or '
- . 'selection.selection_qty <= stock.qty'
- . ' or '
- .'stock_item.manage_stock = 0'
- . ')'
- )
- ->where('stock.stock_status = 1');
+ )->where($where);
return $this;
}
@@ -267,7 +350,10 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
}
/**
+ * Get Catalog Rule Processor.
+ *
* @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+ *
* @deprecated 100.2.0
*/
private function getCatalogRuleProcessor()
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
index 927b8fbff8d85..a28d721cc9a4e 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
@@ -54,7 +54,7 @@ public function create(
) {
$arguments['bundleProduct'] = $bundleProduct;
$arguments['saleableItem'] = $selection;
- $arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
+ $arguments['quantity'] = $quantity ? (float)$quantity : 1.;
return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
}
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
index a5e62fca9483c..836826734f02d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
old mode 100644
new mode 100755
index f3e5eff3834e3..b3ac72d3f416e
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
index af8fc1459d9e3..72e729111948f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,11 +15,12 @@
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
index 2ae9748c773e8..e3ac6483bc7bd 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 48697d43ec824..f28ffbdc40acc 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
index 7123a573bc2e1..60d11345731c1 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
bundle-option-dropdown
true
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
index 380b5b8959025..e6866ae74a7e1 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
price_type
0
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index f48810e0534fe..af93200f946d2 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
BundleProduct
BundleProduct2
@@ -23,6 +23,7 @@
bundleproduct2
10
20
+ 30
4
bundle
10
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
index ca39253aa54a0..254f542316d10 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/json
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
index c912ea5eac41a..4e1dc7ac9cb50 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/json
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
index 12cba3fc179fe..df931c74191f9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/json
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
index cb97521499e23..782c97aab1a29 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
index f0048e2fc95d4..562ded6c8e40f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index 25f1d95dc863c..814d03c52f4be 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
index 795982eb4b939..1d2f21b7d15f9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..65733a5bcc037
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
index bf62212babd43..86db6f372b5f8 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
index 9faf9e69bc873..40a6e1b75c60a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
new file mode 100644
index 0000000000000..0b220efaad49f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index a579460906d0e..574c0dccdb07f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index c0d659f1665a8..40132ea956584 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
new file mode 100644
index 0000000000000..9db8110c0f64b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Create user
+ Login
+ Forgot password
+ Contact Us
+ Change password
+ Register during Checkout
+ Check Out as Guest
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
new file mode 100644
index 0000000000000..4c974e6fced05
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
new file mode 100644
index 0000000000000..8f764899706ac
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+ {{CaptchaData.checkoutAsGuest}}
+ $formItems
+
+
+ {{CaptchaData.register}}
+ $formItems
+
+
+
+ {{CaptchaData.createUser}}
+ $createUser
+
+
+ {{CaptchaData.login}}
+ login
+
+
+ {{CaptchaData.passwd}}
+ $forgotpassword
+
+
+ {{CaptchaData.contactUs}}
+ $contactUs
+
+
+ {{CaptchaData.changePasswd}}
+ $userEdit
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
index be9574fff2cfa..ec2a49f3fc566 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -3,22 +3,23 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Captcha\Test\Unit\Model\Customer\Plugin;
class AjaxLoginTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\Model\Session
*/
protected $sessionManagerMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Captcha\Helper\Data
*/
protected $captchaHelperMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Controller\Result\JsonFactory
*/
protected $jsonFactoryMock;
@@ -38,12 +39,12 @@ class AjaxLoginTest extends \PHPUnit\Framework\TestCase
protected $requestMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Controller\Ajax\Login
*/
protected $loginControllerMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Serialize\Serializer\Json
*/
protected $serializerMock;
@@ -57,6 +58,9 @@ class AjaxLoginTest extends \PHPUnit\Framework\TestCase
*/
protected $model;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->sessionManagerMock = $this->createPartialMock(\Magento\Checkout\Model\Session::class, ['setUsername']);
@@ -72,8 +76,12 @@ protected function setUp()
$this->loginControllerMock->expects($this->any())->method('getRequest')
->will($this->returnValue($this->requestMock));
- $this->captchaHelperMock->expects($this->once())->method('getCaptcha')
- ->with('user_login')->will($this->returnValue($this->captchaMock));
+
+ $this->captchaHelperMock
+ ->expects($this->exactly(1))
+ ->method('getCaptcha')
+ ->will($this->returnValue($this->captchaMock));
+
$this->formIds = ['user_login'];
$this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
@@ -86,6 +94,9 @@ protected function setUp()
);
}
+ /**
+ * Test aroundExecute.
+ */
public function testAroundExecute()
{
$username = 'name';
@@ -103,14 +114,24 @@ public function testAroundExecute()
$this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
$this->captchaMock->expects($this->once())->method('isCorrect')->with($captchaString)
->will($this->returnValue(true));
- $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+ $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
$closure = function () {
return 'result';
};
+
+ $this->captchaHelperMock
+ ->expects($this->exactly(1))
+ ->method('getCaptcha')
+ ->with('user_login')
+ ->will($this->returnValue($this->captchaMock));
+
$this->assertEquals('result', $this->model->aroundExecute($this->loginControllerMock, $closure));
}
+ /**
+ * Test aroundExecuteIncorrectCaptcha.
+ */
public function testAroundExecuteIncorrectCaptcha()
{
$username = 'name';
@@ -128,18 +149,21 @@ public function testAroundExecuteIncorrectCaptcha()
$this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
$this->captchaMock->expects($this->once())->method('isCorrect')
->with($captchaString)->will($this->returnValue(false));
- $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+ $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
$this->sessionManagerMock->expects($this->once())->method('setUsername')->with($username);
$this->jsonFactoryMock->expects($this->once())->method('create')
->will($this->returnValue($this->resultJsonMock));
- $this->resultJsonMock->expects($this->once())->method('setData')
- ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])->will($this->returnValue('response'));
+ $this->resultJsonMock
+ ->expects($this->once())
+ ->method('setData')
+ ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])
+ ->will($this->returnSelf());
$closure = function () {
};
- $this->assertEquals('response', $this->model->aroundExecute($this->loginControllerMock, $closure));
+ $this->assertEquals($this->resultJsonMock, $this->model->aroundExecute($this->loginControllerMock, $closure));
}
/**
@@ -151,7 +175,7 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
{
$this->requestMock->expects($this->once())->method('getContent')
->will($this->returnValue(json_encode($requestContent)));
- $this->serializerMock->expects(($this->once()))->method('unserialize')
+ $this->serializerMock->expects($this->once())->method('unserialize')
->will($this->returnValue($requestContent));
$this->captchaMock->expects($this->once())->method('isRequired')->with($username)
@@ -168,16 +192,39 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
/**
* @return array
*/
- public function aroundExecuteCaptchaIsNotRequired()
+ public function aroundExecuteCaptchaIsNotRequired(): array
{
return [
[
'username' => 'name',
'requestData' => ['username' => 'name', 'captcha_string' => 'string'],
],
+ [
+ 'username' => 'name',
+ 'requestData' =>
+ [
+ 'username' => 'name',
+ 'captcha_string' => 'string',
+ 'captcha_form_id' => $this->formIds[0]
+ ],
+ ],
[
'username' => null,
- 'requestData' => ['captcha_string' => 'string'],
+ 'requestData' =>
+ [
+ 'username' => null,
+ 'captcha_string' => 'string',
+ 'captcha_form_id' => $this->formIds[0]
+ ],
+ ],
+ [
+ 'username' => 'name',
+ 'requestData' =>
+ [
+ 'username' => 'name',
+ 'captcha_string' => 'string',
+ 'captcha_form_id' => null
+ ],
],
];
}
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index 0500b29f787c2..1edbcc029e4ce 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -24,7 +24,7 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
'enable' => '1',
'font' => 'linlibertine',
'mode' => 'after_fail',
- 'forms' => 'user_forgotpassword,user_create,guest_checkout,register_during_checkout',
+ 'forms' => 'user_forgotpassword,user_create',
'failed_attempts_login' => '3',
'failed_attempts_ip' => '1000',
'timeout' => '7',
@@ -35,8 +35,6 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
'always_for' => [
'user_create',
'user_forgotpassword',
- 'guest_checkout',
- 'register_during_checkout',
'contact_us',
],
];
@@ -362,8 +360,7 @@ public function isShownToLoggedInUserDataProvider()
return [
[true, 'contact_us'],
[false, 'user_create'],
- [false, 'user_forgotpassword'],
- [false, 'guest_checkout']
+ [false, 'user_forgotpassword']
];
}
}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php
deleted file mode 100644
index d3f29fae8a592..0000000000000
--- a/app/code/Magento/Captcha/Test/Unit/Observer/CheckGuestCheckoutObserverTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-createMock(Onepage::class);
- $captchaHelperMock = $this->createMock(CaptchaDataHelper::class);
- $this->objectManager = new ObjectManager($this);
- $this->actionFlagMock = $this->createMock(ActionFlag::class);
- $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
- $this->captchaModelMock = $this->createMock(CaptchaModel::class);
- $this->quoteModelMock = $this->createMock(Quote::class);
- $this->controllerMock = $this->createMock(Action::class);
- $this->requestMock = $this->createMock(Http::class);
- $this->responseMock = $this->createMock(HttpResponse::class);
- $this->observer = new Observer(['controller_action' => $this->controllerMock]);
- $this->jsonHelperMock = $this->createMock(JsonHelper::class);
-
- $this->checkGuestCheckoutObserver = $this->objectManager->getObject(
- CheckGuestCheckoutObserver::class,
- [
- 'helper' => $captchaHelperMock,
- 'actionFlag' => $this->actionFlagMock,
- 'captchaStringResolver' => $this->captchaStringResolverMock,
- 'typeOnepage' => $onepageModelTypeMock,
- 'jsonHelper' => $this->jsonHelperMock
- ]
- );
-
- $captchaHelperMock->expects($this->once())
- ->method('getCaptcha')
- ->with(self::FORM_ID)
- ->willReturn($this->captchaModelMock);
- $onepageModelTypeMock->expects($this->once())
- ->method('getQuote')
- ->willReturn($this->quoteModelMock);
- }
-
- public function testCheckGuestCheckoutForRegister()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_REGISTER);
- $this->captchaModelMock->expects($this->never())
- ->method('isRequired');
-
- $this->checkGuestCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckGuestCheckoutWithNoCaptchaRequired()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_GUEST);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(false);
- $this->captchaModelMock->expects($this->never())
- ->method('isCorrect');
-
- $this->checkGuestCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckGuestCheckoutWithIncorrectCaptcha()
- {
- $captchaValue = 'some_word';
- $encodedJsonValue = '{}';
-
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_GUEST);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(true);
- $this->controllerMock->expects($this->once())
- ->method('getRequest')
- ->willReturn($this->requestMock);
- $this->controllerMock->expects($this->once())
- ->method('getResponse')
- ->willReturn($this->responseMock);
- $this->controllerMock->expects($this->once())
- ->method('getResponse')
- ->willReturn($this->responseMock);
- $this->captchaStringResolverMock->expects($this->once())
- ->method('resolve')
- ->with($this->requestMock, self::FORM_ID)
- ->willReturn($captchaValue);
- $this->captchaModelMock->expects($this->once())
- ->method('isCorrect')
- ->with($captchaValue)
- ->willReturn(false);
- $this->actionFlagMock->expects($this->once())
- ->method('set')
- ->with('', Action::FLAG_NO_DISPATCH, true);
- $this->jsonHelperMock->expects($this->once())
- ->method('jsonEncode')
- ->willReturn($encodedJsonValue);
- $this->responseMock->expects($this->once())
- ->method('representJson')
- ->with($encodedJsonValue);
-
- $this->checkGuestCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckGuestCheckoutWithCorrectCaptcha()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_GUEST);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(true);
- $this->controllerMock->expects($this->once())
- ->method('getRequest')
- ->willReturn($this->requestMock);
- $this->captchaStringResolverMock->expects($this->once())
- ->method('resolve')
- ->with($this->requestMock, self::FORM_ID)
- ->willReturn('some_word');
- $this->captchaModelMock->expects($this->once())
- ->method('isCorrect')
- ->with('some_word')
- ->willReturn(true);
- $this->actionFlagMock->expects($this->never())
- ->method('set');
-
- $this->checkGuestCheckoutObserver->execute($this->observer);
- }
-}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php
deleted file mode 100644
index 89012ef653838..0000000000000
--- a/app/code/Magento/Captcha/Test/Unit/Observer/CheckRegisterCheckoutObserverTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-createMock(Onepage::class);
- $captchaHelperMock = $this->createMock(CaptchaDataHelper::class);
- $this->objectManager = new ObjectManager($this);
- $this->actionFlagMock = $this->createMock(ActionFlag::class);
- $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
- $this->captchaModelMock = $this->createMock(CaptchaModel::class);
- $this->quoteModelMock = $this->createMock(Quote::class);
- $this->controllerMock = $this->createMock(Action::class);
- $this->requestMock = $this->createMock(Http::class);
- $this->responseMock = $this->createMock(HttpResponse::class);
- $this->observer = new Observer(['controller_action' => $this->controllerMock]);
- $this->jsonHelperMock = $this->createMock(JsonHelper::class);
-
- $this->checkRegisterCheckoutObserver = $this->objectManager->getObject(
- CheckRegisterCheckoutObserver::class,
- [
- 'helper' => $captchaHelperMock,
- 'actionFlag' => $this->actionFlagMock,
- 'captchaStringResolver' => $this->captchaStringResolverMock,
- 'typeOnepage' => $onepageModelTypeMock,
- 'jsonHelper' => $this->jsonHelperMock
- ]
- );
-
- $captchaHelperMock->expects($this->once())
- ->method('getCaptcha')
- ->with(self::FORM_ID)
- ->willReturn($this->captchaModelMock);
- $onepageModelTypeMock->expects($this->once())
- ->method('getQuote')
- ->willReturn($this->quoteModelMock);
- }
-
- public function testCheckRegisterCheckoutForGuest()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_GUEST);
- $this->captchaModelMock->expects($this->never())
- ->method('isRequired');
-
- $this->checkRegisterCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckRegisterCheckoutWithNoCaptchaRequired()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_REGISTER);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(false);
- $this->captchaModelMock->expects($this->never())
- ->method('isCorrect');
-
- $this->checkRegisterCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckRegisterCheckoutWithIncorrectCaptcha()
- {
- $captchaValue = 'some_word';
- $encodedJsonValue = '{}';
-
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_REGISTER);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(true);
- $this->controllerMock->expects($this->once())
- ->method('getRequest')
- ->willReturn($this->requestMock);
- $this->controllerMock->expects($this->once())
- ->method('getResponse')
- ->willReturn($this->responseMock);
- $this->controllerMock->expects($this->once())
- ->method('getResponse')
- ->willReturn($this->responseMock);
- $this->captchaStringResolverMock->expects($this->once())
- ->method('resolve')
- ->with($this->requestMock, self::FORM_ID)
- ->willReturn($captchaValue);
- $this->captchaModelMock->expects($this->once())
- ->method('isCorrect')
- ->with($captchaValue)
- ->willReturn(false);
- $this->actionFlagMock->expects($this->once())
- ->method('set')
- ->with('', Action::FLAG_NO_DISPATCH, true);
- $this->jsonHelperMock->expects($this->once())
- ->method('jsonEncode')
- ->willReturn($encodedJsonValue);
- $this->responseMock->expects($this->once())
- ->method('representJson')
- ->with($encodedJsonValue);
-
- $this->checkRegisterCheckoutObserver->execute($this->observer);
- }
-
- public function testCheckRegisterCheckoutWithCorrectCaptcha()
- {
- $this->quoteModelMock->expects($this->once())
- ->method('getCheckoutMethod')
- ->willReturn(Onepage::METHOD_REGISTER);
- $this->captchaModelMock->expects($this->once())
- ->method('isRequired')
- ->willReturn(true);
- $this->controllerMock->expects($this->once())
- ->method('getRequest')
- ->willReturn($this->requestMock);
- $this->captchaStringResolverMock->expects($this->once())
- ->method('resolve')
- ->with($this->requestMock, self::FORM_ID)
- ->willReturn('some_word');
- $this->captchaModelMock->expects($this->once())
- ->method('isCorrect')
- ->with('some_word')
- ->willReturn(true);
- $this->actionFlagMock->expects($this->never())
- ->method('set');
-
- $this->checkRegisterCheckoutObserver->execute($this->observer);
- }
-}
diff --git a/app/code/Magento/Captcha/etc/config.xml b/app/code/Magento/Captcha/etc/config.xml
index 71c474de90ff4..dd748dd05ccda 100644
--- a/app/code/Magento/Captcha/etc/config.xml
+++ b/app/code/Magento/Captcha/etc/config.xml
@@ -53,8 +53,6 @@
1
1
- 1
- 1
1
@@ -77,12 +75,6 @@
Forgot password
-
- Check Out as Guest
-
-
- Register during Checkout
-
Contact Us
diff --git a/app/code/Magento/Captcha/etc/db_schema_whitelist.json b/app/code/Magento/Captcha/etc/db_schema_whitelist.json
index 95fd6411b44dd..1f5b1b624e48b 100644
--- a/app/code/Magento/Captcha/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Captcha/etc/db_schema_whitelist.json
@@ -1,13 +1,13 @@
{
- "captcha_log": {
- "column": {
- "type": true,
- "value": true,
- "count": true,
- "updated_at": true
- },
- "constraint": {
- "PRIMARY": true
+ "captcha_log": {
+ "column": {
+ "type": true,
+ "value": true,
+ "count": true,
+ "updated_at": true
+ },
+ "constraint": {
+ "PRIMARY": true
+ }
}
- }
}
\ No newline at end of file
diff --git a/app/code/Magento/Captcha/etc/di.xml b/app/code/Magento/Captcha/etc/di.xml
index 955896eb12744..3a929f5e6cc00 100644
--- a/app/code/Magento/Captcha/etc/di.xml
+++ b/app/code/Magento/Captcha/etc/di.xml
@@ -33,7 +33,6 @@
- user_login
- - guest_checkout
diff --git a/app/code/Magento/Captcha/etc/events.xml b/app/code/Magento/Captcha/etc/events.xml
index e3ddd19de2d12..970c0d077260c 100644
--- a/app/code/Magento/Captcha/etc/events.xml
+++ b/app/code/Magento/Captcha/etc/events.xml
@@ -18,10 +18,6 @@
-
-
diff --git a/app/code/Magento/Captcha/etc/frontend/di.xml b/app/code/Magento/Captcha/etc/frontend/di.xml
index 225e62c8e8203..0c4ab0cda0735 100644
--- a/app/code/Magento/Captcha/etc/frontend/di.xml
+++ b/app/code/Magento/Captcha/etc/frontend/di.xml
@@ -17,7 +17,6 @@
- user_login
- - guest_checkout
diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
index 4ed56fd56cc3a..7180372f004e5 100644
--- a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
@@ -36,29 +36,7 @@
-
- Magento_Captcha/js/view/checkout/loginCaptcha
- additional-login-form-fields
- - guest_checkout
- - checkoutConfig
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Magento_Captcha/js/view/checkout/loginCaptcha
- - additional-login-form-fields
- - guest_checkout
+ - user_login
- checkoutConfig
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 3b322711f8b1f..0f3394e41e7c2 100644
--- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
@@ -6,7 +6,7 @@
var config = {
map: {
'*': {
- captcha: 'Magento_Captcha/captcha'
+ captcha: 'Magento_Captcha/js/captcha'
}
}
};
diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/captcha.js
rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js
diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/onepage.js
deleted file mode 100644
index 7f5f11d20572b..0000000000000
--- a/app/code/Magento/Captcha/view/frontend/web/onepage.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * @deprecated since version 2.2.0
- */
-define(['jquery'], function ($) {
- 'use strict';
-
- $(document).on('login', function () {
- var type;
-
- $('[data-captcha="guest_checkout"], [data-captcha="register_during_checkout"]').hide();
- $('[role="guest_checkout"], [role="register_during_checkout"]').hide();
- type = $('#login\\:guest').is(':checked') ? 'guest_checkout' : 'register_during_checkout';
- $('[role="' + type + '"], [data-captcha="' + type + '"]').show();
- }).on('billingSave', function () {
- $('.captcha-reload:visible').trigger('click');
- });
-});
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index ad1ccea6f2c5a..1e0015d2be2c6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -30,7 +30,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
*/
protected function _prepareLayout()
{
- $this->setTemplate('catalog/category/checkboxes/tree.phtml');
+ $this->setTemplate('Magento_Catalog::catalog/category/checkboxes/tree.phtml');
}
/**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
index 20411a4c4d767..2eef1188e3910 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
@@ -27,7 +27,8 @@ public function getButtonData()
return [
'id' => 'delete',
'label' => __('Delete'),
- 'on_click' => "categoryDelete('" . $this->getDeleteUrl() . "')",
+ 'on_click' => "deleteConfirm('" .__('Are you sure you want to delete this category?') ."', '"
+ . $this->getDeleteUrl() . "', {data: {}})",
'class' => 'delete',
'sort_order' => 10
];
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index 0026e52e039ef..cd6c5021f0cc9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -32,10 +32,9 @@ protected function _getElementHtml(AbstractElement $element)
$from = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml();
$to = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml();
- return __(
- 'from to ' . __('from') . ' ' . __('to') . '
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
@@ -48,12 +50,20 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
*/
protected $_storeId;
+ /**
+ * Core store config
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ private $scopeConfig;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
* @param AbstractDb $resource
*/
@@ -63,10 +73,12 @@ public function __construct(
FetchStrategyInterface $fetchStrategy,
ManagerInterface $eventManager,
StoreManagerInterface $storeManager,
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
AbstractDb $resource = null
) {
$this->_storeManager = $storeManager;
+ $this->scopeConfig = $scopeConfig;
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
}
@@ -387,4 +399,21 @@ public function setPage($pageNum, $pageSize)
$this->setCurPage($pageNum)->setPageSize($pageSize);
return $this;
}
+
+ /**
+ * Add navigation max depth filter
+ *
+ * @return $this
+ */
+ public function addNavigationMaxDepthFilter()
+ {
+ $navigationMaxDepth = (int)$this->scopeConfig->getValue(
+ 'catalog/navigation/max_depth',
+ ScopeInterface::SCOPE_STORE
+ );
+ if ($navigationMaxDepth > 0) {
+ $this->addLevelFilter($navigationMaxDepth);
+ }
+ return $this;
+ }
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
new file mode 100644
index 0000000000000..fc476ab6ff286
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
@@ -0,0 +1,55 @@
+objectManager = $objectManager;
+ $this->catalogCategoryFlatState = $catalogCategoryFlatState;
+ }
+
+ /**
+ * Create class instance with specified parameters
+ *
+ * @param array $data
+ * @return \Magento\Framework\Data\Collection\AbstractDb
+ */
+ public function create(array $data = [])
+ {
+ return $this->objectManager->create(
+ ($this->catalogCategoryFlatState->isAvailable()) ? Flat\Collection::class : Collection::class,
+ $data
+ );
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index bed129e19168f..585da2af529a4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -5,6 +5,15 @@
*/
namespace Magento\Catalog\Model\ResourceModel\Layer\Filter;
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
/**
* Catalog Layer Price Filter resource model
*
@@ -41,6 +50,21 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
*/
private $storeManager;
+ /**
+ * @var IndexScopeResolverInterface|null
+ */
+ private $priceTableResolver;
+
+ /**
+ * @var Context
+ */
+ private $httpContext;
+
+ /**
+ * @var DimensionFactory|null
+ */
+ private $dimensionFactory;
+
/**
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -48,6 +72,9 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
* @param \Magento\Customer\Model\Session $session
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param null $connectionName
+ * @param IndexScopeResolverInterface|null $priceTableResolver
+ * @param Context|null $httpContext
+ * @param DimensionFactory|null $dimensionFactory
*/
public function __construct(
\Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,12 +82,19 @@ public function __construct(
\Magento\Catalog\Model\Layer\Resolver $layerResolver,
\Magento\Customer\Model\Session $session,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- $connectionName = null
+ $connectionName = null,
+ IndexScopeResolverInterface $priceTableResolver = null,
+ Context $httpContext = null,
+ DimensionFactory $dimensionFactory = null
) {
$this->layer = $layerResolver->get();
$this->session = $session;
$this->storeManager = $storeManager;
$this->_eventManager = $eventManager;
+ $this->priceTableResolver = $priceTableResolver
+ ?? ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+ $this->httpContext = $httpContext ?? ObjectManager::getInstance()->get(Context::class);
+ $this->dimensionFactory = $dimensionFactory ?? ObjectManager::getInstance()->get(DimensionFactory::class);
parent::__construct($context, $connectionName);
}
@@ -78,7 +112,7 @@ public function getCount($range)
/**
* Check and set correct variable values to prevent SQL-injections
*/
- $range = floatval($range);
+ $range = (float)$range;
if ($range == 0) {
$range = 1;
}
@@ -118,11 +152,8 @@ protected function _getSelect()
// remove join with main table
$fromPart = $select->getPart(\Magento\Framework\DB\Select::FROM);
- if (!isset(
- $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]
- ) || !isset(
- $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS]
- )
+ if (!isset($fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]) ||
+ !isset($fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS])
) {
return $select;
}
@@ -376,6 +407,30 @@ protected function _construct()
$this->_init('catalog_product_index_price', 'entity_id');
}
+ /**
+ * {@inheritdoc}
+ * @return string
+ */
+ public function getMainTable()
+ {
+ $storeKey = $this->httpContext->getValue(StoreManagerInterface::CONTEXT_STORE);
+ $priceTableName = $this->priceTableResolver->resolve(
+ 'catalog_product_index_price',
+ [
+ $this->dimensionFactory->create(
+ WebsiteDimensionProvider::DIMENSION_NAME,
+ (string)$this->storeManager->getStore($storeKey)->getWebsiteId()
+ ),
+ $this->dimensionFactory->create(
+ CustomerGroupDimensionProvider::DIMENSION_NAME,
+ (string)$this->httpContext->getValue(CustomerContext::CONTEXT_GROUP)
+ )
+ ]
+ );
+
+ return $this->getTable($priceTableName);
+ }
+
/**
* Retrieve joined price index table alias
*
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
index d97f6bebf4e91..da3c4fb4417f2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
@@ -9,6 +9,7 @@
/**
* Interface BaseSelectProcessorInterface
+ *
* @api
* @since 101.0.3
*/
@@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface
const PRODUCT_TABLE_ALIAS = 'child';
/**
+ * Process the select statement
+ *
* @param Select $select
* @return Select
* @since 101.0.3
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 9b87515450a12..fdd98442150ae 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -12,11 +12,15 @@
use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\DB\Select;
use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
use Magento\Store\Model\Store;
use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Framework\Indexer\DimensionFactory;
/**
* Product collection
@@ -276,9 +280,18 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
*/
private $tableMaintainer;
+ /**
+ * @var PriceTableResolver
+ */
+ private $priceTableResolver;
+
+ /**
+ * @var DimensionFactory
+ */
+ private $dimensionFactory;
+
/**
* Collection constructor
- *
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -302,7 +315,8 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
* @param ProductLimitationFactory|null $productLimitationFactory
* @param MetadataPool|null $metadataPool
* @param TableMaintainer|null $tableMaintainer
- *
+ * @param PriceTableResolver|null $priceTableResolver
+ * @param DimensionFactory|null $dimensionFactory
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -328,7 +342,9 @@ public function __construct(
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
ProductLimitationFactory $productLimitationFactory = null,
MetadataPool $metadataPool = null,
- TableMaintainer $tableMaintainer = null
+ TableMaintainer $tableMaintainer = null,
+ PriceTableResolver $priceTableResolver = null,
+ DimensionFactory $dimensionFactory = null
) {
$this->moduleManager = $moduleManager;
$this->_catalogProductFlatState = $catalogProductFlatState;
@@ -359,6 +375,9 @@ public function __construct(
$connection
);
$this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+ $this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(PriceTableResolver::class);
+ $this->dimensionFactory = $dimensionFactory
+ ?: ObjectManager::getInstance()->get(DimensionFactory::class);
}
/**
@@ -455,8 +474,7 @@ public function getFlatState()
}
/**
- * Retrieve is flat enabled flag
- * Return always false if magento run admin
+ * Retrieve is flat enabled. Return always false if magento run admin.
*
* @return bool
*/
@@ -487,8 +505,7 @@ protected function _construct()
}
/**
- * Standard resource collection initialization
- * Needed for child classes
+ * Standard resource collection initialization. Needed for child classes.
*
* @param string $model
* @param string $entityModel
@@ -527,8 +544,7 @@ protected function _prepareStaticFields()
}
/**
- * Retrieve collection empty item
- * Redeclared for specifying id field name without getting resource model inside model
+ * Get collection empty item. Redeclared for specifying id field name without getting resource model inside model.
*
* @return \Magento\Framework\DataObject
*/
@@ -614,8 +630,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
}
/**
- * Add attribute to entities in collection
- * If $attribute=='*' select all attributes
+ * Add attribute to entities in collection. If $attribute=='*' select all attributes.
*
* @param array|string|integer|\Magento\Framework\App\Config\Element $attribute
* @param bool|string $joinType
@@ -651,8 +666,7 @@ public function addAttributeToSelect($attribute, $joinType = false)
}
/**
- * Processing collection items after loading
- * Adding url rewrites, minimal prices, final prices, tax percents
+ * Processing collection items after loading. Adding url rewrites, minimal prices, final prices, tax percents.
*
* @return $this
*/
@@ -663,6 +677,7 @@ protected function _afterLoad()
}
$this->_prepareUrlDataObject();
+ $this->prepareStoreId();
if (count($this)) {
$this->_eventManager->dispatch('catalog_product_collection_load_after', ['collection' => $this]);
@@ -671,6 +686,23 @@ protected function _afterLoad()
return $this;
}
+ /**
+ * Add Store ID to products from collection.
+ *
+ * @return $this
+ */
+ protected function prepareStoreId()
+ {
+ if ($this->getStoreId() !== null) {
+ /** @var $item \Magento\Catalog\Model\Product */
+ foreach ($this->_items as $item) {
+ $item->setStoreId($this->getStoreId());
+ }
+ }
+
+ return $this;
+ }
+
/**
* Prepare Url Data object
*
@@ -737,8 +769,7 @@ public function addIdFilter($productId, $exclude = false)
}
/**
- * Adding product website names to result collection
- * Add for each product websites information
+ * Adding product website names to result collection. Add for each product websites information.
*
* @return $this
*/
@@ -749,7 +780,7 @@ public function addWebsiteNamesToResult()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function load($printQuery = false, $logQuery = false)
{
@@ -800,14 +831,14 @@ protected function doAddWebsiteNamesToResult()
foreach ($this as $product) {
if (isset($productWebsites[$product->getId()])) {
$product->setData('websites', $productWebsites[$product->getId()]);
+ $product->setData('website_ids', $productWebsites[$product->getId()]);
}
}
return $this;
}
/**
- * Add store availability filter. Include availability product
- * for store website
+ * Add store availability filter. Include availability product for store website.
*
* @param null|string|bool|int|Store $store
* @return $this
@@ -913,7 +944,7 @@ private function mapConditionType($conditionType)
'eq' => 'in',
'neq' => 'nin'
];
- return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+ return $conditionsMap[$conditionType] ?? $conditionType;
}
/**
@@ -1061,14 +1092,15 @@ public function getAllAttributeValues($attribute)
$select = clone $this->getSelect();
$attribute = $this->getEntity()->getAttribute($attribute);
- $aiField = $this->getConnection()->getAutoIncrementField($this->getMainTable());
+ $fieldMainTable = $this->getConnection()->getAutoIncrementField($this->getMainTable());
+ $fieldJoinTable = $attribute->getEntity()->getLinkField();
$select->reset()
->from(
['cpe' => $this->getMainTable()],
['entity_id']
)->join(
['cpa' => $attribute->getBackend()->getTable()],
- 'cpe.' . $aiField . ' = cpa.' . $aiField,
+ 'cpe.' . $fieldMainTable . ' = cpa.' . $fieldJoinTable,
['store_id', 'value']
)->where('attribute_id = ?', (int)$attribute->getId());
@@ -1095,11 +1127,11 @@ public function getSelectCountSql()
/**
* Get SQL for get record count
*
- * @param null $select
+ * @param Select $select
* @param bool $resetLeftJoins
- * @return \Magento\Framework\DB\Select
+ * @return Select
*/
- protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
+ protected function _getSelectCountSql(?Select $select = null, $resetLeftJoins = true)
{
$this->_renderFilters();
$countSelect = $select === null ? $this->_getClearSelect() : $this->_buildClearSelect($select);
@@ -1337,8 +1369,7 @@ public function joinUrlRewrite()
}
/**
- * Add URL rewrites data to product
- * If collection loadded - run processing else set flag
+ * Add URL rewrites data to product. If collection loadded - run processing else set flag.
*
* @param int|string $categoryId
* @return $this
@@ -1561,7 +1592,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
}
/**
- * {@inheritdoc}
+ * @inheritdoc
+ *
* @since 101.0.0
*/
protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $entity)
@@ -1680,7 +1712,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
return $this;
} elseif ($attribute == 'is_saleable') {
- $this->getSelect()->order("is_saleable " . $dir);
+ $this->getSelect()->order("is_salable " . $dir);
return $this;
}
@@ -1863,7 +1895,12 @@ protected function _productLimitationJoinPrice()
protected function _productLimitationPrice($joinLeft = false)
{
$filters = $this->_productLimitationFilters;
- if (!$filters->isUsingPriceIndex()) {
+ if (!$filters->isUsingPriceIndex() ||
+ !isset($filters['website_id']) ||
+ (string)$filters['website_id'] === '' ||
+ !isset($filters['customer_group_id']) ||
+ (string)$filters['customer_group_id'] === ''
+ ) {
return $this;
}
@@ -1898,7 +1935,23 @@ protected function _productLimitationPrice($joinLeft = false)
'max_price',
'tier_price',
];
- $tableName = ['price_index' => $this->getTable('catalog_product_index_price')];
+
+ $tableName = [
+ 'price_index' => $this->priceTableResolver->resolve(
+ 'catalog_product_index_price',
+ [
+ $this->dimensionFactory->create(
+ CustomerGroupDimensionProvider::DIMENSION_NAME,
+ (string)$filters['customer_group_id']
+ ),
+ $this->dimensionFactory->create(
+ WebsiteDimensionProvider::DIMENSION_NAME,
+ (string)$filters['website_id']
+ )
+ ]
+ )
+ ];
+
if ($joinLeft) {
$select->joinLeft($tableName, $joinCond, $colls);
} else {
@@ -2228,6 +2281,7 @@ public function addPriceDataFieldFilter($comparisonFormat, $fields)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
* @since 101.0.1
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function addMediaGalleryData()
{
@@ -2239,34 +2293,36 @@ public function addMediaGalleryData()
return $this;
}
- /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
- $attribute = $this->getAttribute('media_gallery');
- $select = $this->getMediaGalleryResource()->createBatchBaseSelect(
- $this->getStoreId(),
- $attribute->getAttributeId()
- );
-
- $mediaGalleries = [];
- $linkField = $this->getProductEntityMetadata()->getLinkField();
$items = $this->getItems();
+ $linkField = $this->getProductEntityMetadata()->getLinkField();
- $select->where(
- 'entity.' . $linkField . ' IN (?)',
- array_map(
- function ($item) use ($linkField) {
- return $item->getData($linkField);
- },
- $items
- )
- );
+ $select = $this->getMediaGalleryResource()
+ ->createBatchBaseSelect(
+ $this->getStoreId(),
+ $this->getAttribute('media_gallery')->getAttributeId()
+ )->reset(
+ Select::ORDER // we don't care what order is in current scenario
+ )->where(
+ 'entity.' . $linkField . ' IN (?)',
+ array_map(
+ function ($item) use ($linkField) {
+ return (int) $item->getOrigData($linkField);
+ },
+ $items
+ )
+ );
+
+ $mediaGalleries = [];
foreach ($this->getConnection()->fetchAll($select) as $row) {
$mediaGalleries[$row[$linkField]][] = $row;
}
foreach ($items as $item) {
- $mediaEntries = isset($mediaGalleries[$item->getData($linkField)]) ?
- $mediaGalleries[$item->getData($linkField)] : [];
- $this->getGalleryReadHandler()->addMediaDataToProduct($item, $mediaEntries);
+ $this->getGalleryReadHandler()
+ ->addMediaDataToProduct(
+ $item,
+ $mediaGalleries[$item->getOrigData($linkField)] ?? []
+ );
}
$this->setFlag('media_gallery_added', true);
@@ -2299,7 +2355,10 @@ private function getGalleryReadHandler()
}
/**
+ * Retrieve Media gallery resource.
+ *
* @deprecated 101.0.1
+ *
* @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
*/
private function getMediaGalleryResource()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
index ee1df8f23424d..ebe04fb63b217 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -7,9 +7,13 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\DB\Select;
use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
{
@@ -38,6 +42,16 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
*/
private $baseSelectProcessor;
+ /**
+ * @var IndexScopeResolverInterface|null
+ */
+ private $priceTableResolver;
+
+ /**
+ * @var DimensionFactory|null
+ */
+ private $dimensionFactory;
+
/**
* LinkedProductSelectBuilderByIndexPrice constructor.
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -45,13 +59,17 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
* @param BaseSelectProcessorInterface|null $baseSelectProcessor
+ * @param IndexScopeResolverInterface|null $priceTableResolver
+ * @param DimensionFactory|null $dimensionFactory
*/
public function __construct(
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\ResourceConnection $resourceConnection,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\EntityManager\MetadataPool $metadataPool,
- BaseSelectProcessorInterface $baseSelectProcessor = null
+ BaseSelectProcessorInterface $baseSelectProcessor = null,
+ IndexScopeResolverInterface $priceTableResolver = null,
+ DimensionFactory $dimensionFactory = null
) {
$this->storeManager = $storeManager;
$this->resource = $resourceConnection;
@@ -59,6 +77,9 @@ public function __construct(
$this->metadataPool = $metadataPool;
$this->baseSelectProcessor = (null !== $baseSelectProcessor)
? $baseSelectProcessor : ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
+ $this->priceTableResolver = $priceTableResolver
+ ?? ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+ $this->dimensionFactory = $dimensionFactory ?? ObjectManager::getInstance()->get(DimensionFactory::class);
}
/**
@@ -68,6 +89,8 @@ public function build($productId)
{
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$productTable = $this->resource->getTableName('catalog_product_entity');
+ $websiteId = $this->storeManager->getStore()->getWebsiteId();
+ $customerGroupId = $this->customerSession->getCustomerGroupId();
$priceSelect = $this->resource->getConnection()->select()
->from(['parent' => $productTable], '')
@@ -80,12 +103,20 @@ public function build($productId)
sprintf('%s.entity_id = link.child_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
['entity_id']
)->joinInner(
- ['t' => $this->resource->getTableName('catalog_product_index_price')],
+ [
+ 't' => $this->priceTableResolver->resolve('catalog_product_index_price', [
+ $this->dimensionFactory->create(WebsiteDimensionProvider::DIMENSION_NAME, (string)$websiteId),
+ $this->dimensionFactory->create(
+ CustomerGroupDimensionProvider::DIMENSION_NAME,
+ (string)$customerGroupId
+ ),
+ ])
+ ],
sprintf('t.entity_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
[]
)->where('parent.entity_id = ?', $productId)
- ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
- ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
+ ->where('t.website_id = ?', $websiteId)
+ ->where('t.customer_group_id = ?', $customerGroupId)
->order('t.min_price ' . Select::SQL_ASC)
->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
->limit(1);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php
new file mode 100644
index 0000000000000..cf5ba451c380e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php
@@ -0,0 +1,38 @@
+priceModifiers = $priceModifiers;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+ {
+ foreach ($this->priceModifiers as $priceModifier) {
+ $priceModifier->modifyPrice($priceTable, $entityIds);
+ }
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
index 24cb4fedd57e5..a499777df871a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
@@ -18,7 +18,7 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte
/**
* Calculated memory size for one record in catalog_product_index_price table
*/
- const MEMORY_SIZE_FOR_ONE_ROW = 250;
+ const MEMORY_SIZE_FOR_ONE_ROW = 200;
/**
* @var WebsiteManagementInterface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
new file mode 100644
index 0000000000000..47fc6802d7eaf
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
@@ -0,0 +1,464 @@
+resource = $resource;
+ $this->metadataPool = $metadataPool;
+ $this->connectionName = $connectionName;
+ $this->columnValueExpressionFactory = $columnValueExpressionFactory;
+ $this->dataHelper = $dataHelper;
+ $this->tableStrategy = $tableStrategy;
+ }
+
+ /**
+ * Apply custom option price to temporary index price table
+ *
+ * @param IndexTableStructure $priceTable
+ * @param array $entityIds
+ * @return void
+ * @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+ {
+ // no need to run all queries if current products have no custom options
+ if (!$this->checkIfCustomOptionsExist($priceTable)) {
+ return;
+ }
+
+ $connection = $this->getConnection();
+ $finalPriceTable = $priceTable->getTableName();
+
+ $coaTable = $this->getCustomOptionAggregateTable();
+ $this->prepareCustomOptionAggregateTable();
+
+ $copTable = $this->getCustomOptionPriceTable();
+ $this->prepareCustomOptionPriceTable();
+
+ $select = $this->getSelectForOptionsWithMultipleValues($finalPriceTable);
+ $query = $select->insertFromSelect($coaTable);
+ $connection->query($query);
+
+ $select = $this->getSelectForOptionsWithOneValue($finalPriceTable);
+ $query = $select->insertFromSelect($coaTable);
+ $connection->query($query);
+
+ $select = $this->getSelectAggregated($coaTable);
+ $query = $select->insertFromSelect($copTable);
+ $connection->query($query);
+
+ // update tmp price index with prices from custom options (from previous aggregated table)
+ $select = $this->getSelectForUpdate($copTable);
+ $query = $select->crossUpdateFromSelect(['i' => $finalPriceTable]);
+ $connection->query($query);
+
+ $connection->delete($coaTable);
+ $connection->delete($copTable);
+ }
+
+ /**
+ * @param IndexTableStructure $priceTable
+ * @return bool
+ * @throws \Exception
+ */
+ private function checkIfCustomOptionsExist(IndexTableStructure $priceTable): bool
+ {
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+ $select = $this->getConnection()
+ ->select()
+ ->from(
+ ['i' => $priceTable->getTableName()],
+ ['entity_id']
+ )->join(
+ ['e' => $this->getTable('catalog_product_entity')],
+ 'e.entity_id = i.entity_id',
+ []
+ )->join(
+ ['o' => $this->getTable('catalog_product_option')],
+ 'o.product_id = e.' . $metadata->getLinkField(),
+ ['option_id']
+ );
+
+ return !empty($this->getConnection()->fetchRow($select));
+ }
+
+ /**
+ * @return \Magento\Framework\DB\Adapter\AdapterInterface
+ */
+ private function getConnection()
+ {
+ if (null === $this->connection) {
+ $this->connection = $this->resource->getConnection($this->connectionName);
+ }
+
+ return $this->connection;
+ }
+
+ /**
+ * Prepare prices for products with custom options that has multiple values
+ *
+ * @param string $sourceTable
+ * @return \Magento\Framework\DB\Select
+ * @throws \Exception
+ */
+ private function getSelectForOptionsWithMultipleValues(string $sourceTable): Select
+ {
+ $connection = $this->resource->getConnection($this->connectionName);
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+ $select = $connection->select()
+ ->from(
+ ['i' => $sourceTable],
+ ['entity_id', 'customer_group_id', 'website_id']
+ )->join(
+ ['e' => $this->getTable('catalog_product_entity')],
+ 'e.entity_id = i.entity_id',
+ []
+ )->join(
+ ['cwd' => $this->getTable('catalog_product_index_website')],
+ 'i.website_id = cwd.website_id',
+ []
+ )->join(
+ ['o' => $this->getTable('catalog_product_option')],
+ 'o.product_id = e.' . $metadata->getLinkField(),
+ ['option_id']
+ )->join(
+ ['ot' => $this->getTable('catalog_product_option_type_value')],
+ 'ot.option_id = o.option_id',
+ []
+ )->join(
+ ['otpd' => $this->getTable('catalog_product_option_type_price')],
+ 'otpd.option_type_id = ot.option_type_id AND otpd.store_id = 0',
+ []
+ )->group(
+ ['i.entity_id', 'i.customer_group_id', 'i.website_id', 'o.option_id']
+ );
+
+ if ($this->isPriceGlobal()) {
+ $optPriceType = 'otpd.price_type';
+ $optPriceValue = 'otpd.price';
+ } else {
+ $select->joinLeft(
+ ['otps' => $this->getTable('catalog_product_option_type_price')],
+ 'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cwd.default_store_id',
+ []
+ );
+
+ $optPriceType = $connection->getCheckSql(
+ 'otps.option_type_price_id > 0',
+ 'otps.price_type',
+ 'otpd.price_type'
+ );
+ $optPriceValue = $connection->getCheckSql('otps.option_type_price_id > 0', 'otps.price', 'otpd.price');
+ }
+
+ $minPriceRound = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+ ]);
+ $minPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $minPriceRound);
+ $minPriceMin = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "MIN({$minPriceExpr})"
+ ]);
+ $minPrice = $connection->getCheckSql("MIN(o.is_require) = 1", $minPriceMin, '0');
+
+ $tierPriceRound = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "ROUND(i.tier_price * ({$optPriceValue} / 100), 4)"
+ ]);
+ $tierPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $tierPriceRound);
+ $tierPriceMin = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "MIN({$tierPriceExpr})"
+ ]);
+ $tierPriceValue = $connection->getCheckSql("MIN(o.is_require) > 0", $tierPriceMin, 0);
+ $tierPrice = $connection->getCheckSql("MIN(i.tier_price) IS NOT NULL", $tierPriceValue, "NULL");
+
+ $maxPriceRound = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+ ]);
+ $maxPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $maxPriceRound);
+ $maxPrice = $connection->getCheckSql(
+ "(MIN(o.type)='radio' OR MIN(o.type)='drop_down')",
+ "MAX({$maxPriceExpr})",
+ "SUM({$maxPriceExpr})"
+ );
+
+ $select->columns(
+ [
+ 'min_price' => $minPrice,
+ 'max_price' => $maxPrice,
+ 'tier_price' => $tierPrice,
+ ]
+ );
+
+ return $select;
+ }
+
+ /**
+ * Prepare prices for products with custom options that has single value
+ *
+ * @param string $sourceTable
+ * @return \Magento\Framework\DB\Select
+ * @throws \Exception
+ */
+ private function getSelectForOptionsWithOneValue(string $sourceTable): Select
+ {
+ $connection = $this->resource->getConnection($this->connectionName);
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+ $select = $connection->select()
+ ->from(
+ ['i' => $sourceTable],
+ ['entity_id', 'customer_group_id', 'website_id']
+ )->join(
+ ['e' => $this->getTable('catalog_product_entity')],
+ 'e.entity_id = i.entity_id',
+ []
+ )->join(
+ ['cwd' => $this->getTable('catalog_product_index_website')],
+ 'i.website_id = cwd.website_id',
+ []
+ )->join(
+ ['o' => $this->getTable('catalog_product_option')],
+ 'o.product_id = e.' . $metadata->getLinkField(),
+ ['option_id']
+ )->join(
+ ['opd' => $this->getTable('catalog_product_option_price')],
+ 'opd.option_id = o.option_id AND opd.store_id = 0',
+ []
+ );
+
+ if ($this->isPriceGlobal()) {
+ $optPriceType = 'opd.price_type';
+ $optPriceValue = 'opd.price';
+ } else {
+ $select->joinLeft(
+ ['ops' => $this->getTable('catalog_product_option_price')],
+ 'ops.option_id = opd.option_id AND ops.store_id = cwd.default_store_id',
+ []
+ );
+
+ $optPriceType = $connection->getCheckSql('ops.option_price_id > 0', 'ops.price_type', 'opd.price_type');
+ $optPriceValue = $connection->getCheckSql('ops.option_price_id > 0', 'ops.price', 'opd.price');
+ }
+
+ $minPriceRound = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+ ]);
+ $priceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $minPriceRound);
+ $minPrice = $connection->getCheckSql("{$priceExpr} > 0 AND o.is_require = 1", $priceExpr, 0);
+
+ $maxPrice = $priceExpr;
+
+ $tierPriceRound = $this->columnValueExpressionFactory
+ ->create([
+ 'expression' => "ROUND(i.tier_price * ({$optPriceValue} / 100), 4)"
+ ]);
+ $tierPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $tierPriceRound);
+ $tierPriceValue = $connection->getCheckSql("{$tierPriceExpr} > 0 AND o.is_require = 1", $tierPriceExpr, 0);
+ $tierPrice = $connection->getCheckSql("i.tier_price IS NOT NULL", $tierPriceValue, "NULL");
+
+ $select->columns(
+ [
+ 'min_price' => $minPrice,
+ 'max_price' => $maxPrice,
+ 'tier_price' => $tierPrice,
+ ]
+ );
+
+ return $select;
+ }
+
+ /**
+ * Aggregate prices with one and multiply options into one table
+ *
+ * @param string $sourceTable
+ * @return \Magento\Framework\DB\Select
+ */
+ private function getSelectAggregated(string $sourceTable): Select
+ {
+ $connection = $this->resource->getConnection($this->connectionName);
+
+ $select = $connection->select()
+ ->from(
+ [$sourceTable],
+ [
+ 'entity_id',
+ 'customer_group_id',
+ 'website_id',
+ 'min_price' => 'SUM(min_price)',
+ 'max_price' => 'SUM(max_price)',
+ 'tier_price' => 'SUM(tier_price)',
+ ]
+ )->group(
+ ['entity_id', 'customer_group_id', 'website_id']
+ );
+
+ return $select;
+ }
+
+ /**
+ * @param string $sourceTable
+ * @return \Magento\Framework\DB\Select
+ */
+ private function getSelectForUpdate(string $sourceTable): Select
+ {
+ $connection = $this->resource->getConnection($this->connectionName);
+
+ $select = $connection->select()->join(
+ ['io' => $sourceTable],
+ 'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
+ ' AND i.website_id = io.website_id',
+ []
+ );
+ $select->columns(
+ [
+ 'min_price' => new ColumnValueExpression('i.min_price + io.min_price'),
+ 'max_price' => new ColumnValueExpression('i.max_price + io.max_price'),
+ 'tier_price' => $connection->getCheckSql(
+ 'i.tier_price IS NOT NULL',
+ 'i.tier_price + io.tier_price',
+ 'NULL'
+ ),
+ ]
+ );
+
+ return $select;
+ }
+
+ /**
+ * @param string $tableName
+ * @return string
+ */
+ private function getTable(string $tableName): string
+ {
+ return $this->resource->getTableName($tableName, $this->connectionName);
+ }
+
+ /**
+ * @return bool
+ */
+ private function isPriceGlobal(): bool
+ {
+ if ($this->isPriceGlobalFlag === null) {
+ $this->isPriceGlobalFlag = $this->dataHelper->isPriceGlobal();
+ }
+
+ return $this->isPriceGlobalFlag;
+ }
+
+ /**
+ * Retrieve table name for custom option temporary aggregation data
+ *
+ * @return string
+ */
+ private function getCustomOptionAggregateTable(): string
+ {
+ return $this->tableStrategy->getTableName('catalog_product_index_price_opt_agr');
+ }
+
+ /**
+ * Retrieve table name for custom option prices data
+ *
+ * @return string
+ */
+ private function getCustomOptionPriceTable(): string
+ {
+ return $this->tableStrategy->getTableName('catalog_product_index_price_opt');
+ }
+
+ /**
+ * Prepare table structure for custom option temporary aggregation data
+ *
+ * @return void
+ */
+ private function prepareCustomOptionAggregateTable()
+ {
+ $this->getConnection()->delete($this->getCustomOptionAggregateTable());
+ }
+
+ /**
+ * Prepare table structure for custom option prices data
+ *
+ * @return void
+ */
+ private function prepareCustomOptionPriceTable()
+ {
+ $this->getConnection()->delete($this->getCustomOptionPriceTable());
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 4ca407a53f8ae..168fa8f50acc2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -6,6 +6,7 @@
namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
use Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
/**
* Default Product Type Price Indexer Resource model
@@ -16,6 +17,8 @@
* @author Magento Core Team
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
+ * @deprecated Not used anymore for price indexation. Class left for backward compatibility
+ * @see DimensionalIndexerInterface
*/
class DefaultPrice extends AbstractIndexer implements PriceInterface
{
@@ -71,7 +74,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param string|null $connectionName
- * @param null|IndexTableStructureFactory $indexTableStructureFactory
+ * @param IndexTableStructureFactory $indexTableStructureFactory
* @param PriceModifierInterface[] $priceModifiers
*/
public function __construct(
@@ -307,7 +310,7 @@ protected function prepareFinalPriceDataForType($entityIds, $type)
$query = $select->insertFromSelect($finalPriceTable->getTableName(), [], false);
$this->getConnection()->query($query);
- $this->applyDiscountPrices($finalPriceTable);
+ $this->modifyPriceIndex($finalPriceTable);
return $this;
}
@@ -327,6 +330,7 @@ protected function prepareFinalPriceDataForType($entityIds, $type)
protected function getSelect($entityIds = null, $type = null)
{
$metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+ $linkField = $metadata->getLinkField();
$connection = $this->getConnection();
$select = $connection->select()->from(
['e' => $this->getTable('catalog_product_entity')],
@@ -356,9 +360,38 @@ protected function getSelect($entityIds = null, $type = null)
'pw.product_id = e.entity_id AND pw.website_id = cw.website_id',
[]
)->joinLeft(
- ['tp' => $this->_getTierPriceIndexTable()],
- 'tp.entity_id = e.entity_id AND tp.website_id = cw.website_id' .
- ' AND tp.customer_group_id = cg.customer_group_id',
+ // we need this only for BCC in case someone expects table `tp` to be present in query
+ ['tp' => $this->getTable('catalog_product_index_tier_price')],
+ 'tp.entity_id = e.entity_id AND tp.customer_group_id = cg.customer_group_id' .
+ ' AND tp.website_id = pw.website_id',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `All Websites` and Customer Group = `Specific Customer Group`
+ ['tier_price_1' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_1.' . $linkField . ' = e.' . $linkField . ' AND tier_price_1.all_groups = 0' .
+ ' AND tier_price_1.customer_group_id = cg.customer_group_id AND tier_price_1.qty = 1' .
+ ' AND tier_price_1.website_id = 0',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `Specific Website`
+ //and Customer Group = `Specific Customer Group`
+ ['tier_price_2' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_2.' . $linkField . ' = e.' . $linkField . ' AND tier_price_2.all_groups = 0' .
+ ' AND tier_price_2.customer_group_id = cg.customer_group_id AND tier_price_2.qty = 1' .
+ ' AND tier_price_2.website_id = cw.website_id',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `All Websites` and Customer Group = `ALL GROUPS`
+ ['tier_price_3' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_3.' . $linkField . ' = e.' . $linkField . ' AND tier_price_3.all_groups = 1' .
+ ' AND tier_price_3.customer_group_id = 0 AND tier_price_3.qty = 1 AND tier_price_3.website_id = 0',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `Specific Website` and Customer Group = `ALL GROUPS`
+ ['tier_price_4' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_4.' . $linkField . ' = e.' . $linkField . ' AND tier_price_4.all_groups = 1' .
+ ' AND tier_price_4.customer_group_id = 0 AND tier_price_4.qty = 1' .
+ ' AND tier_price_4.website_id = cw.website_id',
[]
);
@@ -374,7 +407,7 @@ protected function getSelect($entityIds = null, $type = null)
$this->_addAttributeToSelect(
$select,
'status',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id',
$statusCond,
true
@@ -383,7 +416,7 @@ protected function getSelect($entityIds = null, $type = null)
$taxClassId = $this->_addAttributeToSelect(
$select,
'tax_class_id',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id'
);
} else {
@@ -394,25 +427,25 @@ protected function getSelect($entityIds = null, $type = null)
$price = $this->_addAttributeToSelect(
$select,
'price',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id'
);
$specialPrice = $this->_addAttributeToSelect(
$select,
'special_price',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id'
);
$specialFrom = $this->_addAttributeToSelect(
$select,
'special_from_date',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id'
);
$specialTo = $this->_addAttributeToSelect(
$select,
'special_to_date',
- 'e.' . $metadata->getLinkField(),
+ 'e.' . $linkField,
'cs.store_id'
);
$currentDate = 'cwd.website_date';
@@ -423,15 +456,12 @@ protected function getSelect($entityIds = null, $type = null)
$specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
$specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
$specialPriceExpr = $connection->getCheckSql(
- "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
+ "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
$specialPrice,
$maxUnsignedBigint
);
- $tierPrice = new \Zend_Db_Expr('tp.min_price');
- $tierPriceExpr = $connection->getIfNullSql(
- $tierPrice,
- $maxUnsignedBigint
- );
+ $tierPrice = $this->getTotalTierPriceExpression($price);
+ $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
$finalPrice = $connection->getLeastSql([
$price,
$specialPriceExpr,
@@ -512,12 +542,12 @@ protected function _prepareCustomOptionPriceTable()
}
/**
- * Apply discount prices to final price index table.
+ * Modify data in price index table.
*
* @param IndexTableStructure $finalPriceTable
* @return void
*/
- private function applyDiscountPrices(IndexTableStructure $finalPriceTable) : void
+ private function modifyPriceIndex(IndexTableStructure $finalPriceTable) : void
{
foreach ($this->priceModifiers as $priceModifier) {
$priceModifier->modifyPrice($finalPriceTable);
@@ -791,4 +821,62 @@ protected function hasEntity()
return $this->hasEntity;
}
+
+ /**
+ * @param \Zend_Db_Expr $priceExpression
+ * @return \Zend_Db_Expr
+ */
+ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
+ {
+ $maxUnsignedBigint = '~0';
+
+ return $this->getConnection()->getCheckSql(
+ implode(
+ ' AND ',
+ [
+ 'tier_price_1.value_id is NULL',
+ 'tier_price_2.value_id is NULL',
+ 'tier_price_3.value_id is NULL',
+ 'tier_price_4.value_id is NULL'
+ ]
+ ),
+ 'NULL',
+ $this->getConnection()->getLeastSql([
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_2', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_3', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ ])
+ );
+ }
+
+ /**
+ * @param string $tableAlias
+ * @param \Zend_Db_Expr $priceExpression
+ * @return \Zend_Db_Expr
+ */
+ private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
+ {
+ return $this->getConnection()->getCheckSql(
+ sprintf('%s.value = 0', $tableAlias),
+ sprintf(
+ 'ROUND(%s * (1 - ROUND(%s.percentage_value * cwd.rate, 4) / 100), 4)',
+ $priceExpression,
+ $tableAlias
+ ),
+ sprintf('ROUND(%s.value * cwd.rate, 4)', $tableAlias)
+ );
+ }
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
index 21a7647214c26..9a310c7365ac9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
@@ -9,6 +9,8 @@
*/
namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+
class Factory
{
/**
@@ -40,14 +42,17 @@ public function create($className, array $data = [])
{
$indexerPrice = $this->_objectManager->create($className, $data);
- if (!$indexerPrice instanceof \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice) {
- throw new \Magento\Framework\Exception\LocalizedException(
- __(
- '%1 doesn\'t extend \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice',
- $className
- )
- );
+ if ($indexerPrice instanceof PriceInterface || $indexerPrice instanceof DimensionalIndexerInterface) {
+ return $indexerPrice;
}
- return $indexerPrice;
+
+ throw new \Magento\Framework\Exception\LocalizedException(
+ __(
+ 'Price indexer "%1" must implement %2 or %3',
+ $className,
+ PriceInterface::class,
+ DimensionalIndexerInterface::class
+ )
+ );
}
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
new file mode 100644
index 0000000000000..0005ac8dea58a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -0,0 +1,330 @@
+ 'pw.website_id',
+ CustomerGroupDimensionProvider::DIMENSION_NAME => 'cg.customer_group_id',
+ ];
+
+ /**
+ * @var \Magento\Framework\DB\Adapter\AdapterInterface
+ */
+ private $connection;
+
+ /**
+ * @var \Magento\Framework\EntityManager\MetadataPool
+ */
+ private $metadataPool;
+
+ /**
+ * BaseFinalPrice constructor.
+ * @param \Magento\Framework\App\ResourceConnection $resource
+ * @param JoinAttributeProcessor $joinAttributeProcessor
+ * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param string $connectionName
+ */
+ public function __construct(
+ \Magento\Framework\App\ResourceConnection $resource,
+ JoinAttributeProcessor $joinAttributeProcessor,
+ \Magento\Framework\Module\Manager $moduleManager,
+ \Magento\Framework\Event\ManagerInterface $eventManager,
+ \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+ $connectionName = 'indexer'
+ ) {
+ $this->resource = $resource;
+ $this->connectionName = $connectionName;
+ $this->joinAttributeProcessor = $joinAttributeProcessor;
+ $this->moduleManager = $moduleManager;
+ $this->eventManager = $eventManager;
+ $this->metadataPool = $metadataPool;
+ }
+
+ /**
+ * @param Dimension[] $dimensions
+ * @param string $productType
+ * @param array $entityIds
+ * @return Select
+ * @throws \LogicException
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Zend_Db_Select_Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getQuery(array $dimensions, string $productType, array $entityIds = []): Select
+ {
+ $connection = $this->getConnection();
+ $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+ $linkField = $metadata->getLinkField();
+
+ $select = $connection->select()->from(
+ ['e' => $this->getTable('catalog_product_entity')],
+ ['entity_id']
+ )->joinInner(
+ ['cg' => $this->getTable('customer_group')],
+ array_key_exists(CustomerGroupDimensionProvider::DIMENSION_NAME, $dimensions)
+ ? sprintf(
+ '%s = %s',
+ $this->dimensionToFieldMapper[CustomerGroupDimensionProvider::DIMENSION_NAME],
+ $dimensions[CustomerGroupDimensionProvider::DIMENSION_NAME]->getValue()
+ ) : '',
+ ['customer_group_id']
+ )->joinInner(
+ ['pw' => $this->getTable('catalog_product_website')],
+ 'pw.product_id = e.entity_id',
+ ['pw.website_id']
+ )->joinInner(
+ ['cwd' => $this->getTable('catalog_product_index_website')],
+ 'pw.website_id = cwd.website_id',
+ []
+ )->joinLeft(
+ // we need this only for BCC in case someone expects table `tp` to be present in query
+ ['tp' => $this->getTable('catalog_product_index_tier_price')],
+ 'tp.entity_id = e.entity_id AND' .
+ ' tp.customer_group_id = cg.customer_group_id AND tp.website_id = pw.website_id',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `All Websites` and Customer Group = `Specific Customer Group`
+ ['tier_price_1' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_1.' . $linkField . ' = e.' . $linkField . ' AND tier_price_1.all_groups = 0' .
+ ' AND tier_price_1.customer_group_id = cg.customer_group_id AND tier_price_1.qty = 1' .
+ ' AND tier_price_1.website_id = 0',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `Specific Website`
+ //and Customer Group = `Specific Customer Group`
+ ['tier_price_2' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_2.' . $linkField . ' = e.' . $linkField . ' AND tier_price_2.all_groups = 0 ' .
+ 'AND tier_price_2.customer_group_id = cg.customer_group_id AND tier_price_2.qty = 1' .
+ ' AND tier_price_2.website_id = pw.website_id',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `All Websites` and Customer Group = `ALL GROUPS`
+ ['tier_price_3' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_3.' . $linkField . ' = e.' . $linkField . ' AND tier_price_3.all_groups = 1 ' .
+ 'AND tier_price_3.customer_group_id = 0 AND tier_price_3.qty = 1 AND tier_price_3.website_id = 0',
+ []
+ )->joinLeft(
+ // calculate tier price specified as Website = `Specific Website` and Customer Group = `ALL GROUPS`
+ ['tier_price_4' => $this->getTable('catalog_product_entity_tier_price')],
+ 'tier_price_4.' . $linkField . ' = e.' . $linkField . ' AND tier_price_4.all_groups = 1' .
+ ' AND tier_price_4.customer_group_id = 0 AND tier_price_4.qty = 1' .
+ ' AND tier_price_4.website_id = pw.website_id',
+ []
+ );
+
+ foreach ($dimensions as $dimension) {
+ if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+ throw new \LogicException(
+ 'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+ );
+ }
+ $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+ }
+
+ if ($this->moduleManager->isEnabled('Magento_Tax')) {
+ $taxClassId = $this->joinAttributeProcessor->process($select, 'tax_class_id');
+ } else {
+ $taxClassId = new \Zend_Db_Expr(0);
+ }
+ $select->columns(['tax_class_id' => $taxClassId]);
+
+ $this->joinAttributeProcessor->process($select, 'status', Status::STATUS_ENABLED);
+
+ $price = $this->joinAttributeProcessor->process($select, 'price');
+ $specialPrice = $this->joinAttributeProcessor->process($select, 'special_price');
+ $specialFrom = $this->joinAttributeProcessor->process($select, 'special_from_date');
+ $specialTo = $this->joinAttributeProcessor->process($select, 'special_to_date');
+ $currentDate = 'cwd.website_date';
+
+ $maxUnsignedBigint = '~0';
+ $specialFromDate = $connection->getDatePartSql($specialFrom);
+ $specialToDate = $connection->getDatePartSql($specialTo);
+ $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
+ $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
+ $specialPriceExpr = $connection->getCheckSql(
+ "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
+ $specialPrice,
+ $maxUnsignedBigint
+ );
+ $tierPrice = $this->getTotalTierPriceExpression($price);
+ $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
+ $finalPrice = $connection->getLeastSql([
+ $price,
+ $specialPriceExpr,
+ $tierPriceExpr,
+ ]);
+
+ $select->columns(
+ [
+ //orig_price in catalog_product_index_price_final_tmp
+ 'price' => $connection->getIfNullSql($price, 0),
+ //price in catalog_product_index_price_final_tmp
+ 'final_price' => $connection->getIfNullSql($finalPrice, 0),
+ 'min_price' => $connection->getIfNullSql($finalPrice, 0),
+ 'max_price' => $connection->getIfNullSql($finalPrice, 0),
+ 'tier_price' => $tierPrice,
+ ]
+ );
+
+ $select->where("e.type_id = ?", $productType);
+
+ if ($entityIds !== null) {
+ if (count($entityIds) > 1) {
+ $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
+ } else {
+ $select->where('e.entity_id = ?', $entityIds);
+ }
+ }
+
+ /**
+ * throw event for backward compatibility
+ */
+ $this->eventManager->dispatch(
+ 'prepare_catalog_product_index_select',
+ [
+ 'select' => $select,
+ 'entity_field' => new ColumnValueExpression('e.entity_id'),
+ 'website_field' => new ColumnValueExpression('pw.website_id'),
+ 'store_field' => new ColumnValueExpression('cwd.default_store_id'),
+ ]
+ );
+
+ return $select;
+ }
+
+ /**
+ * Get total tier price expression
+ *
+ * @param \Zend_Db_Expr $priceExpression
+ * @return \Zend_Db_Expr
+ */
+ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
+ {
+ $maxUnsignedBigint = '~0';
+
+ return $this->getConnection()->getCheckSql(
+ implode(
+ ' AND ',
+ [
+ 'tier_price_1.value_id is NULL',
+ 'tier_price_2.value_id is NULL',
+ 'tier_price_3.value_id is NULL',
+ 'tier_price_4.value_id is NULL'
+ ]
+ ),
+ 'NULL',
+ $this->getConnection()->getLeastSql([
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_2', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_3', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ $this->getConnection()->getIfNullSql(
+ $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
+ $maxUnsignedBigint
+ ),
+ ])
+ );
+ }
+
+ /**
+ * Get tier price expression for table
+ *
+ * @param $tableAlias
+ * @param \Zend_Db_Expr $priceExpression
+ * @return \Zend_Db_Expr
+ */
+ private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression): \Zend_Db_Expr
+ {
+ return $this->getConnection()->getCheckSql(
+ sprintf('%s.value = 0', $tableAlias),
+ sprintf(
+ 'ROUND(%s * (1 - ROUND(%s.percentage_value * cwd.rate, 4) / 100), 4)',
+ $priceExpression,
+ $tableAlias
+ ),
+ sprintf('ROUND(%s.value * cwd.rate, 4)', $tableAlias)
+ );
+ }
+
+ /**
+ * Get connection
+ *
+ * return \Magento\Framework\DB\Adapter\AdapterInterface
+ * @throws \DomainException
+ */
+ private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+ {
+ if ($this->connection === null) {
+ $this->connection = $this->resource->getConnection($this->connectionName);
+ }
+
+ return $this->connection;
+ }
+
+ /**
+ * Get table
+ *
+ * @param string $tableName
+ * @return string
+ */
+ private function getTable($tableName)
+ {
+ return $this->resource->getTableName($tableName, $this->connectionName);
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php
new file mode 100644
index 0000000000000..888e68a817081
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php
@@ -0,0 +1,112 @@
+eavConfig = $eavConfig;
+ $this->metadataPool = $metadataPool;
+ $this->resource = $resource;
+ $this->connectionName = $connectionName;
+ }
+
+ /**
+ * @param Select $select
+ * @param string $attributeCode
+ * @param string|null $attributeValue
+ * @return \Zend_Db_Expr
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Zend_Db_Select_Exception
+ */
+ public function process(Select $select, $attributeCode, $attributeValue = null): \Zend_Db_Expr
+ {
+ $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+ $attributeId = $attribute->getAttributeId();
+ $attributeTable = $attribute->getBackend()->getTable();
+ $connection = $this->resource->getConnection($this->connectionName);
+ $joinType = $attributeValue !== null ? 'join' : 'joinLeft';
+ $productIdField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+ if ($attribute->isScopeGlobal()) {
+ $alias = 'ta_' . $attributeCode;
+ $select->{$joinType}(
+ [$alias => $attributeTable],
+ "{$alias}.{$productIdField} = e.{$productIdField} AND {$alias}.attribute_id = {$attributeId}" .
+ " AND {$alias}.store_id = 0",
+ []
+ );
+ $whereExpression = new Expression("{$alias}.value");
+ } else {
+ $dAlias = 'tad_' . $attributeCode;
+ $sAlias = 'tas_' . $attributeCode;
+
+ $select->{$joinType}(
+ [$dAlias => $attributeTable],
+ "{$dAlias}.{$productIdField} = e.{$productIdField} AND {$dAlias}.attribute_id = {$attributeId}" .
+ " AND {$dAlias}.store_id = 0",
+ []
+ );
+ $select->joinLeft(
+ [$sAlias => $attributeTable],
+ "{$sAlias}.{$productIdField} = e.{$productIdField} AND {$sAlias}.attribute_id = {$attributeId}" .
+ " AND {$sAlias}.store_id = cwd.default_store_id",
+ []
+ );
+ $whereExpression = $connection->getCheckSql(
+ $connection->getIfNullSql("{$sAlias}.value_id", -1) . ' > 0',
+ "{$sAlias}.value",
+ "{$dAlias}.value"
+ );
+ }
+
+ if ($attributeValue !== null) {
+ $select->where("{$whereExpression} = ?", $attributeValue);
+ }
+
+ return $whereExpression;
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php
new file mode 100644
index 0000000000000..5a055e5ed9603
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php
@@ -0,0 +1,89 @@
+baseFinalPrice = $baseFinalPrice;
+ $this->indexTableStructureFactory = $indexTableStructureFactory;
+ $this->tableMaintainer = $tableMaintainer;
+ $this->productType = $productType;
+ $this->basePriceModifier = $basePriceModifier;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
+ {
+ $this->tableMaintainer->createMainTmpTable($dimensions);
+
+ $temporaryPriceTable = $this->indexTableStructureFactory->create([
+ 'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+ 'entityField' => 'entity_id',
+ 'customerGroupField' => 'customer_group_id',
+ 'websiteField' => 'website_id',
+ 'taxClassField' => 'tax_class_id',
+ 'originalPriceField' => 'price',
+ 'finalPriceField' => 'final_price',
+ 'minPriceField' => 'min_price',
+ 'maxPriceField' => 'max_price',
+ 'tierPriceField' => 'tier_price',
+ ]);
+ $select = $this->baseFinalPrice->getQuery($dimensions, $this->productType, iterator_to_array($entityIds));
+ $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
+ $this->tableMaintainer->getConnection()->query($query);
+
+ $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 4ebcd1f4b9ae4..ce0a9b6e461ce 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -256,7 +256,8 @@ protected function _saveValueTitles(AbstractModel $object)
$object->unsetData('title');
}
- if ($object->getTitle()) {
+ /*** Checking whether title is not null ***/
+ if ($object->getTitle()!= null) {
if ($existInCurrentStore) {
if ($storeId == $object->getStoreId()) {
$where = [
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
index c7829ab3a31d2..c5c656b726528 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
@@ -13,6 +13,7 @@
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Store\Api\StoreResolverInterface;
use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Class StatusBaseSelectProcessor
@@ -30,28 +31,32 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
private $metadataPool;
/**
- * @var StoreResolverInterface
+ * @var StoreManagerInterface
*/
- private $storeResolver;
+ private $storeManager;
/**
* @param Config $eavConfig
* @param MetadataPool $metadataPool
* @param StoreResolverInterface $storeResolver
+ * @param StoreManagerInterface $storeManager
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
Config $eavConfig,
MetadataPool $metadataPool,
- StoreResolverInterface $storeResolver
+ StoreResolverInterface $storeResolver,
+ StoreManagerInterface $storeManager = null
) {
$this->eavConfig = $eavConfig;
$this->metadataPool = $metadataPool;
- $this->storeResolver = $storeResolver;
+ $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(StoreManagerInterface::class);
}
/**
- * @param Select $select
- * @return Select
+ * @inheritdoc
*/
public function process(Select $select)
{
@@ -70,7 +75,7 @@ public function process(Select $select)
['status_attr' => $statusAttribute->getBackendTable()],
"status_attr.{$linkField} = " . self::PRODUCT_TABLE_ALIAS . ".{$linkField}"
. ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
- . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
+ . ' AND status_attr.store_id = ' . $this->storeManager->getStore()->getId(),
[]
);
diff --git a/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
new file mode 100644
index 0000000000000..ca87efaa87490
--- /dev/null
+++ b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
@@ -0,0 +1,42 @@
+processor = $processor;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(Observer $observer): void
+ {
+ $productIds = $observer->getEvent()->getProductIds();
+ if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
+ $this->processor->markIndexerAsInvalid();
+ }
+ }
+}
diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
index 8cbe235e05f26..44f9193ab4012 100644
--- a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
+++ b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
@@ -22,7 +22,7 @@ class Topmenu
protected $catalogCategory;
/**
- * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+ * @var \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory
*/
private $collectionFactory;
@@ -40,13 +40,13 @@ class Topmenu
* Initialize dependencies.
*
* @param \Magento\Catalog\Helper\Category $catalogCategory
- * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
+ * @param \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Helper\Category $catalogCategory,
- \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+ \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
diff --git a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
index 597a1466a125e..eca4d468950e1 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
@@ -7,6 +7,9 @@
use Magento\Store\Model\Store;
+/**
+ * Attribute validation
+ */
class AttributeValidation
{
/**
@@ -14,6 +17,11 @@ class AttributeValidation
*/
private $storeManager;
+ /**
+ * @var array
+ */
+ private $allowedEntityTypes;
+
/**
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $allowedEntityTypes
@@ -27,9 +35,12 @@ public function __construct(
}
/**
+ * Around validate
+ *
* @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
* @param \Closure $proceed
* @param \Magento\Framework\DataObject $entity
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
* @return bool
*/
public function aroundValidate(
@@ -41,7 +52,7 @@ public function aroundValidate(
return $entity instanceof $allowedEntity;
}, $this->allowedEntityTypes)));
- if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
+ if ($isAllowedType && (int) $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
$attrCode = $subject->getAttribute()->getAttributeCode();
// Null is meaning "no value" which should be overridden by value from default scope
if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
index 4dae4ec68efa8..ff4d2f93c912a 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
@@ -58,7 +58,9 @@ public function afterExecute(ReadSnapshot $subject, array $entityData, $entityTy
$globalAttributes = [];
$attributesMap = [];
$eavEntityType = $metadata->getEavEntityType();
- $attributes = (null === $eavEntityType) ? [] : $this->config->getEntityAttributes($eavEntityType);
+ $attributes = null === $eavEntityType
+ ? []
+ : $this->config->getEntityAttributes($eavEntityType, new \Magento\Framework\DataObject($entityData));
/** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
foreach ($attributes as $attribute) {
diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
index 1397ceb6bf71c..2c4e332e71237 100644
--- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
@@ -29,7 +29,7 @@ public function getValue()
if ($this->value === null) {
$price = $this->product->getPrice();
$priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
- $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : 0;
+ $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
}
return $this->value;
}
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 74f98c2e66a54..f250927889c29 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -80,7 +80,7 @@ public function __construct(
GroupManagementInterface $groupManagement,
CustomerGroupRetrieverInterface $customerGroupRetriever = null
) {
- $quantity = floatval($quantity) ? $quantity : 1;
+ $quantity = (float)$quantity ? $quantity : 1;
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
$this->customerSession = $customerSession;
$this->groupManagement = $groupManagement;
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 44c960dc37641..692487c1d60cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
index e7d9a63484bc6..a99420bcf95bb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index bca6ae2b60bf3..9f8d827b20849 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -121,6 +121,7 @@
+
+
+
+
+
+
+
+
+
+
@@ -184,6 +221,24 @@
+
+
+
+
+
+
+
@@ -196,4 +251,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 3f4ee180fc65f..fd80838692065 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index c2620bc5a3672..1bd9bb4a09c86 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
index ae9dc0557a9bd..7bb9aa60ca628 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
index 105a5c58788de..c7ae52d2b37c3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 4376e78242fbd..c980c43b8f3af 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
index 7af1cacfb3da8..04e15da91777c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index eb672cd162e82..5f0d03597dab1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
index d46b895044531..82042975d5fb8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
new file mode 100644
index 0000000000000..cad8a8cd03e0d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+ scopeWebsite
+ defaultProductPrice
+
+
+ 1
+
+
+ 0
+
+
+
+ scopeGlobal
+ defaultProductPrice
+
+
+ 0
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 42351741d9fa8..5c79c321c9431 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
simpleCategory
simplecategory
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
index 8ae57f9239902..8a26b6babdbbc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
index e93138fecfd47..389c41abf0bd1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
url_key
category
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
index 2423383bc19f7..a46d40c62c76e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
@@ -7,9 +7,13 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
0
attribute
+
+ 0
+ attributeTwo
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
index c674a8fc144ce..1f4b1470098e2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAGAAYAMBIgACEQEDEQH/xACXAAEBAAMBAQEBAAAAAAAAAAAABgMEBQgCAQcQAAEDAQUFBgQDCQAAAAAAAAABAgMEBQYRFpESMTZV0QchcnOzwhMUIkEygaE1QlFSYXGCsbIBAAEFAQAAAAAAAAAAAAAAAAACAwQGBwERAAECAwMLBAMBAAAAAAAAAAEAAgMEERMhkRQxMzRBUVJTcXKxBRJhoSKBwUL/2gAMAwEAAhEDEQA/AP7+AYKysp7Po5aurlbFBEmL3u3NQ6ASaBdArcFnBN5/urzqn0d0Gf7q86p9HdCRkUzy3YFOWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSAm8/wB1edU+jugz/dXnVPo7oGRTPLdgUWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSA1bPtGktWiZWUM7Z6d6qjZG7lwXBf1Q2iO5paaOFCmyCDQoTd/uBLX8n3IUhN3+4EtfyfchIk9Zh9w8pyBpW9QvN4Bwbcsujis+pq2Q4Tq5HbW0u9XJj3Y4fc0ibjPgQjEY0GgJNTS4brj/FaIz3Q2FwFafNP4V3gc1aWz7FY+rjhVrsNjBrlcrsV3Iir/ABPxtqzRyM+boJKeJ7kakm2jkRV3Yom4TlbYf4xrnfFSBuqaCn7ouWwbc+4/FT90XTBz57RlbVvpqWjdUSRoiyfWjUbju71MUlqSyWdVPjpnsqIUVJI3ORFZ3fix+4OnoLSRU3V2HZnANKEjcEGOwVG74OxdUGjZM1RNQROqIlYuw3Zcr9pXpgn1f0xN4kQYgiww8bU4xwe0OG1eg+y7gCg8cvqOLEjuy7gCg8cvqOLEzT1HXIvcfKq0zpn9ShN3+4EtfyfchSE3f7gS1/J9yCJPWYfcPKTA0reoXm85l4P2HUf4/wDSHTPmSOOZiskY17F3tcmKKaXMwjGgvhj/AECMQrTFZ72ObvC5lvxq+gjeivRsUzXvVn4kb34qmpozxWc+NjVtWtqPiOREjbMj1Vf7YFHvMMdLTxP244ImP/maxEUhzMhaxC8UvABrXZuoR9pmLL+9xddfvXNrfkVtJyPqJaOpRiL8VHbKPT8+5THFVS1FnWnE+VKhsUbmsmamG3i1e78jsSwQzoiTRRyIm5HtRf8AZ9MjZGxGMY1rU/damCHTJPMQuDgAa5q31G0VpdnrnuRYO9xNaA1+/r9rUsmeGazqdscrHuZExHo1cVauH30U3THFBDBtfBijj2t+w1Ex0MhMgMcyG1r843J+GC1oDs69B9l3AFB45fUcWJHdl3AFB45fUcWJm3qOuRe4+VV5nTP6lCbv9wJa/k+5CkJu/wBwJa/k+5BEnrMPuHlJgaVvULzeADUlbUAAIQAAhAACF6D7LuAKDxy+o4sSO7LuAKDxy+o4sTMPUdci9x8qqTOmf1KE3f7gS1/J9yFITd/uBLX8n3IIk9Zh9w8pMDSt6hebwAakragABCAAEIAAQvQfZdwBQeOX1HFiR3ZdwBQeOX1HFiZh6jrkXuPlVSZ0z+pQwVlHT2hRy0lXE2WCVMHsduchnBEBINQmQaXhTeQLq8lp9XdRkC6vJafV3UpASMtmeY7Epy3i8RxU3kC6vJafV3UZAuryWn1d1KQBlszzHYlFvF4jipvIF1eS0+ruoyBdXktPq7qUgDLZnmOxKLeLxHFTeQLq8lp9XdRkC6vJafV3UpAGWzPMdiUW8XiOK1bPs6ksqiZR0MDYKdiqrY27kxXFf1U2gCO5xcauNSmySTUr/9k=
image/jpeg
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index f67370dcff296..b367cdcab9d8b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
attribute
textarea
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
index 60b38812e4ced..98c9a70e6aad4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
image
Test Image
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
index 15c2dc8bbebca..c575f1a5db82f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
option1
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 68c0a54ff88fc..68f51559a9f31 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
4
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 0df091eb5f8ef..9ae551b69d388 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
testSku
simple
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
index 88ff2bbace47a..6e532637fb6d3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
Qty_1000
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
index b123800a6cc84..ea0bcafe56c48 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10
100
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
index 903bf03535a37..ca5024920ad40 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
OptionField
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
index 28dd255321844..d16a201cd9ecc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
OptionValueDropDown1
1
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
index 4fae51de86c45..39ecc2d440fc2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1000
true
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
index a703e56beda01..ce964e2d71503 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
0
option1
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
new file mode 100644
index 0000000000000..0aec1244d2650
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ $676.50
+ $615.00
+
+
+ secondStore
+ second_store
+
+
+ secondStoreView
+ second_store_view
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
new file mode 100644
index 0000000000000..e16688ba0d37b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+ string
+
+
+ string
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
index 0880315db5d6b..ae491aefc10cf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
@@ -6,7 +6,7 @@
*/
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
application/json
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
index aed9b7a979836..a37bb36eb6597 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
string
string
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
index d8410593cb5b4..7faac6c3b6d3d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
index d0bcbd3e5db97..063b8c2e5ac63 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
integer
string
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
index 212de2b39d363..9ece47c01fca3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+ alt="escapeHtml(__('Pay with PayPal')) ?>"
+ title="escapeHtml(__('Pay with PayPal')) ?>"/>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index 7c75cc3e594ee..abf434bc6da26 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -206,7 +206,9 @@ define([
beforePlaceOrder: function (data) {
this.setPaymentMethodNonce(data.nonce);
- if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
+ if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
+ typeof data.details.billingAddress !== 'undefined'
+ ) {
this.setBillingAddress(data.details, data.details.billingAddress);
}
@@ -264,6 +266,14 @@ define([
return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
},
+ /**
+ * Is billing address required from PayPal side
+ * @returns {Boolean}
+ */
+ isRequiredBillingAddress: function () {
+ return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
+ },
+
/**
* Get configuration for PayPal
* @returns {Object}
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 542f170da8c3a..41f11b3d529ee 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -56,6 +56,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
*/
private $catalogRuleProcessor;
+ /**
+ * @var array
+ */
+ private $optionsPosition = [];
+
/**
* @param \Magento\Catalog\Block\Product\Context $context
* @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -86,6 +91,8 @@ public function __construct(
}
/**
+ * Return catalog rule processor or creates processor if it does not exist
+ *
* @deprecated 100.2.0
* @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
*/
@@ -101,6 +108,7 @@ private function getCatalogRuleProcessor()
/**
* Returns the bundle product options
+ *
* Will return cached options data if the product options are already initialized
* In a case when $stripSelection parameter is true will reload stored bundle selections collection from DB
*
@@ -135,6 +143,8 @@ public function getOptions($stripSelection = false)
}
/**
+ * Return true if product has options
+ *
* @return bool
*/
public function hasOptions()
@@ -150,7 +160,6 @@ public function hasOptions()
* Returns JSON encoded config to be used in JS scripts
*
* @return string
- *
*/
public function getJsonConfig()
{
@@ -172,6 +181,7 @@ public function getJsonConfig()
}
$optionId = $optionItem->getId();
$options[$optionId] = $this->getOptionItemData($optionItem, $currentProduct, $position);
+ $this->optionsPosition[$position] = $optionId;
// Add attribute default value (if set)
if ($preConfiguredFlag) {
@@ -370,6 +380,7 @@ private function getConfigData(Product $product, array $options)
$config = [
'options' => $options,
'selected' => $this->selectedOptions,
+ 'positions' => $this->optionsPosition,
'bundleId' => $product->getId(),
'priceFormat' => $this->localeFormat->getPriceFormat(),
'prices' => [
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 17ecba545efad..92bada8094c7e 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -6,13 +6,13 @@
namespace Magento\Bundle\Model\Product;
-use Magento\Framework\App\ObjectManager;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
/**
* Bundle Type Model
@@ -537,7 +537,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
foreach ($options as $quoteItemOption) {
if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
if ($optionUpdateFlag) {
- $quoteItemOption->setValue(intval($quoteItemOption->getValue()));
+ $quoteItemOption->setValue((int) $quoteItemOption->getValue());
} else {
$quoteItemOption->setValue($value);
}
@@ -559,7 +559,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
*/
public function prepareQuoteItemQty($qty, $product)
{
- return intval($qty);
+ return (int) $qty;
}
/**
@@ -625,6 +625,7 @@ public function isSalable($product)
/**
* Prepare product and its configuration to be added to some products list.
+ *
* Perform standard preparation process and then prepare of bundle selections options.
*
* @param \Magento\Framework\DataObject $buyRequest
@@ -790,6 +791,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
}
/**
+ * Cast array values to int
+ *
* @param array $array
* @return int[]|int[][]
*/
@@ -809,6 +812,8 @@ private function recursiveIntval(array $array)
}
/**
+ * Convert multi dimensional array to flat
+ *
* @param array $array
* @return int[]
*/
@@ -920,8 +925,7 @@ public function getOptionsByIds($optionIds, $product)
}
/**
- * Prepare additional options/information for order item which will be
- * created from this product
+ * Prepare additional options/information for order item which will be created from this product
*
* @param \Magento\Catalog\Model\Product $product
* @return array
@@ -987,6 +991,7 @@ public function getOrderOptions($product)
/**
* Sort selections method for usort function
+ *
* Sort selections by option position, selection position and selection id
*
* @param \Magento\Catalog\Model\Product $firstItem
@@ -1009,10 +1014,8 @@ public function shakeSelections($firstItem, $secondItem)
$secondItem->getPosition(),
$secondItem->getSelectionId(),
];
- if ($aPosition == $bPosition) {
- return 0;
- }
- return $aPosition < $bPosition ? -1 : 1;
+
+ return $aPosition <=> $bPosition;
}
/**
@@ -1050,6 +1053,7 @@ public function getForceChildItemQtyChanges($product)
/**
* Retrieve additional searchable data from type instance
+ *
* Using based on product id and store_id data
*
* @param \Magento\Catalog\Model\Product $product
@@ -1118,6 +1122,7 @@ public function checkProductBuyState($product)
/**
* Retrieve products divided into groups required to purchase
+ *
* At least one product in each group has to be purchased
*
* @param \Magento\Catalog\Model\Product $product
@@ -1214,6 +1219,8 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
}
/**
+ * Returns selection qty
+ *
* @param \Magento\Framework\DataObject $selection
* @param int[] $qtys
* @param int $selectionOptionId
@@ -1232,6 +1239,8 @@ protected function getQty($selection, $qtys, $selectionOptionId)
}
/**
+ * Returns qty
+ *
* @param \Magento\Catalog\Model\Product $product
* @param \Magento\Framework\DataObject $selection
* @return float|int
@@ -1249,6 +1258,8 @@ protected function getBeforeQty($product, $selection)
}
/**
+ * Validate required options
+ *
* @param \Magento\Catalog\Model\Product $product
* @param bool $isStrictProcessMode
* @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
@@ -1270,6 +1281,8 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
}
/**
+ * Check if selection is salable
+ *
* @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections
* @param bool $skipSaleableCheck
* @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
@@ -1300,6 +1313,8 @@ protected function checkSelectionsIsSale($selections, $skipSaleableCheck, $optio
}
/**
+ * Validate result
+ *
* @param array $_result
* @return void
* @throws \Magento\Framework\Exception\LocalizedException
@@ -1318,6 +1333,8 @@ protected function checkIsResult($_result)
}
/**
+ * Merge selections with options
+ *
* @param \Magento\Catalog\Model\Product\Option[] $options
* @param \Magento\Framework\DataObject[] $selections
* @return \Magento\Framework\DataObject[]
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
index 0b6e97cfb9299..b5dfd312cd0c4 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -6,20 +6,171 @@
namespace Magento\Bundle\Model\ResourceModel\Indexer;
use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\JoinAttributeProcessor;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
/**
* Bundle products Price indexer resource model
*
- * @author Magento Core Team