" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
new file mode 100644
index 0000000000000..07e26bb1a4d8d
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
@@ -0,0 +1,106 @@
+viewerLogger = $viewerLogger;
+ $this->session = $session;
+ $this->productMetadata = $productMetadata;
+ $this->cacheStorage = $cacheStorage;
+ }
+
+ /**
+ * Validate if notification popup can be shown and set the notification flag
+ *
+ * @inheritdoc
+ */
+ public function isVisible(array $arguments)
+ {
+ $userId = $this->session->getUser()->getId();
+ $cacheKey = self::$cachePrefix . $userId;
+ $value = $this->cacheStorage->load($cacheKey);
+ if ($value === false) {
+ $value = version_compare(
+ $this->viewerLogger->get($userId)->getLastViewVersion(),
+ $this->productMetadata->getVersion(),
+ '<'
+ );
+ $this->cacheStorage->save(false, $cacheKey);
+ }
+ return (bool)$value;
+ }
+
+ /**
+ * Get condition name
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return self::$conditionName;
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
new file mode 100644
index 0000000000000..967ccabcdb49c
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
@@ -0,0 +1,103 @@
+resource = $resource;
+ $this->logFactory = $logFactory;
+ }
+
+ /**
+ * Save (insert new or update existing) log.
+ *
+ * @param int $viewerId
+ * @param string $lastViewVersion
+ * @return bool
+ */
+ public function log(int $viewerId, string $lastViewVersion) : bool
+ {
+ /** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
+ $connection = $this->resource->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+ $connection->insertOnDuplicate(
+ $this->resource->getTableName(self::LOG_TABLE_NAME),
+ [
+ 'viewer_id' => $viewerId,
+ 'last_view_version' => $lastViewVersion
+ ],
+ [
+ 'last_view_version'
+ ]
+ );
+ return true;
+ }
+
+ /**
+ * Get log by viewer Id.
+ *
+ * @param int $viewerId
+ * @return Log
+ */
+ public function get(int $viewerId) : Log
+ {
+ return $this->logFactory->create(['data' => $this->loadLogData($viewerId)]);
+ }
+
+ /**
+ * Load release notification viewer log data by viewer id
+ *
+ * @param int $viewerId
+ * @return array
+ */
+ private function loadLogData(int $viewerId) : array
+ {
+ $connection = $this->resource->getConnection();
+ $select = $connection->select()
+ ->from($this->resource->getTableName(self::LOG_TABLE_NAME))
+ ->where('viewer_id = ?', $viewerId);
+
+ $data = $connection->fetchRow($select);
+ if (!$data) {
+ $data = [];
+ }
+ return $data;
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php b/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php
new file mode 100644
index 0000000000000..27100b62fa798
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php
@@ -0,0 +1,46 @@
+getData('id');
+ }
+
+ /**
+ * Get viewer id
+ *
+ * @return int
+ */
+ public function getViewerId()
+ {
+ return $this->getData('viewer_id');
+ }
+
+ /**
+ * Get last viewed product version
+ *
+ * @return string
+ */
+ public function getLastViewVersion()
+ {
+ return $this->getData('last_view_version');
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/README.md b/app/code/Magento/ReleaseNotification/README.md
new file mode 100644
index 0000000000000..bb0a6e7f4cf80
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/README.md
@@ -0,0 +1,11 @@
+ # Magento_ReleaseNotification Module
+
+The **Release Notification Module** serves to provide a notification delivery platform for displaying new features of a Magento installation or upgrade as well as any other required release notifications.
+
+## Purpose and Content
+
+* Provides a method of notifying administrators of changes, features, and functionality being introduced in a Magento release
+* Displays a modal containing a high level overview of the features included in the installed or upgraded release of Magento upon the initial login of each administrator into the Admin Panel for a given Magento version
+* The modal is enabled with pagination functionality to allow for easy navigation between each modal page
+* Each modal page includes detailed information about a highlighted feature of the Magento release or other notification
+* Release Notification modal content is determined and provided by Magento Marketing
diff --git a/app/code/Magento/ReleaseNotification/Setup/InstallSchema.php b/app/code/Magento/ReleaseNotification/Setup/InstallSchema.php
new file mode 100644
index 0000000000000..a6a0f51befa3f
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Setup/InstallSchema.php
@@ -0,0 +1,69 @@
+startSetup();
+
+ /**
+ * Create table 'release_notification_viewer_log'
+ */
+ $table = $setup->getConnection()->newTable(
+ $setup->getTable('release_notification_viewer_log')
+ )->addColumn(
+ 'id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+ 'Log ID'
+ )->addColumn(
+ 'viewer_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['unsigned' => true, 'nullable' => false],
+ 'Viewer admin user ID'
+ )->addColumn(
+ 'last_view_version',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 16,
+ ['nullable' => false],
+ 'Viewer last view on product version'
+ )->addIndex(
+ $setup->getIdxName(
+ 'release_notification_viewer_log',
+ ['viewer_id'],
+ \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+ ),
+ ['viewer_id'],
+ ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
+ )->addForeignKey(
+ $setup->getFkName('release_notification_viewer_log', 'viewer_id', 'admin_user', 'user_id'),
+ 'viewer_id',
+ $setup->getTable('admin_user'),
+ 'user_id',
+ Table::ACTION_CASCADE
+ )->setComment(
+ 'Release Notification Viewer Log Table'
+ );
+ $setup->getConnection()->createTable($table);
+
+ $setup->endSetup();
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
new file mode 100644
index 0000000000000..894368cbcba01
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
@@ -0,0 +1,189 @@
+storageMock = $this->getMockBuilder(StorageInterface::class)
+ ->setMethods(['getId'])
+ ->getMockForAbstractClass();
+ $this->authMock = $this->getMockBuilder(Auth::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $contextMock = $this->getMockBuilder(Context::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $contextMock->expects($this->once())
+ ->method('getAuth')
+ ->willReturn($this->authMock);
+ $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+ ->getMockForAbstractClass();
+ $this->notificationLoggerMock = $this->getMockBuilder(NotificationLogger::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+ ->getMock();
+ $resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->resultMock = $this->getMockBuilder(Json::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultFactoryMock->expects($this->once())
+ ->method('create')
+ ->with(ResultFactory::TYPE_JSON)
+ ->willReturn($this->resultMock);
+ $objectManagerHelper = new ObjectManagerHelper($this);
+ $this->action = $objectManagerHelper->getObject(
+ MarkUserNotified::class,
+ [
+ 'resultFactory' => $resultFactoryMock,
+ 'productMetadata' => $this->productMetadataMock,
+ 'notificationLogger' => $this->notificationLoggerMock,
+ 'context' => $contextMock,
+ 'logger' => $this->loggerMock
+ ]
+ );
+ }
+
+ public function testExecuteSuccess()
+ {
+ $this->authMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($this->storageMock);
+ $this->storageMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $this->productMetadataMock->expects($this->once())
+ ->method('getVersion')
+ ->willReturn('999.999.999-alpha');
+ $this->notificationLoggerMock->expects($this->once())
+ ->method('log')
+ ->with(1, '999.999.999-alpha')
+ ->willReturn(true);
+ $this->resultMock->expects($this->once())
+ ->method('setData')
+ ->with(
+ [
+ 'success' => true,
+ 'error_message' => ''
+ ],
+ false,
+ []
+ )->willReturnSelf();
+ $this->assertEquals($this->resultMock, $this->action->execute());
+ }
+
+ public function testExecuteFailedWithLocalizedException()
+ {
+ $this->authMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($this->storageMock);
+ $this->storageMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $this->productMetadataMock->expects($this->once())
+ ->method('getVersion')
+ ->willReturn('999.999.999-alpha');
+ $this->notificationLoggerMock->expects($this->once())
+ ->method('log')
+ ->willThrowException(new LocalizedException(__('Error message')));
+ $this->resultMock->expects($this->once())
+ ->method('setData')
+ ->with(
+ [
+ 'success' => false,
+ 'error_message' => 'Error message'
+ ],
+ false,
+ []
+ )->willReturnSelf();
+ $this->assertEquals($this->resultMock, $this->action->execute());
+ }
+
+ public function testExecuteFailedWithException()
+ {
+ $this->authMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($this->storageMock);
+ $this->storageMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $this->productMetadataMock->expects($this->once())
+ ->method('getVersion')
+ ->willReturn('999.999.999-alpha');
+ $this->notificationLoggerMock->expects($this->once())
+ ->method('log')
+ ->willThrowException(new \Exception('Any message'));
+ $this->resultMock->expects($this->once())
+ ->method('setData')
+ ->with(
+ [
+ 'success' => false,
+ 'error_message' => __('It is impossible to log user action')
+ ],
+ false,
+ []
+ )->willReturnSelf();
+ $this->assertEquals($this->resultMock, $this->action->execute());
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
new file mode 100644
index 0000000000000..3ec00697507c1
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
@@ -0,0 +1,128 @@
+cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
+ ->getMockForAbstractClass();
+ $this->logMock = $this->getMockBuilder(Log::class)
+ ->getMock();
+ $this->sessionMock = $this->getMockBuilder(Session::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getUser', 'getId'])
+ ->getMock();
+ $this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $objectManager = new ObjectManager($this);
+ $this->canViewNotification = $objectManager->getObject(
+ CanViewNotification::class,
+ [
+ 'viewerLogger' => $this->viewerLoggerMock,
+ 'session' => $this->sessionMock,
+ 'productMetadata' => $this->productMetadataMock,
+ 'cacheStorage' => $this->cacheStorageMock,
+ ]
+ );
+ }
+
+ public function testIsVisibleLoadDataFromCache()
+ {
+ $this->sessionMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($this->sessionMock);
+ $this->sessionMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $this->cacheStorageMock->expects($this->once())
+ ->method('load')
+ ->with('release-notification-popup-1')
+ ->willReturn("0");
+ $this->assertEquals(false, $this->canViewNotification->isVisible([]));
+ }
+
+ /**
+ * @param bool $expected
+ * @param string $version
+ * @param string|null $lastViewVersion
+ * @dataProvider isVisibleProvider
+ */
+ public function testIsVisible($expected, $version, $lastViewVersion)
+ {
+ $this->cacheStorageMock->expects($this->once())
+ ->method('load')
+ ->with('release-notification-popup-1')
+ ->willReturn(false);
+ $this->sessionMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($this->sessionMock);
+ $this->sessionMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $this->productMetadataMock->expects($this->once())
+ ->method('getVersion')
+ ->willReturn($version);
+ $this->logMock->expects($this->once())
+ ->method('getLastViewVersion')
+ ->willReturn($lastViewVersion);
+ $this->viewerLoggerMock->expects($this->once())
+ ->method('get')
+ ->with(1)
+ ->willReturn($this->logMock);
+ $this->cacheStorageMock->expects($this->once())
+ ->method('save')
+ ->with(false, 'release-notification-popup-1');
+ $this->assertEquals($expected, $this->canViewNotification->isVisible([]));
+ }
+
+ public function isVisibleProvider()
+ {
+ return [
+ [false, '2.2.1-dev', '999.999.999-alpha'],
+ [true, '2.2.1-dev', '2.0.0'],
+ [true, '2.2.1-dev', null],
+ [false, '2.2.1-dev', '2.2.1'],
+ [true, '2.2.1-dev', '2.2.0'],
+ [true, '2.3.0', '2.2.0'],
+ [false, '2.2.2', '2.2.2'],
+ ];
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/Ui/DataProvider/DataProvider.php b/app/code/Magento/ReleaseNotification/Ui/DataProvider/DataProvider.php
new file mode 100644
index 0000000000000..48f01b3b058e2
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Ui/DataProvider/DataProvider.php
@@ -0,0 +1,198 @@
+name = $name;
+ $this->searchResult = $searchResult;
+ $this->searchCriteria = $searchCriteria;
+ $this->collection = $collection;
+ $this->data = $data;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getConfigData()
+ {
+ return isset($this->data['config']) ? $this->data['config'] : [];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setConfigData($config)
+ {
+ $this->data['config'] = $config;
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMeta()
+ {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getFieldMetaInfo($fieldSetName, $fieldName)
+ {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getFieldSetMetaInfo($fieldSetName)
+ {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getFieldsMetaInfo($fieldSetName)
+ {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPrimaryFieldName()
+ {
+ return 'release_notification';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getRequestFieldName()
+ {
+ return 'release_notification';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getData()
+ {
+ return $this->collection->toArray();
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function addFilter(\Magento\Framework\Api\Filter $filter)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function addOrder($field, $direction)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function setLimit($offset, $size)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSearchCriteria()
+ {
+ return $this->searchCriteria;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSearchResult()
+ {
+ return $this->searchResult;
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
new file mode 100644
index 0000000000000..b338420a2c143
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -0,0 +1,24 @@
+{
+ "name": "magento/module-release-notification",
+ "description": "N/A",
+ "require": {
+ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "magento/module-user": "101.0.*",
+ "magento/module-backend": "100.2.*",
+ "magento/framework": "101.0.*"
+ },
+ "type": "magento2-module",
+ "version": "100.2.0",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\ReleaseNotification\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml b/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..4b1ddc69ce3bd
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ReleaseNotification/etc/module.xml b/app/code/Magento/ReleaseNotification/etc/module.xml
new file mode 100644
index 0000000000000..134d82e4f5776
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
new file mode 100644
index 0000000000000..0f4a1f87b8b4e
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
@@ -0,0 +1,112 @@
+"Next >","Next >"
+"< Back","< Back"
+"Done","Done"
+"What's new with Magento 2.2.2","What's new with Magento 2.2.2"
+"Magento 2.2.2 offers advanced new features, including:
+
+
Advanced Reporting
+
Gain valuable insights through a dynamic suite of product, order, and customer reports,
+ powered by Magento Business Intelligence.
+
+
Instant Purchase
+
Simplify ordering and boost conversion rates by allowing your customers to use stored
+ payment and shipping information to skip tedious checkout steps.
+
+
Email Marketing Automation
+
Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
+ your Magento store's live data.
+
Release notes and additional details can be found at
+ Magento DevDocs .
+
","Magento 2.2.2 offers advanced new features, including:
+
+
Advanced Reporting
+
Gain valuable insights through a dynamic suite of product, order, and customer reports,
+ powered by Magento Business Intelligence.
+
+
Instant Purchase
+
Simplify ordering and boost conversion rates by allowing your customers to use stored
+ payment and shipping information to skip tedious checkout steps.
+
+
Email Marketing Automation
+
Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
+ your Magento store's live data.
+
Release notes and additional details can be found at
+ Magento DevDocs .
+
"
+"Advanced Reporting","Advanced Reporting"
+"Advanced Reporting
+ provides you with a dynamic suite of reports with rich insights about the health of your
+ business.
As part of the Advanced Reporting service, we may also use your customer
+ data for such purposes as benchmarking, improving our products and services, and providing you
+ with new and improved analytics.
By using Magento 2.2.2, you agree to the Advanced
+ Reporting Privacy Policy and
+ Terms
+ of Service . You may opt out at any time from the Stores Configuration page.
+ ","Advanced Reporting
+ provides you with a dynamic suite of reports with rich insights about the health of your
+ business.
As part of the Advanced Reporting service, we may also use your customer
+ data for such purposes as benchmarking, improving our products and services, and providing you
+ with new and improved analytics.
By using Magento 2.2.2, you agree to the Advanced
+ Reporting Privacy Policy and
+ Terms
+ of Service . You may opt out at any time from the Stores Configuration page.
"
+"Instant Purchase","Instant Purchase"
+"Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
+ Logged-in customers can use previously-stored payment credentials and shipping information
+ to skip steps, making the process faster and easier, especially for mobile shoppers. Key
+ features include:
+
+
+ Configurable “Instant Purchase” button to place orders Support for all payment solutions using Braintree Vault, including Braintree Credit
+ Card, Braintree PayPal, and PayPal Payflow Pro. Shipping to the customer’s default address using the lowest cost, available shipping
+ method Ability for developers to customize the Instant Purchase business logic to meet
+ merchant needs ","Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
+ Logged-in customers can use previously-stored payment credentials and shipping information
+ to skip steps, making the process faster and easier, especially for mobile shoppers. Key
+ features include:
+
+
+ Configurable “Instant Purchase” button to place orders Support for all payment solutions using Braintree Vault, including Braintree Credit
+ Card, Braintree PayPal, and PayPal Payflow Pro. Shipping to the customer’s default address using the lowest cost, available shipping
+ method Ability for developers to customize the Instant Purchase business logic to meet
+ merchant needs "
+"Email Marketing Automation","Email Marketing Automation"
+"Unlock an unparalleled level of insight and control of your eCommerce marketing with
+ dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
+ ensures every customer’s journey is captured, segmented, and personalized, enabling you to
+ deliver customer-centric campaigns that beat your results over and over again. Benefits include:
+
+
+ No obligation 14-day trial. Automation campaigns using your live Magento store data that drive revenue,
+ including abandoned cart, abandoned browse, product replenishment, and many more Built-in solution for transactional emails. Telephone support and advice from marketing experts included. ","Unlock an unparalleled level of insight and control of your eCommerce marketing with
+ dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
+ ensures every customer’s journey is captured, segmented, and personalized, enabling you to
+ deliver customer-centric campaigns that beat your results over and over again. Benefits include:
+
+
+ No obligation 14-day trial. Automation campaigns using your live Magento store data that drive revenue,
+ including abandoned cart, abandoned browse, product replenishment, and many more Built-in solution for transactional emails. Telephone support and advice from marketing experts included. "
diff --git a/app/code/Magento/ReleaseNotification/registration.php b/app/code/Magento/ReleaseNotification/registration.php
new file mode 100644
index 0000000000000..c5bce27f20387
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/registration.php
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
new file mode 100644
index 0000000000000..1ddfde5cafb9c
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
@@ -0,0 +1,377 @@
+
+
+
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js b/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js
new file mode 100644
index 0000000000000..b74ef2af1a04d
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'Magento_Ui/js/modal/modal-component',
+ 'Magento_Ui/js/modal/alert',
+ 'mage/translate'
+], function ($, Modal, alert, $t) {
+ 'use strict';
+
+ return Modal.extend({
+ defaults: {
+ imports: {
+ logAction: '${ $.provider }:data.logAction'
+ }
+ },
+
+ /**
+ * Error handler.
+ *
+ * @param {Object} xhr - request result.
+ */
+ onError: function (xhr) {
+ if (xhr.statusText === 'abort') {
+ return;
+ }
+
+ alert({
+ content: xhr.message || $t('An error occurred while logging process.')
+ });
+ },
+
+ /**
+ * Log release notes show
+ */
+ logReleaseNotesShow: function () {
+ var self = this,
+ data = {
+ 'form_key': window.FORM_KEY
+ };
+
+ $.ajax({
+ type: 'POST',
+ url: this.logAction,
+ data: data,
+ showLoader: true
+ }).done(function (xhr) {
+ if (xhr.error) {
+ self.onError(xhr);
+ }
+ }).fail(this.onError);
+ },
+
+ /**
+ * Close release notes
+ */
+ closeReleaseNotes: function () {
+ this.logReleaseNotesShow();
+ this.closeModal();
+ }
+ });
+});
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 48a87bf77cf94..158455db26455 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -363,12 +363,11 @@ public function setStoreIds($storeIds)
public function getCurrentCurrencyCode()
{
if ($this->_currentCurrencyCode === null) {
- $this->_currentCurrencyCode = count(
- $this->_storeIds
- ) > 0 ? $this->_storeManager->getStore(
- array_shift($this->_storeIds)
- )->getBaseCurrencyCode() : $this->_storeManager->getStore()->getBaseCurrencyCode();
+ $this->_currentCurrencyCode = count($this->_storeIds) > 0
+ ? $this->_storeManager->getStore(array_shift($this->_storeIds))->getCurrentCurrencyCode()
+ : $this->_storeManager->getStore()->getBaseCurrencyCode();
}
+
return $this->_currentCurrencyCode;
}
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
index cc21b8dc98395..337c87f6da03d 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
@@ -298,7 +298,7 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
}
/**
- * Add views count
+ * Add views count.
*
* @param string $from
* @param string $to
@@ -322,10 +322,7 @@ public function addViewsCount($from = '', $to = '')
['views' => 'COUNT(report_table_views.event_id)']
)->join(
['e' => $this->getProductEntityTableName()],
- $this->getConnection()->quoteInto(
- 'e.entity_id = report_table_views.object_id AND e.attribute_set_id = ?',
- $this->getProductAttributeSetId()
- )
+ 'e.entity_id = report_table_views.object_id'
)->where(
'report_table_views.event_type_id = ?',
$productViewEvent
@@ -341,6 +338,7 @@ public function addViewsCount($from = '', $to = '')
if ($from != '' && $to != '') {
$this->getSelect()->where('logged_at >= ?', $from)->where('logged_at <= ?', $to);
}
+
return $this;
}
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index 6e891c481aebe..f3f14ef8c3543 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -192,7 +192,7 @@ protected function getProductData(array $productIds)
. ' AND product_name.attribute_id = ' . $productAttrNameId
. ' AND product_name.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID,
['name' => 'product_name.value']
- )->joinInner(
+ )->joinLeft(
['product_price' => $productAttrPrice->getBackend()->getTable()],
"product_price.{$linkField} = main_table.{$linkField}"
." AND product_price.attribute_id = {$productAttrPriceId}",
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php
new file mode 100644
index 0000000000000..dc16928861b1c
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php
@@ -0,0 +1,91 @@
+storeManagerMock = $this->getMockForAbstractClass(
+ \Magento\Store\Model\StoreManagerInterface::class,
+ [],
+ '',
+ true,
+ true,
+ true,
+ ['getStore']
+ );
+
+ $this->model = $objectManager->getObject(
+ \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid::class,
+ ['_storeManager' => $this->storeManagerMock]
+ );
+ }
+
+ /**
+ * @param $storeIds
+ *
+ * @dataProvider getCurrentCurrencyCodeDataProvider
+ */
+ public function testGetCurrentCurrencyCode($storeIds)
+ {
+ $storeMock = $this->getMockForAbstractClass(
+ \Magento\Store\Api\Data\StoreInterface::class,
+ [],
+ '',
+ true,
+ true,
+ true,
+ ['getBaseCurrencyCode', 'getCurrentCurrencyCode']
+ );
+
+ $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+ $this->model->setStoreIds($storeIds);
+
+ if ($storeIds) {
+ $storeMock->expects($this->once())->method('getCurrentCurrencyCode')->willReturn('EUR');
+ $expectedCurrencyCode = 'EUR';
+ } else {
+ $storeMock->expects($this->once())->method('getBaseCurrencyCode')->willReturn('USD');
+ $expectedCurrencyCode = 'USD';
+ }
+
+ $currencyCode = $this->model->getCurrentCurrencyCode();
+ $this->assertEquals($expectedCurrencyCode, $currencyCode);
+ }
+
+ /**
+ * DataProvider for testGetCurrentCurrencyCode.
+ *
+ * @return array
+ */
+ public function getCurrentCurrencyCodeDataProvider()
+ {
+ return [
+ [[]],
+ [[2]],
+ ];
+ }
+}
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
new file mode 100644
index 0000000000000..038d37a990442
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
@@ -0,0 +1,286 @@
+objectManager = new ObjectManager($this);
+ $context = $this->createPartialMock(Context::class, ['getResource', 'getEavConfig']);
+ $entityFactoryMock = $this->createMock(EntityFactory::class);
+ $loggerMock = $this->createMock(LoggerInterface::class);
+ $fetchStrategyMock = $this->createMock(FetchStrategyInterface::class);
+ $eventManagerMock = $this->createMock(ManagerInterface::class);
+ $eavConfigMock = $this->createMock(Config::class);
+ $this->resourceMock = $this->createPartialMock(ResourceConnection::class, ['getTableName', 'getConnection']);
+ $eavEntityFactoryMock = $this->createMock(EavEntityFactory::class);
+ $resourceHelperMock = $this->createMock(Helper::class);
+ $universalFactoryMock = $this->createMock(UniversalFactory::class);
+ $storeManagerMock = $this->createPartialMockForAbstractClass(
+ StoreManagerInterface::class,
+ ['getStore', 'getId']
+ );
+ $moduleManagerMock = $this->createMock(Manager::class);
+ $productFlatStateMock = $this->createMock(State::class);
+ $scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+ $optionFactoryMock = $this->createMock(OptionFactory::class);
+ $catalogUrlMock = $this->createMock(Url::class);
+ $localeDateMock = $this->createMock(TimezoneInterface::class);
+ $customerSessionMock = $this->createMock(Session::class);
+ $dateTimeMock = $this->createMock(DateTime::class);
+ $groupManagementMock = $this->createMock(GroupManagementInterface::class);
+ $eavConfig = $this->createPartialMock(Config::class, ['getEntityType']);
+ $entityType = $this->createMock(Type::class);
+
+ $eavConfig->expects($this->atLeastOnce())->method('getEntityType')->willReturn($entityType);
+ $context->expects($this->atLeastOnce())->method('getResource')->willReturn($this->resourceMock);
+ $context->expects($this->atLeastOnce())->method('getEavConfig')->willReturn($eavConfig);
+
+ $defaultAttributes = $this->createPartialMock(DefaultAttributes::class, ['_getDefaultAttributes']);
+ $productMock = $this->objectManager->getObject(
+ ResourceProduct::class,
+ ['context' => $context, 'defaultAttributes' => $defaultAttributes]
+ );
+
+ $this->eventTypeFactoryMock = $this->createMock(TypeFactory::class);
+ $productTypeMock = $this->createMock(ProductType::class);
+ $quoteResourceMock = $this->createMock(Collection::class);
+ $this->connectionMock = $this->createPartialMockForAbstractClass(AdapterInterface::class, ['select']);
+ $this->selectMock = $this->createPartialMock(
+ Select::class,
+ [
+ 'reset',
+ 'from',
+ 'join',
+ 'where',
+ 'group',
+ 'order',
+ 'having',
+ ]
+ );
+
+ $storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeManagerMock);
+ $storeManagerMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
+ $universalFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($productMock);
+ $this->resourceMock->expects($this->atLeastOnce())->method('getTableName')->willReturn('test_table');
+ $this->resourceMock->expects($this->atLeastOnce())->method('getConnection')->willReturn($this->connectionMock);
+ $this->connectionMock->expects($this->atLeastOnce())->method('select')->willReturn($this->selectMock);
+
+ $this->collection = new ProductCollection(
+ $entityFactoryMock,
+ $loggerMock,
+ $fetchStrategyMock,
+ $eventManagerMock,
+ $eavConfigMock,
+ $this->resourceMock,
+ $eavEntityFactoryMock,
+ $resourceHelperMock,
+ $universalFactoryMock,
+ $storeManagerMock,
+ $moduleManagerMock,
+ $productFlatStateMock,
+ $scopeConfigMock,
+ $optionFactoryMock,
+ $catalogUrlMock,
+ $localeDateMock,
+ $customerSessionMock,
+ $dateTimeMock,
+ $groupManagementMock,
+ $productMock,
+ $this->eventTypeFactoryMock,
+ $productTypeMock,
+ $quoteResourceMock,
+ $this->connectionMock
+ );
+ }
+
+ /**
+ * Test addViewsCount behavior.
+ */
+ public function testAddViewsCount()
+ {
+ $context = $this->createPartialMock(
+ \Magento\Framework\Model\ResourceModel\Db\Context::class,
+ ['getResources']
+ );
+ $context->expects($this->atLeastOnce())
+ ->method('getResources')
+ ->willReturn($this->resourceMock);
+ $abstractResourceMock = $this->getMockForAbstractClass(
+ \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
+ ['context' => $context],
+ '',
+ true,
+ true,
+ true,
+ [
+ 'getTableName',
+ 'getConnection',
+ 'getMainTable',
+ ]
+ );
+
+ $abstractResourceMock->expects($this->atLeastOnce())
+ ->method('getConnection')
+ ->willReturn($this->connectionMock);
+ $abstractResourceMock->expects($this->atLeastOnce())
+ ->method('getMainTable')
+ ->willReturn('catalog_product');
+
+ /** @var \Magento\Reports\Model\ResourceModel\Event\Type\Collection $eventTypesCollection */
+ $eventTypesCollection = $this->objectManager->getObject(
+ \Magento\Reports\Model\ResourceModel\Event\Type\Collection::class,
+ ['resource' => $abstractResourceMock]
+ );
+ $eventTypeMock = $this->createPartialMock(
+ \Magento\Reports\Model\Event\Type::class,
+ [
+ 'getEventName',
+ 'getId',
+ 'getCollection',
+ ]
+ );
+
+ $eventTypesCollection->addItem($eventTypeMock);
+
+ $this->eventTypeFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($eventTypeMock);
+ $eventTypeMock->expects($this->atLeastOnce())
+ ->method('getCollection')
+ ->willReturn($eventTypesCollection);
+ $eventTypeMock->expects($this->atLeastOnce())
+ ->method('getEventName')
+ ->willReturn('catalog_product_view');
+ $eventTypeMock->expects($this->atLeastOnce())
+ ->method('getId')
+ ->willReturn(1);
+
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('reset')
+ ->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('from')
+ ->with(
+ ['report_table_views' => 'test_table'],
+ ['views' => 'COUNT(report_table_views.event_id)']
+ )->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('join')
+ ->with(
+ ['e' => 'test_table'],
+ 'e.entity_id = report_table_views.object_id'
+ )->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('where')
+ ->with('report_table_views.event_type_id = ?', 1)
+ ->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('group')
+ ->with('e.entity_id')
+ ->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('order')
+ ->with('views DESC')
+ ->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())
+ ->method('having')
+ ->with('COUNT(report_table_views.event_id) > ?', 0)
+ ->willReturn($this->selectMock);
+
+ $this->collection->addViewsCount();
+ }
+
+ /**
+ * Get mock for abstract class with methods.
+ *
+ * @param string $className
+ * @param array $methods
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function createPartialMockForAbstractClass($className, $methods)
+ {
+ return $this->getMockForAbstractClass(
+ $className,
+ [],
+ '',
+ true,
+ true,
+ true,
+ $methods
+ );
+ }
+}
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
index 051dc3f5f5593..7bb866287d37a 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
@@ -124,7 +124,8 @@ public function testLoadWithFilter()
$this->selectMock->expects($this->once())->method('reset')->willReturnSelf();
$this->selectMock->expects($this->once())->method('from')->willReturnSelf();
$this->selectMock->expects($this->once())->method('useStraightJoin')->willReturnSelf();
- $this->selectMock->expects($this->exactly(2))->method('joinInner')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('joinInner')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('joinLeft')->willReturnSelf();
$collection->expects($this->once())->method('getOrdersData')->willReturn([]);
$productAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
$priceAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 74ed132bc65d2..1058052dd1122 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -22,7 +22,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index f3b36e8b3f3fa..47680b454c29f 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -18,7 +18,7 @@
"magento/module-review-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ReviewAnalytics/LICENSE.txt b/app/code/Magento/ReviewAnalytics/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/ReviewAnalytics/LICENSE_AFL.txt b/app/code/Magento/ReviewAnalytics/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/ReviewAnalytics/README.md b/app/code/Magento/ReviewAnalytics/README.md
new file mode 100644
index 0000000000000..b078083dfb7dc
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_ReviewAnalytics module
+
+The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
new file mode 100644
index 0000000000000..965b6294db16a
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -0,0 +1,23 @@
+{
+ "name": "magento/module-review-analytics",
+ "description": "N/A",
+ "require": {
+ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "magento/framework": "100.2.*",
+ "magento/module-review": "100.2.*"
+ },
+ "type": "magento2-module",
+ "version": "100.2.0",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\ReviewAnalytics\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/ReviewAnalytics/etc/analytics.xml b/app/code/Magento/ReviewAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..cd5d1b2c1af4c
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/analytics.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+ reviews
+
+
+
+
+
+
+
+
+ rating_option_votes
+
+
+
+
+
diff --git a/app/code/Magento/ReviewAnalytics/etc/module.xml b/app/code/Magento/ReviewAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..65df87bac4af1
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ReviewAnalytics/etc/reports.xml b/app/code/Magento/ReviewAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..8dd508983aced
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/reports.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ReviewAnalytics/registration.php b/app/code/Magento/ReviewAnalytics/registration.php
new file mode 100644
index 0000000000000..6b795ca04c61b
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/registration.php
@@ -0,0 +1,11 @@
+resultPageFactory->create(true);
$resultPage->addHandle('robots_index_index');
+ $resultPage->setHeader('Content-Type', 'text/plain');
return $resultPage;
}
}
diff --git a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
index 22a69cc13bd52..d3a7a97c7ea80 100644
--- a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
@@ -51,6 +51,9 @@ public function testExecute()
$resultPageMock->expects($this->once())
->method('addHandle')
->with('robots_index_index');
+ $resultPageMock->expects($this->once())
+ ->method('setHeader')
+ ->with('Content-Type', 'text/plain');
$this->resultPageFactory->expects($this->any())
->method('create')
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 323c2df975a8a..b684fe8c62df2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -160,4 +160,22 @@ public function convertPrice($value, $format = true)
)
: $this->priceCurrency->convert($value, $this->getStore());
}
+
+ /**
+ * If item is quote or wishlist we need to get product from it.
+ *
+ * @param $item
+ *
+ * @return Product
+ */
+ public function getProduct($item)
+ {
+ if ($item instanceof Product) {
+ $product = $item;
+ } else {
+ $product = $item->getProduct();
+ }
+
+ return $product;
+ }
}
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index c8afc6d8a292b..69f4d19e4dd63 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -10,9 +10,12 @@
use Magento\Customer\Api\AddressMetadataInterface;
use Magento\Customer\Model\Metadata\Form as CustomerForm;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
use Magento\Framework\App\ObjectManager;
use Magento\Quote\Model\Quote\Address;
use Magento\Quote\Model\Quote\Item;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Model\Order;
/**
* Order create model
@@ -235,6 +238,11 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
*/
private $serializer;
+ /**
+ * @var ExtensibleDataObjectConverter
+ */
+ private $dataObjectConverter;
+
/**
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -265,6 +273,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
* @param \Magento\Quote\Model\QuoteFactory $quoteFactory
* @param array $data
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+ * @param ExtensibleDataObjectConverter|null $dataObjectConverter
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -296,7 +305,8 @@ public function __construct(
\Magento\Sales\Api\OrderManagementInterface $orderManagement,
\Magento\Quote\Model\QuoteFactory $quoteFactory,
array $data = [],
- \Magento\Framework\Serialize\Serializer\Json $serializer = null
+ \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+ ExtensibleDataObjectConverter $dataObjectConverter = null
) {
$this->_objectManager = $objectManager;
$this->_eventManager = $eventManager;
@@ -328,6 +338,8 @@ public function __construct(
$this->serializer = $serializer ?: ObjectManager::getInstance()
->get(\Magento\Framework\Serialize\Serializer\Json::class);
parent::__construct($data);
+ $this->dataObjectConverter = $dataObjectConverter ?: ObjectManager::getInstance()
+ ->get(ExtensibleDataObjectConverter::class);
}
/**
@@ -514,9 +526,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
$shippingAddress = $order->getShippingAddress();
if ($shippingAddress) {
- $addressDiff = array_diff_assoc($shippingAddress->getData(), $order->getBillingAddress()->getData());
- unset($addressDiff['address_type'], $addressDiff['entity_id']);
- $shippingAddress->setSameAsBilling(empty($addressDiff));
+ $shippingAddress->setSameAsBilling($this->isAddressesAreEqual($order));
}
$this->_initBillingAddressFromOrder($order);
@@ -1914,6 +1924,7 @@ public function createOrder()
$oldOrder = $this->getSession()->getOrder();
$oldOrder->setRelationChildId($order->getId());
$oldOrder->setRelationChildRealId($order->getIncrementId());
+ $oldOrder->save();
$this->orderManagement->cancel($oldOrder->getEntityId());
$order->save();
}
@@ -2009,4 +2020,26 @@ protected function _getNewCustomerEmail()
return $email;
}
+
+ /**
+ * Checks id shipping and billing addresses are equal.
+ *
+ * @param Order $order
+ * @return bool
+ */
+ private function isAddressesAreEqual(Order $order)
+ {
+ $shippingAddress = $order->getShippingAddress();
+ $billingAddress = $order->getBillingAddress();
+ $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], OrderAddressInterface::class);
+ $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], OrderAddressInterface::class);
+ unset(
+ $shippingData['address_type'],
+ $shippingData['entity_id'],
+ $billingData['address_type'],
+ $billingData['entity_id']
+ );
+
+ return $shippingData == $billingData;
+ }
}
diff --git a/app/code/Magento/Sales/Model/Order/CustomerManagement.php b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
index a84d90693e087..bf54e65d0ce10 100644
--- a/app/code/Magento/Sales/Model/Order/CustomerManagement.php
+++ b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
@@ -3,8 +3,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Sales\Model\Order;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\AlreadyExistsException;
use Magento\Quote\Model\Quote\Address as QuoteAddress;
@@ -43,6 +45,11 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
*/
protected $objectCopyService;
+ /**
+ * @var \Magento\Quote\Model\Quote\AddressFactory
+ */
+ private $quoteAddressFactory;
+
/**
* @param \Magento\Framework\DataObject\Copy $objectCopyService
* @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
@@ -50,6 +57,7 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
* @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory
* @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory
* @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+ * @param \Magento\Quote\Model\Quote\AddressFactory|null $quoteAddressFactory
*/
public function __construct(
\Magento\Framework\DataObject\Copy $objectCopyService,
@@ -57,7 +65,8 @@ public function __construct(
\Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory,
\Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory,
\Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory,
- \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+ \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+ \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory = null
) {
$this->objectCopyService = $objectCopyService;
$this->accountManagement = $accountManagement;
@@ -65,6 +74,9 @@ public function __construct(
$this->customerFactory = $customerFactory;
$this->addressFactory = $addressFactory;
$this->regionFactory = $regionFactory;
+ $this->quoteAddressFactory = $quoteAddressFactory ?: ObjectManager::getInstance()->get(
+ \Magento\Quote\Model\Quote\AddressFactory::class
+ );
}
/**
@@ -84,6 +96,9 @@ public function create($orderId)
);
$addresses = $order->getAddresses();
foreach ($addresses as $address) {
+ if (!$this->isNeededToSaveAddress($address->getData('quote_address_id'))) {
+ continue;
+ }
$addressData = $this->objectCopyService->copyFieldsetToTarget(
'order_address',
'to_customer_address',
@@ -117,6 +132,26 @@ public function create($orderId)
$account = $this->accountManagement->createAccount($customer);
$order->setCustomerId($account->getId());
$this->orderRepository->save($order);
+
return $account;
}
+
+ /**
+ * Check if we need to save address in address book.
+ *
+ * @param int $quoteAddressId
+ *
+ * @return bool
+ */
+ private function isNeededToSaveAddress($quoteAddressId)
+ {
+ $saveInAddressBook = true;
+
+ $quoteAddress = $this->quoteAddressFactory->create()->load($quoteAddressId);
+ if ($quoteAddress && $quoteAddress->getId()) {
+ $saveInAddressBook = (int)$quoteAddress->getData('save_in_address_book');
+ }
+
+ return $saveInAddressBook;
+ }
}
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index cb26fb611f219..64e20d5a69041 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -93,6 +93,11 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
*/
protected $orderRepository;
+ /**
+ * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection|null
+ */
+ private $tracksCollection = null;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -331,16 +336,11 @@ public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
*/
public function getTracksCollection()
{
- if (!$this->hasData(ShipmentInterface::TRACKS)) {
- $this->setTracks($this->_trackCollectionFactory->create()->setShipmentFilter($this->getId()));
-
- if ($this->getId()) {
- foreach ($this->getTracks() as $track) {
- $track->setShipment($this);
- }
- }
+ if ($this->tracksCollection === null) {
+ $this->tracksCollection = $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
}
- return $this->getTracks();
+
+ return $this->tracksCollection;
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
index 9001267f6bc4a..69077749902b5 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
@@ -17,12 +17,19 @@ class OrderRegistrar implements \Magento\Sales\Model\Order\Shipment\OrderRegistr
*/
public function register(OrderInterface $order, ShipmentInterface $shipment)
{
- /** @var \Magento\Sales\Api\Data\ShipmentItemInterface|\Magento\Sales\Model\Order\Shipment\Item $item */
+ $totalQty = 0;
+ /** @var \Magento\Sales\Model\Order\Shipment\Item $item */
foreach ($shipment->getItems() as $item) {
if ($item->getQty() > 0) {
$item->register();
+
+ if (!$item->getOrderItem()->isDummy(true)) {
+ $totalQty += $item->getQty();
+ }
}
}
+ $shipment->setTotalQty($totalQty);
+
return $order;
}
}
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
index 6d9bffdd00771..c0a3f84e8846d 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
@@ -121,7 +121,7 @@ private function getQuantitiesFromOrderItems(array $items)
{
$shipmentItems = [];
foreach ($items as $item) {
- if (!$item->getIsVirtual() && !$item->getParentItem()) {
+ if (!$item->getIsVirtual() && (!$item->getParentItem() || $item->isShipSeparately())) {
$shipmentItems[$item->getItemId()] = $item->getQtyOrdered();
}
}
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index 0503343842c87..642f8647ef56b 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -96,15 +96,15 @@ protected function prepareItems(
\Magento\Sales\Model\Order $order,
array $items = []
) {
- $totalQty = 0;
+ $shipmentItems = [];
foreach ($order->getAllItems() as $orderItem) {
- if (!$this->canShipItem($orderItem, $items)) {
+ if ($this->validateItem($orderItem, $items) === false) {
continue;
}
/** @var \Magento\Sales\Model\Order\Shipment\Item $item */
$item = $this->converter->itemToShipmentItem($orderItem);
- if ($orderItem->getIsVirtual() || $orderItem->getParentItemId()) {
+ if ($orderItem->getIsVirtual() || ($orderItem->getParentItemId() && !$orderItem->isShipSeparately())) {
$item->isDeleted(true);
}
@@ -124,8 +124,7 @@ protected function prepareItems(
$qty = min($qty, $orderItem->getSimpleQtyToShip());
$item->setQty($this->castQty($orderItem, $qty));
- $shipment->addItem($item);
-
+ $shipmentItems[] = $item;
continue;
} else {
$qty = 1;
@@ -144,10 +143,65 @@ protected function prepareItems(
}
}
- $totalQty += $qty;
-
$item->setQty($this->castQty($orderItem, $qty));
- $shipment->addItem($item);
+ $shipmentItems[] = $item;
+ }
+ return $this->setItemsToShipment($shipment, $shipmentItems);
+ }
+
+ /**
+ * Validate order item before shipment
+ *
+ * @param Item $orderItem
+ * @param array $items
+ * @return bool
+ */
+ private function validateItem(\Magento\Sales\Model\Order\Item $orderItem, array $items)
+ {
+ if (!$this->canShipItem($orderItem, $items)) {
+ return false;
+ }
+
+ // Remove from shipment items without qty or with qty=0
+ if (!$orderItem->isDummy(true)
+ && (!isset($items[$orderItem->getId()]) || $items[$orderItem->getId()] <= 0)
+ ) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Set prepared items to shipment document
+ *
+ * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
+ * @param array $shipmentItems
+ * @return \Magento\Sales\Api\Data\ShipmentInterface
+ */
+ private function setItemsToShipment(\Magento\Sales\Api\Data\ShipmentInterface $shipment, $shipmentItems)
+ {
+ $totalQty = 0;
+
+ /**
+ * Verify that composite products shipped separately has children, if not -> remove from collection
+ */
+ /** @var \Magento\Sales\Model\Order\Shipment\Item $shipmentItem */
+ foreach ($shipmentItems as $key => $shipmentItem) {
+ if ($shipmentItem->getOrderItem()->getHasChildren()
+ && $shipmentItem->getOrderItem()->isShipSeparately()
+ ) {
+ $containerId = $shipmentItem->getOrderItem()->getId();
+ $childItems = array_filter($shipmentItems, function ($item) use ($containerId) {
+ return $containerId == $item->getOrderItem()->getParentItemId();
+ });
+
+ if (count($childItems) <= 0) {
+ unset($shipmentItems[$key]);
+ continue;
+ }
+ }
+ $totalQty += $shipmentItem->getQty();
+ $shipment->addItem($shipmentItem);
}
return $shipment->setTotalQty($totalQty);
}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
index 5851b2d936139..9c8671d02c578 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
@@ -62,8 +62,8 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
$this->shipmentItemResource->save($item);
}
}
- if (null !== $object->getTracks()) {
- foreach ($object->getTracks() as $track) {
+ if (null !== $object->getTracksCollection()) {
+ foreach ($object->getTracksCollection() as $track) {
$track->setParentId($object->getId());
$this->shipmentTrackResource->save($track);
}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php
new file mode 100644
index 0000000000000..846fa46572fde
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php
@@ -0,0 +1,60 @@
+connection = $resourceConnection->getConnection('sales');
+ $this->resourceConnection = $resourceConnection;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getIds($mainTableName, $gridTableName)
+ {
+ $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+ $gridTableName = $this->resourceConnection->getTableName($gridTableName);
+ $select = $this->connection->select()
+ ->from($mainTableName, [$mainTableName . '.entity_id'])
+ ->joinInner(
+ [$gridTableName => $gridTableName],
+ sprintf(
+ '%s.entity_id = %s.entity_id AND %s.updated_at > %s.updated_at',
+ $mainTableName,
+ $gridTableName,
+ $mainTableName,
+ $gridTableName
+ ),
+ []
+ );
+
+ return $this->connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
+ }
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
index 59906c79215fa..42c6e9d650315 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
@@ -38,10 +38,12 @@ public function __construct(
*/
public function getIds($mainTableName, $gridTableName)
{
+ $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+ $gridTableName = $this->resourceConnection->getTableName($gridTableName);
$select = $this->getConnection()->select()
- ->from($this->getConnection()->getTableName($mainTableName), [$mainTableName . '.entity_id'])
+ ->from($mainTableName, [$mainTableName . '.entity_id'])
->joinLeft(
- [$gridTableName => $this->getConnection()->getTableName($gridTableName)],
+ [$gridTableName => $gridTableName],
sprintf(
'%s.%s = %s.%s',
$mainTableName,
diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
index 2f08c26de9058..24f56c0dbd595 100644
--- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php
+++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
@@ -195,7 +195,7 @@ public function refund(
*/
protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo)
{
- if ($creditmemo->getId()) {
+ if ($creditmemo->getId() && $creditmemo->getState() != \Magento\Sales\Model\Order\Creditmemo::STATE_OPEN) {
throw new \Magento\Framework\Exception\LocalizedException(
__('We cannot register an existing credit memo.')
);
diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
index 8b104b0b35590..1c36a9a538366 100644
--- a/app/code/Magento/Sales/Setup/UpgradeData.php
+++ b/app/code/Magento/Sales/Setup/UpgradeData.php
@@ -3,18 +3,25 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Sales\Setup;
use Magento\Eav\Model\Config;
+use Magento\Framework\App\State;
use Magento\Framework\DB\AggregatedFieldDataConverter;
use Magento\Framework\DB\DataConverter\SerializedToJson;
use Magento\Framework\DB\FieldToConvert;
use Magento\Framework\Setup\ModuleContextInterface;
use Magento\Framework\Setup\ModuleDataSetupInterface;
use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
/**
* Data upgrade script
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class UpgradeData implements UpgradeDataInterface
{
@@ -36,20 +43,50 @@ class UpgradeData implements UpgradeDataInterface
private $aggregatedFieldConverter;
/**
- * Constructor
- *
+ * @var AddressCollectionFactory
+ */
+ private $addressCollectionFactory;
+
+ /**
+ * @var OrderFactory
+ */
+ private $orderFactory;
+
+ /**
+ * @var QuoteFactory
+ */
+ private $quoteFactory;
+
+ /**
+ * @var State
+ */
+ private $state;
+
+ /**
* @param SalesSetupFactory $salesSetupFactory
* @param Config $eavConfig
* @param AggregatedFieldDataConverter $aggregatedFieldConverter
+ * @param AddressCollectionFactory $addressCollFactory
+ * @param OrderFactory $orderFactory
+ * @param QuoteFactory $quoteFactory
+ * @param State $state
*/
public function __construct(
SalesSetupFactory $salesSetupFactory,
Config $eavConfig,
- AggregatedFieldDataConverter $aggregatedFieldConverter
+ AggregatedFieldDataConverter $aggregatedFieldConverter,
+ AddressCollectionFactory $addressCollFactory,
+ OrderFactory $orderFactory,
+ QuoteFactory $quoteFactory,
+ State $state
) {
$this->salesSetupFactory = $salesSetupFactory;
$this->eavConfig = $eavConfig;
$this->aggregatedFieldConverter = $aggregatedFieldConverter;
+ $this->addressCollectionFactory = $addressCollFactory;
+ $this->orderFactory = $orderFactory;
+ $this->quoteFactory = $quoteFactory;
+ $this->state = $state;
}
/**
@@ -64,6 +101,13 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
if (version_compare($context->getVersion(), '2.0.6', '<')) {
$this->convertSerializedDataToJson($context->getVersion(), $salesSetup);
}
+ if (version_compare($context->getVersion(), '2.0.8', '<')) {
+ $this->state->emulateAreaCode(
+ \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+ [$this, 'fillQuoteAddressIdInSalesOrderAddress'],
+ [$setup]
+ );
+ }
$this->eavConfig->clear();
}
@@ -118,4 +162,34 @@ private function convertSerializedDataToJson($setupVersion, SalesSetup $salesSet
}
$this->aggregatedFieldConverter->convert($fieldsToUpdate, $salesSetup->getConnection());
}
+
+ /**
+ * Fill quote_address_id in table sales_order_address if it is empty.
+ */
+ public function fillQuoteAddressIdInSalesOrderAddress()
+ {
+ $addressCollection = $this->addressCollectionFactory->create();
+ /** @var \Magento\Sales\Model\Order\Address $orderAddress */
+ foreach ($addressCollection as $orderAddress) {
+ if (!$orderAddress->getData('quote_address_id')) {
+ $orderId = $orderAddress->getParentId();
+ $addressType = $orderAddress->getAddressType();
+
+ /** @var \Magento\Sales\Model\Order $order */
+ $order = $this->orderFactory->create()->load($orderId);
+ $quoteId = $order->getQuoteId();
+ $quote = $this->quoteFactory->create()->load($quoteId);
+
+ if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) {
+ $quoteAddressId = $quote->getShippingAddress()->getId();
+ $orderAddress->setData('quote_address_id', $quoteAddressId);
+ } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) {
+ $quoteAddressId = $quote->getBillingAddress()->getId();
+ $orderAddress->setData('quote_address_id', $quoteAddressId);
+ }
+
+ $orderAddress->save();
+ }
+ }
+ }
}
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
index 447fd7791ecbd..e010674ca354e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
@@ -3,8 +3,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
+use Magento\Catalog\Model\Product;
use Magento\Catalog\Pricing\Price\FinalPrice;
class AbstractCreateTest extends \PHPUnit\Framework\TestCase
@@ -67,4 +69,34 @@ public function testGetItemPrice()
->willReturn($resultPrice);
$this->assertEquals($resultPrice, $this->model->getItemPrice($this->productMock));
}
+
+ /**
+ * @param $item
+ *
+ * @dataProvider getProductDataProvider
+ */
+ public function testGetProduct($item)
+ {
+ $product = $this->model->getProduct($item);
+
+ self::assertInstanceOf(Product::class, $product);
+ }
+
+ /**
+ * DataProvider for testGetProduct.
+ *
+ * @return array
+ */
+ public function getProductDataProvider()
+ {
+ $productMock = $this->createMock(Product::class);
+
+ $itemMock = $this->createMock(\Magento\Wishlist\Model\Item::class);
+ $itemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
+
+ return [
+ [$productMock],
+ [$itemMock],
+ ];
+ }
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
index a265d39bafd93..b284a529d2a15 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
@@ -8,8 +8,25 @@
namespace Magento\Sales\Test\Unit\Model\AdminOrder;
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Customer\Model\Customer\Mapper;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\RequestInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\Updater;
+use Magento\Sales\Model\AdminOrder\Create;
use Magento\Sales\Model\AdminOrder\Product;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -19,161 +36,74 @@ class CreateTest extends \PHPUnit\Framework\TestCase
{
const CUSTOMER_ID = 1;
- /** @var \Magento\Sales\Model\AdminOrder\Create */
- protected $adminOrderCreate;
-
- /** @var \Magento\Backend\Model\Session\Quote|\PHPUnit_Framework_MockObject_MockObject */
- protected $sessionQuoteMock;
-
- /** @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject */
- protected $formFactoryMock;
-
- /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
- protected $customerFactoryMock;
-
- /** @var \Magento\Quote\Model\Quote\Item\Updater|\PHPUnit_Framework_MockObject_MockObject */
- protected $itemUpdater;
-
- /** @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject */
- protected $customerMapper;
-
/**
- * @var Product\Quote\Initializer|\PHPUnit_Framework_MockObject_MockObject
+ * @var Create
*/
- protected $quoteInitializerMock;
+ private $adminOrderCreate;
/**
- * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var SessionQuote|MockObject
*/
- protected $customerRepositoryMock;
+ private $sessionQuote;
/**
- * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var FormFactory|MockObject
*/
- protected $addressRepositoryMock;
+ private $formFactory;
/**
- * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var CustomerInterfaceFactory|MockObject
*/
- protected $addressFactoryMock;
+ private $customerFactory;
/**
- * @var \Magento\Customer\Api\GroupRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var Updater|MockObject
*/
- protected $groupRepositoryMock;
+ private $itemUpdater;
/**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var Mapper|MockObject
*/
- protected $scopeConfigMock;
+ private $customerMapper;
/**
- * @var \Magento\Sales\Model\AdminOrder\EmailSender|\PHPUnit_Framework_MockObject_MockObject
+ * @var GroupRepositoryInterface|MockObject
*/
- protected $emailSenderMock;
+ private $groupRepository;
/**
- * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var DataObjectHelper|MockObject
*/
- protected $accountManagementMock;
+ private $dataObjectHelper;
- /**
- * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $dataObjectHelper;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $objectFactory;
-
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- */
protected function setUp()
{
- $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
- $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
- $registryMock = $this->createMock(\Magento\Framework\Registry::class);
- $configMock = $this->createMock(\Magento\Sales\Model\Config::class);
- $this->sessionQuoteMock = $this->createMock(\Magento\Backend\Model\Session\Quote::class);
- $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
- $copyMock = $this->createMock(\Magento\Framework\DataObject\Copy::class);
- $messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
- $this->formFactoryMock = $this->createPartialMock(\Magento\Customer\Model\Metadata\FormFactory::class, ['create']);
- $this->customerFactoryMock = $this->createPartialMock(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class, ['create']);
-
- $this->itemUpdater = $this->createMock(\Magento\Quote\Model\Quote\Item\Updater::class);
-
- $this->objectFactory = $this->getMockBuilder(\Magento\Framework\DataObject\Factory::class)
+ $this->sessionQuote = $this->createMock(SessionQuote::class);
+ $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']);
+ $this->customerFactory = $this->createPartialMock(CustomerInterfaceFactory::class, ['create']);
+
+ $this->itemUpdater = $this->createMock(Updater::class);
+
+ $this->customerMapper = $this->getMockBuilder(Mapper::class)
+ ->setMethods(['toFlatArray'])
->disableOriginalConstructor()
- ->setMethods(['create'])
->getMock();
- $this->customerMapper = $this->getMockBuilder(
- \Magento\Customer\Model\Customer\Mapper::class
- )->setMethods(['toFlatArray'])->disableOriginalConstructor()->getMock();
-
- $this->quoteInitializerMock = $this->createMock(\Magento\Sales\Model\AdminOrder\Product\Quote\Initializer::class);
- $this->customerRepositoryMock = $this->getMockForAbstractClass(
- \Magento\Customer\Api\CustomerRepositoryInterface::class,
- [],
- '',
- false
- );
- $this->addressRepositoryMock = $this->getMockForAbstractClass(
- \Magento\Customer\Api\AddressRepositoryInterface::class,
- [],
- '',
- false
- );
- $this->addressFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
- $this->groupRepositoryMock = $this->getMockForAbstractClass(
- \Magento\Customer\Api\GroupRepositoryInterface::class,
- [],
- '',
- false
- );
- $this->scopeConfigMock = $this->getMockForAbstractClass(
- \Magento\Framework\App\Config\ScopeConfigInterface::class,
- [],
- '',
- false
- );
- $this->emailSenderMock = $this->createMock(\Magento\Sales\Model\AdminOrder\EmailSender::class);
- $this->accountManagementMock = $this->getMockForAbstractClass(
- \Magento\Customer\Api\AccountManagementInterface::class,
- [],
- '',
- false
- );
- $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+ $this->groupRepository = $this->getMockForAbstractClass(GroupRepositoryInterface::class);
+ $this->dataObjectHelper = $this->getMockBuilder(DataObjectHelper::class)
->disableOriginalConstructor()
->getMock();
$objectManagerHelper = new ObjectManagerHelper($this);
$this->adminOrderCreate = $objectManagerHelper->getObject(
- \Magento\Sales\Model\AdminOrder\Create::class,
+ Create::class,
[
- 'objectManager' => $objectManagerMock,
- 'eventManager' => $eventManagerMock,
- 'coreRegistry' => $registryMock,
- 'salesConfig' => $configMock,
- 'quoteSession' => $this->sessionQuoteMock,
- 'logger' => $loggerMock,
- 'objectCopyService' => $copyMock,
- 'messageManager' => $messageManagerMock,
- 'quoteInitializer' => $this->quoteInitializerMock,
- 'customerRepository' => $this->customerRepositoryMock,
- 'addressRepository' => $this->addressRepositoryMock,
- 'addressFactory' => $this->addressFactoryMock,
- 'metadataFormFactory' => $this->formFactoryMock,
- 'customerFactory' => $this->customerFactoryMock,
- 'groupRepository' => $this->groupRepositoryMock,
+ 'quoteSession' => $this->sessionQuote,
+ 'metadataFormFactory' => $this->formFactory,
+ 'customerFactory' => $this->customerFactory,
+ 'groupRepository' => $this->groupRepository,
'quoteItemUpdater' => $this->itemUpdater,
'customerMapper' => $this->customerMapper,
- 'objectFactory' => $this->objectFactory,
- 'accountManagement' => $this->accountManagementMock,
'dataObjectHelper' => $this->dataObjectHelper,
]
);
@@ -188,64 +118,60 @@ public function testSetAccountData()
];
$attributeMocks = [];
- foreach ($attributes as $attribute) {
- $attributeMock = $this->createMock(\Magento\Customer\Api\Data\AttributeMetadataInterface::class);
+ foreach ($attributes as $value) {
+ $attribute = $this->createMock(AttributeMetadataInterface::class);
+ $attribute->method('getAttributeCode')
+ ->willReturn($value[0]);
- $attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attribute[0]));
-
- $attributeMocks[] = $attributeMock;
+ $attributeMocks[] = $attribute;
}
- $customerGroupMock = $this->getMockForAbstractClass(
- \Magento\Customer\Api\Data\GroupInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getTaxClassId']
- );
- $customerGroupMock->expects($this->once())->method('getTaxClassId')->will($this->returnValue($taxClassId));
- $customerFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
- $customerFormMock->expects($this->any())
- ->method('getAttributes')
- ->will($this->returnValue([$attributeMocks[1]]));
- $customerFormMock->expects($this->any())->method('extractData')->will($this->returnValue([]));
- $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue(['group_id' => 1]));
-
- $customerFormMock->expects($this->any())
- ->method('prepareRequest')
- ->will($this->returnValue($this->createMock(\Magento\Framework\App\RequestInterface::class)));
-
- $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
- $this->customerMapper->expects($this->atLeastOnce())
+ $customerGroup = $this->getMockForAbstractClass(GroupInterface::class);
+ $customerGroup->method('getTaxClassId')
+ ->willReturn($taxClassId);
+ $customerForm = $this->createMock(Form::class);
+ $customerForm->method('getAttributes')
+ ->willReturn([$attributeMocks[1]]);
+ $customerForm
+ ->method('extractData')
+ ->willReturn([]);
+ $customerForm
+ ->method('restoreData')
+ ->willReturn(['group_id' => 1]);
+
+ $customerForm->method('prepareRequest')
+ ->willReturn($this->createMock(RequestInterface::class));
+
+ $customer = $this->createMock(CustomerInterface::class);
+ $this->customerMapper->expects(self::atLeastOnce())
->method('toFlatArray')
->willReturn(['group_id' => 1]);
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $quoteMock->expects($this->any())->method('getCustomer')->will($this->returnValue($customerMock));
- $quoteMock->expects($this->once())
- ->method('addData')
+ $quote = $this->createMock(Quote::class);
+ $quote->method('getCustomer')->willReturn($customer);
+ $quote->method('addData')
->with(
[
'customer_group_id' => $attributes[1][1],
'customer_tax_class_id' => $taxClassId
]
);
- $this->dataObjectHelper->expects($this->once())
- ->method('populateWithArray')
+ $this->dataObjectHelper->method('populateWithArray')
->with(
- $customerMock,
- ['group_id' => 1], \Magento\Customer\Api\Data\CustomerInterface::class
+ $customer,
+ ['group_id' => 1], CustomerInterface::class
);
- $this->formFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerFormMock));
- $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
- $this->customerFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerMock));
+ $this->formFactory->method('create')
+ ->willReturn($customerForm);
+ $this->sessionQuote
+ ->method('getQuote')
+ ->willReturn($quote);
+ $this->customerFactory->method('create')
+ ->willReturn($customer);
- $this->groupRepositoryMock->expects($this->once())
- ->method('getById')
- ->will($this->returnValue($customerGroupMock));
+ $this->groupRepository->method('getById')
+ ->willReturn($customerGroup);
$this->adminOrderCreate->setAccountData(['group_id' => 1]);
}
@@ -253,7 +179,7 @@ public function testSetAccountData()
public function testUpdateQuoteItemsNotArray()
{
$object = $this->adminOrderCreate->updateQuoteItems('string');
- $this->assertEquals($this->adminOrderCreate, $object);
+ self::assertEquals($this->adminOrderCreate, $object);
}
public function testUpdateQuoteItemsEmptyConfiguredOption()
@@ -266,22 +192,21 @@ public function testUpdateQuoteItemsEmptyConfiguredOption()
]
];
- $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+ $item = $this->createMock(Item::class);
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $quoteMock->expects($this->once())
- ->method('getItemById')
- ->will($this->returnValue($itemMock));
+ $quote = $this->createMock(Quote::class);
+ $quote->method('getItemById')
+ ->willReturn($item);
- $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
- $this->itemUpdater->expects($this->once())
- ->method('update')
- ->with($this->equalTo($itemMock), $this->equalTo($items[1]))
- ->will($this->returnSelf());
+ $this->sessionQuote->method('getQuote')
+ ->willReturn($quote);
+ $this->itemUpdater->method('update')
+ ->with(self::equalTo($item), self::equalTo($items[1]))
+ ->willReturnSelf();
$this->adminOrderCreate->setRecollect(false);
$object = $this->adminOrderCreate->updateQuoteItems($items);
- $this->assertEquals($this->adminOrderCreate, $object);
+ self::assertEquals($this->adminOrderCreate, $object);
}
public function testUpdateQuoteItemsWithConfiguredOption()
@@ -295,43 +220,50 @@ public function testUpdateQuoteItemsWithConfiguredOption()
]
];
- $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
- $itemMock->expects($this->once())
- ->method('getQty')
- ->will($this->returnValue($qty));
+ $item = $this->createMock(Item::class);
+ $item->method('getQty')
+ ->willReturn($qty);
- $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
- $quoteMock->expects($this->once())
- ->method('updateItem')
- ->will($this->returnValue($itemMock));
+ $quote = $this->createMock(Quote::class);
+ $quote->method('updateItem')
+ ->willReturn($item);
- $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
+ $this->sessionQuote
+ ->method('getQuote')
+ ->willReturn($quote);
$expectedInfo = $items[1];
$expectedInfo['qty'] = $qty;
- $this->itemUpdater->expects($this->once())
- ->method('update')
- ->with($this->equalTo($itemMock), $this->equalTo($expectedInfo));
+ $this->itemUpdater->method('update')
+ ->with(self::equalTo($item), self::equalTo($expectedInfo));
$this->adminOrderCreate->setRecollect(false);
$object = $this->adminOrderCreate->updateQuoteItems($items);
- $this->assertEquals($this->adminOrderCreate, $object);
+ self::assertEquals($this->adminOrderCreate, $object);
}
public function testApplyCoupon()
{
- $couponCode = '';
- $quoteMock = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getShippingAddress', 'setCouponCode']);
- $this->sessionQuoteMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
-
- $addressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['setCollectShippingRates', 'setFreeShipping']);
- $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($addressMock);
- $quoteMock->expects($this->once())->method('setCouponCode')->with($couponCode)->willReturnSelf();
-
- $addressMock->expects($this->once())->method('setCollectShippingRates')->with(true)->willReturnSelf();
- $addressMock->expects($this->once())->method('setFreeShipping')->with(0)->willReturnSelf();
+ $couponCode = '123';
+ $quote = $this->createPartialMock(Quote::class, ['getShippingAddress', 'setCouponCode']);
+ $this->sessionQuote->method('getQuote')
+ ->willReturn($quote);
+
+ $address = $this->createPartialMock(Address::class, ['setCollectShippingRates', 'setFreeShipping']);
+ $quote->method('getShippingAddress')
+ ->willReturn($address);
+ $quote->method('setCouponCode')
+ ->with($couponCode)
+ ->willReturnSelf();
+
+ $address->method('setCollectShippingRates')
+ ->with(true)
+ ->willReturnSelf();
+ $address->method('setFreeShipping')
+ ->with(0)
+ ->willReturnSelf();
$object = $this->adminOrderCreate->applyCoupon($couponCode);
- $this->assertEquals($this->adminOrderCreate, $object);
+ self::assertEquals($this->adminOrderCreate, $object);
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php
index 8a2305543c490..2794860793ed6 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php
@@ -6,6 +6,7 @@
namespace Magento\Sales\Test\Unit\Model\Order;
use Magento\Quote\Model\Quote\Address;
+use Magento\Sales\Api\Data\OrderAddressInterface;
/**
* Class BuilderTest
@@ -49,6 +50,11 @@ class CustomerManagementTest extends \PHPUnit\Framework\TestCase
*/
protected $service;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $quoteAddressFactory;
+
protected function setUp()
{
$this->objectCopyService = $this->createMock(\Magento\Framework\DataObject\Copy::class);
@@ -66,6 +72,7 @@ protected function setUp()
['create']
);
$this->orderRepository = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
+ $this->quoteAddressFactory = $this->createMock(\Magento\Quote\Model\Quote\AddressFactory::class);
$this->service = new \Magento\Sales\Model\Order\CustomerManagement(
$this->objectCopyService,
@@ -73,7 +80,8 @@ protected function setUp()
$this->customerFactory,
$this->addressFactory,
$this->regionFactory,
- $this->orderRepository
+ $this->orderRepository,
+ $this->quoteAddressFactory
);
}
@@ -94,12 +102,12 @@ public function testCreateCreatesCustomerBasedonGuestOrder()
$orderMock->expects($this->once())->method('getCustomerId')->will($this->returnValue(null));
$orderMock->expects($this->any())->method('getBillingAddress')->will($this->returnValue('billing_address'));
- $orderBillingAddress = $this->createMock(\Magento\Sales\Api\Data\OrderAddressInterface::class);
+ $orderBillingAddress = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['getData']);
$orderBillingAddress->expects($this->once())
->method('getAddressType')
->willReturn(Address::ADDRESS_TYPE_BILLING);
- $orderShippingAddress = $this->createMock(\Magento\Sales\Api\Data\OrderAddressInterface::class);
+ $orderShippingAddress = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['getData']);
$orderShippingAddress->expects($this->once())
->method('getAddressType')
->willReturn(Address::ADDRESS_TYPE_SHIPPING);
@@ -108,6 +116,17 @@ public function testCreateCreatesCustomerBasedonGuestOrder()
->method('getAddresses')
->will($this->returnValue([$orderBillingAddress, $orderShippingAddress]));
+ $billingQuoteAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+ $billingQuoteAddress->expects($this->once())->method('load')->willReturn($billingQuoteAddress);
+ $billingQuoteAddress->expects($this->once())->method('getId')->willReturn(4);
+ $billingQuoteAddress->expects($this->once())->method('getData')->with('save_in_address_book')->willReturn(1);
+
+ $shippingQuoteAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+ $shippingQuoteAddress->expects($this->once())->method('load')->willReturn($shippingQuoteAddress);
+ $shippingQuoteAddress->expects($this->once())->method('getId')->willReturn(5);
+ $shippingQuoteAddress->expects($this->once())->method('getData')->with('save_in_address_book')->willReturn(1);
+ $this->quoteAddressFactory->expects($this->exactly(2))->method('create')
+ ->willReturnOnConsecutiveCalls($billingQuoteAddress, $shippingQuoteAddress);
$this->orderRepository->expects($this->once())->method('get')->with(1)->will($this->returnValue($orderMock));
$this->objectCopyService->expects($this->any())->method('copyFieldsetToTarget')->will($this->returnValueMap(
[
@@ -142,4 +161,25 @@ public function testCreateCreatesCustomerBasedonGuestOrder()
$this->orderRepository->expects($this->once())->method('save')->with($orderMock);
$this->assertEquals($customerMock, $this->service->create(1));
}
+
+ /**
+ * Get mock for abstract class with methods.
+ *
+ * @param string $className
+ * @param array $methods
+ *
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function createPartialMockForAbstractClass($className, $methods = [])
+ {
+ return $this->getMockForAbstractClass(
+ $className,
+ [],
+ '',
+ true,
+ true,
+ true,
+ $methods
+ );
+ }
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
index ecc37a2cd427d..9eb6be5f6d66e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
@@ -37,23 +37,20 @@ protected function setUp()
public function testRegister()
{
$item1 = $this->getShipmentItemMock();
- $item1->expects($this->once())
- ->method('getQty')
- ->willReturn(0);
- $item1->expects($this->never())
- ->method('register');
+ $item1->expects($this->once())->method('getQty')->willReturn(0);
+ $item1->expects($this->never())->method('register');
+ $item1->expects($this->never())->method('getOrderItem');
$item2 = $this->getShipmentItemMock();
- $item2->expects($this->once())
- ->method('getQty')
- ->willReturn(0.5);
- $item2->expects($this->once())
- ->method('register');
+ $item2->expects($this->atLeastOnce())->method('getQty')->willReturn(0.5);
+ $item2->expects($this->once())->method('register');
+
+ $orderItemMock = $this->createMock(\Magento\Sales\Model\Order\Item::class);
+ $orderItemMock->expects($this->once())->method('isDummy')->with(true)->willReturn(false);
+ $item2->expects($this->once())->method('getOrderItem')->willReturn($orderItemMock);
$items = [$item1, $item2];
- $this->shipmentMock->expects($this->once())
- ->method('getItems')
- ->willReturn($items);
+ $this->shipmentMock->expects($this->once())->method('getItems')->willReturn($items);
$this->assertEquals(
$this->orderMock,
$this->model->register($this->orderMock, $this->shipmentMock)
@@ -67,7 +64,7 @@ private function getShipmentItemMock()
{
return $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentItemInterface::class)
->disableOriginalConstructor()
- ->setMethods(['register'])
+ ->setMethods(['register', 'getOrderItem'])
->getMockForAbstractClass();
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
index 78e2483c6374e..e65b1b8330b93 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
@@ -84,10 +84,18 @@ public function testCreate($tracks)
$orderItem->expects($this->any())->method('getParentItemId')->willReturn(false);
$orderItem->expects($this->any())->method('getIsVirtual')->willReturn(false);
- $shipmentItem = $this->createPartialMock(\Magento\Sales\Model\Order\Shipment\Item::class, ['setQty']);
+ $shipmentItem = $this->createPartialMock(
+ \Magento\Sales\Model\Order\Shipment\Item::class,
+ ['setQty', 'getOrderItem', 'getQty']
+ );
$shipmentItem->expects($this->once())
->method('setQty')
->with(5);
+ $shipmentItem->expects($this->once())
+ ->method('getQty')
+ ->willReturn(5);
+
+ $shipmentItem->expects($this->atLeastOnce())->method('getOrderItem')->willReturn($orderItem);
$order = $this->createPartialMock(\Magento\Sales\Model\Order::class, ['getAllItems']);
$order->expects($this->any())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
index 787e6f8e065d2..a7a615fb0f508 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
@@ -86,7 +86,8 @@ protected function setUp()
'getId',
'getItems',
'getTracks',
- 'getComments'
+ 'getComments',
+ 'getTracksCollection',
]
)
->getMock();
@@ -123,7 +124,7 @@ public function testProcessRelations()
->method('getComments')
->willReturn([$this->commentMock]);
$this->shipmentMock->expects($this->exactly(2))
- ->method('getTracks')
+ ->method('getTracksCollection')
->willReturn([$this->trackMock]);
$this->itemMock->expects($this->once())
->method('setParentId')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
index 8e248d239a501..5ed60f8de306f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
@@ -5,15 +5,11 @@
*/
namespace Magento\Sales\Test\Unit\Model\ResourceModel\Provider;
-use Magento\Framework\ObjectManager\TMap;
use Magento\Framework\ObjectManager\TMapFactory;
use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider;
use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
-/**
- * Class NotSyncedDataProviderTest
- */
class NotSyncedDataProviderTest extends \PHPUnit\Framework\TestCase
{
public function testGetIdsEmpty()
@@ -23,30 +19,14 @@ public function testGetIdsEmpty()
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $tMap = $this->getMockBuilder(TMap::class)
- ->disableOriginalConstructor()
- ->getMock();
- $tMapFactory->expects(static::once())
- ->method('create')
- ->with(
- [
- 'array' => [],
- 'type' => NotSyncedDataProviderInterface::class
- ]
- )
- ->willReturn($tMap);
- $tMap->expects(static::once())
- ->method('getIterator')
- ->willReturn(new \ArrayIterator([]));
+ $tMapFactory->method('create')
+ ->willReturn([]);
- $provider = new NotSyncedDataProvider($tMapFactory, []);
- static::assertEquals([], $provider->getIds('main_table', 'grid_table'));
+ $provider = new NotSyncedDataProvider($tMapFactory);
+ self::assertEquals([], $provider->getIds('main_table', 'grid_table'));
}
- /**
- * @covers \Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider::getIds
- */
public function testGetIds()
{
/** @var TMapFactory|MockObject $tMapFactory */
@@ -54,46 +34,31 @@ public function testGetIds()
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $tMap = $this->getMockBuilder(TMap::class)
- ->disableOriginalConstructor()
- ->getMock();
$provider1 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
->getMockForAbstractClass();
- $provider1->expects(static::once())
- ->method('getIds')
+ $provider1->method('getIds')
->willReturn([1, 2]);
$provider2 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
->getMockForAbstractClass();
- $provider2->expects(static::once())
- ->method('getIds')
+ $provider2->method('getIds')
->willReturn([2, 3, 4]);
- $tMapFactory->expects(static::once())
- ->method('create')
- ->with(
+ $tMapFactory->method('create')
+ ->with(self::equalTo(
[
- 'array' => [
- 'provider1' => NotSyncedDataProviderInterface::class,
- 'provider2' => NotSyncedDataProviderInterface::class
- ],
+ 'array' => [$provider1, $provider2],
'type' => NotSyncedDataProviderInterface::class
]
- )
- ->willReturn($tMap);
- $tMap->expects(static::once())
- ->method('getIterator')
- ->willReturn(new \ArrayIterator([$provider1, $provider2]));
+ ))
+ ->willReturn([$provider1, $provider2]);
- $provider = new NotSyncedDataProvider(
- $tMapFactory,
- [
- 'provider1' => NotSyncedDataProviderInterface::class,
- 'provider2' => NotSyncedDataProviderInterface::class,
- ]
- );
+ $provider = new NotSyncedDataProvider($tMapFactory, [$provider1, $provider2]);
- static::assertEquals([1, 2, 3, 4], array_values($provider->getIds('main_table', 'grid_table')));
+ self::assertEquals(
+ [1, 2, 3, 4],
+ array_values($provider->getIds('main_table', 'grid_table'))
+ );
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
index 9ecab6cf9ab52..2e668f0b0d6f1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
@@ -243,6 +243,78 @@ public function testRefund()
$this->assertSame($creditMemoMock, $this->creditmemoService->refund($creditMemoMock, true));
}
+ public function testRefundPendingCreditMemo()
+ {
+ $creditMemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class)
+ ->setMethods(['getId', 'getOrder', 'getState', 'getInvoice'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $creditMemoMock->expects($this->once())->method('getId')->willReturn(444);
+ $creditMemoMock->expects($this->once())->method('getState')
+ ->willReturn(\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN);
+ $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
+
+ $creditMemoMock->expects($this->atLeastOnce())->method('getOrder')->willReturn($orderMock);
+ $orderMock->expects($this->once())->method('getBaseTotalRefunded')->willReturn(0);
+ $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10);
+ $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
+
+ $this->priceCurrencyMock->expects($this->any())
+ ->method('round')
+ ->willReturnArgument(0);
+
+ // Set payment adapter dependency
+ $refundAdapterMock = $this->getMockBuilder(\Magento\Sales\Model\Order\RefundAdapterInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->objectManagerHelper->setBackwardCompatibleProperty(
+ $this->creditmemoService,
+ 'refundAdapter',
+ $refundAdapterMock
+ );
+
+ // Set resource dependency
+ $resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->objectManagerHelper->setBackwardCompatibleProperty(
+ $this->creditmemoService,
+ 'resource',
+ $resourceMock
+ );
+
+ // Set order repository dependency
+ $orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->objectManagerHelper->setBackwardCompatibleProperty(
+ $this->creditmemoService,
+ 'orderRepository',
+ $orderRepositoryMock
+ );
+
+ $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $resourceMock->expects($this->once())->method('getConnection')->with('sales')->willReturn($adapterMock);
+ $adapterMock->expects($this->once())->method('beginTransaction');
+ $refundAdapterMock->expects($this->once())
+ ->method('refund')
+ ->with($creditMemoMock, $orderMock, false)
+ ->willReturn($orderMock);
+ $orderRepositoryMock->expects($this->once())
+ ->method('save')
+ ->with($orderMock);
+ $creditMemoMock->expects($this->once())
+ ->method('getInvoice')
+ ->willReturn(null);
+ $adapterMock->expects($this->once())->method('commit');
+ $this->creditmemoRepositoryMock->expects($this->once())
+ ->method('save');
+
+ $this->assertSame($creditMemoMock, $this->creditmemoService->refund($creditMemoMock, true));
+ }
+
/**
* @expectedExceptionMessage The most money available to refund is 1.
* @expectedException \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index c4a99e5b45076..9761f82d1894a 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -32,7 +32,7 @@
"magento/module-sales-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 9de3f238d6a39..22ddc7b333574 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -470,6 +470,15 @@
CreditmemoRelationsComposite
+
+
+
+
+ - Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider
+ - Magento\Sales\Model\ResourceModel\Provider\UpdatedAtListProvider
+
+
+
sales_order
@@ -520,6 +529,7 @@
- sales_order_payment.method
- sales_order.total_refunded
+ Magento\Sales\Model\ResourceModel\Provider\NotSyncedOrderDataProvider
diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
index d680d7373bc35..0c8208b4167f5 100644
--- a/app/code/Magento/Sales/etc/fieldset.xml
+++ b/app/code/Magento/Sales/etc/fieldset.xml
@@ -279,7 +279,7 @@
-
-
+
- getDataId() == 'cart'): ?>
- getItemPrice($_item->getProduct()) ?>
-
- getItemPrice($_item) ?>
-
+ getItemPrice($block->getProduct($_item)) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 02529cee5c0ff..8990ea8d3f75b 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -325,12 +325,12 @@ define([
data = this.serializeData(this.billingAddressContainer);
} else {
data = this.serializeData(this.shippingAddressContainer);
- areasToLoad.push('shipping_method');
}
+ areasToLoad.push('shipping_method');
data = data.toObject();
data['shipping_as_billing'] = flag ? 1 : 0;
data['reset_shipping'] = 1;
- this.loadArea( areasToLoad, true, data);
+ this.loadArea(areasToLoad, true, data);
},
resetShippingMethod : function(data){
diff --git a/app/code/Magento/SalesAnalytics/LICENSE.txt b/app/code/Magento/SalesAnalytics/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/SalesAnalytics/LICENSE_AFL.txt b/app/code/Magento/SalesAnalytics/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/SalesAnalytics/README.md b/app/code/Magento/SalesAnalytics/README.md
new file mode 100644
index 0000000000000..70f456c97d4b3
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_SalesAnalytics module
+
+The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
new file mode 100644
index 0000000000000..344971d7056cf
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -0,0 +1,23 @@
+{
+ "name": "magento/module-sales-analytics",
+ "description": "N/A",
+ "require": {
+ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "magento/framework": "100.2.*",
+ "magento/module-sales": "100.2.*"
+ },
+ "type": "magento2-module",
+ "version": "100.2.0",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\SalesAnalytics\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/SalesAnalytics/etc/analytics.xml b/app/code/Magento/SalesAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..be6c4dfde9b19
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/analytics.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+ orders
+
+
+
+
+
+
+
+
+ order_items
+
+
+
+
+
+
+
+
+ order_addresses
+
+
+
+
+
diff --git a/app/code/Magento/SalesAnalytics/etc/module.xml b/app/code/Magento/SalesAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..7a15075a4bc21
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/SalesAnalytics/etc/reports.xml b/app/code/Magento/SalesAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..bb6bdb800e9bf
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/reports.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/SalesAnalytics/registration.php b/app/code/Magento/SalesAnalytics/registration.php
new file mode 100644
index 0000000000000..eff2c5b1a2c05
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/registration.php
@@ -0,0 +1,11 @@
+getChildren() as $child) {
- $ratio = $child->getBaseRowTotal() / $parentBaseRowTotal;
+ $ratio = $parentBaseRowTotal != 0 ? $child->getBaseRowTotal() / $parentBaseRowTotal : 0;
foreach ($keys as $key) {
if (!$item->hasData($key)) {
continue;
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 108cc341253ae..1e8fbf43ec3bc 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -136,6 +136,7 @@ public function asHtml()
*
* @param \Magento\Framework\Model\AbstractModel $model
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validate(\Magento\Framework\Model\AbstractModel $model)
{
@@ -145,8 +146,22 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
$attr = $this->getAttribute();
$total = 0;
foreach ($model->getQuote()->getAllVisibleItems() as $item) {
- if (parent::validate($item)) {
- $total += $item->getData($attr);
+ $hasValidChild = false;
+ $useChildrenTotal = ($item->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
+ $childrenAttrTotal = 0;
+ $children = $item->getChildren();
+ if (!empty($children)) {
+ foreach ($children as $child) {
+ if (parent::validate($child)) {
+ $hasValidChild = true;
+ if ($useChildrenTotal) {
+ $childrenAttrTotal += $child->getData($attr);
+ }
+ }
+ }
+ }
+ if ($hasValidChild || parent::validate($item)) {
+ $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
}
}
return $this->validateAttribute($total);
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
index a1c325f39a947..671f20a27a460 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -229,7 +229,30 @@ public function collectItemHasChildrenDataProvider()
{
$data = [
// 3 items, each $100, testing that discount are distributed to item correctly
- 'three_items' => [
+ [
+ 'child_item_data' => [
+ 'item1' => [
+ 'base_row_total' => 0,
+ ]
+ ],
+ 'parent_item_data' => [
+ 'discount_amount' => 20,
+ 'base_discount_amount' => 10,
+ 'original_discount_amount' => 40,
+ 'base_original_discount_amount' => 20,
+ 'base_row_total' => 0,
+ ],
+ 'expected_child_item_data' => [
+ 'item1' => [
+ 'discount_amount' => 0,
+ 'base_discount_amount' => 0,
+ 'original_discount_amount' => 0,
+ 'base_original_discount_amount' => 0,
+ ]
+ ],
+ ],
+ [
+ // 3 items, each $100, testing that discount are distributed to item correctly
'child_item_data' => [
'item1' => [
'base_row_total' => 100,
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index f3ad8a39de00e..e813d7342761f 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -124,7 +124,7 @@ public function getSuggestUrl()
{
return $this->_getUrl(
'search/ajax/suggest',
- ['_secure' => $this->storeManager->getStore()->isCurrentlySecure()]
+ ['_secure' => $this->_getRequest()->isSecure()]
);
}
diff --git a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
index 5cfde7e8efda9..291362734feff 100644
--- a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Search\Test\Unit\Helper;
/**
@@ -43,6 +44,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
*/
protected $storeManagerMock;
+ /**
+ * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $urlBuilderMock;
+
protected function setUp()
{
$this->stringMock = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
@@ -53,9 +59,14 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods([])
->getMock();
+ $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+ ->setMethods(['getUrl'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
$this->contextMock = $this->createMock(\Magento\Framework\App\Helper\Context::class);
$this->contextMock->expects($this->any())->method('getScopeConfig')->willReturn($this->scopeConfigMock);
$this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
+ $this->contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
$this->model = new \Magento\Search\Helper\Data(
$this->contextMock,
@@ -126,4 +137,39 @@ public function queryTextDataProvider()
['testtest', 7, 'testtes'],
];
}
+
+ /**
+ * Test getSuggestUrl() take into consideration type of request(secure, non-secure).
+ *
+ * @dataProvider getSuggestUrlDataProvider
+ * @param bool $isSecure
+ * @return void
+ */
+ public function testGetSuggestUrl(bool $isSecure)
+ {
+ $this->requestMock->expects(self::once())
+ ->method('isSecure')
+ ->willReturn($isSecure);
+ $this->urlBuilderMock->expects(self::once())
+ ->method('getUrl')
+ ->with(self::identicalTo('search/ajax/suggest'), self::identicalTo(['_secure' => $isSecure]));
+ $this->model->getSuggestUrl();
+ }
+
+ /**
+ * Provide test data for testGetSuggestUrl() test.
+ *
+ * @return array
+ */
+ public function getSuggestUrlDataProvider()
+ {
+ return [
+ 'non-secure' => [
+ 'isSecure' => false,
+ ],
+ 'secure' => [
+ 'secure' => true,
+ ],
+ ];
+ }
}
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 60ba6550cddf4..c6aecd101fc6f 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -11,7 +11,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
index c4297b404717c..2ea87be13d5e3 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -9,7 +9,7 @@
helper('Magento\Search\Helper\Data');
+$helper = $this->helper(\Magento\Search\Helper\Data::class);
?>
@@ -23,7 +23,7 @@ $helper = $this->helper('Magento\Search\Helper\Data');
$block->getRequest()->isSecure()]) ?>",
+ "url":"getSuggestUrl()?>",
"destinationSelector":"#search_autocomplete"}
}'
type="text"
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 5520bae0e26a8..5eca94bce562b 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -109,6 +109,8 @@ public function execute()
$isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label'];
+ $responseAjax = new \Magento\Framework\DataObject();
+
try {
$this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
$this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
@@ -143,7 +145,6 @@ public function execute()
$shipment->register();
$shipment->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
- $responseAjax = new \Magento\Framework\DataObject();
if ($isNeedCreateLabel) {
$this->labelGenerator->create($shipment, $this->_request);
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 06fa1e5295c60..a7a2a3d48b06e 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -25,7 +25,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index f2de699fe1a2e..35e36aa5584c9 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -27,7 +27,7 @@
getShipment()->getAllItems() ?>
-
+ getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
getItemHtml($_item) ?>
getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index fc62e4d2fa6bb..8dddfaedda4e5 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -16,7 +16,7 @@
getShipment()->getAllItems() ?>
-
+ getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
getItemHtml($_item) ?>
getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json
index f11b23cc3b6c4..a162cef1614ca 100644
--- a/app/code/Magento/Signifyd/composer.json
+++ b/app/code/Magento/Signifyd/composer.json
@@ -3,21 +3,21 @@
"description": "Submitting Case Entry to Signifyd on Order Creation",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/module-config": "100.2.*",
- "magento/framework": "100.2.*",
- "magento/module-sales": "100.2.*",
+ "magento/module-config": "101.0.*",
+ "magento/framework": "101.0.*",
+ "magento/module-sales": "101.0.*",
"magento/module-store": "100.2.*",
- "magento/module-customer": "100.2.*",
+ "magento/module-customer": "101.0.*",
"magento/module-directory": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-payment": "100.2.*"
},
"suggest": {
- "magento/module-config": "100.2.*"
+ "magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0-dev",
+ "version": "100.2.1",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 3ae3061310a0b..840a6a1858fae 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -113,7 +113,6 @@ public function scheduledGenerateSitemaps()
$sitemap->generateXml();
} catch (\Exception $e) {
$errors[] = $e->getMessage();
- throw $e;
}
}
@@ -122,8 +121,7 @@ public function scheduledGenerateSitemaps()
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
- $translate = $this->_translateModel->getTranslateInline();
- $this->_translateModel->setTranslateInline(false);
+ $this->inlineTranslation->suspend();
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 515caebe1ef27..f6a5f029eafca 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -43,6 +43,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
const TYPE_URL = 'url';
+ /**
+ * Last mode date min value
+ */
+ const LAST_MOD_MIN_VAL = '0000-01-01 00:00:00';
+
/**
* Real file path
*
@@ -157,6 +162,13 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
*/
protected $_cacheTag = true;
+ /**
+ * Last mode min timestamp value
+ *
+ * @var int
+ */
+ private $lastModMinTsVal;
+
/**
* Initialize dependencies.
*
@@ -661,7 +673,11 @@ protected function _getMediaUrl($url)
*/
protected function _getFormattedLastmodDate($date)
{
- return date('c', strtotime($date));
+ if ($this->lastModMinTsVal === null) {
+ $this->lastModMinTsVal = strtotime(self::LAST_MOD_MIN_VAL);
+ }
+ $timestamp = max(strtotime($date), $this->lastModMinTsVal);
+ return date('c', $timestamp);
}
/**
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
index 92e6f4e2e2293..ac88f23ff9d69 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -7,6 +7,10 @@
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+/**
+ * Class ObserverTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ObserverTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -96,11 +100,11 @@ protected function setUp()
);
}
- /**
- * @expectedException \Exception
- */
- public function testScheduledGenerateSitemapsThrowsException()
+ public function testScheduledGenerateSitemapsSendsExceptionEmail()
{
+ $exception = 'Sitemap Exception';
+ $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
+
$this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
$this->collectionFactoryMock->expects($this->once())
@@ -111,7 +115,55 @@ public function testScheduledGenerateSitemapsThrowsException()
->method('getIterator')
->willReturn(new \ArrayIterator([$this->sitemapMock]));
- $this->sitemapMock->expects($this->once())->method('generateXml')->willThrowException(new \Exception());
+ $this->sitemapMock->expects($this->once())
+ ->method('generateXml')
+ ->willThrowException(new \Exception($exception));
+
+ $this->scopeConfigMock->expects($this->at(1))
+ ->method('getValue')
+ ->with(
+ \Magento\Sitemap\Model\Observer::XML_PATH_ERROR_RECIPIENT,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
+ ->willReturn('error-recipient@example.com');
+
+ $this->inlineTranslationMock->expects($this->once())
+ ->method('suspend');
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('setTemplateIdentifier')
+ ->will($this->returnSelf());
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('setTemplateOptions')
+ ->with([
+ 'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+ 'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+ ])
+ ->will($this->returnSelf());
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('setTemplateVars')
+ ->with(['warnings' => $exception])
+ ->will($this->returnSelf());
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('setFrom')
+ ->will($this->returnSelf());
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('addTo')
+ ->will($this->returnSelf());
+
+ $this->transportBuilderMock->expects($this->once())
+ ->method('getTransport')
+ ->willReturn($transport);
+
+ $transport->expects($this->once())
+ ->method('sendMessage');
+
+ $this->inlineTranslationMock->expects($this->once())
+ ->method('resume');
$this->observer->scheduledGenerateSitemaps();
}
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index 40b72cbd53c00..83210c5789776 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -540,7 +540,7 @@ protected function _getModelMock($mockBeforeSave = false)
$this->returnValue(
[
new \Magento\Framework\DataObject(
- ['url' => 'product.html', 'updated_at' => '2012-12-21 00:00:00']
+ ['url' => 'product.html', 'updated_at' => '0000-00-00 00:00:00']
),
new \Magento\Framework\DataObject(
[
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
index 3a0357cf30c51..519464cf76cf1 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
@@ -10,7 +10,7 @@
xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
http://store.com/product.html
- 2012-12-21T00:00:00-08:00
+ 0000-01-01T00:00:00-08:00
monthly
0.5
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
index e79e022c98995..cc2ff96dd28f2 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
@@ -22,7 +22,7 @@
http://store.com/product.html
- 2012-12-21T00:00:00-08:00
+ 0000-01-01T00:00:00-08:00
monthly
0.5
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 71d9198a332a7..88be3616eebd0 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -18,7 +18,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 074dcb0262040..3d8d46983b5aa 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -223,9 +223,12 @@ public function getStoreName()
*/
public function getTargetStorePostData(\Magento\Store\Model\Store $store, $data = [])
{
- $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME] = $store->getCode();
+ $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME]
+ = $store->getCode();
+ //We need to fromStore as true because it will enable proper URL
+ //rewriting during store switching.
return $this->_postDataHelper->getPostData(
- $store->getCurrentUrl(false),
+ $store->getCurrentUrl(true),
$data
);
}
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index aca8c4a0ba5ec..56751f2188411 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -1136,7 +1136,14 @@ public function isDefault()
public function getCurrentUrl($fromStore = true)
{
$sidQueryParam = $this->_sidResolver->getSessionIdQueryParam($this->_getSession());
- $requestString = $this->_url->escape(ltrim($this->_request->getRequestString(), '/'));
+ /** @var string $requestString Request path without query parameters */
+ $requestString = $this->_url->escape(
+ preg_replace(
+ '/\?.*?$/',
+ '',
+ ltrim($this->_request->getRequestString(), '/')
+ )
+ );
$storeUrl = $this->getUrl('', ['_secure' => $this->_storeManager->getStore()->isCurrentlySecure()]);
diff --git a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
index 5f0ba6c0b42d3..8b4799d2b3437 100644
--- a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
+++ b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
@@ -53,7 +53,7 @@ public function testGetTargetStorePostData()
$storeSwitchUrl = 'http://domain.com/stores/store/switch';
$store->expects($this->atLeastOnce())
->method('getCurrentUrl')
- ->with(false)
+ ->with(true)
->willReturn($storeSwitchUrl);
$this->corePostDataHelper->expects($this->any())
->method('getPostData')
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index aef54a47971ff..c05584c2d8bcb 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -370,10 +370,11 @@ public function testGetBaseUrlWrongType()
* @param boolean $secure
* @param string $url
* @param string $expected
+ * @param bool|string $fromStore
*/
- public function testGetCurrentUrl($secure, $url, $expected)
+ public function testGetCurrentUrl($secure, $url, $expected, $fromStore)
{
- $defaultStore = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+ $defaultStore = $this->createPartialMock(Store::class, [
'getId',
'isCurrentlySecure',
'__wakeup'
@@ -386,15 +387,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
$config = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
- $this->requestMock->expects($this->atLeastOnce())->method('getRequestString')->will($this->returnValue(''));
+ $requestString = preg_replace(
+ '/http(s?)\:\/\/[a-z0-9\-]+\//i',
+ '',
+ $url
+ );
+ $this->requestMock
+ ->expects($this->atLeastOnce())
+ ->method('getRequestString')
+ ->willReturn($requestString);
$this->requestMock->expects($this->atLeastOnce())->method('getQueryValue')->will($this->returnValue([
'SID' => 'sid'
]));
$urlMock = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
- $urlMock->expects($this->atLeastOnce())->method('setScope')->will($this->returnSelf());
- $urlMock->expects($this->any())->method('getUrl')
- ->will($this->returnValue($url));
+ $urlMock
+ ->expects($this->atLeastOnce())
+ ->method('setScope')
+ ->will($this->returnSelf());
+ $urlMock->expects($this->any())
+ ->method('getUrl')
+ ->will($this->returnValue(str_replace($requestString, '', $url)));
+ $urlMock
+ ->expects($this->atLeastOnce())
+ ->method('escape')
+ ->willReturnArgument(0);
$storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
$storeManager->expects($this->any())
@@ -409,7 +426,7 @@ public function testGetCurrentUrl($secure, $url, $expected)
$model->setStoreId(2);
$model->setCode('scope_code');
- $this->assertEquals($expected, $model->getCurrentUrl(false));
+ $this->assertEquals($expected, $model->getCurrentUrl($fromStore));
}
/**
@@ -418,9 +435,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
public function getCurrentUrlDataProvider()
{
return [
- [true, 'http://test/url', 'http://test/url?SID=sid&___store=scope_code'],
- [true, 'http://test/url?SID=sid1&___store=scope', 'http://test/url?SID=sid&___store=scope_code'],
- [false, 'https://test/url', 'https://test/url?SID=sid&___store=scope_code']
+ [
+ true,
+ 'http://test/url',
+ 'http://test/url?SID=sid&___store=scope_code',
+ false
+ ],
+ [
+ true,
+ 'http://test/url?SID=sid1&___store=scope',
+ 'http://test/url?SID=sid&___store=scope_code',
+ false
+ ],
+ [
+ false,
+ 'https://test/url',
+ 'https://test/url?SID=sid&___store=scope_code',
+ false
+ ],
+ [
+ true,
+ 'http://test/u/u.2?__store=scope_code',
+ 'http://test/u/u.2?'
+ . 'SID=sid&___store=scope_code&___from_store=old-store',
+ 'old-store'
+ ]
];
}
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index 662414049c955..f9eb84e2f9fa1 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -14,7 +14,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index 470337a97dcd9..bb5b23620df4b 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -115,6 +115,10 @@
php
+ php3
+ php4
+ php5
+ php7
htaccess
jsp
pl
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 2429607dc8716..787d58891c9e0 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -6,7 +6,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index aef8a25da2834..dfd3d6ce15f71 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -119,6 +119,12 @@ public function __construct(
$configurableAttributeData,
$data
);
+
+ $this->addData(
+ [
+ 'cache_lifetime' => isset($data['cache_lifetime']) ? $data['cache_lifetime'] : 3600
+ ]
+ );
}
/**
diff --git a/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml b/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
index 593ae32374417..62d6e57221f82 100644
--- a/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
+++ b/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
@@ -6,7 +6,13 @@
*/
-->
-
-
+
+
+ false
+
+
+
+
diff --git a/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml b/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
index 28bf7baac0a36..9f47b4386c742 100644
--- a/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
+++ b/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
@@ -12,7 +12,11 @@
-
+
+ false
+
+
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 7ecd6558ef6ea..75a39a0e4e270 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
?>
-
+