diff --git a/app/code/Magento/Authorization/Setup/InstallSchema.php b/app/code/Magento/Authorization/Setup/InstallSchema.php
index d2199ef50ff836939de4a8b930482e744222390c..be78cce218735960373e7c04510390fe56f06186 100644
--- a/app/code/Magento/Authorization/Setup/InstallSchema.php
+++ b/app/code/Magento/Authorization/Setup/InstallSchema.php
@@ -138,7 +138,6 @@ class InstallSchema implements InstallSchemaInterface
'role_id',
$installer->getTable('authorization_role'),
'role_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Admin Rule Table'
diff --git a/app/code/Magento/Bundle/Setup/InstallSchema.php b/app/code/Magento/Bundle/Setup/InstallSchema.php
index 96f43cb95704dbcf8d9e672be049493bfccab912..94325c54ff13c965a23e20a7b1962818b5816d2f 100644
--- a/app/code/Magento/Bundle/Setup/InstallSchema.php
+++ b/app/code/Magento/Bundle/Setup/InstallSchema.php
@@ -79,7 +79,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Bundle Option');
@@ -138,7 +137,6 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('catalog_product_bundle_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Bundle Option Value');
@@ -238,7 +236,6 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('catalog_product_bundle_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -251,7 +248,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Bundle Selection');
@@ -305,7 +301,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -318,7 +313,6 @@ class InstallSchema implements InstallSchemaInterface
'selection_id',
$installer->getTable('catalog_product_bundle_selection'),
'selection_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Bundle Selection Price');
@@ -383,7 +377,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -396,7 +389,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -409,7 +401,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Bundle Price Index');
diff --git a/app/code/Magento/CacheInvalidate/Model/Observer.php b/app/code/Magento/CacheInvalidate/Model/Observer.php
new file mode 100644
index 0000000000000000000000000000000000000000..6deb4f50aac511b57fc7bf5cf920a6f172bad351
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/Model/Observer.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CacheInvalidate\Model;
+
+/**
+ * Class Observer
+ */
+class Observer
+{
+ /**
+ * Application config object
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $_config;
+
+ /**
+ * @var \Magento\PageCache\Helper\Data
+ */
+ protected $_helper;
+
+ /**
+ * @var \Magento\Framework\HTTP\Adapter\Curl
+ */
+ protected $_curlAdapter;
+
+ /**
+ * Constructor
+ *
+ * @param \Magento\PageCache\Model\Config $config
+ * @param \Magento\PageCache\Helper\Data $helper
+ * @param \Magento\Framework\HTTP\Adapter\Curl $curlAdapter
+ */
+ public function __construct(
+ \Magento\PageCache\Model\Config $config,
+ \Magento\PageCache\Helper\Data $helper,
+ \Magento\Framework\HTTP\Adapter\Curl $curlAdapter
+ ) {
+ $this->_config = $config;
+ $this->_helper = $helper;
+ $this->_curlAdapter = $curlAdapter;
+ }
+
+ /**
+ * If Varnish caching is enabled it collects array of tags
+ * of incoming object and asks to clean cache.
+ *
+ * @param \Magento\Framework\Event\Observer $observer
+ * @return void
+ */
+ public function invalidateVarnish(\Magento\Framework\Event\Observer $observer)
+ {
+ if ($this->_config->getType() == \Magento\PageCache\Model\Config::VARNISH && $this->_config->isEnabled()) {
+ $object = $observer->getEvent()->getObject();
+ if ($object instanceof \Magento\Framework\Object\IdentityInterface) {
+ $tags = [];
+ $pattern = "((^|,)%s(,|$))";
+ foreach ($object->getIdentities() as $tag) {
+ $tags[] = sprintf($pattern, preg_replace("~_\\d+$~", '', $tag));
+ $tags[] = sprintf($pattern, $tag);
+ }
+ $this->sendPurgeRequest(implode('|', array_unique($tags)));
+ }
+ }
+ }
+
+ /**
+ * Flash Varnish cache
+ *
+ * @param \Magento\Framework\Event\Observer $observer
+ * @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function flushAllCache(\Magento\Framework\Event\Observer $observer)
+ {
+ if ($this->_config->getType() == \Magento\PageCache\Model\Config::VARNISH && $this->_config->isEnabled()) {
+ $this->sendPurgeRequest('.*');
+ }
+ }
+
+ /**
+ * Send curl purge request
+ * to invalidate cache by tags pattern
+ *
+ * @param string $tagsPattern
+ * @return void
+ */
+ protected function sendPurgeRequest($tagsPattern)
+ {
+ $headers = ["X-Magento-Tags-Pattern: {$tagsPattern}"];
+ $this->_curlAdapter->setOptions([CURLOPT_CUSTOMREQUEST => 'PURGE']);
+ $this->_curlAdapter->write('', $this->_helper->getUrl('*'), '1.1', $headers);
+ $this->_curlAdapter->read();
+ $this->_curlAdapter->close();
+ }
+}
diff --git a/app/code/Magento/CacheInvalidate/README.md b/app/code/Magento/CacheInvalidate/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..6cca6ffec03e45b5b7c09ba7d6e8a6543e14eb00
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/README.md
@@ -0,0 +1,2 @@
+The CacheInvalidate module is used to invalidate the Varnish cache if it is configured.
+It listens for events that request the cache to be flushed or cause the cache to be invalid, then sends Varnish a purge request using cURL.
\ No newline at end of file
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1abf5d45605acb48f111f7126ab58dcae9c9e540
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CacheInvalidate\Test\Unit\Model;
+
+class ObserverTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Model\Observer */
+ protected $_model;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event\Observer */
+ protected $_observerMock;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\HTTP\Adapter\Curl */
+ protected $_curlMock;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\PageCache\Model\Config */
+ protected $_configMock;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\PageCache\Helper\Data */
+ protected $_helperMock;
+
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Object\ */
+ protected $_observerObject;
+
+ /**
+ * Set up all mocks and data for test
+ */
+ public function setUp()
+ {
+ $this->_configMock = $this->getMock(
+ 'Magento\PageCache\Model\Config',
+ ['getType', 'isEnabled'],
+ [],
+ '',
+ false
+ );
+ $this->_helperMock = $this->getMock('Magento\PageCache\Helper\Data', ['getUrl'], [], '', false);
+ $this->_curlMock = $this->getMock(
+ '\Magento\Framework\HTTP\Adapter\Curl',
+ ['setOptions', 'write', 'read', 'close'],
+ [],
+ '',
+ false
+ );
+ $this->_model = new \Magento\CacheInvalidate\Model\Observer(
+ $this->_configMock,
+ $this->_helperMock,
+ $this->_curlMock
+ );
+ $this->_observerMock = $this->getMock(
+ 'Magento\Framework\Event\Observer',
+ ['getEvent'],
+ [],
+ '',
+ false
+ );
+ $this->_observerObject = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+ }
+
+ /**
+ * Test case for cache invalidation
+ */
+ public function testInvalidateVarnish()
+ {
+ $tags = ['cache_1', 'cache_group'];
+ $pattern = '((^|,)cache(,|$))|((^|,)cache_1(,|$))|((^|,)cache_group(,|$))';
+
+ $this->_configMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
+ $this->_configMock->expects(
+ $this->once()
+ )->method(
+ 'getType'
+ )->will(
+ $this->returnValue(\Magento\PageCache\Model\Config::VARNISH)
+ );
+ $eventMock = $this->getMock('Magento\Framework\Event', ['getObject'], [], '', false);
+ $eventMock->expects($this->once())->method('getObject')->will($this->returnValue($this->_observerObject));
+ $this->_observerMock->expects($this->once())->method('getEvent')->will($this->returnValue($eventMock));
+ $this->_observerObject->expects($this->once())->method('getIdentities')->will($this->returnValue($tags));
+ $this->sendPurgeRequest($pattern);
+
+ $this->_model->invalidateVarnish($this->_observerMock);
+ }
+
+ /**
+ * Test case for flushing all the cache
+ */
+ public function testFlushAllCache()
+ {
+ $this->_configMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
+ $this->_configMock->expects(
+ $this->once()
+ )->method(
+ 'getType'
+ )->will(
+ $this->returnValue(\Magento\PageCache\Model\Config::VARNISH)
+ );
+
+ $this->sendPurgeRequest('.*');
+ $this->_model->flushAllCache($this->_observerMock);
+ }
+
+ /**
+ * @param string $tags
+ */
+ protected function sendPurgeRequest($tags)
+ {
+ $url = 'http://mangento.index.php';
+ $httpVersion = '1.1';
+ $headers = ["X-Magento-Tags-Pattern: {$tags}"];
+ $this->_helperMock->expects(
+ $this->any()
+ )->method(
+ 'getUrl'
+ )->with(
+ $this->equalTo('*'),
+ []
+ )->will(
+ $this->returnValue($url)
+ );
+ $this->_curlMock->expects($this->once())->method('setOptions')->with([CURLOPT_CUSTOMREQUEST => 'PURGE']);
+ $this->_curlMock->expects(
+ $this->once()
+ )->method(
+ 'write'
+ )->with(
+ $this->equalTo(''),
+ $this->equalTo($url),
+ $httpVersion,
+ $this->equalTo($headers)
+ );
+ $this->_curlMock->expects($this->once())->method('read');
+ $this->_curlMock->expects($this->once())->method('close');
+ }
+}
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..3fe142a52e825fe6bae3ab6d56e798302d3ba3c3
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -0,0 +1,24 @@
+{
+ "name": "magento/module-cache-invalidate",
+ "description": "N/A",
+ "require": {
+ "php": "~5.5.0|~5.6.0",
+ "magento/module-page-cache": "0.74.0-beta4",
+ "magento/framework": "0.74.0-beta4",
+ "magento/magento-composer-installer": "*"
+ },
+ "type": "magento2-module",
+ "version": "0.74.0-beta4",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "extra": {
+ "map": [
+ [
+ "*",
+ "Magento/CacheInvalidate"
+ ]
+ ]
+ }
+}
diff --git a/app/code/Magento/CacheInvalidate/etc/events.xml b/app/code/Magento/CacheInvalidate/etc/events.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d4ba3665ee66fb4e1e1eee75045302c199bf2985
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/etc/events.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
+ <event name="clean_cache_by_tags">
+ <observer name="invalidate_varnish" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="adminhtml_cache_flush_system">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="clean_media_cache_after">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="clean_catalog_images_cache_after">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="assigned_theme_changed">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="catalogrule_after_apply">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="adminhtml_cache_refresh_type">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="adminhtml_cache_flush_all">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="assign_theme_to_stores_after">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="flushAllCache" />
+ </event>
+ <event name="controller_action_postdispatch_adminhtml_system_currency_saveRates">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="controller_action_postdispatch_adminhtml_system_config_save">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="controller_action_postdispatch_adminhtml_catalog_product_action_attribute_save">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="controller_action_postdispatch_adminhtml_catalog_product_massStatus">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+ <event name="controller_action_postdispatch_adminhtml_system_currencysymbol_save">
+ <observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Model\Observer" method="invalidateVarnish" />
+ </event>
+</config>
diff --git a/app/code/Magento/CacheInvalidate/etc/module.xml b/app/code/Magento/CacheInvalidate/etc/module.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca87df877a43a93eb2be450fa10b0013d099eff9
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+ <module name="Magento_CacheInvalidate" setup_version="2.0.0">
+ <sequence>
+ <module name="Magento_Store"/>
+ </sequence>
+ </module>
+</config>
diff --git a/app/code/Magento/Catalog/Setup/InstallSchema.php b/app/code/Magento/Catalog/Setup/InstallSchema.php
index 1ca2468ed2a4ef213c22bfb9b7a31c0aaa6e322c..d2dc790edb124beb7e7aaa34c86114e7a17ff7e2 100644
--- a/app/code/Magento/Catalog/Setup/InstallSchema.php
+++ b/app/code/Magento/Catalog/Setup/InstallSchema.php
@@ -115,7 +115,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_set_id',
$installer->getTable('eav_attribute_set'),
'attribute_set_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -123,7 +122,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Table');
@@ -203,7 +201,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -216,7 +213,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -224,7 +220,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Datetime Attribute Backend Table');
@@ -304,7 +299,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -317,7 +311,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -325,7 +318,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Decimal Attribute Backend Table');
@@ -400,7 +392,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -408,7 +399,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -416,7 +406,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Integer Attribute Backend Table');
@@ -496,7 +485,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -509,7 +497,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -517,7 +504,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Text Attribute Backend Table');
@@ -597,7 +583,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -610,7 +595,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -618,7 +602,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Varchar Attribute Backend Table');
@@ -709,7 +692,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -722,7 +704,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -730,7 +711,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Gallery Attribute Backend Table');
@@ -896,7 +876,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -909,7 +888,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -917,7 +895,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Category Datetime Attribute Backend Table');
@@ -1001,7 +978,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1014,7 +990,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1022,7 +997,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Category Decimal Attribute Backend Table');
@@ -1101,7 +1075,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1114,7 +1087,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1122,7 +1094,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Category Integer Attribute Backend Table');
@@ -1201,7 +1172,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1214,7 +1184,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1222,7 +1191,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Category Text Attribute Backend Table');
@@ -1306,7 +1274,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1319,7 +1286,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1327,7 +1293,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Category Varchar Attribute Backend Table');
@@ -1373,7 +1338,6 @@ class InstallSchema implements InstallSchemaInterface
'category_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1381,7 +1345,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product To Category Linkage Table');
@@ -1514,7 +1477,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1522,7 +1484,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1530,8 +1491,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment(
'Catalog Compare Table'
@@ -1569,7 +1529,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1577,7 +1536,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -1675,7 +1633,6 @@ class InstallSchema implements InstallSchemaInterface
'linked_product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1683,7 +1640,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1696,7 +1652,6 @@ class InstallSchema implements InstallSchemaInterface
'link_type_id',
$installer->getTable('catalog_product_link_type'),
'link_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -1754,7 +1709,6 @@ class InstallSchema implements InstallSchemaInterface
'link_type_id',
$installer->getTable('catalog_product_link_type'),
'link_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -1821,7 +1775,6 @@ class InstallSchema implements InstallSchemaInterface
'link_id',
$installer->getTable('catalog_product_link'),
'link_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1834,7 +1787,6 @@ class InstallSchema implements InstallSchemaInterface
'product_link_attribute_id',
$installer->getTable('catalog_product_link_attribute'),
'product_link_attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -1901,7 +1853,6 @@ class InstallSchema implements InstallSchemaInterface
'link_id',
$installer->getTable('catalog_product_link'),
'link_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1914,7 +1865,6 @@ class InstallSchema implements InstallSchemaInterface
'product_link_attribute_id',
$installer->getTable('catalog_product_link_attribute'),
'product_link_attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -1981,7 +1931,6 @@ class InstallSchema implements InstallSchemaInterface
'link_id',
$installer->getTable('catalog_product_link'),
'link_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -1994,7 +1943,6 @@ class InstallSchema implements InstallSchemaInterface
'product_link_attribute_id',
$installer->getTable('catalog_product_link_attribute'),
'product_link_attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2086,7 +2034,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2099,7 +2046,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2107,7 +2053,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2169,7 +2114,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2182,7 +2126,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2258,7 +2201,6 @@ class InstallSchema implements InstallSchemaInterface
'value_id',
$installer->getTable('catalog_product_entity_media_gallery'),
'value_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2266,7 +2208,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2279,7 +2220,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2374,7 +2314,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2448,7 +2387,6 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('catalog_product_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2456,7 +2394,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2523,7 +2460,6 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('catalog_product_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2531,7 +2467,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2663,7 +2598,6 @@ class InstallSchema implements InstallSchemaInterface
'option_type_id',
$installer->getTable('catalog_product_option_type_value'),
'option_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2671,7 +2605,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2738,7 +2671,6 @@ class InstallSchema implements InstallSchemaInterface
'option_type_id',
$installer->getTable('catalog_product_option_type_value'),
'option_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2746,7 +2678,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2908,7 +2839,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -2947,7 +2877,6 @@ class InstallSchema implements InstallSchemaInterface
'child_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -2955,7 +2884,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -3169,7 +3097,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -3182,7 +3109,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -3190,7 +3116,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -3252,7 +3177,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -3265,7 +3189,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -3273,7 +3196,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -3319,7 +3241,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -4605,7 +4526,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -4618,7 +4538,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -4631,7 +4550,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
@@ -4694,7 +4612,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -4707,7 +4624,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -4715,7 +4631,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment(
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
index d7730876dd43e08eec57a8789f719d4262a2b3fa..aa6705a61ca829bc17506700a82eaaef67602093 100644
--- a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
@@ -283,7 +283,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -291,7 +290,6 @@ class InstallSchema implements InstallSchemaInterface
'stock_id',
$installer->getTable('cataloginventory_stock'),
'stock_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Cataloginventory Stock Item');
diff --git a/app/code/Magento/CatalogRule/Setup/InstallSchema.php b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
index 7c9fd560f92a857956d04366b247c52e8b33690e..610434b70a4448f545de5db717fc93e15dfced94 100644
--- a/app/code/Magento/CatalogRule/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
@@ -418,7 +418,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -426,7 +425,6 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('catalogrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -434,7 +432,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('CatalogRule Group Website');
@@ -469,7 +466,6 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('catalogrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -477,7 +473,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Rules To Websites Relations');
@@ -512,7 +507,6 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('catalogrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -525,7 +519,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Rules To Customer Groups Relations');
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php b/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
index baed812982fcbaf707c62d6b2c37c2851617f93e..88acf7808b614cd0654f92eecd70e37f27cc9200 100644
--- a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
@@ -57,7 +57,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -65,7 +64,6 @@ class InstallSchema implements InstallSchemaInterface
'category_id',
$installer->getTable('catalog_category_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -73,7 +71,6 @@ class InstallSchema implements InstallSchemaInterface
'url_rewrite_id',
$installer->getTable('url_rewrite'),
'url_rewrite_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('url_rewrite_relation');
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 27f72fb347f391cd41e74da27eb83713e46abd1a..8cf93dd33eaa66b2e65598029299152b508dc991 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -34,7 +34,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
protected $_directoryBlock;
/**
- * @var \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface
+ * @var \Magento\Shipping\Model\CarrierFactoryInterface
*/
protected $_carrierFactory;
@@ -48,7 +48,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Directory\Block\Data $directoryBlock
- * @param \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface $carrierFactory
+ * @param \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory
* @param PriceCurrencyInterface $priceCurrency
* @param array $data
*/
@@ -57,7 +57,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
\Magento\Customer\Model\Session $customerSession,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Directory\Block\Data $directoryBlock,
- \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface $carrierFactory,
+ \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory,
PriceCurrencyInterface $priceCurrency,
array $data = []
) {
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 50db79346bdbb9c2e5c0f05a300135a83e6d7161..2877afcf85ed8820a084c34cd72c03874baf4996 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -10,6 +10,7 @@
"magento/module-customer": "0.74.0-beta4",
"magento/module-catalog": "0.74.0-beta4",
"magento/module-payment": "0.74.0-beta4",
+ "magento/module-shipping": "0.74.0-beta4",
"magento/module-tax": "0.74.0-beta4",
"magento/module-directory": "0.74.0-beta4",
"magento/module-eav": "0.74.0-beta4",
diff --git a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
index 2b782a0ed9bf781c7f262f24df3f87c3d9ada9bc..d4df1585bb67b80436fde0e266ddaef1225b6bd1 100644
--- a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
+++ b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
@@ -97,14 +97,12 @@ class InstallSchema implements InstallSchemaInterface
'agreement_id',
$installer->getTable('checkout_agreement'),
'agreement_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('checkout_agreement_store', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Checkout Agreement Store'
diff --git a/app/code/Magento/Cms/Setup/InstallSchema.php b/app/code/Magento/Cms/Setup/InstallSchema.php
index d57b656b110393c18585834c08f84c813fad474e..00c2eba7289fe191a41b801fc3c8ad0749a4c20a 100644
--- a/app/code/Magento/Cms/Setup/InstallSchema.php
+++ b/app/code/Magento/Cms/Setup/InstallSchema.php
@@ -102,14 +102,12 @@ class InstallSchema implements InstallSchemaInterface
'block_id',
$installer->getTable('cms_block'),
'block_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('cms_block_store', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'CMS Block To Store Linkage Table'
@@ -262,14 +260,12 @@ class InstallSchema implements InstallSchemaInterface
'page_id',
$installer->getTable('cms_page'),
'page_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('cms_page_store', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'CMS Page To Store Linkage Table'
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
index 51ce770c9aa042b6da48a047baa8752c3e67f706..d4514e8618dbdb4f9f62f98d9ea828d10d7ad6be 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
@@ -77,8 +77,7 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Super Attribute Table');
@@ -147,7 +146,6 @@ class InstallSchema implements InstallSchemaInterface
'product_super_attribute_id',
$installer->getTable('catalog_product_super_attribute'),
'product_super_attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -155,7 +153,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Super Attribute Label Table');
@@ -231,7 +228,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -244,7 +240,6 @@ class InstallSchema implements InstallSchemaInterface
'product_super_attribute_id',
$installer->getTable('catalog_product_super_attribute'),
'product_super_attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Super Attribute Pricing Table');
@@ -300,7 +295,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -308,7 +302,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Catalog Product Super Link Table');
diff --git a/app/code/Magento/Customer/Setup/InstallSchema.php b/app/code/Magento/Customer/Setup/InstallSchema.php
index d4a9815838c9e3d0d68a5795b6875cc034d8eac6..6f6750f3797043f4f25cfb78b4fd5e83bd0f0b6a 100644
--- a/app/code/Magento/Customer/Setup/InstallSchema.php
+++ b/app/code/Magento/Customer/Setup/InstallSchema.php
@@ -123,15 +123,13 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->addForeignKey(
$installer->getFkName('customer_entity', 'website_id', 'store_website', 'website_id'),
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Customer Entity'
);
@@ -262,7 +260,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -274,7 +271,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('customer_address_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -286,7 +282,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Address Entity Datetime'
@@ -350,7 +345,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -362,7 +356,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('customer_address_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -374,7 +367,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Address Entity Decimal'
@@ -438,21 +430,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_address_entity_int', 'entity_id', 'customer_address_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_address_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_address_entity_int', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Address Entity Int'
@@ -513,14 +502,12 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_address_entity_text', 'entity_id', 'customer_address_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_address_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -532,7 +519,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Address Entity Text'
@@ -596,7 +582,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -608,7 +593,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('customer_address_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -620,7 +604,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Address Entity Varchar'
@@ -684,21 +667,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_datetime', 'entity_id', 'customer_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_datetime', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Entity Datetime'
@@ -762,21 +742,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_decimal', 'entity_id', 'customer_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_decimal', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Entity Decimal'
@@ -840,21 +817,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_int', 'entity_id', 'customer_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_int', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Entity Int'
@@ -915,21 +889,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_text', 'entity_id', 'customer_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_text', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Entity Text'
@@ -993,21 +964,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_varchar', 'entity_id', 'customer_entity', 'entity_id'),
'entity_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_entity_varchar', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Entity Varchar'
@@ -1100,7 +1068,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Eav Attribute'
@@ -1132,7 +1099,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Form Attribute'
@@ -1188,14 +1154,12 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('customer_eav_attribute_website', 'website_id', 'store_website', 'website_id'),
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Customer Eav Attribute Website'
diff --git a/app/code/Magento/DesignEditor/Setup/InstallSchema.php b/app/code/Magento/DesignEditor/Setup/InstallSchema.php
index e6a87de0bc1f10d3d7d8c2b03b881b0a62b90a10..d5edc3e7e86d98eec58a52b36111134615284f64 100644
--- a/app/code/Magento/DesignEditor/Setup/InstallSchema.php
+++ b/app/code/Magento/DesignEditor/Setup/InstallSchema.php
@@ -51,7 +51,6 @@ class InstallSchema implements InstallSchemaInterface
'theme_id',
$setup->getTable('theme'),
'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Design Editor Theme Change'
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 6d5c1720a2ce7b03dd418fb59139810ca3592116..dc2388e4e0c5606d3fbc3ff45c0a36d97d128da4 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -295,10 +295,10 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
/**
* Collect and get rates
*
- * @param RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return bool|Result|null
*/
- public function collectRates(RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag($this->_activeFlag)) {
return false;
@@ -1255,10 +1255,10 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
/**
* Processing additional validation to check is carrier applicable.
*
- * @param RateRequest $request
- * @return $this|Error|boolean
+ * @param \Magento\Framework\Object $request
+ * @return $this|\Magento\Framework\Object|boolean
*/
- public function proccessAdditionalValidation(RateRequest $request)
+ public function proccessAdditionalValidation(\Magento\Framework\Object $request)
{
//Skip by item validation if there is no items in request
if (!count($this->getAllItems($request))) {
diff --git a/app/code/Magento/Directory/Setup/InstallSchema.php b/app/code/Magento/Directory/Setup/InstallSchema.php
index e28328894d0223e232d15ec445244cb4bdac5b2b..101ccd3ededc4c46b5f92e2950d0aa1e5abbb537 100644
--- a/app/code/Magento/Directory/Setup/InstallSchema.php
+++ b/app/code/Magento/Directory/Setup/InstallSchema.php
@@ -168,7 +168,6 @@ class InstallSchema implements InstallSchemaInterface
'region_id',
$installer->getTable('directory_country_region'),
'region_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Directory Country Region Name'
diff --git a/app/code/Magento/Downloadable/Setup/InstallSchema.php b/app/code/Magento/Downloadable/Setup/InstallSchema.php
index 101da102b1418efda65a311856d4cb5ebb9ee6c5..e7043312e7a49331987f862339b2d8463041f45f 100644
--- a/app/code/Magento/Downloadable/Setup/InstallSchema.php
+++ b/app/code/Magento/Downloadable/Setup/InstallSchema.php
@@ -116,7 +116,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Downloadable Link Table');
@@ -164,7 +163,6 @@ class InstallSchema implements InstallSchemaInterface
'link_id',
$installer->getTable('downloadable_link'),
'link_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addIndex(
@@ -176,7 +174,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Downloadable Link Price Table');
@@ -274,16 +271,14 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->addForeignKey(
$installer->getFkName('downloadable_link_purchased', 'order_id', 'sales_order', 'entity_id'),
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Downloadable Link Purchased Table');
$installer->getConnection()->createTable($table);
@@ -427,7 +422,6 @@ class InstallSchema implements InstallSchemaInterface
'purchased_id',
$installer->getTable('downloadable_link_purchased'),
'purchased_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -440,8 +434,7 @@ class InstallSchema implements InstallSchemaInterface
'order_item_id',
$installer->getTable('sales_order_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Downloadable Link Purchased Item Table');
$installer->getConnection()->createTable($table);
@@ -493,7 +486,6 @@ class InstallSchema implements InstallSchemaInterface
'link_id',
$installer->getTable('downloadable_link'),
'link_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addIndex(
@@ -505,7 +497,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Link Title Table');
@@ -567,7 +558,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Downloadable Sample Table');
@@ -620,7 +610,6 @@ class InstallSchema implements InstallSchemaInterface
'sample_id',
$installer->getTable('downloadable_sample'),
'sample_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addIndex(
@@ -632,7 +621,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Downloadable Sample Title Table');
diff --git a/app/code/Magento/Eav/Setup/InstallSchema.php b/app/code/Magento/Eav/Setup/InstallSchema.php
index 9fb0d559cce5b8af7a54bfca2f6f7ecbb854e1a0..244cfe2d85e9e56e0e5771ef30b4c3b8888fbc0f 100644
--- a/app/code/Magento/Eav/Setup/InstallSchema.php
+++ b/app/code/Magento/Eav/Setup/InstallSchema.php
@@ -204,14 +204,12 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity'
@@ -281,21 +279,18 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('eav_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_datetime', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_datetime', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Value Prefix'
@@ -365,21 +360,18 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('eav_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_decimal', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_decimal', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Value Prefix'
@@ -449,21 +441,18 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('eav_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_int', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_int', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Value Prefix'
@@ -533,21 +522,18 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('eav_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_text', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_text', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Value Prefix'
@@ -617,21 +603,18 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('eav_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_varchar', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_varchar', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Value Prefix'
@@ -758,7 +741,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute'
@@ -811,14 +793,12 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_entity_store', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Store'
@@ -870,7 +850,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute Set'
@@ -940,7 +919,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_set_id',
$installer->getTable('eav_attribute_set'),
'attribute_set_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute Group'
@@ -1015,7 +993,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -1027,7 +1004,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_group_id',
$installer->getTable('eav_attribute_group'),
'attribute_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Entity Attributes'
@@ -1065,7 +1041,6 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute Option'
@@ -1112,14 +1087,12 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('eav_attribute_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_attribute_option_value', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute Option Value'
@@ -1166,14 +1139,12 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_attribute_label', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Attribute Label'
@@ -1237,7 +1208,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Form Type'
@@ -1269,14 +1239,12 @@ class InstallSchema implements InstallSchemaInterface
'entity_type_id',
$installer->getTable('eav_entity_type'),
'entity_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_form_type_entity', 'type_id', 'eav_form_type', 'type_id'),
'type_id',
$installer->getTable('eav_form_type'),
'type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Form Type Entity'
@@ -1325,7 +1293,6 @@ class InstallSchema implements InstallSchemaInterface
'type_id',
$installer->getTable('eav_form_type'),
'type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Form Fieldset'
@@ -1363,14 +1330,12 @@ class InstallSchema implements InstallSchemaInterface
'fieldset_id',
$installer->getTable('eav_form_fieldset'),
'fieldset_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_form_fieldset_label', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Form Fieldset Label'
@@ -1431,21 +1396,18 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('eav_form_element', 'fieldset_id', 'eav_form_fieldset', 'fieldset_id'),
'fieldset_id',
$installer->getTable('eav_form_fieldset'),
'fieldset_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->addForeignKey(
$installer->getFkName('eav_form_element', 'type_id', 'eav_form_type', 'type_id'),
'type_id',
$installer->getTable('eav_form_type'),
'type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Eav Form Element'
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 51ac852ac050d79893f68a4dc7a1d4fc47da9ad8..66f266dd1a8450611cba7a72e55e406a135e6caa 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -236,10 +236,10 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
/**
* Collect and get rates
*
- * @param RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return Result|bool|null
*/
- public function collectRates(RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag($this->_activeFlag)) {
return false;
diff --git a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
index a43eb599a8d722bbfafe95504703ee86c22c7ca8..e15c6b957e2231a9f9506f923c1f94d3b2c0dad9 100644
--- a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
+++ b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
@@ -78,7 +78,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Google Experiment code');
diff --git a/app/code/Magento/Integration/Setup/InstallSchema.php b/app/code/Magento/Integration/Setup/InstallSchema.php
index f3522a162f2fcb8776620150433a18c16cc09395..7c6bfda56692ba91f7ceb1170b00f28b055c88a4 100644
--- a/app/code/Magento/Integration/Setup/InstallSchema.php
+++ b/app/code/Magento/Integration/Setup/InstallSchema.php
@@ -211,21 +211,18 @@ class InstallSchema implements InstallSchemaInterface
'admin_id',
$adminTable,
'user_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('oauth_token', 'consumer_id', 'oauth_consumer', 'entity_id'),
'consumer_id',
$installer->getTable('oauth_consumer'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('oauth_token', 'customer_id', 'customer_entity', 'entity_id'),
'customer_id',
$customerTable,
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'OAuth Tokens'
@@ -268,7 +265,6 @@ class InstallSchema implements InstallSchemaInterface
'consumer_id',
$installer->getTable('oauth_consumer'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'OAuth Nonce'
@@ -361,7 +357,6 @@ class InstallSchema implements InstallSchemaInterface
'consumer_id',
$installer->getTable('oauth_consumer'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
);
diff --git a/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Database.php b/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Database.php
index 6c77da1c9f7f4a7bd05d6f74ca3d476d20b03041..1d1c0c7224c383dd59a48ee93e017b7eaf9b80d8 100644
--- a/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Database.php
+++ b/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Database.php
@@ -109,7 +109,6 @@ class Database extends \Magento\MediaStorage\Model\Resource\File\Storage\Abstrac
'directory_id',
$dirStorageTable,
'directory_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'File Storage'
diff --git a/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Directory/Database.php
index 8291cd225711713be1671f237f6cd42998ddb55f..0ea6567f6404adc0630b0a132af105a0c1985bd5 100644
--- a/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Directory/Database.php
+++ b/app/code/Magento/MediaStorage/Model/Resource/File/Storage/Directory/Database.php
@@ -81,7 +81,6 @@ class Database extends \Magento\MediaStorage\Model\Resource\File\Storage\Abstrac
'parent_id',
$table,
'directory_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Directory Storage'
diff --git a/app/code/Magento/Newsletter/Setup/InstallSchema.php b/app/code/Magento/Newsletter/Setup/InstallSchema.php
index 87ad2e8adcca1e752c396dccefc41423777758bd..f567558d0550f4ad4987a2b13d3418093c147c7c 100644
--- a/app/code/Magento/Newsletter/Setup/InstallSchema.php
+++ b/app/code/Magento/Newsletter/Setup/InstallSchema.php
@@ -92,8 +92,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Newsletter Subscriber');
$installer->getConnection()->createTable($table);
@@ -293,7 +292,6 @@ class InstallSchema implements InstallSchemaInterface
'template_id',
$installer->getTable('newsletter_template'),
'template_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Newsletter Queue');
@@ -345,7 +343,6 @@ class InstallSchema implements InstallSchemaInterface
'queue_id',
$installer->getTable('newsletter_queue'),
'queue_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -358,7 +355,6 @@ class InstallSchema implements InstallSchemaInterface
'subscriber_id',
$installer->getTable('newsletter_subscriber'),
'subscriber_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Newsletter Queue Link');
@@ -392,7 +388,6 @@ class InstallSchema implements InstallSchemaInterface
'queue_id',
$installer->getTable('newsletter_queue'),
'queue_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -400,7 +395,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Newsletter Queue Store Link');
@@ -459,7 +453,6 @@ class InstallSchema implements InstallSchemaInterface
'queue_id',
$installer->getTable('newsletter_queue'),
'queue_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -467,7 +460,6 @@ class InstallSchema implements InstallSchemaInterface
'subscriber_id',
$installer->getTable('newsletter_subscriber'),
'subscriber_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Newsletter Problems');
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
index ff96421b77034d67dc4cf1cb6ab6c4d83077d3ad..d85a0d771d2fb3a8602b779c84ca27c9204efccf 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
@@ -55,12 +55,12 @@ class Flatrate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implement
}
/**
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return Result|bool
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag('active')) {
return false;
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 0586b180b8832ae34b16ca6267c77dab93df82e4..fdbc3c264671dfe4714d0f003a48d54efcba85dc 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -58,10 +58,10 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
/**
* FreeShipping Rates Collector
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return \Magento\Shipping\Model\Rate\Result|bool
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag('active')) {
return false;
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
index e1411217d1d5d1b96dae3cfd82ee4ba78047b4b1..40df2042c043dbb3782b0d3e6b8f3d6a1d304734 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
@@ -50,11 +50,11 @@ class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
}
/**
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return \Magento\Shipping\Model\Rate\Result
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag('active')) {
return false;
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index 4456feee0578c38c56347f4ec2f474d5d5d765fa..21c1fc1cf75899ce1fdbb49c15e31c9865d57c32 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -72,13 +72,13 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
}
/**
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return \Magento\Shipping\Model\Rate\Result
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag('active')) {
return false;
diff --git a/app/code/Magento/Payment/Model/Cart.php b/app/code/Magento/Payment/Model/Cart.php
index 85962afa760aac013aa161f98e21225336030a10..436bdc899a48d198278823bd4ec1c381384d6447 100644
--- a/app/code/Magento/Payment/Model/Cart.php
+++ b/app/code/Magento/Payment/Model/Cart.php
@@ -75,7 +75,7 @@ class Cart
/**
* @param \Magento\Payment\Model\Cart\SalesModel\Factory $salesModelFactory
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Sales\Model\Order|\Magento\Quote\Model\Quote $salesModel
+ * @param \Magento\Quote\Api\Data\CartInterface $salesModel
*/
public function __construct(
\Magento\Payment\Model\Cart\SalesModel\Factory $salesModelFactory,
@@ -91,6 +91,7 @@ class Cart
* Return payment cart sales model
*
* @return \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
+ * @api
*/
public function getSalesModel()
{
@@ -102,6 +103,7 @@ class Cart
*
* @param float $taxAmount
* @return void
+ * @api
*/
public function addTax($taxAmount)
{
@@ -113,6 +115,7 @@ class Cart
*
* @param float $taxAmount
* @return void
+ * @api
*/
public function setTax($taxAmount)
{
@@ -123,6 +126,7 @@ class Cart
* Get tax amount
*
* @return float
+ * @api
*/
public function getTax()
{
@@ -134,6 +138,7 @@ class Cart
*
* @param float $discountAmount
* @return void
+ * @api
*/
public function addDiscount($discountAmount)
{
@@ -145,6 +150,7 @@ class Cart
*
* @param float $discountAmount
* @return void
+ * @api
*/
public function setDiscount($discountAmount)
{
@@ -155,6 +161,7 @@ class Cart
* Get discount amount
*
* @return float
+ * @api
*/
public function getDiscount()
{
@@ -166,6 +173,7 @@ class Cart
*
* @param float $shippingAmount
* @return void
+ * @api
*/
public function addShipping($shippingAmount)
{
@@ -177,6 +185,7 @@ class Cart
*
* @param float $shippingAmount
* @return void
+ * @api
*/
public function setShipping($shippingAmount)
{
@@ -187,6 +196,7 @@ class Cart
* Get shipping amount
*
* @return float
+ * @api
*/
public function getShipping()
{
@@ -198,6 +208,7 @@ class Cart
*
* @param float $subtotalAmount
* @return void
+ * @api
*/
public function addSubtotal($subtotalAmount)
{
@@ -208,6 +219,7 @@ class Cart
* Get subtotal amount
*
* @return float
+ * @api
*/
public function getSubtotal()
{
@@ -222,6 +234,7 @@ class Cart
* @param float $amount
* @param string|null $identifier
* @return void
+ * @api
*/
public function addCustomItem($name, $qty, $amount, $identifier = null)
{
@@ -232,6 +245,7 @@ class Cart
* Get all cart items
*
* @return array
+ * @api
*/
public function getAllItems()
{
@@ -243,6 +257,7 @@ class Cart
* Get shipping, tax, subtotal and discount amounts all together
*
* @return array
+ * @api
*/
public function getAmounts()
{
@@ -255,6 +270,7 @@ class Cart
* Specify that shipping should be transferred as cart item
*
* @return void
+ * @api
*/
public function setTransferShippingAsItem()
{
@@ -265,6 +281,7 @@ class Cart
* Specify that discount should be transferred as cart item
*
* @return void
+ * @api
*/
public function setTransferDiscountAsItem()
{
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
index 186a6fc45f5c8dc0ffe77e8f31aa54476da796ba..f077e1a72f1870943e626cbcc0dc41c1062c9ac6 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
@@ -26,7 +26,7 @@ class Factory
/**
* Wrap sales model with Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
*
- * @param \Magento\Sales\Model\Order|\Magento\Quote\Model\Quote $salesModel
+ * @param \Magento\Quote\Api\Data\CartInterface $salesModel
* @return \Magento\Payment\Model\Cart\SalesModel\SalesModelInterface
* @throws \InvalidArgumentException
*/
diff --git a/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php b/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
index 117eb8b1d48e2ba5fd61cf5c504e67f6730c7003..a210f55bb3a2b3f7cb6a7d75d92377bac6070b17 100644
--- a/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
+++ b/app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php
@@ -14,26 +14,31 @@ interface SalesModelInterface
* Get all items from shopping sales model
*
* @return array
+ * @api
*/
public function getAllItems();
/**
* @return float|null
+ * @api
*/
public function getBaseSubtotal();
/**
* @return float|null
+ * @api
*/
public function getBaseTaxAmount();
/**
* @return float|null
+ * @api
*/
public function getBaseShippingAmount();
/**
* @return float|null
+ * @api
*/
public function getBaseDiscountAmount();
@@ -43,13 +48,15 @@ interface SalesModelInterface
* @param string $key
* @param mixed $args
* @return mixed
+ * @api
*/
public function getDataUsingMethod($key, $args = null);
/**
* Return object that contains tax related fields
*
- * @return \Magento\Sales\Model\Order|\Magento\Quote\Model\Quote\Address
+ * @return \Magento\Sales\Api\Data\OrderInterface|\Magento\Quote\Api\Data\AddressInterface
+ * @api
*/
public function getTaxContainer();
}
diff --git a/app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php b/app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php
index d2bb13d0eda1823369883e738efa3888c7507b65..9d2ad43801e5ebda0834b4c4adff7019e4631b65 100644
--- a/app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php
+++ b/app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php
@@ -14,6 +14,7 @@ interface PaymentMethodChecksInterface
* Retrieve payment method code
*
* @return string
+ * @api
*/
public function getCode();
@@ -22,6 +23,7 @@ interface PaymentMethodChecksInterface
* Can be used in admin
*
* @return bool
+ * @api
*/
public function canUseInternal();
@@ -29,6 +31,7 @@ interface PaymentMethodChecksInterface
* Can be used in regular checkout
*
* @return bool
+ * @api
*/
public function canUseCheckout();
@@ -37,6 +40,7 @@ interface PaymentMethodChecksInterface
*
* @param string $country
* @return bool
+ * @api
*/
public function canUseForCountry($country);
@@ -45,6 +49,7 @@ interface PaymentMethodChecksInterface
*
* @param string $currencyCode
* @return bool
+ * @api
*/
public function canUseForCurrency($currencyCode);
@@ -55,6 +60,7 @@ interface PaymentMethodChecksInterface
* @param int|string|null|\Magento\Store\Model\Store $storeId
*
* @return mixed
+ * @api
*/
public function getConfigData($field, $storeId = null);
}
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index 62a196bfce79f0b267fea1af1edc2cbf5dd35097..9d782ce97998d70e2a78f63ecd92a51fa7a1a2ed 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -86,6 +86,7 @@ class Config
* Retrieve active system payments
*
* @return array
+ * @api
*/
public function getActiveMethods()
{
@@ -107,6 +108,7 @@ class Config
* Get list of credit card types
*
* @return array
+ * @api
*/
public function getCcTypes()
{
@@ -117,6 +119,7 @@ class Config
* Retrieve array of payment methods information
*
* @return array
+ * @api
*/
public function getMethodsInfo()
{
@@ -127,6 +130,7 @@ class Config
* Get payment groups
*
* @return array
+ * @api
*/
public function getGroups()
{
@@ -137,6 +141,7 @@ class Config
* Retrieve list of months translation
*
* @return array
+ * @api
*/
public function getMonths()
{
@@ -155,6 +160,7 @@ class Config
* Retrieve array of available years
*
* @return array
+ * @api
*/
public function getYears()
{
diff --git a/app/code/Magento/Payment/Model/InfoInterface.php b/app/code/Magento/Payment/Model/InfoInterface.php
index 270ee9c16fe89c98208ec2f8ac1cde356adae12b..b39670441cf23d5fd320c6faf98f421ee39b5321 100644
--- a/app/code/Magento/Payment/Model/InfoInterface.php
+++ b/app/code/Magento/Payment/Model/InfoInterface.php
@@ -16,6 +16,7 @@ interface InfoInterface
*
* @param string $data
* @return string
+ * @api
*/
public function encrypt($data);
@@ -24,6 +25,7 @@ interface InfoInterface
*
* @param string $data
* @return string
+ * @api
*/
public function decrypt($data);
@@ -33,6 +35,7 @@ interface InfoInterface
* @param string $key
* @param string|null $value
* @return mixed
+ * @api
*/
public function setAdditionalInformation($key, $value = null);
@@ -41,6 +44,7 @@ interface InfoInterface
*
* @param mixed|null $key
* @return bool
+ * @api
*/
public function hasAdditionalInformation($key = null);
@@ -49,6 +53,7 @@ interface InfoInterface
*
* @param string|null $key
* @return $this
+ * @api
*/
public function unsAdditionalInformation($key = null);
@@ -57,6 +62,7 @@ interface InfoInterface
*
* @param string|null $key
* @return mixed
+ * @api
*/
public function getAdditionalInformation($key = null);
@@ -65,6 +71,7 @@ interface InfoInterface
*
* @return \Magento\Payment\Model\MethodInterface
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function getMethodInstance();
}
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 74e26082b6c0b7525c47b07c57f5c6cf08bc263d..e316982a1be7081f470bc8cb2493d19ea0debfea 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -260,6 +260,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check order availability
*
* @return bool
+ * @api
*/
public function canOrder()
{
@@ -270,6 +271,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check authorize availability
*
* @return bool
+ * @api
*/
public function canAuthorize()
{
@@ -280,6 +282,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check capture availability
*
* @return bool
+ * @api
*/
public function canCapture()
{
@@ -290,6 +293,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check partial capture availability
*
* @return bool
+ * @api
*/
public function canCapturePartial()
{
@@ -300,6 +304,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check whether capture can be performed once and no further capture possible
*
* @return bool
+ * @api
*/
public function canCaptureOnce()
{
@@ -310,6 +315,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check refund availability
*
* @return bool
+ * @api
*/
public function canRefund()
{
@@ -320,6 +326,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check partial refund availability for invoice
*
* @return bool
+ * @api
*/
public function canRefundPartialPerInvoice()
{
@@ -332,6 +339,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Framework\Object $payment
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function canVoid(\Magento\Framework\Object $payment)
{
@@ -363,6 +371,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Can be edit order (renew order)
*
* @return bool
+ * @api
*/
public function canEdit()
{
@@ -373,6 +382,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Check fetch transaction info availability
*
* @return bool
+ * @api
*/
public function canFetchTransactionInfo()
{
@@ -386,6 +396,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param string $transactionId
* @return array
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId)
{
@@ -396,6 +407,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Retrieve payment system relation flag
*
* @return bool
+ * @api
*/
public function isGateway()
{
@@ -406,6 +418,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Retrieve payment method online/offline flag
*
* @return bool
+ * @api
*/
public function isOffline()
{
@@ -416,6 +429,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Flag if we need to run payment initialize while order place
*
* @return bool
+ * @api
*/
public function isInitializeNeeded()
{
@@ -482,6 +496,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Retrieve block type for display method information
*
* @return string
+ * @api
*/
public function getInfoBlockType()
{
@@ -491,8 +506,9 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
/**
* Retrieve payment information model object
*
- * @return \Magento\Payment\Model\Info
+ * @return \Magento\Payment\Model\InfoInterface
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function getInfoInstance()
{
@@ -508,6 +524,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function validate()
{
@@ -537,6 +554,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function order(\Magento\Framework\Object $payment, $amount)
{
@@ -555,6 +573,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function authorize(\Magento\Framework\Object $payment, $amount)
{
@@ -573,6 +592,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function capture(\Magento\Framework\Object $payment, $amount)
{
@@ -591,6 +611,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param Invoice $invoice
* @param Payment $payment
* @return $this
+ * @api
*/
public function processInvoice($invoice, $payment)
{
@@ -606,6 +627,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param Invoice $invoice
* @param Payment $payment
* @return $this
+ * @api
*/
public function processBeforeRefund($invoice, $payment)
{
@@ -621,6 +643,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function refund(\Magento\Framework\Object $payment, $amount)
{
@@ -635,6 +658,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
* @param Payment $payment
* @return $this
+ * @api
*/
public function processCreditmemo($creditmemo, $payment)
{
@@ -649,6 +673,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @return $this
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function cancel(\Magento\Framework\Object $payment)
{
@@ -661,6 +686,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Framework\Object $payment
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function void(\Magento\Framework\Object $payment)
{
@@ -676,6 +702,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Payment\Model\InfoInterface $payment
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function canReviewPayment(\Magento\Payment\Model\InfoInterface $payment)
{
@@ -688,6 +715,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Payment\Model\InfoInterface $payment
* @return false
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
{
@@ -703,6 +731,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* @param \Magento\Payment\Model\InfoInterface $payment
* @return false
* @throws \Magento\Framework\Exception\LocalizedException
+ * @api
*/
public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
{
@@ -744,6 +773,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @param array|\Magento\Framework\Object $data
* @return $this
+ * @api
*/
public function assignData($data)
{
@@ -759,6 +789,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Prepare info instance for save
*
* @return $this
+ * @api
*/
public function prepareSave()
{
@@ -768,9 +799,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
/**
* Check whether payment method can be used
*
- * TODO: payment method instance is not supposed to know about quote
- *
- * @param \Magento\Quote\Model\Quote|null $quote
+ * @param \Magento\Quote\Api\Data\CartInterface|null $quote
* @return bool
*/
public function isAvailable($quote = null)
@@ -797,6 +826,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @return $this
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function initialize($paymentAction, $stateObject)
{
@@ -808,6 +838,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
* Used to universalize payment actions when processing payment place
*
* @return string
+ * @api
*/
public function getConfigPaymentAction()
{
@@ -832,6 +863,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @return bool
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
+ * @api
*/
public function getDebugFlag()
{
@@ -843,6 +875,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
*
* @param mixed $debugData
* @return void
+ * @api
*/
public function debugData($debugData)
{
diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
index 167f88c7e9fca09662aaad2148ed7c3599c210f9..978e75c5840aaeae528aad5111f93b3c77fc75c5 100644
--- a/app/code/Magento/Payment/Model/Method/Cc.php
+++ b/app/code/Magento/Payment/Model/Method/Cc.php
@@ -250,6 +250,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
/**
* @return bool
+ * @api
*/
public function hasVerification()
{
@@ -262,6 +263,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
/**
* @return array
+ * @api
*/
public function getVerificationRegEx()
{
@@ -298,6 +300,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
/**
* @param string $type
* @return bool
+ * @api
*/
public function otherCcType($type)
{
@@ -309,6 +312,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
*
* @param string $ccNumber
* @return bool
+ * @api
*/
public function validateCcNum($ccNumber)
{
@@ -348,6 +352,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
*
* @param string $ccNumber
* @return bool
+ * @api
*/
public function validateCcNumOther($ccNumber)
{
@@ -357,7 +362,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
/**
* Check whether there are CC types set in configuration
*
- * @param \Magento\Quote\Model\Quote|null $quote
+ * @param \Magento\Quote\Api\Data\CartInterface|null $quote
* @return bool
*/
public function isAvailable($quote = null)
diff --git a/app/code/Magento/Payment/Model/MethodInterface.php b/app/code/Magento/Payment/Model/MethodInterface.php
index 0e6c1da86887622a33d98efeb2df06b65e14741b..f800703d73e3cf04cbbd8294c70262e5fb60ae0a 100644
--- a/app/code/Magento/Payment/Model/MethodInterface.php
+++ b/app/code/Magento/Payment/Model/MethodInterface.php
@@ -15,6 +15,7 @@ interface MethodInterface
* Retrieve payment method code
*
* @return string
+ * @api
*/
public function getCode();
@@ -22,6 +23,7 @@ interface MethodInterface
* Retrieve block type for method form generation
*
* @return string
+ * @api
*/
public function getFormBlockType();
@@ -29,6 +31,7 @@ interface MethodInterface
* Retrieve payment method title
*
* @return string
+ * @api
*/
public function getTitle();
}
diff --git a/app/code/Magento/Payment/Model/MethodList.php b/app/code/Magento/Payment/Model/MethodList.php
index 8ba8a76d77acc33da2bb8e9c2f1423776ed76313..5d486411b9f7a8d63139579ff76d55d13e26ccb8 100644
--- a/app/code/Magento/Payment/Model/MethodList.php
+++ b/app/code/Magento/Payment/Model/MethodList.php
@@ -33,10 +33,11 @@ class MethodList
}
/**
- * @param \Magento\Quote\Model\Quote $quote
+ * @param \Magento\Quote\Api\Data\CartInterface $quote
* @return \Magento\Payment\Model\MethodInterface[]
+ * @api
*/
- public function getAvailableMethods(\Magento\Quote\Model\Quote $quote = null)
+ public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote = null)
{
$store = $quote ? $quote->getStoreId() : null;
$methods = [];
@@ -54,10 +55,10 @@ class MethodList
* Check payment method model
*
* @param \Magento\Payment\Model\MethodInterface $method
- * @param \Magento\Quote\Model\Quote $quote
+ * @param \Magento\Quote\Api\Data\CartInterface $quote
* @return bool
*/
- protected function _canUseMethod($method, \Magento\Quote\Model\Quote $quote)
+ protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface $quote)
{
return $this->methodSpecificationFactory->create(
[
diff --git a/app/code/Magento/ProductAlert/Setup/InstallSchema.php b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
index 6b8e6b732f368e00e1b40579d23956c81578dc06..8ccda0176f7682591e0a283f97287450c331ae2d 100644
--- a/app/code/Magento/ProductAlert/Setup/InstallSchema.php
+++ b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
@@ -97,21 +97,18 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('product_alert_price', 'product_id', 'catalog_product_entity', 'entity_id'),
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('product_alert_price', 'website_id', 'store_website', 'website_id'),
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Product Alert Price'
@@ -185,21 +182,18 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('product_alert_stock', 'customer_id', 'customer_entity', 'entity_id'),
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('product_alert_stock', 'product_id', 'catalog_product_entity', 'entity_id'),
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Product Alert Stock'
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 1d663cfd5d942c84d88a63f9161cdc9773f2c4aa..88010642002f69ba6d36ff56c882fd2f96076ccd 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2253,12 +2253,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
{
if (!$this->getReservedOrderId()) {
$this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
- } else {
- //checking if reserved order id was already used for some order
- //if yes reserving new one if not using old one
- if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
- $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
- }
}
return $this;
}
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index c57a8d0d5e8163661cdb1e240d60924801c3e5bb..4cddfa347659b75a2930348d1fb19cf54bf3226c 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -248,7 +248,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
* @param \Magento\Quote\Model\Quote\Address\Total\CollectorFactory $totalCollectorFactory
* @param Address\TotalFactory $addressTotalFactory
* @param \Magento\Framework\Object\Copy $objectCopyService
- * @param Address\CarrierFactoryInterface $carrierFactory
+ * @param \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory
* @param Address\Validator $validator
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -280,7 +280,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
\Magento\Quote\Model\Quote\Address\Total\CollectorFactory $totalCollectorFactory,
\Magento\Quote\Model\Quote\Address\TotalFactory $addressTotalFactory,
\Magento\Framework\Object\Copy $objectCopyService,
- \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface $carrierFactory,
+ \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory,
Address\Validator $validator,
\Magento\Customer\Model\Address\Mapper $addressMapper,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
index 6f58b342a667a7b0a56dee8e649007f5710ddfba..3b4649c44736fce125edcde2e664247dd5a22411 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
@@ -75,7 +75,8 @@ class ToOrder
'\Magento\Sales\Api\Data\OrderInterface'
);
$order->setStoreId($object->getQuote()->getStoreId())
- ->setQuoteId($object->getQuote()->getId());
+ ->setQuoteId($object->getQuote()->getId())
+ ->setIncrementId($object->getQuote()->getReservedOrderId());
$this->objectCopyService->copyFieldsetToTarget('sales_convert_quote', 'to_order', $object->getQuote(), $order);
$this->eventManager->dispatch(
diff --git a/app/code/Magento/Quote/Model/Resource/Quote.php b/app/code/Magento/Quote/Model/Resource/Quote.php
index 4483f59150e89ab68d768e1971b2507ce8461194..990902300124466ee9cdc4a3437425e9f5841156 100644
--- a/app/code/Magento/Quote/Model/Resource/Quote.php
+++ b/app/code/Magento/Quote/Model/Resource/Quote.php
@@ -16,22 +16,22 @@ use Magento\Framework\Model\Resource\Db\AbstractDb;
class Quote extends AbstractDb
{
/**
- * @var \Magento\Eav\Model\Config
+ * @var \Magento\SalesSequence\Model\Manager
*/
- protected $_config;
+ protected $sequenceManager;
/**
* @param \Magento\Framework\Model\Resource\Db\Context $context
- * @param \Magento\Eav\Model\Config $config
- * @param string|null $resourcePrefix
+ * @param \Magento\SalesSequence\Model\Manager $sequenceManager
+ * @param null $resourcePrefix
*/
public function __construct(
\Magento\Framework\Model\Resource\Db\Context $context,
- \Magento\Eav\Model\Config $config,
+ \Magento\SalesSequence\Model\Manager $sequenceManager,
$resourcePrefix = null
) {
parent::__construct($context, $resourcePrefix);
- $this->_config = $config;
+ $this->sequenceManager = $sequenceManager;
}
/**
@@ -156,28 +156,8 @@ class Quote extends AbstractDb
*/
public function getReservedOrderId($quote)
{
- $storeId = (int)$quote->getStoreId();
- return $this->_config->getEntityType(\Magento\Sales\Model\Order::ENTITY)->fetchNewIncrementId($storeId);
- }
-
- /**
- * Check is order increment id use in sales/order table
- *
- * @param int $orderIncrementId
- * @return bool
- */
- public function isOrderIncrementIdUsed($orderIncrementId)
- {
- $adapter = $this->_getReadAdapter();
- $bind = [':increment_id' => $orderIncrementId];
- $select = $adapter->select();
- $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
- $entity_id = $adapter->fetchOne($select, $bind);
- if ($entity_id > 0) {
- return true;
- }
-
- return false;
+ return $this->sequenceManager->getSequence(\Magento\Sales\Model\Order::ENTITY, (int)$quote->getStoreId())
+ ->getNextValue();
}
/**
diff --git a/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
index 6801bb83f5e43e43ad241ac5fed14dae285e9302..f21945483c6873facccac4eb9efeebe611ba723c 100644
--- a/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
@@ -24,7 +24,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface $carrierFactory
+ * @param \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory
* @param \Zend_Db_Adapter_Abstract $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -33,7 +33,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Quote\Model\Quote\Address\CarrierFactoryInterface $carrierFactory,
+ \Magento\Shipping\Model\CarrierFactoryInterface $carrierFactory,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php
index 5e736acaaabe153a06ad2ff08fb848204673a164..7e9947028060c0ec596393146748c4e5907b7789 100644
--- a/app/code/Magento/Quote/Setup/InstallSchema.php
+++ b/app/code/Magento/Quote/Setup/InstallSchema.php
@@ -334,7 +334,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote'
@@ -684,7 +683,6 @@ class InstallSchema implements InstallSchemaInterface
'quote_id',
$installer->getTable('quote'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote Address'
@@ -965,29 +963,25 @@ class InstallSchema implements InstallSchemaInterface
'parent_item_id',
$installer->getTable('quote_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id'),
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('quote_item', 'quote_id', 'quote', 'entity_id'),
'quote_id',
$installer->getTable('quote'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('quote_item', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Quote Item'
);
@@ -1245,7 +1239,6 @@ class InstallSchema implements InstallSchemaInterface
'quote_address_id',
$installer->getTable('quote_address'),
'address_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -1257,14 +1250,12 @@ class InstallSchema implements InstallSchemaInterface
'parent_item_id',
$installer->getTable('quote_address_item'),
'address_item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('quote_address_item', 'quote_item_id', 'quote_item', 'item_id'),
'quote_item_id',
$installer->getTable('quote_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote Address Item'
@@ -1314,7 +1305,6 @@ class InstallSchema implements InstallSchemaInterface
'item_id',
$installer->getTable('quote_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote Item Option'
@@ -1448,7 +1438,6 @@ class InstallSchema implements InstallSchemaInterface
'quote_id',
$installer->getTable('quote'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote Payment'
@@ -1540,7 +1529,6 @@ class InstallSchema implements InstallSchemaInterface
'address_id',
$installer->getTable('quote_address'),
'address_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Quote Shipping Rate'
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php
index 8dea99e3bed4cc480d50780aff182647a8d95a37..0859ec68fe7bde8d106915f6a98a7c013813872b 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php
@@ -84,7 +84,7 @@ class ToOrderTest extends \PHPUnit_Framework_TestCase
$object = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
$quote = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
- $object->expects($this->exactly(4))->method('getQuote')->willReturn($quote);
+ $object->expects($this->exactly(5))->method('getQuote')->willReturn($quote);
$quote->expects($this->once())->method('getId')->willReturn($quoteId);
$quote->expects($this->once())->method('getStoreId')->willReturn($storeId);
$this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Resource/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/Resource/QuoteTest.php
deleted file mode 100644
index 33885a47c6bb30365fdff0b0ca2ed287dc4a2bf8..0000000000000000000000000000000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/Resource/QuoteTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Quote\Test\Unit\Model\Resource;
-
-class QuoteTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Quote\Model\Resource\Quote
- */
- protected $model;
-
- /**
- * @var \Magento\Framework\App\Resource
- */
- protected $resourceMock;
-
- /**
- * @var \Magento\Eav\Model\Config
- */
- protected $configMock;
-
- /**
- * @var \Magento\Framework\DB\Adapter\Pdo\Mysql
- */
- protected $adapterMock;
-
- /**
- * @var \Magento\Framework\DB\Select
- */
- protected $selectMock;
-
- protected function setUp()
- {
- $this->selectMock = $this->getMock('\Magento\Framework\DB\Select', [], [], '', false);
- $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
- $this->selectMock->expects($this->any())->method('where');
-
- $this->adapterMock = $this->getMock('\Magento\Framework\DB\Adapter\Pdo\Mysql', [], [], '', false);
- $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
-
- $this->resourceMock = $this->getMock('\Magento\Framework\App\Resource', [], [], '', false);
- $this->resourceMock->expects(
- $this->any()
- )->method(
- 'getConnection'
- )->will(
- $this->returnValue($this->adapterMock)
- );
-
- $this->configMock = $this->getMock('\Magento\Eav\Model\Config', [], [], '', false);
-
- $contextMock = $this->getMock('\Magento\Framework\Model\Resource\Db\Context', [], [], '', false);
- $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
-
- $this->model = new \Magento\Quote\Model\Resource\Quote(
- $contextMock,
- $this->configMock
- );
- }
-
- /**
- * @param $value
- * @dataProvider isOrderIncrementIdUsedDataProvider
- */
- public function testIsOrderIncrementIdUsed($value)
- {
- $expectedBind = [':increment_id' => $value];
- $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
- $this->model->isOrderIncrementIdUsed($value);
- }
-
- /**
- * @return array
- */
- public function isOrderIncrementIdUsedDataProvider()
- {
- return [[100000001], ['10000000001'], ['M10000000001']];
- }
-}
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 2d867ccca552b0bf3dee8361003601c036092d3a..173e239f796d8072845d23365a02360f0f45a16d 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -10,6 +10,8 @@
"magento/module-authorization": "0.74.0-beta4",
"magento/module-payment": "0.74.0-beta4",
"magento/module-sales": "0.74.0-beta4",
+ "magento/module-shipping": "0.74.0-beta4",
+ "magento/module-sales-sequence": "0.74.0-beta4",
"magento/module-backend": "0.74.0-beta4",
"magento/module-directory": "0.74.0-beta4",
"magento/module-eav": "0.74.0-beta4",
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index 6de66a60e04a8c28d281e4f55f1fb0cca6a388dc..347405789dc2e49d5131525a55b1ec3aebbe4b29 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -57,14 +57,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
protected function _prepareCollection()
{
$collection = $this->_quotesFactory->create();
- if ($this->queryResolver->isSingleQuery()) {
- $collection->prepareForProductsInCarts();
- $collection->setSelectCountSqlType(
- \Magento\Reports\Model\Resource\Quote\Collection::SELECT_COUNT_SQL_TYPE_CART
- );
- } else {
- $collection->prepareActiveCartItems();
- }
+ $collection->prepareActiveCartItems();
$this->setCollection($collection);
return parent::_prepareCollection();
}
@@ -80,6 +73,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
'header' => __('ID'),
'align' => 'right',
'index' => 'entity_id',
+ 'sortable' => false,
'header_css_class' => 'col-id',
'column_css_class' => 'col-id'
]
@@ -90,6 +84,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
[
'header' => __('Product'),
'index' => 'name',
+ 'sortable' => false,
'header_css_class' => 'col-product',
'column_css_class' => 'col-product'
]
@@ -104,6 +99,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
'type' => 'currency',
'currency_code' => $currencyCode,
'index' => 'price',
+ 'sortable' => false,
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
'rate' => $this->getRate($currencyCode),
'header_css_class' => 'col-price',
@@ -117,6 +113,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
'header' => __('Carts'),
'align' => 'right',
'index' => 'carts',
+ 'sortable' => false,
'header_css_class' => 'col-carts',
'column_css_class' => 'col-carts'
]
@@ -128,6 +125,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
'header' => __('Orders'),
'align' => 'right',
'index' => 'orders',
+ 'sortable' => false,
'header_css_class' => 'col-qty',
'column_css_class' => 'col-qty'
]
diff --git a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
index a4b9fee5599cade00a19481c4a35a4bab335746b..c602eb91ae9b4284b289204770089483d4879ffe 100644
--- a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
@@ -66,6 +66,11 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
*/
protected $_quoteItemFactory;
+ /**
+ * @var \Magento\Sales\Model\Resource\Order\Collection
+ */
+ protected $orderResource;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
@@ -79,6 +84,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
* @param \Magento\Framework\Object\Copy\Config $fieldsetConfig
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Quote\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+ * @param \Magento\Sales\Model\Resource\Order\Collection $orderResource
* @param mixed $connection
* @param string $modelName
*
@@ -97,6 +103,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
\Magento\Framework\Object\Copy\Config $fieldsetConfig,
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Quote\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory,
+ \Magento\Sales\Model\Resource\Order\Collection $orderResource,
$connection = null,
$modelName = self::CUSTOMER_MODEL_NAME
) {
@@ -114,6 +121,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
$connection,
$modelName
);
+ $this->orderResource = $orderResource;
$this->quoteRepository = $quoteRepository;
$this->_quoteItemFactory = $quoteItemFactory;
}
@@ -152,90 +160,6 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
return $this;
}
- /**
- * Order for each customer
- *
- * @param string $fromDate
- * @param string $toDate
- * @return $this
- */
- public function joinOrders($fromDate = '', $toDate = '')
- {
- if ($fromDate != '' && $toDate != '') {
- $dateFilter = " AND orders.created_at BETWEEN '{$fromDate}' AND '{$toDate}'";
- } else {
- $dateFilter = '';
- }
-
- $this->getSelect()->joinLeft(
- ['orders' => $this->getTable('sales_order')],
- "orders.customer_id = e.entity_id" . $dateFilter,
- []
- );
-
- return $this;
- }
-
- /**
- * Add orders count
- *
- * @return $this
- */
- public function addOrdersCount()
- {
- $this->getSelect()->columns(
- ["orders_count" => "COUNT(orders.entity_id)"]
- )->where(
- 'orders.state <> ?',
- \Magento\Sales\Model\Order::STATE_CANCELED
- )->group(
- "e.entity_id"
- );
-
- return $this;
- }
-
- /**
- * Order summary info for each customer such as orders_count, orders_avg_amount, orders_total_amount
- *
- * @param int $storeId
- * @return $this
- */
- public function addSumAvgTotals($storeId = 0)
- {
- $adapter = $this->getConnection();
- $baseSubtotalRefunded = $adapter->getIfNullSql('orders.base_subtotal_refunded', 0);
- $baseSubtotalCanceled = $adapter->getIfNullSql('orders.base_subtotal_canceled', 0);
-
- /**
- * calculate average and total amount
- */
- $expr = $storeId ==
- 0 ?
- "(orders.base_subtotal - {$baseSubtotalCanceled} - {$baseSubtotalRefunded}) * orders.base_to_global_rate" :
- "orders.base_subtotal - {$baseSubtotalCanceled} - {$baseSubtotalRefunded}";
-
- $this->getSelect()->columns(
- ["orders_avg_amount" => "AVG({$expr})"]
- )->columns(
- ["orders_sum_amount" => "SUM({$expr})"]
- );
-
- return $this;
- }
-
- /**
- * Order by total amount
- *
- * @param string $dir
- * @return $this
- */
- public function orderByTotalAmount($dir = self::SORT_ORDER_DESC)
- {
- $this->getSelect()->order("orders_sum_amount {$dir}");
- return $this;
- }
-
/**
* Add order statistics
*
@@ -259,7 +183,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
$customerIds = $this->getColumnValues($this->getResource()->getIdFieldName());
if ($this->_addOrderStatistics && !empty($customerIds)) {
- $adapter = $this->getConnection();
+ $adapter = $this->orderResource->getConnection();
$baseSubtotalRefunded = $adapter->getIfNullSql('orders.base_subtotal_refunded', 0);
$baseSubtotalCanceled = $adapter->getIfNullSql('orders.base_subtotal_canceled', 0);
@@ -267,9 +191,9 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
"(orders.base_subtotal-{$baseSubtotalCanceled}-{$baseSubtotalRefunded})*orders.base_to_global_rate" :
"orders.base_subtotal-{$baseSubtotalCanceled}-{$baseSubtotalRefunded}";
- $select = $this->getConnection()->select();
+ $select = $this->orderResource->getConnection()->select();
$select->from(
- ['orders' => $this->getTable('sales_order')],
+ ['orders' => $this->orderResource->getTable('sales_order')],
[
'orders_avg_amount' => "AVG({$totalExpr})",
'orders_sum_amount' => "SUM({$totalExpr})",
@@ -286,7 +210,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
'orders.customer_id'
);
- foreach ($this->getConnection()->fetchAll($select) as $ordersInfo) {
+ foreach ($this->orderResource->getConnection()->fetchAll($select) as $ordersInfo) {
$this->getItemById($ordersInfo['customer_id'])->addData($ordersInfo);
}
}
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 3e77d75e16eb6f2f451477f1c89ceb4f907b4e8e..3eb9ac629a26e8fdcd075618a98ea3c26357ce1a 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -56,6 +56,11 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
protected $_productType;
+ /**
+ * @var \Magento\Quote\Model\Resource\Quote\Collection
+ */
+ protected $quoteResource;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
@@ -79,6 +84,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Catalog\Model\Resource\Product $product
* @param \Magento\Reports\Model\Event\TypeFactory $eventTypeFactory
* @param \Magento\Catalog\Model\Product\Type $productType
+ * @param \Magento\Quote\Model\Resource\Quote\Collection $quoteResource
* @param mixed $connection
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -106,6 +112,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Catalog\Model\Resource\Product $product,
\Magento\Reports\Model\Event\TypeFactory $eventTypeFactory,
\Magento\Catalog\Model\Product\Type $productType,
+ \Magento\Quote\Model\Resource\Quote\Collection $quoteResource,
$connection = null
) {
$this->setProductEntityId($product->getEntityIdField());
@@ -135,6 +142,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
);
$this->_eventTypeFactory = $eventTypeFactory;
$this->_productType = $productType;
+ $this->quoteResource = $quoteResource;
}
/**
@@ -239,7 +247,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
public function getSelectCountSql()
{
if ($this->_selectCountSqlType == self::SELECT_COUNT_SQL_TYPE_CART) {
- $countSelect = clone $this->getSelect();
+ $countSelect = clone $this->quoteResource->getSelect();
$countSelect->reset()->from(
['quote_item_table' => $this->getTable('quote_item')],
['COUNT(DISTINCT quote_item_table.product_id)']
@@ -263,102 +271,6 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
return $countSelect;
}
- /**
- * Add orders count
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- public function addOrdersCount($from = '', $to = '')
- {
- $orderItemTableName = $this->getTable('sales_order_item');
- $productFieldName = sprintf('e.%s', $this->getProductEntityId());
-
- $this->getSelect()->joinLeft(
- ['order_items' => $orderItemTableName],
- "order_items.product_id = {$productFieldName}",
- []
- )->columns(
- ['orders' => 'COUNT(order_items2.item_id)']
- )->group(
- $productFieldName
- );
-
- $dateFilter = ['order_items2.item_id = order_items.item_id'];
- if ($from != '' && $to != '') {
- $dateFilter[] = $this->_prepareBetweenSql('order_items2.created_at', $from, $to);
- }
-
- $this->getSelect()->joinLeft(
- ['order_items2' => $orderItemTableName],
- implode(' AND ', $dateFilter),
- []
- );
-
- return $this;
- }
-
- /**
- * Add ordered qty's
- *
- * @param string $from
- * @param string $to
- * @return $this
- */
- public function addOrderedQty($from = '', $to = '')
- {
- $adapter = $this->getConnection();
- $compositeTypeIds = $this->_productType->getCompositeTypes();
- $orderTableAliasName = $adapter->quoteIdentifier('order');
-
- $orderJoinCondition = [
- $orderTableAliasName . '.entity_id = order_items.order_id',
- $adapter->quoteInto("{$orderTableAliasName}.state <> ?", \Magento\Sales\Model\Order::STATE_CANCELED),
- ];
-
- $productJoinCondition = [
- $adapter->quoteInto('(e.type_id NOT IN (?))', $compositeTypeIds),
- 'e.entity_id = order_items.product_id',
- $adapter->quoteInto('e.attribute_set_id = ?', $this->getProductAttributeSetId()),
- ];
-
- if ($from != '' && $to != '') {
- $fieldName = $orderTableAliasName . '.created_at';
- $orderJoinCondition[] = $this->_prepareBetweenSql($fieldName, $from, $to);
- }
-
- $this->getSelect()->reset()->from(
- ['order_items' => $this->getTable('sales_order_item')],
- ['ordered_qty' => 'SUM(order_items.qty_ordered)', 'order_items_name' => 'order_items.name']
- )->joinInner(
- ['order' => $this->getTable('sales_order')],
- implode(' AND ', $orderJoinCondition),
- []
- )->joinLeft(
- ['e' => $this->getProductEntityTableName()],
- implode(' AND ', $productJoinCondition),
- [
- 'entity_id' => 'order_items.product_id',
- 'attribute_set_id' => 'e.attribute_set_id',
- 'type_id' => 'e.type_id',
- 'sku' => 'e.sku',
- 'has_options' => 'e.has_options',
- 'required_options' => 'e.required_options',
- 'created_at' => 'e.created_at',
- 'updated_at' => 'e.updated_at'
- ]
- )->where(
- 'parent_item_id IS NULL'
- )->group(
- 'order_items.product_id'
- )->having(
- 'SUM(order_items.qty_ordered) > ?',
- 0
- );
- return $this;
- }
-
/**
* Set order
*
@@ -368,7 +280,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
{
- if (in_array($attribute, ['carts', 'orders', 'ordered_qty'])) {
+ if (in_array($attribute, ['carts'])) {
$this->getSelect()->order($attribute . ' ' . $dir);
} else {
parent::setOrder($attribute, $dir);
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index 521135eeb0422efb7b7f4b9822d00b567793c81b..0c71c26aa69ebf90ac9456c0d898508470399c55 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -68,6 +68,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
* @param \Magento\Catalog\Model\Resource\Product $product
* @param \Magento\Reports\Model\Event\TypeFactory $eventTypeFactory
* @param \Magento\Catalog\Model\Product\Type $productType
+ * @param \Magento\Quote\Model\Resource\Quote\Collection $quoteResource
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\CatalogInventory\Model\Resource\Stock\Item $itemResource
@@ -98,6 +99,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
\Magento\Catalog\Model\Resource\Product $product,
\Magento\Reports\Model\Event\TypeFactory $eventTypeFactory,
\Magento\Catalog\Model\Product\Type $productType,
+ \Magento\Quote\Model\Resource\Quote\Collection $quoteResource,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\CatalogInventory\Model\Resource\Stock\Item $itemResource,
@@ -126,6 +128,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
$product,
$eventTypeFactory,
$productType,
+ $quoteResource,
$connection
);
$this->stockRegistry = $stockRegistry;
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Sold/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Sold/Collection.php
index 0b91b4a360e7134702a1785a73c75be07ae973ba..2959e2cd45165da18c3911b55f876298326e3452 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Sold/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Sold/Collection.php
@@ -11,7 +11,7 @@
*/
namespace Magento\Reports\Model\Resource\Product\Sold;
-class Collection extends \Magento\Reports\Model\Resource\Product\Collection
+class Collection extends \Magento\Reports\Model\Resource\Order\Collection
{
/**
* Set Date range to collection
@@ -34,6 +34,46 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
return $this;
}
+ /**
+ * Add ordered qty's
+ *
+ * @param string $from
+ * @param string $to
+ * @return $this
+ */
+ public function addOrderedQty($from = '', $to = '')
+ {
+ $adapter = $this->getConnection();
+ $orderTableAliasName = $adapter->quoteIdentifier('order');
+
+ $orderJoinCondition = [
+ $orderTableAliasName . '.entity_id = order_items.order_id',
+ $adapter->quoteInto("{$orderTableAliasName}.state <> ?", \Magento\Sales\Model\Order::STATE_CANCELED),
+ ];
+
+ if ($from != '' && $to != '') {
+ $fieldName = $orderTableAliasName . '.created_at';
+ $orderJoinCondition[] = $this->prepareBetweenSql($fieldName, $from, $to);
+ }
+
+ $this->getSelect()->reset()->from(
+ ['order_items' => $this->getTable('sales_order_item')],
+ ['ordered_qty' => 'SUM(order_items.qty_ordered)', 'order_items_name' => 'order_items.name']
+ )->joinInner(
+ ['order' => $this->getTable('sales_order')],
+ implode(' AND ', $orderJoinCondition),
+ []
+ )->where(
+ 'parent_item_id IS NULL'
+ )->group(
+ 'order_items.product_id'
+ )->having(
+ 'SUM(order_items.qty_ordered) > ?',
+ 0
+ );
+ return $this;
+ }
+
/**
* Set store filter to collection
*
@@ -49,29 +89,38 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
}
/**
- * Add website product limitation
+ * Set order
*
+ * @param string $attribute
+ * @param string $dir
* @return $this
*/
- protected function _productLimitationJoinWebsite()
+ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
{
- $filters = $this->_productLimitationFilters;
- $conditions = ['product_website.product_id=e.entity_id'];
- if (isset($filters['website_ids'])) {
- $conditions[] = $this->getConnection()->quoteInto(
- 'product_website.website_id IN(?)',
- $filters['website_ids']
- );
-
- $subQuery = $this->getConnection()->select()->from(
- ['product_website' => $this->getTable('catalog_product_website')],
- ['product_website.product_id']
- )->where(
- join(' AND ', $conditions)
- );
- $this->getSelect()->where('e.entity_id IN( ' . $subQuery . ' )');
+ if (in_array($attribute, ['orders', 'ordered_qty'])) {
+ $this->getSelect()->order($attribute . ' ' . $dir);
+ } else {
+ parent::setOrder($attribute, $dir);
}
return $this;
}
+
+ /**
+ * Prepare between sql
+ *
+ * @param string $fieldName Field name with table suffix ('created_at' or 'main_table.created_at')
+ * @param string $from
+ * @param string $to
+ * @return string Formatted sql string
+ */
+ protected function prepareBetweenSql($fieldName, $from, $to)
+ {
+ return sprintf(
+ '(%s BETWEEN %s AND %s)',
+ $fieldName,
+ $this->getConnection()->quote($from),
+ $this->getConnection()->quote($to)
+ );
+ }
}
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 38ba00038520a828469d8d5c1cda8976c9a3b0b3..cb2a9333fe01e3f67cc168067fc0fdc0a1bcc773 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -13,6 +13,10 @@
*/
namespace Magento\Reports\Model\Resource\Quote;
+/**
+ * Class Collection
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
{
const SELECT_COUNT_SQL_TYPE_CART = 1;
@@ -39,12 +43,17 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
/**
* @var \Magento\Catalog\Model\Resource\Product\Collection
*/
- protected $_productResource;
+ protected $productResource;
/**
* @var \Magento\Customer\Model\Resource\Customer
*/
- protected $_customerResource;
+ protected $customerResource;
+
+ /**
+ * @var \Magento\Sales\Model\Resource\Order\Collection
+ */
+ protected $orderResource;
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -53,6 +62,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Product\Collection $productResource
* @param \Magento\Customer\Model\Resource\Customer $customerResource
+ * @param \Magento\Sales\Model\Resource\Order\Collection $orderResource
* @param null $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -63,12 +73,14 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Product\Collection $productResource,
\Magento\Customer\Model\Resource\Customer $customerResource,
+ \Magento\Sales\Model\Resource\Order\Collection $orderResource,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
- $this->_productResource = $productResource;
- $this->_customerResource = $customerResource;
+ $this->productResource = $productResource;
+ $this->customerResource = $customerResource;
+ $this->orderResource = $orderResource;
}
/**
@@ -120,75 +132,47 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
/**
* Prepare select query for products in carts report
*
- * @return $this
+ * @return \Magento\Framework\DB\Select
*/
- public function prepareForProductsInCarts()
+ public function prepareActiveCartItems()
{
- $productAttrName = $this->_productResource->getAttribute('name');
- $productAttrNameId = (int)$productAttrName->getAttributeId();
- $productAttrNameTable = $productAttrName->getBackend()->getTable();
- $productAttrPrice = $this->_productResource->getAttribute('price');
- $productAttrPriceId = (int)$productAttrPrice->getAttributeId();
- $productAttrPriceTable = $productAttrPrice->getBackend()->getTable();
-
- $this->getSelect()->useStraightJoin(
- true
- )->reset(
- \Zend_Db_Select::COLUMNS
- )->joinInner(
- ['quote_items' => $this->getTable('quote_item')],
- 'quote_items.quote_id = main_table.entity_id',
- null
- )->joinInner(
- ['e' => $this->getTable('catalog_product_entity')],
- 'e.entity_id = quote_items.product_id',
- null
- )->joinInner(
- ['product_name' => $productAttrNameTable],
- 'product_name.entity_id = e.entity_id'
- . ' AND product_name.attribute_id = ' . $productAttrNameId
- . ' AND product_name.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID,
- ['name' => 'product_name.value']
- )->joinInner(
- ['product_price' => $productAttrPriceTable],
- "product_price.entity_id = e.entity_id AND product_price.attribute_id = {$productAttrPriceId}",
- ['price' => new \Zend_Db_Expr('product_price.value * main_table.base_to_global_rate')]
- )->joinLeft(
- ['order_items' => new \Zend_Db_Expr(sprintf('(%s)', $this->getOrdersSubSelect()))],
- 'order_items.product_id = e.entity_id',
- []
- )->columns(
- 'e.*'
- )->columns(
- ['carts' => new \Zend_Db_Expr('COUNT(quote_items.item_id)')]
- )->columns(
- 'order_items.orders'
- )->where(
- 'main_table.is_active = ?',
- 1
- )->group(
- 'quote_items.product_id'
- );
+ $quoteItemsSelect = $this->getSelect();
+ $quoteItemsSelect->reset()
+ ->from(['main_table' => $this->getTable('quote')], '')
+ ->columns('quote_items.product_id')
+ ->columns(['carts' => new \Zend_Db_Expr('COUNT(quote_items.item_id)')])
+ ->columns('main_table.base_to_global_rate')
+ ->joinInner(
+ ['quote_items' => $this->getTable('quote_item')],
+ 'quote_items.quote_id = main_table.entity_id',
+ null
+ )->where(
+ 'main_table.is_active = ?',
+ 1
+ )->group(
+ 'quote_items.product_id'
+ );
- return $this;
+ return $quoteItemsSelect;
}
/**
- * Orders quantity subselect
+ * Orders quantity data
*
- * @return \Magento\Framework\DB\Select
+ * @param array $productIds
+ * @return array
*/
- protected function getOrdersSubSelect()
+ protected function getOrdersData(array $productIds)
{
- $ordersSubSelect = clone $this->getSelect();
+ $ordersSubSelect = clone $this->orderResource->getSelect();
$ordersSubSelect->reset()->from(
['oi' => $this->getTable('sales_order_item')],
- ['orders' => new \Zend_Db_Expr('COUNT(1)'), 'product_id']
- )->group(
+ ['product_id', 'orders' => new \Zend_Db_Expr('COUNT(1)')]
+ )->where('oi.product_id IN (?)', $productIds)->group(
'oi.product_id'
);
- return $ordersSubSelect;
+ return $this->orderResource->getConnection()->fetchAssoc($ordersSubSelect);
}
/**
@@ -211,7 +195,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
*/
public function addCustomerData($filter = null)
{
- $customersSelect = $this->_customerResource->getReadConnection()->select();
+ $customersSelect = $this->customerResource->getReadConnection()->select();
$customersSelect->from(['customer' => 'customer_entity'], 'entity_id');
if (isset($filter['customer_name'])) {
$customersSelect = $this->getCustomerNames($customersSelect);
@@ -223,7 +207,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
if (isset($filter['email'])) {
$customersSelect->where('customer.email LIKE ?', '%' . $filter['email'] . '%');
}
- $filteredCustomers = $this->_customerResource->getReadConnection()->fetchCol($customersSelect);
+ $filteredCustomers = $this->customerResource->getReadConnection()->fetchCol($customersSelect);
$this->getSelect()->where('main_table.customer_id IN (?)', $filteredCustomers);
return $this;
}
@@ -270,24 +254,14 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
/**
* Get select count sql
*
- * @return string
+ * @return \Magento\Framework\DB\Select
*/
public function getSelectCountSql()
{
- $countSelect = clone $this->getSelect();
- $countSelect->reset(\Zend_Db_Select::ORDER);
- $countSelect->reset(\Zend_Db_Select::LIMIT_COUNT);
- $countSelect->reset(\Zend_Db_Select::LIMIT_OFFSET);
- $countSelect->reset(\Zend_Db_Select::COLUMNS);
- $countSelect->reset(\Zend_Db_Select::GROUP);
- $countSelect->resetJoinLeft();
-
- if ($this->_selectCountSqlType == self::SELECT_COUNT_SQL_TYPE_CART) {
- $countSelect->columns("COUNT(DISTINCT e.entity_id)");
- } else {
- $countSelect->columns("COUNT(DISTINCT main_table.entity_id)");
- }
-
+ $countSelect = clone $this->prepareActiveCartItems();
+ $countSelect->reset(\Zend_Db_Select::COLUMNS)
+ ->reset(\Zend_Db_Select::GROUP)
+ ->columns('COUNT(DISTINCT quote_items.product_id)');
return $countSelect;
}
@@ -297,10 +271,10 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
*/
protected function getCustomerNames($select)
{
- $attrFirstname = $this->_customerResource->getAttribute('firstname');
+ $attrFirstname = $this->customerResource->getAttribute('firstname');
$attrFirstnameId = (int)$attrFirstname->getAttributeId();
$attrFirstnameTableName = $attrFirstname->getBackend()->getTable();
- $attrLastname = $this->_customerResource->getAttribute('lastname');
+ $attrLastname = $this->customerResource->getAttribute('lastname');
$attrLastnameId = (int)$attrLastname->getAttributeId();
$attrLastnameTableName = $attrLastname->getBackend()->getTable();
$select->joinInner(
@@ -326,7 +300,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
*/
public function resolveCustomerNames()
{
- $select = $this->_customerResource->getReadConnection()->select();
+ $select = $this->customerResource->getReadConnection()->select();
$customerName = $select->getAdapter()->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' ');
$select->from(
@@ -343,4 +317,69 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
next($customersData);
}
}
+
+ /**
+ * Separate query for product and order data
+ *
+ * @param array $productIds
+ * @return array
+ * @throws \Magento\Eav\Exception
+ */
+ protected function getProductData(array $productIds)
+ {
+ $productConnection = $this->productResource->getConnection('read');
+ $productAttrName = $this->productResource->getAttribute('name');
+ $productAttrNameId = (int)$productAttrName->getAttributeId();
+ $productAttrPrice = $this->productResource->getAttribute('price');
+ $productAttrPriceId = (int)$productAttrPrice->getAttributeId();
+
+ $select = clone $this->productResource->getSelect();
+ $select->reset();
+ $select->from(
+ ['main_table' => $this->getTable('catalog_product_entity')]
+ )->useStraightJoin(
+ true
+ )->joinInner(
+ ['product_name' => $productAttrName->getBackend()->getTable()],
+ 'product_name.entity_id = main_table.entity_id'
+ . ' AND product_name.attribute_id = ' . $productAttrNameId
+ . ' AND product_name.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+ ['name' => 'product_name.value']
+ )->joinInner(
+ ['product_price' => $productAttrPrice->getBackend()->getTable()],
+ "product_price.entity_id = main_table.entity_id AND product_price.attribute_id = {$productAttrPriceId}",
+ ['price' => new \Zend_Db_Expr('product_price.value')]
+ )->where('main_table.entity_id IN (?)', $productIds);
+
+ $productData = $productConnection->fetchAssoc($select);
+ return $productData;
+ }
+
+ /**
+ * Add data fetched from another database
+ *
+ * @return $this
+ */
+ protected function _afterLoad()
+ {
+ parent::_afterLoad();
+ $items = $this->getItems();
+ $productIds = [];
+ foreach ($items as $item) {
+ $productIds[] = $item->getProductId();
+ }
+ $productData = $this->getProductData($productIds);
+ $orderData = $this->getOrdersData($productIds);
+ foreach ($items as $item) {
+ $item->setId($item->getProductId());
+ $item->setPrice($productData[$item->getProductId()]['price'] * $item->getBaseToGlobalRate());
+ $item->setName($productData[$item->getProductId()]['name']);
+ $item->setOrders(0);
+ if (isset($orderData[$item->getProductId()])) {
+ $item->setOrders($orderData[$item->getProductId()]['orders']);
+ }
+ }
+
+ return $this;
+ }
}
diff --git a/app/code/Magento/Reports/Setup/InstallSchema.php b/app/code/Magento/Reports/Setup/InstallSchema.php
index bea0fc3cb2e6710e0d27b9f47aabe6bbb34d2c52..707597f5a747a2192ff1cb20072745c0a6e21ff4 100644
--- a/app/code/Magento/Reports/Setup/InstallSchema.php
+++ b/app/code/Magento/Reports/Setup/InstallSchema.php
@@ -111,7 +111,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -124,7 +123,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -132,8 +130,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Reports Compared Product Index Table');
$installer->getConnection()->createTable($table);
@@ -222,7 +219,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -235,7 +231,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -243,8 +238,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Reports Viewed Product Index Table');
$installer->getConnection()->createTable($table);
@@ -357,7 +351,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -365,7 +358,6 @@ class InstallSchema implements InstallSchemaInterface
'event_type_id',
$installer->getTable('report_event_types'),
'event_type_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Reports Event Table');
@@ -452,7 +444,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -465,7 +456,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -473,8 +463,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Reports Compared Product Index Table');
$installer->getConnection()->createTable($table);
@@ -556,7 +545,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -569,7 +557,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -577,8 +564,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Reports Viewed Product Index Table');
$installer->getConnection()->createTable($table);
@@ -667,7 +653,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -680,7 +665,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Most Viewed Products Aggregated Daily');
@@ -769,7 +753,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -782,7 +765,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Most Viewed Products Aggregated Monthly');
@@ -871,7 +853,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -884,7 +865,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Most Viewed Products Aggregated Yearly');
diff --git a/app/code/Magento/Reports/Test/Unit/Model/Resource/Report/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/Resource/Report/Quote/CollectionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d3b7eadd6da68560e28bcad5b9a1b5249209c615
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Model/Resource/Report/Quote/CollectionTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Reports\Test\Unit\Model\Resource\Report\Quote;
+
+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Magento\Reports\Model\Resource\Quote\Collection as Collection;
+
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $selectMock;
+
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+ $this->selectMock = $this->getMock('\Magento\Framework\DB\Select', [], [], '', false);
+ }
+
+ public function testGetSelectCountSql()
+ {
+ /** @var $collection \PHPUnit_Framework_MockObject_MockObject */
+ $constructArgs = $this->objectManager
+ ->getConstructArguments('Magento\Reports\Model\Resource\Quote\Collection');
+ $collection = $this->getMock(
+ 'Magento\Reports\Model\Resource\Quote\Collection',
+ ['prepareActiveCartItems', 'getSelect'],
+ $constructArgs,
+ '',
+ false
+ );
+
+ $collection->expects($this->once())->method('prepareActiveCartItems')->willReturn($this->selectMock);
+ $this->selectMock->expects($this->atLeastOnce())->method('reset')->willReturnSelf();
+ $this->selectMock->expects($this->once())
+ ->method('columns')
+ ->with('COUNT(DISTINCT quote_items.product_id)')
+ ->willReturnSelf();
+ $this->assertEquals($this->selectMock, $collection->getSelectCountSql());
+ }
+
+ public function testPrepareActiveCartItems()
+ {
+ /** @var $collection \PHPUnit_Framework_MockObject_MockObject */
+ $constructArgs = $this->objectManager
+ ->getConstructArguments('Magento\Reports\Model\Resource\Quote\Collection');
+ $collection = $this->getMock(
+ 'Magento\Reports\Model\Resource\Quote\Collection',
+ ['getSelect', 'getTable'],
+ $constructArgs,
+ '',
+ false
+ );
+
+ $collection->expects($this->once())->method('getSelect')->willReturn($this->selectMock);
+ $this->selectMock->expects($this->once())->method('reset')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
+ $this->selectMock->expects($this->atLeastOnce())->method('columns')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('joinInner')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('where')->willReturnSelf();
+ $this->selectMock->expects($this->once())->method('group')->willReturnSelf();
+ $collection->expects($this->exactly(2))->method('getTable')->willReturn('table');
+ $collection->prepareActiveCartItems();
+ }
+
+ public function testLoadWithFilter()
+ {
+ /** @var $collection \PHPUnit_Framework_MockObject_MockObject */
+ $constructArgs = $this->objectManager
+ ->getConstructArguments('Magento\Reports\Model\Resource\Quote\Collection');
+ $constructArgs['eventManager'] = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+ $readConnectionMock = $this->getMock('Magento\Framework\DB\Adapter\AdapterInterface', [], [], '', false);
+ $resourceMock = $this->getMock('\Magento\Quote\Model\Resource\Quote', [], [], '', false);
+ $constructArgs['resource'] = $resourceMock;
+ $productResourceMock = $this->getMock('\Magento\Catalog\Model\Resource\Product\Collection', [], [], '', false);
+ $constructArgs['productResource'] = $productResourceMock;
+ $orderResourceMock = $this->getMock('\Magento\Sales\Model\Resource\Order\Collection', [], [], '', false);
+ $constructArgs['orderResource'] = $orderResourceMock;
+
+ $collection = $this->getMock(
+ 'Magento\Reports\Model\Resource\Quote\Collection',
+ [
+ '_beforeLoad',
+ '_renderFilters',
+ '_renderOrders',
+ '_renderLimit',
+ 'printLogQuery',
+ 'getData',
+ '_setIsLoaded',
+ 'setConnection',
+ '_initSelect',
+ 'getTable',
+ 'getItems',
+ 'getOrdersData',
+ ],
+ $constructArgs
+ );
+ //load()
+ $collection->expects($this->once())->method('_beforeLoad')->willReturnSelf();
+ $collection->expects($this->once())->method('_renderFilters')->willReturnSelf();
+ $collection->expects($this->once())->method('_renderOrders')->willReturnSelf();
+ $collection->expects($this->once())->method('_renderLimit')->willReturnSelf();
+ $collection->expects($this->once())->method('printLogQuery')->willReturnSelf();
+ $collection->expects($this->once())->method('getData')->willReturn(null);
+ $collection->expects($this->once())->method('_setIsLoaded')->willReturnSelf();
+
+ //productLoad()
+ $productAttributeMock = $this->getMock(
+ '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute',
+ [],
+ [],
+ '',
+ false
+ );
+ $priceAttributeMock = $this->getMock(
+ '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute',
+ [],
+ [],
+ '',
+ false
+ );
+ $productResourceMock->expects($this->once())
+ ->method('getConnection')
+ ->with('read')
+ ->willReturn($readConnectionMock);
+ $productResourceMock->expects($this->any())
+ ->method('getAttribute')
+ ->willReturnMap([['name', $productAttributeMock], ['price', $priceAttributeMock]]);
+ $productResourceMock->expects($this->once())->method('getSelect')->willReturn($this->selectMock);
+ $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();
+ $collection->expects($this->once())->method('getOrdersData')->willReturn([]);
+
+ $productAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
+ $priceAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
+ $readConnectionMock->expects($this->once())->method('fetchAssoc')->willReturn([1, 2, 3]);
+
+ //_afterLoad()
+ $collection->expects($this->once())->method('getItems')->willReturn([]);
+
+ $collection->loadWithFilter();
+ }
+}
diff --git a/app/code/Magento/Review/Setup/InstallSchema.php b/app/code/Magento/Review/Setup/InstallSchema.php
index 6d5a14fe2880f21d46abd7d3be56f5be04d60fb0..276b7389bff8fd84a89d735d65747ae079a59320 100644
--- a/app/code/Magento/Review/Setup/InstallSchema.php
+++ b/app/code/Magento/Review/Setup/InstallSchema.php
@@ -125,7 +125,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('review_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -133,7 +132,6 @@ class InstallSchema implements InstallSchemaInterface
'status_id',
$installer->getTable('review_status'),
'status_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION,
\Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
)
->setComment('Review base information');
@@ -210,15 +208,13 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->addForeignKey(
$installer->getFkName('review_detail', 'review_id', 'review', 'review_id'),
'review_id',
$installer->getTable('review'),
'review_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -226,8 +222,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)
->setComment('Review detail information');
$installer->getConnection()->createTable($table);
@@ -288,7 +283,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Review aggregates');
@@ -322,7 +316,6 @@ class InstallSchema implements InstallSchemaInterface
'review_id',
$installer->getTable('review'),
'review_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -330,7 +323,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Review Store');
@@ -425,7 +417,6 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('rating_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Ratings');
@@ -480,7 +471,6 @@ class InstallSchema implements InstallSchemaInterface
'rating_id',
$installer->getTable('rating'),
'rating_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Rating options');
@@ -570,7 +560,6 @@ class InstallSchema implements InstallSchemaInterface
'option_id',
$installer->getTable('rating_option'),
'option_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -578,7 +567,6 @@ class InstallSchema implements InstallSchemaInterface
'review_id',
$installer->getTable('review'),
'review_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Rating option values');
@@ -658,7 +646,6 @@ class InstallSchema implements InstallSchemaInterface
'rating_id',
$installer->getTable('rating'),
'rating_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -666,7 +653,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Rating vote aggregated');
@@ -700,7 +686,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -708,8 +693,7 @@ class InstallSchema implements InstallSchemaInterface
'rating_id',
$installer->getTable('rating'),
'rating_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Rating Store');
$installer->getConnection()->createTable($table);
@@ -749,7 +733,6 @@ class InstallSchema implements InstallSchemaInterface
'rating_id',
$installer->getTable('rating'),
'rating_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
@@ -757,7 +740,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Rating Title');
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
index 63b1f9055bdd1e78a525a655e5cef4e96595048d..832aed45797e962b32264d1681ca979fee5cfe8c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
use Magento\Backend\App\Action;
-use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
+use Magento\Sales\Model\Order\Email\Sender\CreditmemoCommentSender;
class AddComment extends \Magento\Backend\App\Action
{
@@ -16,9 +16,9 @@ class AddComment extends \Magento\Backend\App\Action
protected $creditmemoLoader;
/**
- * @var CreditmemoSender
+ * @var CreditmemoCommentSender
*/
- protected $creditmemoSender;
+ protected $creditmemoCommentSender;
/**
* @var \Magento\Framework\View\Result\PageFactory
@@ -38,7 +38,7 @@ class AddComment extends \Magento\Backend\App\Action
/**
* @param Action\Context $context
* @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
- * @param CreditmemoSender $creditmemoSender
+ * @param CreditmemoCommentSender $creditmemoCommentSender
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
* @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
* @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
@@ -46,13 +46,13 @@ class AddComment extends \Magento\Backend\App\Action
public function __construct(
Action\Context $context,
\Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader,
- CreditmemoSender $creditmemoSender,
+ CreditmemoCommentSender $creditmemoCommentSender,
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
\Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
\Magento\Framework\Controller\Result\RawFactory $resultRawFactory
) {
$this->creditmemoLoader = $creditmemoLoader;
- $this->creditmemoSender = $creditmemoSender;
+ $this->creditmemoCommentSender = $creditmemoCommentSender;
$this->resultPageFactory = $resultPageFactory;
$this->resultJsonFactory = $resultJsonFactory;
$this->resultRawFactory = $resultRawFactory;
@@ -94,7 +94,7 @@ class AddComment extends \Magento\Backend\App\Action
);
$comment->save();
- $this->creditmemoSender->send($creditmemo, !empty($data['is_customer_notified']), $data['comment']);
+ $this->creditmemoCommentSender->send($creditmemo, !empty($data['is_customer_notified']), $data['comment']);
$resultPage = $this->resultPageFactory->create();
$response = $resultPage->getLayout()->getBlock('creditmemo_comments')->toHtml();
} catch (\Magento\Framework\Exception\LocalizedException $e) {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index 6ba3acd497b1f06992c9b871cc1cc63f2a1da6de..dbbd9dd55e33e64ae70286cadd0111f9a54d363b 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -81,16 +81,15 @@ class Save extends \Magento\Backend\App\Action
);
}
- $comment = '';
if (!empty($data['comment_text'])) {
$creditmemo->addComment(
$data['comment_text'],
isset($data['comment_customer_notify']),
isset($data['is_visible_on_front'])
);
- if (isset($data['comment_customer_notify'])) {
- $comment = $data['comment_text'];
- }
+
+ $creditmemo->setCustomerNote($data['comment_text']);
+ $creditmemo->setCustomerNoteNotify(isset($data['comment_customer_notify']));
}
if (isset($data['do_refund'])) {
@@ -107,9 +106,6 @@ class Save extends \Magento\Backend\App\Action
}
$creditmemo->register();
- if (!empty($data['send_email'])) {
- $creditmemo->setEmailSent(true);
- }
$creditmemo->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
$transactionSave = $this->_objectManager->create(
@@ -123,7 +119,10 @@ class Save extends \Magento\Backend\App\Action
$transactionSave->addObject($creditmemo->getInvoice());
}
$transactionSave->save();
- $this->creditmemoSender->send($creditmemo, !empty($data['send_email']), $comment);
+
+ if (!empty($data['send_email'])) {
+ $this->creditmemoSender->send($creditmemo);
+ }
$this->messageManager->addSuccess(__('You created the credit memo.'));
$this->_getSession()->getCommentText(true);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index 1fffaf8a03ee16324a611fdf6f1b9f862c1367af..3758ad060f0dcb4c6714cac12fa1ad9d41b7540e 100755
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -9,7 +9,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
use Magento\Backend\App\Action;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Registry;
-use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
use Magento\Sales\Model\Order\Invoice;
@@ -19,9 +19,9 @@ use Magento\Sales\Model\Order\Invoice;
class Save extends \Magento\Backend\App\Action
{
/**
- * @var InvoiceCommentSender
+ * @var InvoiceSender
*/
- protected $invoiceCommentSender;
+ protected $invoiceSender;
/**
* @var ShipmentSender
@@ -36,17 +36,17 @@ class Save extends \Magento\Backend\App\Action
/**
* @param Action\Context $context
* @param Registry $registry
- * @param InvoiceCommentSender $invoiceCommentSender
+ * @param InvoiceSender $invoiceSender
* @param ShipmentSender $shipmentSender
*/
public function __construct(
Action\Context $context,
Registry $registry,
- InvoiceCommentSender $invoiceCommentSender,
+ InvoiceSender $invoiceSender,
ShipmentSender $shipmentSender
) {
$this->registry = $registry;
- $this->invoiceCommentSender = $invoiceCommentSender;
+ $this->invoiceSender = $invoiceSender;
$this->shipmentSender = $shipmentSender;
parent::__construct($context);
}
@@ -153,14 +153,13 @@ class Save extends \Magento\Backend\App\Action
isset($data['comment_customer_notify']),
isset($data['is_visible_on_front'])
);
+
+ $invoice->setCustomerNote($data['comment_text']);
+ $invoice->setCustomerNoteNotify(isset($data['comment_customer_notify']));
}
$invoice->register();
- if (!empty($data['send_email'])) {
- $invoice->setEmailSent(true);
- }
-
$invoice->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
$invoice->getOrder()->setIsInProcess(true);
@@ -175,7 +174,6 @@ class Save extends \Magento\Backend\App\Action
if (!empty($data['do_shipment']) || (int)$invoice->getOrder()->getForcedShipmentWithInvoice()) {
$shipment = $this->_prepareShipment($invoice);
if ($shipment) {
- $shipment->setEmailSent($invoice->getEmailSent());
$transactionSave->addObject($shipment);
}
}
@@ -195,19 +193,19 @@ class Save extends \Magento\Backend\App\Action
}
// send invoice/shipment emails
- $comment = '';
- if (isset($data['comment_customer_notify'])) {
- $comment = $data['comment_text'];
- }
try {
- $this->invoiceCommentSender->send($invoice, !empty($data['send_email']), $comment);
+ if (!empty($data['send_email'])) {
+ $this->invoiceSender->send($invoice);
+ }
} catch (\Exception $e) {
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('We can\'t send the invoice email.'));
}
if ($shipment) {
try {
- $this->shipmentSender->send($shipment, !empty($data['send_email']));
+ if (!empty($data['send_email'])) {
+ $this->shipmentSender->send($shipment);
+ }
} catch (\Exception $e) {
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('We can\'t send the shipment.'));
diff --git a/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php b/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php
new file mode 100644
index 0000000000000000000000000000000000000000..b872e5b9de289a11573bdae418dd86fe57d7abf3
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Config/Backend/Email/AsyncSending.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\Config\Backend\Email;
+
+/**
+ * Backend model for global configuration value
+ * 'sales_email/general/async_sending'.
+ */
+class AsyncSending extends \Magento\Framework\App\Config\Value
+{
+ /**
+ * Dispatches corresponding event after saving of configuration
+ * value if it was changed.
+ *
+ * Dispatches next events:
+ *
+ * - config_data_sales_email_general_async_sending_enabled
+ * - config_data_sales_email_general_async_sending_disabled
+ *
+ * @return $this
+ */
+ public function afterSave()
+ {
+ if ($this->isValueChanged()) {
+ $state = $this->getValue() ? 'enabled' : 'disabled';
+
+ $this->_eventManager->dispatch(
+ $this->_eventPrefix . '_sales_email_general_async_sending_' . $state,
+ $this->_getEventData()
+ );
+ }
+
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Sales/Model/Observer/SendEmails.php b/app/code/Magento/Sales/Model/Observer/SendEmails.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8c8d00cddb52d4f23c7b51aab51d46776d2d27e
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Observer/SendEmails.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\Observer;
+
+/**
+ * Sales emails sending observer.
+ *
+ * Performs handling of cron jobs related to sending emails to customers
+ * after creation/modification of Order, Invoice, Shipment or Creditmemo.
+ */
+class SendEmails
+{
+ /**
+ * Email sender model.
+ *
+ * @var \Magento\Sales\Model\Order\Email\Sender
+ */
+ protected $emailSender;
+
+ /**
+ * Entity resource model.
+ *
+ * @var \Magento\Sales\Model\Resource\EntityAbstract
+ */
+ protected $entityResource;
+
+ /**
+ * Entity collection model.
+ *
+ * @var \Magento\Sales\Model\Resource\Collection\AbstractCollection
+ */
+ protected $entityCollection;
+
+ /**
+ * Global configuration storage.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $globalConfig;
+
+ /**
+ * @param \Magento\Sales\Model\Order\Email\Sender $emailSender
+ * @param \Magento\Sales\Model\Resource\EntityAbstract $entityResource
+ * @param \Magento\Sales\Model\Resource\Collection\AbstractCollection $entityCollection
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
+ */
+ public function __construct(
+ \Magento\Sales\Model\Order\Email\Sender $emailSender,
+ \Magento\Sales\Model\Resource\EntityAbstract $entityResource,
+ \Magento\Sales\Model\Resource\Collection\AbstractCollection $entityCollection,
+ \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
+ ) {
+ $this->emailSender = $emailSender;
+ $this->entityResource = $entityResource;
+ $this->entityCollection = $entityCollection;
+ $this->globalConfig = $globalConfig;
+ }
+
+ /**
+ * Handles asynchronous email sending during corresponding
+ * cron job.
+ *
+ * Also method is used in the next events:
+ *
+ * - config_data_sales_email_general_async_sending_disabled
+ *
+ * Works only if asynchronous email sending is enabled
+ * in global settings.
+ *
+ * @return void
+ */
+ public function execute()
+ {
+ if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
+ $this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
+ $this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
+
+ /** @var \Magento\Sales\Model\AbstractModel $item */
+ foreach ($this->entityCollection->getItems() as $item) {
+ if ($this->emailSender->send($item, true)) {
+ $this->entityResource->save(
+ $item->setEmailSent(true)
+ );
+ }
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 667678cc71d24a24127cd0abb7ace46d519d8ba2..94847e91dbe200c9ea34764d4981d08ac986db98 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -45,6 +45,7 @@ use Magento\Sales\Model\Resource\Order\Status\History\Collection as HistoryColle
* @method bool hasForcedCanCreditmemo()
* @method bool getIsInProcess()
* @method \Magento\Customer\Model\Customer getCustomer()
+ * @method \Magento\Sales\Model\Order setSendEmail(bool $value)
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -520,7 +521,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
*/
protected function _canVoidOrder()
{
- return !($this->canUnhold() || $this->isPaymentReview());
+ return !($this->isCanceled() || $this->canUnhold() || $this->isPaymentReview());
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index ec5829dc30e18066c186db6fead57c9a48f4279c..9e77f5afd8635e1b6421a1915684a4c0a858cbd0 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -21,6 +21,11 @@ use Magento\Sales\Model\EntityInterface;
* @method \Magento\Sales\Model\Resource\Order\Creditmemo _getResource()
* @method \Magento\Sales\Model\Resource\Order\Creditmemo getResource()
* @method \Magento\Sales\Model\Order\Creditmemo setCreatedAt(string $value)
+ * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
+ * @method string getCustomerNote()
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNoteNotify(bool $value)
+ * @method bool getCustomerNoteNotify()
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 50441777e01cab6309354625c12b893d68099517..e476e5ec8b544272154e907ce04cf46be2dd08ba 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -10,7 +10,7 @@ use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\Creditmemo;
use Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
use Magento\Sales\Model\Order\Email\Container\Template;
-use Magento\Sales\Model\Order\Email\NotifySender;
+use Magento\Sales\Model\Order\Email\Sender;
use Magento\Sales\Model\Resource\Order\Creditmemo as CreditmemoResource;
use Magento\Sales\Model\Order\Address\Renderer;
@@ -19,7 +19,7 @@ use Magento\Sales\Model\Order\Address\Renderer;
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class CreditmemoSender extends NotifySender
+class CreditmemoSender extends Sender
{
/**
* @var PaymentHelper
@@ -32,14 +32,16 @@ class CreditmemoSender extends NotifySender
protected $creditmemoResource;
/**
- * @var Renderer
+ * Global configuration storage.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
*/
- protected $addressRenderer;
+ protected $globalConfig;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Renderer
*/
- protected $loggerMock;
+ protected $addressRenderer;
/**
* @param Template $templateContainer
@@ -48,6 +50,7 @@ class CreditmemoSender extends NotifySender
* @param \Psr\Log\LoggerInterface $logger
* @param PaymentHelper $paymentHelper
* @param CreditmemoResource $creditmemoResource
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
* @param Renderer $addressRenderer
*/
public function __construct(
@@ -57,50 +60,71 @@ class CreditmemoSender extends NotifySender
\Psr\Log\LoggerInterface $logger,
PaymentHelper $paymentHelper,
CreditmemoResource $creditmemoResource,
+ \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
Renderer $addressRenderer
) {
parent::__construct($templateContainer, $identityContainer, $senderBuilderFactory, $logger);
$this->paymentHelper = $paymentHelper;
$this->creditmemoResource = $creditmemoResource;
+ $this->globalConfig = $globalConfig;
$this->addressRenderer = $addressRenderer;
}
/**
- * Send email to customer
+ * Sends order creditmemo email to the customer.
+ *
+ * Email will be sent immediately in two cases:
+ *
+ * - if asynchronous email sending is disabled in global settings
+ * - if $forceSyncMode parameter is set to TRUE
+ *
+ * Otherwise, email will be sent later during running of
+ * corresponding cron job.
*
* @param Creditmemo $creditmemo
- * @param bool $notify
- * @param string $comment
+ * @param bool $forceSyncMode
* @return bool
*/
- public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
+ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
{
- $order = $creditmemo->getOrder();
- if ($order->getShippingAddress()) {
- $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
- } else {
- $formattedShippingAddress = '';
- }
- $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
- $this->templateContainer->setTemplateVars(
- [
- 'order' => $creditmemo->getOrder(),
- 'creditmemo' => $creditmemo,
- 'comment' => $comment,
- 'billing' => $order->getBillingAddress(),
- 'payment_html' => $this->getPaymentHtml($order),
- 'store' => $order->getStore(),
- 'formattedShippingAddress' => $formattedShippingAddress,
- 'formattedBillingAddress' => $formattedBillingAddress,
- ]
- );
+ $creditmemo->setSendEmail(true);
+
+ if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+ $order = $creditmemo->getOrder();
+
+ if ($order->getShippingAddress()) {
+ $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
+ } else {
+ $formattedShippingAddress = '';
+ }
+
+ $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
+
+ $this->templateContainer->setTemplateVars(
+ [
+ 'order' => $order,
+ 'creditmemo' => $creditmemo,
+ 'comment' => $creditmemo->getCustomerNoteNotify() ? $creditmemo->getCustomerNote() : '',
+ 'billing' => $order->getBillingAddress(),
+ 'payment_html' => $this->getPaymentHtml($order),
+ 'store' => $order->getStore(),
+ 'formattedShippingAddress' => $formattedShippingAddress,
+ 'formattedBillingAddress' => $formattedBillingAddress,
+ ]
+ );
- $result = $this->checkAndSend($order, $notify);
- if ($result) {
- $creditmemo->setEmailSent(true);
- $this->creditmemoResource->saveAttribute($creditmemo, 'email_sent');
+ if ($this->checkAndSend($order)) {
+ $creditmemo->setEmailSent(true);
+
+ $this->creditmemoResource->saveAttribute($creditmemo, ['send_email', 'email_sent']);
+
+ return true;
+ }
}
- return $result;
+
+ $this->creditmemoResource->saveAttribute($creditmemo, 'send_email');
+
+ return false;
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index b26d038222bd8d66bfec6e23906e753ef786f59d..0796ff0443b198be2f4f2533e825fb8eca25c2f9 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -9,15 +9,17 @@ use Magento\Payment\Helper\Data as PaymentHelper;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
use Magento\Sales\Model\Order\Email\Container\Template;
-use Magento\Sales\Model\Order\Email\NotifySender;
+use Magento\Sales\Model\Order\Email\Sender;
use Magento\Sales\Model\Order\Invoice;
use Magento\Sales\Model\Resource\Order\Invoice as InvoiceResource;
use Magento\Sales\Model\Order\Address\Renderer;
/**
* Class InvoiceSender
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class InvoiceSender extends NotifySender
+class InvoiceSender extends Sender
{
/**
* @var PaymentHelper
@@ -29,6 +31,13 @@ class InvoiceSender extends NotifySender
*/
protected $invoiceResource;
+ /**
+ * Global configuration storage.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $globalConfig;
+
/**
* @var Renderer
*/
@@ -41,6 +50,7 @@ class InvoiceSender extends NotifySender
* @param \Psr\Log\LoggerInterface $logger
* @param PaymentHelper $paymentHelper
* @param InvoiceResource $invoiceResource
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
* @param Renderer $addressRenderer
*/
public function __construct(
@@ -50,49 +60,70 @@ class InvoiceSender extends NotifySender
\Psr\Log\LoggerInterface $logger,
PaymentHelper $paymentHelper,
InvoiceResource $invoiceResource,
+ \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
Renderer $addressRenderer
) {
parent::__construct($templateContainer, $identityContainer, $senderBuilderFactory, $logger);
$this->paymentHelper = $paymentHelper;
$this->invoiceResource = $invoiceResource;
+ $this->globalConfig = $globalConfig;
$this->addressRenderer = $addressRenderer;
}
/**
- * Send email to customer
+ * Sends order invoice email to the customer.
+ *
+ * Email will be sent immediately in two cases:
+ *
+ * - if asynchronous email sending is disabled in global settings
+ * - if $forceSyncMode parameter is set to TRUE
+ *
+ * Otherwise, email will be sent later during running of
+ * corresponding cron job.
*
* @param Invoice $invoice
- * @param bool $notify
- * @param string $comment
+ * @param bool $forceSyncMode
* @return bool
*/
- public function send(Invoice $invoice, $notify = true, $comment = '')
+ public function send(Invoice $invoice, $forceSyncMode = false)
{
- $order = $invoice->getOrder();
- if ($order->getShippingAddress()) {
- $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
- } else {
- $formattedShippingAddress = '';
- }
- $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
- $this->templateContainer->setTemplateVars(
- [
- 'order' => $order,
- 'invoice' => $invoice,
- 'comment' => $comment,
- 'billing' => $order->getBillingAddress(),
- 'payment_html' => $this->getPaymentHtml($order),
- 'store' => $order->getStore(),
- 'formattedShippingAddress' => $formattedShippingAddress,
- 'formattedBillingAddress' => $formattedBillingAddress,
- ]
- );
- $result = $this->checkAndSend($order, $notify);
- if ($result) {
- $invoice->setEmailSent(true);
- $this->invoiceResource->saveAttribute($invoice, 'email_sent');
+ $invoice->setSendEmail(true);
+
+ if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+ $order = $invoice->getOrder();
+
+ if ($order->getShippingAddress()) {
+ $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
+ } else {
+ $formattedShippingAddress = '';
+ }
+ $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
+
+ $this->templateContainer->setTemplateVars(
+ [
+ 'order' => $order,
+ 'invoice' => $invoice,
+ 'comment' => $invoice->getCustomerNoteNotify() ? $invoice->getCustomerNote() : '',
+ 'billing' => $order->getBillingAddress(),
+ 'payment_html' => $this->getPaymentHtml($order),
+ 'store' => $order->getStore(),
+ 'formattedShippingAddress' => $formattedShippingAddress,
+ 'formattedBillingAddress' => $formattedBillingAddress
+ ]
+ );
+
+ if ($this->checkAndSend($order)) {
+ $invoice->setEmailSent(true);
+
+ $this->invoiceResource->saveAttribute($invoice, ['send_email', 'email_sent']);
+
+ return true;
+ }
}
- return $result;
+
+ $this->invoiceResource->saveAttribute($invoice, 'send_email');
+
+ return false;
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
index 9388270c7db300ea4f4de64b95eca3fa9ada02df..dc2d544d335bd35b9aa5c81327f272bb2c927872 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -28,6 +28,13 @@ class OrderSender extends Sender
*/
protected $orderResource;
+ /**
+ * Global configuration storage.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $globalConfig;
+
/**
* @var Renderer
*/
@@ -40,6 +47,7 @@ class OrderSender extends Sender
* @param \Psr\Log\LoggerInterface $logger
* @param PaymentHelper $paymentHelper
* @param OrderResource $orderResource
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
* @param Renderer $addressRenderer
*/
public function __construct(
@@ -49,28 +57,48 @@ class OrderSender extends Sender
\Psr\Log\LoggerInterface $logger,
PaymentHelper $paymentHelper,
OrderResource $orderResource,
+ \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
Renderer $addressRenderer
) {
parent::__construct($templateContainer, $identityContainer, $senderBuilderFactory, $logger);
$this->paymentHelper = $paymentHelper;
$this->orderResource = $orderResource;
+ $this->globalConfig = $globalConfig;
$this->addressRenderer = $addressRenderer;
}
/**
- * Send email to customer
+ * Sends order email to the customer.
+ *
+ * Email will be sent immediately in two cases:
+ *
+ * - if asynchronous email sending is disabled in global settings
+ * - if $forceSyncMode parameter is set to TRUE
+ *
+ * Otherwise, email will be sent later during running of
+ * corresponding cron job.
*
* @param Order $order
+ * @param bool $forceSyncMode
* @return bool
*/
- public function send(Order $order)
+ public function send(Order $order, $forceSyncMode = false)
{
- $result = $this->checkAndSend($order);
- if ($result) {
- $order->setEmailSent(true);
- $this->orderResource->saveAttribute($order, 'email_sent');
+ $order->setSendEmail(true);
+
+ if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+ if ($this->checkAndSend($order)) {
+ $order->setEmailSent(true);
+
+ $this->orderResource->saveAttribute($order, ['send_email', 'email_sent']);
+
+ return true;
+ }
}
- return $result;
+
+ $this->orderResource->saveAttribute($order, 'send_email');
+
+ return false;
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 811f89496835862b32ef5300de1b844e67182e39..cedd82ae34d6426ed8fff4d60ff9a48565b8ca20 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -9,15 +9,17 @@ use Magento\Payment\Helper\Data as PaymentHelper;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
use Magento\Sales\Model\Order\Email\Container\Template;
-use Magento\Sales\Model\Order\Email\NotifySender;
+use Magento\Sales\Model\Order\Email\Sender;
use Magento\Sales\Model\Order\Shipment;
use Magento\Sales\Model\Resource\Order\Shipment as ShipmentResource;
use Magento\Sales\Model\Order\Address\Renderer;
/**
* Class ShipmentSender
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class ShipmentSender extends NotifySender
+class ShipmentSender extends Sender
{
/**
* @var PaymentHelper
@@ -29,6 +31,13 @@ class ShipmentSender extends NotifySender
*/
protected $shipmentResource;
+ /**
+ * Global configuration storage.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $globalConfig;
+
/**
* @var Renderer
*/
@@ -41,6 +50,7 @@ class ShipmentSender extends NotifySender
* @param \Psr\Log\LoggerInterface $logger
* @param PaymentHelper $paymentHelper
* @param ShipmentResource $shipmentResource
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
* @param Renderer $addressRenderer
*/
public function __construct(
@@ -50,49 +60,70 @@ class ShipmentSender extends NotifySender
\Psr\Log\LoggerInterface $logger,
PaymentHelper $paymentHelper,
ShipmentResource $shipmentResource,
+ \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
Renderer $addressRenderer
) {
parent::__construct($templateContainer, $identityContainer, $senderBuilderFactory, $logger);
$this->paymentHelper = $paymentHelper;
$this->shipmentResource = $shipmentResource;
+ $this->globalConfig = $globalConfig;
$this->addressRenderer = $addressRenderer;
}
/**
- * Send email to customer
+ * Sends order shipment email to the customer.
+ *
+ * Email will be sent immediately in two cases:
+ *
+ * - if asynchronous email sending is disabled in global settings
+ * - if $forceSyncMode parameter is set to TRUE
+ *
+ * Otherwise, email will be sent later during running of
+ * corresponding cron job.
*
* @param Shipment $shipment
- * @param bool $notify
- * @param string $comment
+ * @param bool $forceSyncMode
* @return bool
*/
- public function send(Shipment $shipment, $notify = true, $comment = '')
+ public function send(Shipment $shipment, $forceSyncMode = false)
{
- $order = $shipment->getOrder();
- if ($order->getShippingAddress()) {
- $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
- } else {
- $formattedShippingAddress = '';
- }
- $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
- $this->templateContainer->setTemplateVars(
- [
- 'order' => $order,
- 'shipment' => $shipment,
- 'comment' => $comment,
- 'billing' => $order->getBillingAddress(),
- 'payment_html' => $this->getPaymentHtml($order),
- 'store' => $order->getStore(),
- 'formattedShippingAddress' => $formattedShippingAddress,
- 'formattedBillingAddress' => $formattedBillingAddress,
- ]
- );
- $result = $this->checkAndSend($order, $notify);
- if ($result) {
- $shipment->setEmailSent(true);
- $this->shipmentResource->saveAttribute($shipment, 'email_sent');
+ $shipment->setSendEmail(true);
+
+ if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+ $order = $shipment->getOrder();
+
+ if ($order->getShippingAddress()) {
+ $formattedShippingAddress = $this->addressRenderer->format($order->getShippingAddress(), 'html');
+ } else {
+ $formattedShippingAddress = '';
+ }
+ $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
+
+ $this->templateContainer->setTemplateVars(
+ [
+ 'order' => $order,
+ 'shipment' => $shipment,
+ 'comment' => $shipment->getCustomerNoteNotify() ? $shipment->getCustomerNote() : '',
+ 'billing' => $order->getBillingAddress(),
+ 'payment_html' => $this->getPaymentHtml($order),
+ 'store' => $order->getStore(),
+ 'formattedShippingAddress' => $formattedShippingAddress,
+ 'formattedBillingAddress' => $formattedBillingAddress
+ ]
+ );
+
+ if ($this->checkAndSend($order)) {
+ $shipment->setEmailSent(true);
+
+ $this->shipmentResource->saveAttribute($shipment, ['send_email', 'email_sent']);
+
+ return true;
+ }
}
- return $result;
+
+ $this->shipmentResource->saveAttribute($shipment, 'send_email');
+
+ return false;
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index d88dfa1d8850a2fd04018895cb9c4417ed041c41..8317b7041d61f3e747af2b644050854b3b55174d 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -12,6 +12,11 @@ use Magento\Sales\Model\EntityInterface;
/**
* @method \Magento\Sales\Model\Order\Invoice setCreatedAt(string $value)
+ * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
+ * @method string getCustomerNote()
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNoteNotify(bool $value)
+ * @method bool getCustomerNoteNotify()
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index ec3a0561cf262bb577f4f3a9e6f381b1ca121566..3472e9663ad337ceb64c7399b06a60e389883708 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -16,6 +16,11 @@ use Magento\Sales\Model\EntityInterface;
* @method \Magento\Sales\Model\Resource\Order\Shipment _getResource()
* @method \Magento\Sales\Model\Resource\Order\Shipment getResource()
* @method \Magento\Sales\Model\Order\Shipment setCreatedAt(string $value)
+ * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
+ * @method string getCustomerNote()
+ * @method \Magento\Sales\Model\Order\Invoice setCustomerNoteNotify(bool $value)
+ * @method bool getCustomerNoteNotify()
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
*/
diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php
index e4c43d87676778164d099ad8699467373810250a..fd517941e38a02bb475a13e56ab6100dd531a911 100644
--- a/app/code/Magento/Sales/Setup/InstallSchema.php
+++ b/app/code/Magento/Sales/Setup/InstallSchema.php
@@ -876,15 +876,13 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->addForeignKey(
$installer->getFkName('sales_order', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Order'
);
@@ -1037,22 +1035,19 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->addForeignKey(
$installer->getFkName('sales_order_grid', 'entity_id', 'sales_order', 'entity_id'),
'entity_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_order_grid', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Order Grid'
);
@@ -1197,7 +1192,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Order Address'
@@ -1699,15 +1693,13 @@ class InstallSchema implements InstallSchemaInterface
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_order_item', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Order Item'
);
@@ -2050,7 +2042,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Order Payment'
@@ -2180,15 +2171,13 @@ class InstallSchema implements InstallSchemaInterface
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_shipment', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Shipment'
);
@@ -2296,15 +2285,13 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('sales_shipment'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_shipment_grid', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Shipment Grid'
);
@@ -2395,7 +2382,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_shipment'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Shipment Item'
@@ -2487,7 +2473,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_shipment'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Shipment Track'
@@ -2546,7 +2531,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_shipment'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Shipment Comment'
@@ -2850,15 +2834,13 @@ class InstallSchema implements InstallSchemaInterface
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_invoice', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Invoice'
);
@@ -2996,15 +2978,13 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('sales_invoice'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_invoice_grid', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Invoice Grid'
);
@@ -3173,7 +3153,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_invoice'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Invoice Item'
@@ -3232,7 +3211,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_invoice'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Invoice Comment'
@@ -3560,15 +3538,13 @@ class InstallSchema implements InstallSchemaInterface
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_creditmemo', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Creditmemo'
);
@@ -3748,15 +3724,13 @@ class InstallSchema implements InstallSchemaInterface
'entity_id',
$installer->getTable('sales_creditmemo'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_creditmemo_grid', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Flat Creditmemo Grid'
);
@@ -3925,7 +3899,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_creditmemo'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Creditmemo Item'
@@ -3984,7 +3957,6 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_creditmemo'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Flat Creditmemo Comment'
@@ -4066,8 +4038,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Invoiced Aggregated'
);
@@ -4148,8 +4119,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Invoiced Aggregated Order'
);
@@ -4296,8 +4266,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Order Aggregated Created'
);
@@ -4394,7 +4363,6 @@ class InstallSchema implements InstallSchemaInterface
'order_id',
$installer->getTable('sales_order'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -4406,14 +4374,12 @@ class InstallSchema implements InstallSchemaInterface
'parent_id',
$installer->getTable('sales_payment_transaction'),
'transaction_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_payment_transaction', 'payment_id', 'sales_order_payment', 'entity_id'),
'payment_id',
$installer->getTable('sales_order_payment'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Payment Transaction'
@@ -4489,8 +4455,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Refunded Aggregated'
);
@@ -4565,8 +4530,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Refunded Aggregated Order'
);
@@ -4641,8 +4605,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Shipping Aggregated'
);
@@ -4717,8 +4680,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Sales Shipping Aggregated Order'
);
@@ -4796,7 +4758,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -4808,7 +4769,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Bestsellers Aggregated Daily'
@@ -4887,7 +4847,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -4899,7 +4858,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Bestsellers Aggregated Monthly'
@@ -4978,7 +4936,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -4990,7 +4947,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Bestsellers Aggregated Yearly'
@@ -5138,7 +5094,6 @@ class InstallSchema implements InstallSchemaInterface
'status',
$installer->getTable('sales_order_status'),
'status',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Order Status Table'
@@ -5176,14 +5131,12 @@ class InstallSchema implements InstallSchemaInterface
'status',
$installer->getTable('sales_order_status'),
'status',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('sales_order_status_label', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Order Status Label Table'
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
index b1178f1268f0dc446d252882798158ce8920ad11..99823503bd2e1abe1ba888584a5d47885e66de6e 100644
--- a/app/code/Magento/Sales/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -20,6 +20,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
* {@inheritdoc}
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
{
@@ -111,6 +112,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
);
}
}
+
if (version_compare($context->getVersion(), '2.0.3') < 0) {
$dropIncrementIndexTables = [
'sales_creditmemo',
@@ -155,5 +157,79 @@ class UpgradeSchema implements UpgradeSchemaInterface
);
}
}
+
+ if (version_compare($context->getVersion(), '2.0.4') < 0) {
+
+ /**
+ * Adding 'send_email' columns.
+ */
+
+ $tables = ['sales_order', 'sales_invoice', 'sales_shipment', 'sales_creditmemo'];
+
+ foreach ($tables as $table) {
+ $table = $setup->getTable($table);
+
+ $setup->getConnection()
+ ->addColumn(
+ $table,
+ 'send_email',
+ [
+ 'type' => Table::TYPE_SMALLINT,
+ 'after' => 'email_sent',
+ 'comment' => 'Send Email',
+ 'unsigned' => true
+ ]
+ );
+
+ $setup->getConnection()
+ ->addIndex($table, $setup->getIdxName($table, ['email_sent']), 'email_sent');
+
+ $setup->getConnection()
+ ->addIndex($table, $setup->getIdxName($table, ['send_email']), 'send_email');
+ }
+
+ /**
+ * Adding 'customer_note' columns.
+ */
+
+ $tables = ['sales_invoice', 'sales_shipment', 'sales_creditmemo'];
+
+ foreach ($tables as $table) {
+ $table = $setup->getTable($table);
+
+ $setup->getConnection()
+ ->addColumn(
+ $table,
+ 'customer_note',
+ [
+ 'type' => Table::TYPE_TEXT,
+ 'after' => 'updated_at',
+ 'comment' => 'Customer Note'
+ ]
+ );
+ }
+
+ /**
+ * Adding 'customer_note_notify' columns.
+ */
+
+ $tables = ['sales_invoice', 'sales_shipment', 'sales_creditmemo'];
+
+ foreach ($tables as $table) {
+ $table = $setup->getTable($table);
+
+ $setup->getConnection()
+ ->addColumn(
+ $table,
+ 'customer_note_notify',
+ [
+ 'type' => Table::TYPE_SMALLINT,
+ 'after' => 'customer_note',
+ 'comment' => 'Customer Note Notify',
+ 'unsigned' => true
+ ]
+ );
+ }
+ }
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..69f3f6e0df310d27dc7c7c6774ad5a62ca1e82cb
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Config\Backend\Email;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Unit test of backend model for global configuration value
+ * 'sales_email/general/async_sending'.
+ */
+class AsyncSendingTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Sales\Model\Config\Backend\Email\AsyncSending
+ */
+ protected $object;
+
+ /**
+ * @var \Magento\Framework\App\Config|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $config;
+
+ /**
+ * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $context;
+
+ /**
+ * @var \Magento\Framework\Event\Manager\Proxy|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $eventManager;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->config = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
+
+ $this->eventManager = $this->getMock('Magento\Framework\Event\Manager\Proxy', [], [], '', false);
+
+ $this->context = $this->getMock('Magento\Framework\Model\Context', ['getEventDispatcher'], [], '', false);
+ $this->context->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManager);
+
+ $this->object = $objectManager->getObject(
+ '\Magento\Sales\Model\Config\Backend\Email\AsyncSending',
+ [
+ 'config' => $this->config,
+ 'context' => $this->context
+ ]
+ );
+ }
+
+ /**
+ * @param int $value
+ * @param int $oldValue
+ * @param string $eventName
+ * @dataProvider afterSaveDataProvider
+ * @return void
+ */
+ public function testAfterSave($value, $oldValue, $eventName)
+ {
+ $path = 'sales_email/general/async_sending';
+ $scope = \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT;
+
+ $this->object->setData(['value' => $value, 'path' => $path, 'scope' => $scope]);
+
+ $this->config->expects($this->once())->method('getValue')->with($path, $scope)->willReturn($oldValue);
+
+ if ($value == $oldValue) {
+ $this->eventManager->expects($this->never())->method('dispatch');
+ } else {
+ $this->eventManager->expects($this->once())->method('dispatch')->with($eventName);
+ }
+
+ $this->object->afterSave();
+ }
+
+ /**
+ * @return array
+ */
+ public function afterSaveDataProvider()
+ {
+ return [
+ [0, 0, null],
+ [1, 1, null],
+ [0, 1, 'config_data_sales_email_general_async_sending_disabled'],
+ [1, 0, 'config_data_sales_email_general_async_sending_enabled']
+ ];
+ }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Observer/SendEmailsTest.php b/app/code/Magento/Sales/Test/Unit/Model/Observer/SendEmailsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b3e4a9905a17f761eb6b763df933dabf5630d6b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Observer/SendEmailsTest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Observer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Unit test of sales emails sending observer.
+ */
+class SendEmailsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Subject of testing.
+ *
+ * @var \Magento\Sales\Model\Observer\SendEmails
+ */
+ protected $object;
+
+ /**
+ * Email sender model mock.
+ *
+ * @var \Magento\Sales\Model\Order\Email\Sender|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $emailSender;
+
+ /**
+ * Entity resource model mock.
+ *
+ * @var \Magento\Sales\Model\Resource\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $entityResource;
+
+ /**
+ * Entity collection model mock.
+ *
+ * @var \Magento\Sales\Model\Resource\Collection\AbstractCollection|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $entityCollection;
+
+ /**
+ * Global configuration storage mock.
+ *
+ * @var \Magento\Framework\App\Config|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $globalConfig;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $this->emailSender = $this->getMock(
+ 'Magento\Sales\Model\Order\Email\Sender',
+ ['send'],
+ [],
+ '',
+ false
+ );
+
+ $this->entityResource = $this->getMockForAbstractClass(
+ 'Magento\Sales\Model\Resource\EntityAbstract',
+ [],
+ '',
+ false,
+ false,
+ true,
+ ['save']
+ );
+
+ $this->entityCollection = $this->getMockForAbstractClass(
+ 'Magento\Sales\Model\Resource\Collection\AbstractCollection',
+ [],
+ '',
+ false,
+ false,
+ true,
+ ['addFieldToFilter', 'getItems']
+ );
+
+ $this->globalConfig = $this->getMock(
+ 'Magento\Framework\App\Config',
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->object = $objectManager->getObject(
+ 'Magento\Sales\Model\Observer\SendEmails',
+ [
+ 'emailSender' => $this->emailSender,
+ 'entityResource' => $this->entityResource,
+ 'entityCollection' => $this->entityCollection,
+ 'globalConfig' => $this->globalConfig
+ ]
+ );
+ }
+
+ /**
+ * @param int $configValue
+ * @param array|null $collectionItems
+ * @param bool|null $emailSendingResult
+ * @dataProvider executeDataProvider
+ * @return void
+ */
+ public function testExecute($configValue, $collectionItems, $emailSendingResult)
+ {
+ $path = 'sales_email/general/async_sending';
+
+ $this->globalConfig
+ ->expects($this->once())
+ ->method('getValue')
+ ->with($path)
+ ->willReturn($configValue);
+
+ if ($configValue) {
+ $this->entityCollection
+ ->expects($this->at(0))
+ ->method('addFieldToFilter')
+ ->with('send_email', ['eq' => 1]);
+
+ $this->entityCollection
+ ->expects($this->at(1))
+ ->method('addFieldToFilter')
+ ->with('email_sent', ['null' => true]);
+
+ $this->entityCollection
+ ->expects($this->any())
+ ->method('getItems')
+ ->willReturn($collectionItems);
+
+ if ($collectionItems) {
+ /** @var \Magento\Sales\Model\AbstractModel|\PHPUnit_Framework_MockObject_MockObject $collectionItem */
+ $collectionItem = $collectionItems[0];
+
+ $this->emailSender
+ ->expects($this->once())
+ ->method('send')
+ ->with($collectionItem, true)
+ ->willReturn($emailSendingResult);
+
+ if ($emailSendingResult) {
+ $collectionItem
+ ->expects($this->once())
+ ->method('setEmailSent')
+ ->with(true)
+ ->willReturn($collectionItem);
+
+ $this->entityResource
+ ->expects($this->once())
+ ->method('save')
+ ->with($collectionItem);
+ }
+ }
+ }
+
+ $this->object->execute();
+ }
+
+ /**
+ * @return array
+ */
+ public function executeDataProvider()
+ {
+ $entityModel = $this->getMockForAbstractClass(
+ 'Magento\Sales\Model\AbstractModel',
+ [],
+ '',
+ false,
+ false,
+ true,
+ ['setEmailSent']
+ );
+
+ return [
+ [1, [$entityModel], true],
+ [1, [$entityModel], false],
+ [1, [], null],
+ [0, null, null]
+ ];
+ }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index f57cac671fa583cd989e9251664ad6a1113a3c7d..cd70e51424497d16585475b55edaab6d526e7cef 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -10,6 +10,11 @@ namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
*/
abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
{
+ /**
+ * @var \Magento\Sales\Model\Order\Email\Sender|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $senderMock;
+
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
@@ -36,12 +41,24 @@ abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
protected $orderMock;
/**
- * @var \Magento\Sales\Model\Order\Address\Renderer | \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $addressRendererMock;
+ protected $paymentHelper;
/**
- * @var \Magento\Sales\Model\Order\Address | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Order\Address\Renderer|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $addressRenderer;
+
+ /**
+ * Global configuration storage mock.
+ *
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $globalConfig;
+
+ /**
+ * @var \Magento\Sales\Model\Order\Address|\PHPUnit_Framework_MockObject_MockObject
*/
protected $addressMock;
@@ -52,6 +69,14 @@ abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
public function stepMockSetup()
{
+ $this->senderMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Email\Sender',
+ ['send', 'sendCopyTo'],
+ [],
+ '',
+ false
+ );
+
$this->senderBuilderFactoryMock = $this->getMock(
'\Magento\Sales\Model\Order\Email\SenderBuilderFactory',
['create'],
@@ -77,20 +102,46 @@ abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
$this->orderMock = $this->getMock(
'\Magento\Sales\Model\Order',
- [],
+ [
+ 'getStore', 'getBillingAddress', 'getPayment',
+ '__wakeup', 'getCustomerIsGuest', 'getCustomerName',
+ 'getCustomerEmail', 'getShippingAddress', 'setSendEmail',
+ 'setEmailSent'
+ ],
[],
'',
false
);
-
$this->orderMock->expects($this->any())
->method('getStore')
->will($this->returnValue($this->storeMock));
+ $paymentInfoMock = $this->getMock(
+ '\Magento\Payment\Model\Info',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->orderMock->expects($this->any())
+ ->method('getPayment')
+ ->will($this->returnValue($paymentInfoMock));
-
- $this->addressRendererMock = $this->getMock('Magento\Sales\Model\Order\Address\Renderer', [], [], '', false);
+ $this->addressRenderer = $this->getMock('Magento\Sales\Model\Order\Address\Renderer', [], [], '', false);
$this->addressMock = $this->getMock('Magento\Sales\Model\Order\Address', [], [], '', false);
- $this->addressRendererMock->expects($this->any())->method('format')->willReturn(1);
+
+ $this->paymentHelper = $this->getMock('\Magento\Payment\Helper\Data', ['getInfoBlockHtml'], [], '', false);
+ $this->paymentHelper->expects($this->any())
+ ->method('getInfoBlockHtml')
+ ->will($this->returnValue('payment'));
+
+ $this->globalConfig = $this->getMock(
+ 'Magento\Framework\App\Config',
+ ['getValue'],
+ [],
+ '',
+ false
+ );
+
$this->loggerMock = $this->getMock(
'\Psr\Log\LoggerInterface',
[],
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
index c15aed06c125e85fe4732a483105522167522fde..977ded72038ee29f205fa6981c1f534dfdae6120 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
@@ -26,6 +26,7 @@ class CreditmemoCommentSenderTest extends AbstractSenderTest
{
$this->stepMockSetup();
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity');
+ $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
$this->creditmemoMock = $this->getMock(
'\Magento\Sales\Model\Order\Creditmemo',
['getStore', '__wakeup', 'getOrder'],
@@ -44,7 +45,7 @@ class CreditmemoCommentSenderTest extends AbstractSenderTest
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
- $this->addressRendererMock
+ $this->addressRenderer
);
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index eff59e2afe8a99999fb54d326754148fd7192968..cfe7bfc22e54f51db6edc23e02859488612fd11b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
-use \Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
+use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
class CreditmemoSenderTest extends AbstractSenderTest
{
@@ -15,52 +15,34 @@ class CreditmemoSenderTest extends AbstractSenderTest
protected $sender;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject
*/
protected $creditmemoMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $paymentHelper;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Resource\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $creditmemoResource;
+ protected $creditmemoResourceMock;
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- */
protected function setUp()
{
$this->stepMockSetup();
- $this->paymentHelper = $this->getMock('\Magento\Payment\Helper\Data', ['getInfoBlockHtml'], [], '', false);
- $this->paymentHelper->expects($this->any())
- ->method('getInfoBlockHtml')
- ->will($this->returnValue('payment'));
- $this->creditmemoResource = $this->getMock(
+ $this->creditmemoResourceMock = $this->getMock(
'\Magento\Sales\Model\Resource\Order\Creditmemo',
- [],
+ ['saveAttribute'],
[],
'',
false
);
- $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity');
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
$this->creditmemoMock = $this->getMock(
'\Magento\Sales\Model\Order\Creditmemo',
- ['getStore', '__wakeup', 'getOrder'],
+ [
+ 'getStore', '__wakeup', 'getOrder',
+ 'setSendEmail', 'setEmailSent', 'getCustomerNoteNotify',
+ 'getCustomerNote'
+ ],
[],
'',
false
@@ -71,95 +53,156 @@ class CreditmemoSenderTest extends AbstractSenderTest
$this->creditmemoMock->expects($this->any())
->method('getOrder')
->will($this->returnValue($this->orderMock));
+
+ $this->identityContainerMock = $this->getMock(
+ '\Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity',
+ ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'],
+ [],
+ '',
+ false
+ );
+ $this->identityContainerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
+
$this->sender = new CreditmemoSender(
$this->templateContainerMock,
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
$this->paymentHelper,
- $this->creditmemoResource,
- $this->addressRendererMock
+ $this->creditmemoResourceMock,
+ $this->globalConfig,
+ $this->addressRenderer
);
}
- public function testSendFalse()
- {
- $this->stepAddressFormat($this->addressMock);
- $result = $this->sender->send($this->creditmemoMock);
- $this->assertFalse($result);
- }
-
- public function testSendTrueWithCustomerCopy()
+ /**
+ * @param int $configValue
+ * @param bool|null $forceSyncMode
+ * @param bool|null $customerNoteNotify
+ * @param bool|null $emailSendingResult
+ * @dataProvider sendDataProvider
+ * @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $emailSendingResult)
{
- $billingAddress = $this->addressMock;
- $this->stepAddressFormat($this->addressMock);
$comment = 'comment_test';
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
+ $address = 'address_test';
+ $configPath = 'sales_email/general/async_sending';
+
+ $this->creditmemoMock->expects($this->once())
+ ->method('setSendEmail')
+ ->with(true);
+
+ $this->globalConfig->expects($this->once())
+ ->method('getValue')
+ ->with($configPath)
+ ->willReturn($configValue);
+
+ if (!$configValue || $forceSyncMode) {
+ $addressMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Address',
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->addressRenderer->expects($this->any())
+ ->method('format')
+ ->with($addressMock, 'html')
+ ->willReturn($address);
+
+ $this->orderMock->expects($this->any())
+ ->method('getBillingAddress')
+ ->willReturn($addressMock);
+
+ $this->orderMock->expects($this->any())
+ ->method('getShippingAddress')
+ ->willReturn($addressMock);
+
+ $this->creditmemoMock->expects($this->once())
+ ->method('getCustomerNoteNotify')
+ ->willReturn($customerNoteNotify);
+
+ $this->creditmemoMock->expects($this->any())
+ ->method('getCustomerNote')
+ ->willReturn($comment);
+
+ $this->templateContainerMock->expects($this->once())
+ ->method('setTemplateVars')
+ ->with(
[
'order' => $this->orderMock,
'creditmemo' => $this->creditmemoMock,
- 'comment' => $comment,
- 'billing' => $billingAddress,
+ 'comment' => $customerNoteNotify ? $comment : '',
+ 'billing' => $addressMock,
'payment_html' => 'payment',
'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
+ 'formattedShippingAddress' => $address,
+ 'formattedBillingAddress' => $address
]
- )
+ );
+
+ $this->identityContainerMock->expects($this->once())
+ ->method('isEnabled')
+ ->willReturn($emailSendingResult);
+
+ if ($emailSendingResult) {
+ $this->senderBuilderFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->senderMock);
+
+ $this->senderMock->expects($this->once())->method('send');
+
+ $this->senderMock->expects($this->once())->method('sendCopyTo');
+
+ $this->creditmemoMock->expects($this->once())
+ ->method('setEmailSent')
+ ->with(true);
+
+ $this->creditmemoResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->creditmemoMock, ['send_email', 'email_sent']);
+
+ $this->assertTrue(
+ $this->sender->send($this->creditmemoMock)
+ );
+ } else {
+ $this->creditmemoResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->creditmemoMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->creditmemoMock)
+ );
+ }
+ } else {
+ $this->creditmemoResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->creditmemoMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->creditmemoMock)
);
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
- $this->stepSendWithoutSendCopy();
- $result = $this->sender->send($this->creditmemoMock, true, $comment);
- $this->assertTrue($result);
+ }
}
- public function testSendTrueWithoutCustomerCopy()
+ /**
+ * @return array
+ */
+ public function sendDataProvider()
{
- $billingAddress = $this->addressMock;
- $this->stepAddressFormat($billingAddress);
- $comment = 'comment_test';
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
- [
- 'order' => $this->orderMock,
- 'creditmemo' => $this->creditmemoMock,
- 'billing' => $billingAddress,
- 'payment_html' => 'payment',
- 'comment' => $comment,
- 'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
- ]
- )
- );
- $this->stepSendWithCallSendCopyTo();
- $result = $this->sender->send($this->creditmemoMock, false, $comment);
- $this->assertTrue($result);
+ return [
+ [0, 0, 1, true],
+ [0, 0, 0, true],
+ [0, 0, 1, false],
+ [0, 0, 0, false],
+ [0, 1, 1, true],
+ [0, 1, 0, true],
+ [1, null, null, null]
+ ];
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
index 28888804481dc704bff9ca1455c25688db95fb84..30b838341b5ce16a3d733839f911ee1014c2ccfe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
@@ -40,6 +40,8 @@ class InvoiceCommentSenderTest extends AbstractSenderTest
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity');
+ $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
+
$this->invoiceMock = $this->getMock(
'\Magento\Sales\Model\Order\Invoice',
['getStore', '__wakeup', 'getOrder'],
@@ -59,7 +61,7 @@ class InvoiceCommentSenderTest extends AbstractSenderTest
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
- $this->addressRendererMock
+ $this->addressRenderer
);
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
index 3cb4e27fc43121dec895f70e6e436bbebac6c58f..35cb0e84b6566f2e74c0f17f20d918e8a88945a9 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
-use \Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
class InvoiceSenderTest extends AbstractSenderTest
{
@@ -15,54 +15,34 @@ class InvoiceSenderTest extends AbstractSenderTest
protected $sender;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Order\Invoice|\PHPUnit_Framework_MockObject_MockObject
*/
protected $invoiceMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $paymentHelper;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Resource\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $invoiceResource;
+ protected $invoiceResourceMock;
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- */
protected function setUp()
{
$this->stepMockSetup();
- $this->paymentHelper = $this->getMock('\Magento\Payment\Helper\Data', ['getInfoBlockHtml'], [], '', false);
- $this->paymentHelper->expects($this->any())
- ->method('getInfoBlockHtml')
- ->will($this->returnValue('payment'));
- $this->invoiceResource = $this->getMock(
+ $this->invoiceResourceMock = $this->getMock(
'\Magento\Sales\Model\Resource\Order\Invoice',
- [],
- [],
- '',
- false
- );
-
- $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\InvoiceIdentity');
-
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
+ ['saveAttribute'],
[],
'',
false
);
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
$this->invoiceMock = $this->getMock(
'\Magento\Sales\Model\Order\Invoice',
- ['getStore', '__wakeup', 'getOrder'],
+ [
+ 'getStore', '__wakeup', 'getOrder',
+ 'setSendEmail', 'setEmailSent', 'getCustomerNoteNotify',
+ 'getCustomerNote'
+ ],
[],
'',
false
@@ -74,100 +54,155 @@ class InvoiceSenderTest extends AbstractSenderTest
->method('getOrder')
->will($this->returnValue($this->orderMock));
+ $this->identityContainerMock = $this->getMock(
+ '\Magento\Sales\Model\Order\Email\Container\InvoiceIdentity',
+ ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'],
+ [],
+ '',
+ false
+ );
+ $this->identityContainerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
+
$this->sender = new InvoiceSender(
$this->templateContainerMock,
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
$this->paymentHelper,
- $this->invoiceResource,
- $this->addressRendererMock
+ $this->invoiceResourceMock,
+ $this->globalConfig,
+ $this->addressRenderer
);
}
- public function testSendFalse()
- {
- $billingAddress = $this->addressMock;
- $this->stepAddressFormat($billingAddress);
- $result = $this->sender->send($this->invoiceMock);
- $this->assertFalse($result);
- }
-
- public function testSendTrueWithCustomerCopy()
+ /**
+ * @param int $configValue
+ * @param bool|null $forceSyncMode
+ * @param bool|null $customerNoteNotify
+ * @param bool|null $emailSendingResult
+ * @dataProvider sendDataProvider
+ * @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $emailSendingResult)
{
- $billingAddress = $this->addressMock;
- $this->stepAddressFormat($billingAddress);
$comment = 'comment_test';
+ $address = 'address_test';
+ $configPath = 'sales_email/general/async_sending';
+
+ $this->invoiceMock->expects($this->once())
+ ->method('setSendEmail')
+ ->with(true);
+
+ $this->globalConfig->expects($this->once())
+ ->method('getValue')
+ ->with($configPath)
+ ->willReturn($configValue);
+
+ if (!$configValue || $forceSyncMode) {
+ $addressMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Address',
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->addressRenderer->expects($this->any())
+ ->method('format')
+ ->with($addressMock, 'html')
+ ->willReturn($address);
+
+ $this->orderMock->expects($this->any())
+ ->method('getBillingAddress')
+ ->willReturn($addressMock);
+
+ $this->orderMock->expects($this->any())
+ ->method('getShippingAddress')
+ ->willReturn($addressMock);
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
+ $this->invoiceMock->expects($this->once())
+ ->method('getCustomerNoteNotify')
+ ->willReturn($customerNoteNotify);
+
+ $this->invoiceMock->expects($this->any())
+ ->method('getCustomerNote')
+ ->willReturn($comment);
+
+ $this->templateContainerMock->expects($this->once())
+ ->method('setTemplateVars')
+ ->with(
[
'order' => $this->orderMock,
'invoice' => $this->invoiceMock,
- 'comment' => $comment,
- 'billing' => $billingAddress,
+ 'comment' => $customerNoteNotify ? $comment : '',
+ 'billing' => $addressMock,
'payment_html' => 'payment',
'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
+ 'formattedShippingAddress' => $address,
+ 'formattedBillingAddress' => $address
]
- )
+ );
+
+ $this->identityContainerMock->expects($this->once())
+ ->method('isEnabled')
+ ->willReturn($emailSendingResult);
+
+ if ($emailSendingResult) {
+ $this->senderBuilderFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->senderMock);
+
+ $this->senderMock->expects($this->once())->method('send');
+
+ $this->senderMock->expects($this->once())->method('sendCopyTo');
+
+ $this->invoiceMock->expects($this->once())
+ ->method('setEmailSent')
+ ->with(true);
+
+ $this->invoiceResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->invoiceMock, ['send_email', 'email_sent']);
+
+ $this->assertTrue(
+ $this->sender->send($this->invoiceMock)
+ );
+ } else {
+ $this->invoiceResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->invoiceMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->invoiceMock)
+ );
+ }
+ } else {
+ $this->invoiceResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->invoiceMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->invoiceMock)
);
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
- $this->stepSendWithoutSendCopy();
- $result = $this->sender->send($this->invoiceMock, true, $comment);
- $this->assertTrue($result);
+ }
}
- public function testSendTrueWithoutCustomerCopy()
+ /**
+ * @return array
+ */
+ public function sendDataProvider()
{
- $billingAddress = $this->addressMock;
- $this->stepAddressFormat($billingAddress);
- $comment = 'comment_test';
-
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
- [
- 'order' => $this->orderMock,
- 'invoice' => $this->invoiceMock,
- 'billing' => $billingAddress,
- 'payment_html' => 'payment',
- 'comment' => $comment,
- 'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
- ]
- )
- );
- $this->stepSendWithCallSendCopyTo();
- $result = $this->sender->send($this->invoiceMock, false, $comment);
- $this->assertTrue($result);
+ return [
+ [0, 0, 1, true],
+ [0, 0, 0, true],
+ [0, 0, 1, false],
+ [0, 0, 0, false],
+ [0, 1, 1, true],
+ [0, 1, 0, true],
+ [1, null, null, null]
+ ];
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
index 1ddc4e3724cd4050d2834987243c202baf9e126f..9bb5745162152cf85610abaa6cd8af1564586c7d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
@@ -18,12 +18,13 @@ class OrderCommentSenderTest extends AbstractSenderTest
{
$this->stepMockSetup();
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity');
+ $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
$this->sender = new OrderCommentSender(
$this->templateContainerMock,
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
- $this->addressRendererMock
+ $this->addressRenderer
);
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
index b6453f501acb007a92b30ed940b4f003b454f8c7..5350c1924f023c6055e59eec341cb024acb687ca 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
-use \Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
class OrderSenderTest extends AbstractSenderTest
{
@@ -15,42 +15,32 @@ class OrderSenderTest extends AbstractSenderTest
protected $sender;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Resource\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $paymentHelper;
+ protected $orderResourceMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $orderResource;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $loggerMock;
-
protected function setUp()
{
$this->stepMockSetup();
- $this->paymentHelper = $this->getMock(
- '\Magento\Payment\Helper\Data',
- ['getInfoBlockHtml'],
+
+ $this->orderResourceMock = $this->getMock(
+ '\Magento\Sales\Model\Resource\Order',
+ ['saveAttribute'],
[],
'',
false
);
- $this->paymentHelper->expects($this->any())
- ->method('getInfoBlockHtml')
- ->will($this->returnValue('payment'));
- $this->orderResource = $this->getMock(
- '\Magento\Sales\Model\Resource\Order',
- [],
+ $this->identityContainerMock = $this->getMock(
+ '\Magento\Sales\Model\Order\Email\Container\OrderIdentity',
+ ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'],
[],
'',
false
);
- $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\OrderIdentity');
+ $this->identityContainerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
$this->sender = new OrderSender(
$this->templateContainerMock,
@@ -58,110 +48,125 @@ class OrderSenderTest extends AbstractSenderTest
$this->senderBuilderFactoryMock,
$this->loggerMock,
$this->paymentHelper,
- $this->orderResource,
- $this->addressRendererMock
+ $this->orderResourceMock,
+ $this->globalConfig,
+ $this->addressRenderer
);
}
- public function testSendFalse()
- {
- $this->stepAddressFormat($this->addressMock);
- $result = $this->sender->send($this->orderMock);
- $this->assertFalse($result);
- }
-
- public function testSendTrueForCustomer()
+ /**
+ * @param int $configValue
+ * @param bool|null $forceSyncMode
+ * @param bool|null $emailSendingResult
+ * @dataProvider sendDataProvider
+ * @return void
+ */
+ public function testSend($configValue, $forceSyncMode, $emailSendingResult)
{
- $billingAddress = $this->addressMock;
+ $address = 'address_test';
+ $configPath = 'sales_email/general/async_sending';
$this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
- $this->stepAddressFormat($billingAddress);
+ ->method('setSendEmail')
+ ->with(true);
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
- [
- 'order' => $this->orderMock,
- 'billing' => $billingAddress,
- 'payment_html' => 'payment',
- 'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
- ]
- )
+ $this->globalConfig->expects($this->once())
+ ->method('getValue')
+ ->with($configPath)
+ ->willReturn($configValue);
+
+ if (!$configValue || $forceSyncMode) {
+ $this->identityContainerMock->expects($this->once())
+ ->method('isEnabled')
+ ->willReturn($emailSendingResult);
+
+ if ($emailSendingResult) {
+ $addressMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Address',
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->addressRenderer->expects($this->any())
+ ->method('format')
+ ->with($addressMock, 'html')
+ ->willReturn($address);
+
+ $this->orderMock->expects($this->any())
+ ->method('getBillingAddress')
+ ->willReturn($addressMock);
+
+ $this->orderMock->expects($this->any())
+ ->method('getShippingAddress')
+ ->willReturn($addressMock);
+
+ $this->templateContainerMock->expects($this->once())
+ ->method('setTemplateVars')
+ ->with(
+ [
+ 'order' => $this->orderMock,
+ 'billing' => $addressMock,
+ 'payment_html' => 'payment',
+ 'store' => $this->storeMock,
+ 'formattedShippingAddress' => $address,
+ 'formattedBillingAddress' => $address
+ ]
+ );
+
+ $this->senderBuilderFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->senderMock);
+
+ $this->senderMock->expects($this->once())->method('send');
+
+ $this->senderMock->expects($this->once())->method('sendCopyTo');
+
+ $this->orderMock->expects($this->once())
+ ->method('setEmailSent')
+ ->with(true);
+
+ $this->orderResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->orderMock, ['send_email', 'email_sent']);
+
+ $this->assertTrue(
+ $this->sender->send($this->orderMock)
+ );
+ } else {
+ $this->orderResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->orderMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->orderMock)
+ );
+ }
+ } else {
+ $this->orderResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->orderMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->orderMock)
);
- $this->stepSend($this->once(), $this->once());
- $result = $this->sender->send($this->orderMock);
- $this->assertTrue($result);
+ }
}
- public function testSendTrueForGuest()
+ /**
+ * @return array
+ */
+ public function sendDataProvider()
{
- $billingAddress = $this->getMock(
- '\Magento\Sales\Model\Order\Address',
- [],
- [],
- '',
- false
- );
- $this->stepAddressFormat($billingAddress);
- $billingAddress->expects($this->any())
- ->method('getName')
- ->will($this->returnValue('name'));
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(true));
- $this->orderMock->expects($this->any())
- ->method('getBillingAddress')
- ->will($this->returnValue($billingAddress));
-
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
- [
- 'order' => $this->orderMock,
- 'billing' => $billingAddress,
- 'payment_html' => 'payment',
- 'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
- ]
- )
- );
- $this->stepSend($this->once(), $this->once());
- $result = $this->sender->send($this->orderMock);
- $this->assertTrue($result);
+ return [
+ [0, 0, true],
+ [0, 0, true],
+ [0, 0, false],
+ [0, 0, false],
+ [0, 1, true],
+ [0, 1, true],
+ [1, null, null, null]
+ ];
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
index 6d4c4f26fc03078f2d05510cf28b07ce15af2d7a..0a69bb2fcf85d7eae3c0f0841ee17be8afdd1221 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
@@ -23,6 +23,7 @@ class ShipmentCommentSenderTest extends AbstractSenderTest
{
$this->stepMockSetup();
$this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity');
+ $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
$this->shipmentMock = $this->getMock(
'\Magento\Sales\Model\Order\Shipment',
['getStore', '__wakeup', 'getOrder'],
@@ -42,7 +43,7 @@ class ShipmentCommentSenderTest extends AbstractSenderTest
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
- $this->addressRendererMock
+ $this->addressRenderer
);
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
index 1f57f234e409c43c25f1089980aa88fbf389daa6..a13619f0423eaaa9a0f0ee3636c0c999454a0a9c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
-use \Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
class ShipmentSenderTest extends AbstractSenderTest
{
@@ -15,54 +15,34 @@ class ShipmentSenderTest extends AbstractSenderTest
protected $sender;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Order\Shipment|\PHPUnit_Framework_MockObject_MockObject
*/
protected $shipmentMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $paymentHelper;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Resource\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $shipmentResource;
+ protected $shipmentResourceMock;
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- */
protected function setUp()
{
$this->stepMockSetup();
- $this->paymentHelper = $this->getMock('\Magento\Payment\Helper\Data', ['getInfoBlockHtml'], [], '', false);
- $this->paymentHelper->expects($this->any())
- ->method('getInfoBlockHtml')
- ->will($this->returnValue('payment'));
- $this->shipmentResource = $this->getMock(
+ $this->shipmentResourceMock = $this->getMock(
'\Magento\Sales\Model\Resource\Order\Shipment',
- [],
- [],
- '',
- false
- );
-
- $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\ShipmentIdentity');
-
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
+ ['saveAttribute'],
[],
'',
false
);
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
$this->shipmentMock = $this->getMock(
'\Magento\Sales\Model\Order\Shipment',
- ['getStore', '__wakeup', 'getOrder'],
+ [
+ 'getStore', '__wakeup', 'getOrder',
+ 'setSendEmail', 'setEmailSent', 'getCustomerNoteNotify',
+ 'getCustomerNote'
+ ],
[],
'',
false
@@ -74,99 +54,155 @@ class ShipmentSenderTest extends AbstractSenderTest
->method('getOrder')
->will($this->returnValue($this->orderMock));
+ $this->identityContainerMock = $this->getMock(
+ '\Magento\Sales\Model\Order\Email\Container\ShipmentIdentity',
+ ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'],
+ [],
+ '',
+ false
+ );
+ $this->identityContainerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
+
$this->sender = new ShipmentSender(
$this->templateContainerMock,
$this->identityContainerMock,
$this->senderBuilderFactoryMock,
$this->loggerMock,
$this->paymentHelper,
- $this->shipmentResource,
- $this->addressRendererMock
+ $this->shipmentResourceMock,
+ $this->globalConfig,
+ $this->addressRenderer
);
}
- public function testSendFalse()
- {
- $this->stepAddressFormat($this->addressMock);
- $result = $this->sender->send($this->shipmentMock);
- $this->assertFalse($result);
- }
-
- public function testSendTrueWithCustomerCopy()
+ /**
+ * @param int $configValue
+ * @param bool|null $forceSyncMode
+ * @param bool|null $customerNoteNotify
+ * @param bool|null $emailSendingResult
+ * @dataProvider sendDataProvider
+ * @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $emailSendingResult)
{
- $billingAddress = $this->addressMock;
$comment = 'comment_test';
+ $address = 'address_test';
+ $configPath = 'sales_email/general/async_sending';
+
+ $this->shipmentMock->expects($this->once())
+ ->method('setSendEmail')
+ ->with(true);
+
+ $this->globalConfig->expects($this->once())
+ ->method('getValue')
+ ->with($configPath)
+ ->willReturn($configValue);
+
+ if (!$configValue || $forceSyncMode) {
+ $addressMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Address',
+ [],
+ [],
+ '',
+ false
+ );
+
+ $this->addressRenderer->expects($this->any())
+ ->method('format')
+ ->with($addressMock, 'html')
+ ->willReturn($address);
+
+ $this->orderMock->expects($this->any())
+ ->method('getBillingAddress')
+ ->willReturn($addressMock);
+
+ $this->orderMock->expects($this->any())
+ ->method('getShippingAddress')
+ ->willReturn($addressMock);
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
- $this->stepAddressFormat($billingAddress);
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
+ $this->shipmentMock->expects($this->once())
+ ->method('getCustomerNoteNotify')
+ ->willReturn($customerNoteNotify);
+
+ $this->shipmentMock->expects($this->any())
+ ->method('getCustomerNote')
+ ->willReturn($comment);
+
+ $this->templateContainerMock->expects($this->once())
+ ->method('setTemplateVars')
+ ->with(
[
'order' => $this->orderMock,
'shipment' => $this->shipmentMock,
- 'comment' => $comment,
- 'billing' => $billingAddress,
+ 'comment' => $customerNoteNotify ? $comment : '',
+ 'billing' => $addressMock,
'payment_html' => 'payment',
'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
+ 'formattedShippingAddress' => $address,
+ 'formattedBillingAddress' => $address
]
- )
+ );
+
+ $this->identityContainerMock->expects($this->once())
+ ->method('isEnabled')
+ ->willReturn($emailSendingResult);
+
+ if ($emailSendingResult) {
+ $this->senderBuilderFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->senderMock);
+
+ $this->senderMock->expects($this->once())->method('send');
+
+ $this->senderMock->expects($this->once())->method('sendCopyTo');
+
+ $this->shipmentMock->expects($this->once())
+ ->method('setEmailSent')
+ ->with(true);
+
+ $this->shipmentResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->shipmentMock, ['send_email', 'email_sent']);
+
+ $this->assertTrue(
+ $this->sender->send($this->shipmentMock)
+ );
+ } else {
+ $this->shipmentResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->shipmentMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->shipmentMock)
+ );
+ }
+ } else {
+ $this->shipmentResourceMock->expects($this->once())
+ ->method('saveAttribute')
+ ->with($this->shipmentMock, 'send_email');
+
+ $this->assertFalse(
+ $this->sender->send($this->shipmentMock)
);
- $paymentInfoMock = $this->getMock(
- '\Magento\Payment\Model\Info',
- [],
- [],
- '',
- false
- );
- $this->orderMock->expects($this->once())
- ->method('getPayment')
- ->will($this->returnValue($paymentInfoMock));
- $this->stepSendWithoutSendCopy();
- $result = $this->sender->send($this->shipmentMock, true, $comment);
- $this->assertTrue($result);
+ }
}
- public function testSendTrueWithoutCustomerCopy()
+ /**
+ * @return array
+ */
+ public function sendDataProvider()
{
- $billingAddress = $this->addressMock;
- $comment = 'comment_test';
-
- $this->orderMock->expects($this->once())
- ->method('getCustomerIsGuest')
- ->will($this->returnValue(false));
- $this->stepAddressFormat($billingAddress);
-
- $this->identityContainerMock->expects($this->once())
- ->method('isEnabled')
- ->will($this->returnValue(true));
- $this->templateContainerMock->expects($this->once())
- ->method('setTemplateVars')
- ->with(
- $this->equalTo(
- [
- 'order' => $this->orderMock,
- 'shipment' => $this->shipmentMock,
- 'billing' => $billingAddress,
- 'payment_html' => 'payment',
- 'comment' => $comment,
- 'store' => $this->storeMock,
- 'formattedShippingAddress' => 1,
- 'formattedBillingAddress' => 1
- ]
- )
- );
- $this->stepSendWithCallSendCopyTo();
- $result = $this->sender->send($this->shipmentMock, false, $comment);
- $this->assertTrue($result);
+ return [
+ [0, 0, 1, true],
+ [0, 0, 0, true],
+ [0, 0, 1, false],
+ [0, 0, 0, false],
+ [0, 1, 1, true],
+ [0, 1, 0, true],
+ [1, null, null, null]
+ ];
}
}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index d3a0a17afb3e01472852a13c96b1c486fe9f0572..b222a99d487454639b77b3a2552c45115a8f1919 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -348,6 +348,11 @@ class OrderTest extends \PHPUnit_Framework_TestCase
$order->setData('state', $orderState);
$payment = $this->_prepareOrderPayment($order);
$canVoidOrder = true;
+
+ if ($orderState == \Magento\Sales\Model\Order::STATE_CANCELED) {
+ $canVoidOrder = false;
+ }
+
if ($orderState == \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW) {
$canVoidOrder = false;
}
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index e7482704e39adc243e781283034f20f391152eb0..4ea65218f81382b54f65b88152199aa1e2866db6 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -119,6 +119,14 @@
<label>Sales Emails</label>
<tab>sales</tab>
<resource>Magento_Sales::sales_email</resource>
+ <group id="general" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+ <label>General Settings</label>
+ <field id="async_sending" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+ <label>Asynchronous sending</label>
+ <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
+ <backend_model>Magento\Sales\Model\Config\Backend\Email\AsyncSending</backend_model>
+ </field>
+ </group>
<group id="order" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Order</label>
<field id="enabled" translate="label" type="select" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -340,7 +348,7 @@
<label>PDF Print-outs</label>
<tab>sales</tab>
<resource>Magento_Sales::sales_pdf</resource>
- <group id="invoice" translate="label" type="text" sortOrder="1" showInDefault="10" showInWebsite="1" showInStore="1">
+ <group id="invoice" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Invoice</label>
<field id="put_order_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Display Order ID in Header</label>
diff --git a/app/code/Magento/Sales/etc/config.xml b/app/code/Magento/Sales/etc/config.xml
index f88cf2955f60ed8f3db411ad7f4f49b37b87dc51..e786d5e45149b1b0cbb655d91a7cbc94ff33b5e0 100644
--- a/app/code/Magento/Sales/etc/config.xml
+++ b/app/code/Magento/Sales/etc/config.xml
@@ -23,6 +23,9 @@
</minimum_order>
</sales>
<sales_email>
+ <general>
+ <async_sending>0</async_sending>
+ </general>
<order>
<enabled>1</enabled>
<template>sales_email_order_template</template>
diff --git a/app/code/Magento/Sales/etc/crontab.xml b/app/code/Magento/Sales/etc/crontab.xml
index 1bd5b3e3e2478754784856b302a17ec3c2162470..15264798d8f1f8f34b800160472065b76f4ae72b 100644
--- a/app/code/Magento/Sales/etc/crontab.xml
+++ b/app/code/Magento/Sales/etc/crontab.xml
@@ -37,5 +37,17 @@
<job name="sales_grid_order_creditmemo_async_insert" instance="Magento\Sales\Model\Observer\Order\Creditmemo\IndexGrid" method="asyncInsert">
<schedule>*/1 * * * *</schedule>
</job>
+ <job name="sales_send_order_emails" instance="Magento\Sales\Model\Observer\Order\SendEmails" method="execute">
+ <schedule>*/1 * * * *</schedule>
+ </job>
+ <job name="sales_send_order_invoice_emails" instance="Magento\Sales\Model\Observer\Order\Invoice\SendEmails" method="execute">
+ <schedule>*/1 * * * *</schedule>
+ </job>
+ <job name="sales_send_order_shipment_emails" instance="Magento\Sales\Model\Observer\Order\Shipment\SendEmails" method="execute">
+ <schedule>*/1 * * * *</schedule>
+ </job>
+ <job name="sales_send_order_creditmemo_emails" instance="Magento\Sales\Model\Observer\Order\Creditmemo\SendEmails" method="execute">
+ <schedule>*/1 * * * *</schedule>
+ </job>
</group>
</config>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index ba45f06f9d73eed3c92d5d35faaaf5210363d158..9e20997c62f002c51ce2448f1e59e46acedf86da 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -157,6 +157,34 @@
<argument name="entityGrid" xsi:type="object">Magento\Sales\Model\Resource\Order\Creditmemo\Grid</argument>
</arguments>
</virtualType>
+ <virtualType name="Magento\Sales\Model\Observer\Order\SendEmails" type="Magento\Sales\Model\Observer\SendEmails">
+ <arguments>
+ <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\OrderSender</argument>
+ <argument name="entityResource" xsi:type="object">Magento\Sales\Model\Resource\Order</argument>
+ <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\Resource\Order\Collection</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="Magento\Sales\Model\Observer\Order\Invoice\SendEmails" type="Magento\Sales\Model\Observer\SendEmails">
+ <arguments>
+ <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\InvoiceSender</argument>
+ <argument name="entityResource" xsi:type="object">Magento\Sales\Model\Resource\Order\Invoice</argument>
+ <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\Resource\Order\Invoice\Collection</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="Magento\Sales\Model\Observer\Order\Shipment\SendEmails" type="Magento\Sales\Model\Observer\SendEmails">
+ <arguments>
+ <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\ShipmentSender</argument>
+ <argument name="entityResource" xsi:type="object">Magento\Sales\Model\Resource\Order\Shipment</argument>
+ <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\Resource\Order\Shipment\Collection</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="Magento\Sales\Model\Observer\Order\Creditmemo\SendEmails" type="Magento\Sales\Model\Observer\SendEmails">
+ <arguments>
+ <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\CreditmemoSender</argument>
+ <argument name="entityResource" xsi:type="object">Magento\Sales\Model\Resource\Order\Creditmemo</argument>
+ <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\Resource\Order\Creditmemo\Collection</argument>
+ </arguments>
+ </virtualType>
<type name="Magento\SalesSequence\Model\EntityPool">
<arguments>
<argument name="entities" xsi:type="array">
diff --git a/app/code/Magento/Sales/etc/events.xml b/app/code/Magento/Sales/etc/events.xml
index 1260e97f8d9d48c95b7e9e77102267339abefcc6..9e38abcd68e8c2812d99b3dc4f33c20135e9e2d5 100644
--- a/app/code/Magento/Sales/etc/events.xml
+++ b/app/code/Magento/Sales/etc/events.xml
@@ -39,6 +39,12 @@
<observer name="sales_grid_order_shipment_async_insert" instance="Magento\Sales\Model\Observer\Order\Shipment\IndexGrid" method="asyncInsert" />
<observer name="sales_grid_order_creditmemo_async_insert" instance="Magento\Sales\Model\Observer\Order\Creditmemo\IndexGrid" method="asyncInsert" />
</event>
+ <event name="config_data_sales_email_general_async_sending_disabled">
+ <observer name="sales_send_order_emails" instance="Magento\Sales\Model\Observer\Order\SendEmails" method="execute" />
+ <observer name="sales_send_order_invoice_emails" instance="Magento\Sales\Model\Observer\Order\Invoice\SendEmails" method="execute" />
+ <observer name="sales_send_order_shipment_emails" instance="Magento\Sales\Model\Observer\Order\Shipment\SendEmails" method="execute" />
+ <observer name="sales_send_order_creditmemo_emails" instance="Magento\Sales\Model\Observer\Order\Creditmemo\SendEmails" method="execute" />
+ </event>
<event name="store_add">
<observer name="magento_sequence" instance="Magento\SalesSequence\Model\Observer" method="execute" />
</event>
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
index eb894f667baef8cdb7b1214aec572f7660e00f50..931f2ab5884d8cb48936375b141eaba64c35d37e 100644
--- a/app/code/Magento/Sales/etc/module.xml
+++ b/app/code/Magento/Sales/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
- <module name="Magento_Sales" setup_version="2.0.3">
+ <module name="Magento_Sales" setup_version="2.0.4">
<sequence>
<module name="Magento_Rule"/>
<module name="Magento_Catalog"/>
diff --git a/app/code/Magento/SalesRule/Setup/InstallSchema.php b/app/code/Magento/SalesRule/Setup/InstallSchema.php
index 700bdac3b587dd4fe706e90df90563a327d17cd8..0e319cccfc9fbd32dd184de60ba3bc3f37c1a8fa 100644
--- a/app/code/Magento/SalesRule/Setup/InstallSchema.php
+++ b/app/code/Magento/SalesRule/Setup/InstallSchema.php
@@ -264,7 +264,6 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Salesrule Coupon'
@@ -302,14 +301,12 @@ class InstallSchema implements InstallSchemaInterface
'coupon_id',
$installer->getTable('salesrule_coupon'),
'coupon_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_coupon_usage', 'customer_id', 'customer_entity', 'entity_id'),
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Salesrule Coupon Usage'
@@ -356,14 +353,12 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_customer', 'rule_id', 'salesrule', 'rule_id'),
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Salesrule Customer'
@@ -415,14 +410,12 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_label', 'store_id', 'store', 'store_id'),
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Salesrule Label'
@@ -472,8 +465,7 @@ class InstallSchema implements InstallSchemaInterface
'attribute_id',
$installer->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
'salesrule_product_attribute',
@@ -484,22 +476,19 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$installer->getTable('customer_group'),
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_product_attribute', 'rule_id', 'salesrule', 'rule_id'),
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_product_attribute', 'website_id', 'store_website', 'website_id'),
'website_id',
$installer->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Salesrule Product Attribute'
);
@@ -607,7 +596,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Coupon Aggregated'
@@ -705,7 +693,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Coupon Aggregated Order'
@@ -743,14 +730,12 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('salesrule_website', 'website_id', 'core/website', 'website_id'),
'website_id',
$websitesTable,
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Rules To Websites Relations'
@@ -784,7 +769,6 @@ class InstallSchema implements InstallSchemaInterface
'rule_id',
$installer->getTable('salesrule'),
'rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -796,7 +780,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_group_id',
$customerGroupsTable,
'customer_group_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Rules To Customer Groups Relations'
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index 8d71564f7d997e9f8277565b9d07693caa49dfc4..da5dd3cbe32d26c5fd163586799d45cbe142642a 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -4,7 +4,7 @@
"require": {
"php": "~5.5.0|~5.6.0",
"magento/framework": "0.74.0-beta4",
- "magento/magento-composer-installer": "0.74.0-beta4"
+ "magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta4",
diff --git a/app/code/Magento/Search/Setup/InstallSchema.php b/app/code/Magento/Search/Setup/InstallSchema.php
index 8a4acf9042b8ea7d17b9572e7536f8f3f20622d1..3c20f81310ed0b9ecc5c0bd6cbb08c82eafcce28 100644
--- a/app/code/Magento/Search/Setup/InstallSchema.php
+++ b/app/code/Magento/Search/Setup/InstallSchema.php
@@ -124,7 +124,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)
->setComment('Search query table');
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
index 70310d404c6fa4273b42a117d9d705fd0fd2d9e2..c1fdc5ecd880d668a722046d05c0a3075e2b4540 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
@@ -6,7 +6,7 @@
*/
namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
-use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
use Magento\Backend\App\Action;
use Magento\Framework\View\Result\LayoutFactory;
@@ -18,9 +18,9 @@ class AddComment extends \Magento\Backend\App\Action
protected $shipmentLoader;
/**
- * @var ShipmentSender
+ * @var ShipmentCommentSender
*/
- protected $shipmentSender;
+ protected $shipmentCommentSender;
/**
* @var LayoutFactory
@@ -30,17 +30,17 @@ class AddComment extends \Magento\Backend\App\Action
/**
* @param Action\Context $context
* @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
- * @param ShipmentSender $shipmentSender
+ * @param ShipmentCommentSender $shipmentCommentSender
* @param LayoutFactory $resultLayoutFactory
*/
public function __construct(
Action\Context $context,
\Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
- ShipmentSender $shipmentSender,
+ ShipmentCommentSender $shipmentCommentSender,
LayoutFactory $resultLayoutFactory
) {
$this->shipmentLoader = $shipmentLoader;
- $this->shipmentSender = $shipmentSender;
+ $this->shipmentCommentSender = $shipmentCommentSender;
$this->resultLayoutFactory = $resultLayoutFactory;
parent::__construct($context);
}
@@ -79,7 +79,7 @@ class AddComment extends \Magento\Backend\App\Action
isset($data['is_visible_on_front'])
);
- $this->shipmentSender->send($shipment, !empty($data['is_customer_notified']), $data['comment']);
+ $this->shipmentCommentSender->send($shipment, !empty($data['is_customer_notified']), $data['comment']);
$shipment->save();
$resultLayout = $this->resultLayoutFactory->create();
$resultLayout->addDefaultHandle();
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 7bb56f5087c0f345788b454326742b918893d245..c187d9bb21b55870757cb76449665f92a9718216 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -100,23 +100,19 @@ class Save extends \Magento\Backend\App\Action
return;
}
- $shipment->register();
- $comment = '';
if (!empty($data['comment_text'])) {
$shipment->addComment(
$data['comment_text'],
isset($data['comment_customer_notify']),
isset($data['is_visible_on_front'])
);
- if (isset($data['comment_customer_notify'])) {
- $comment = $data['comment_text'];
- }
- }
- if (!empty($data['send_email'])) {
- $shipment->setEmailSent(true);
+ $shipment->setCustomerNote($data['comment_text']);
+ $shipment->setCustomerNoteNotify(isset($data['comment_customer_notify']));
}
+ $shipment->register();
+
$shipment->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
$responseAjax = new \Magento\Framework\Object();
$isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label'];
@@ -128,7 +124,9 @@ class Save extends \Magento\Backend\App\Action
$this->_saveShipment($shipment);
- $this->shipmentSender->send($shipment, !empty($data['send_email']), $comment);
+ if (!empty($data['send_email'])) {
+ $this->shipmentSender->send($shipment);
+ }
$shipmentCreatedMessage = __('The shipment has been created.');
$labelCreatedMessage = __('You created the shipping label.');
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index fd793ff3d03a7945feee7850449a192985b97485..04e8bc658ade10cc6a5f6d42ce34d7835710a5f4 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -8,10 +8,12 @@
namespace Magento\Shipping\Model\Carrier;
-use Magento\Quote\Model\Quote\Address\AbstractCarrierInterface;
use Magento\Quote\Model\Quote\Address\RateResult\Error;
use Magento\Shipping\Model\Shipment\Request;
+/**
+ * Class AbstractCarrier
+ */
abstract class AbstractCarrier extends \Magento\Framework\Object implements AbstractCarrierInterface
{
/**
@@ -137,6 +139,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
* @param string $field
* @return bool
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
+ * @api
*/
public function getConfigFlag($field)
{
@@ -154,11 +157,11 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
/**
* Collect and get rates
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return \Magento\Shipping\Model\Rate\Result|bool|null
* @abstract
*/
- abstract public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request);
+ abstract public function collectRates(\Magento\Framework\Object $request);
/**
* Do request to shipment
@@ -276,11 +279,11 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
}
/**
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return $this|bool|false|\Magento\Framework\Model\AbstractModel
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
- public function checkAvailableShipCountries(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function checkAvailableShipCountries(\Magento\Framework\Object $request)
{
$speCountriesAllow = $this->getConfigData('sallowspecific');
/*
@@ -323,11 +326,11 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
/**
* Processing additional validation to check is carrier applicable.
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
- * @return $this|bool|Error
+ * @param \Magento\Framework\Object $request
+ * @return $this|bool|\Magento\Framework\Object
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function proccessAdditionalValidation(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function proccessAdditionalValidation(\Magento\Framework\Object $request)
{
return $this;
}
@@ -593,6 +596,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @return bool
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
+ * @api
*/
public function getDebugFlag()
{
diff --git a/app/code/Magento/Quote/Model/Quote/Address/AbstractCarrierInterface.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
similarity index 83%
rename from app/code/Magento/Quote/Model/Quote/Address/AbstractCarrierInterface.php
rename to app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
index acc4f1b93d48291383afedf533b76438717bdaca..a8a9f2f747c31adfd37f69aae90489b571b69298 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/AbstractCarrierInterface.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
@@ -3,8 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Quote\Model\Quote\Address;
+namespace Magento\Shipping\Model\Carrier;
+/**
+ * Interface AbstractCarrierInterface
+ */
interface AbstractCarrierInterface
{
/**
@@ -12,16 +15,18 @@ interface AbstractCarrierInterface
*
* @param string $field
* @return mixed
+ * @api
*/
public function getConfigData($field);
/**
* Collect and get rates
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return \Magento\Framework\Object|bool|null
+ * @api
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request);
+ public function collectRates(\Magento\Framework\Object $request);
/**
* Do request to shipment
@@ -29,6 +34,7 @@ interface AbstractCarrierInterface
*
* @param \Magento\Framework\Object $request
* @return \Magento\Framework\Object
+ * @api
*/
public function requestToShipment($request);
@@ -38,6 +44,7 @@ interface AbstractCarrierInterface
*
* @param \Magento\Framework\Object $request
* @return \Magento\Framework\Object
+ * @api
*/
public function returnOfShipment($request);
@@ -46,6 +53,7 @@ interface AbstractCarrierInterface
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @api
*/
public function getContainerTypes(\Magento\Framework\Object $params = null);
@@ -53,6 +61,7 @@ interface AbstractCarrierInterface
* Get Container Types, that could be customized
*
* @return array
+ * @api
*/
public function getCustomizableContainerTypes();
@@ -61,27 +70,31 @@ interface AbstractCarrierInterface
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @api
*/
public function getDeliveryConfirmationTypes(\Magento\Framework\Object $params = null);
/**
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return $this|bool|false|\Magento\Framework\Model\AbstractModel
+ * @api
*/
- public function checkAvailableShipCountries(\Magento\Quote\Model\Quote\Address\RateRequest $request);
+ public function checkAvailableShipCountries(\Magento\Framework\Object $request);
/**
* Processing additional validation to check is carrier applicable.
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
- * @return $this|\Magento\Quote\Model\Quote\Address\RateResult\Error|boolean
+ * @param \Magento\Framework\Object $request
+ * @return $this|\Magento\Framework\Object|boolean
+ * @api
*/
- public function proccessAdditionalValidation(\Magento\Quote\Model\Quote\Address\RateRequest $request);
+ public function proccessAdditionalValidation(\Magento\Framework\Object $request);
/**
* Determine whether current carrier enabled for activity
*
* @return bool
+ * @api
*/
public function isActive();
@@ -89,6 +102,7 @@ interface AbstractCarrierInterface
* Whether this carrier has fixed rates calculation
*
* @return bool
+ * @api
*/
public function isFixed();
@@ -96,6 +110,7 @@ interface AbstractCarrierInterface
* Check if carrier has shipping tracking option available
*
* @return bool
+ * @api
*/
public function isTrackingAvailable();
@@ -103,6 +118,7 @@ interface AbstractCarrierInterface
* Check if carrier has shipping label option available
*
* @return bool
+ * @api
*/
public function isShippingLabelsAvailable();
@@ -110,6 +126,7 @@ interface AbstractCarrierInterface
* Retrieve sort order of current carrier
*
* @return string|null
+ * @api
*/
public function getSortOrder();
@@ -118,6 +135,7 @@ interface AbstractCarrierInterface
*
* @param float $cost
* @return float final price for shipping method
+ * @api
*/
public function getFinalPriceWithHandlingFee($cost);
@@ -126,6 +144,7 @@ interface AbstractCarrierInterface
*
* @param int $weight in someone measure
* @return float Weight in pounds
+ * @api
*/
public function convertWeightToLbs($weight);
@@ -134,6 +153,7 @@ interface AbstractCarrierInterface
*
* @param int|float $weight
* @return int|float weight
+ * @api
*/
public function getTotalNumOfBoxes($weight);
@@ -141,6 +161,7 @@ interface AbstractCarrierInterface
* Is state province required
*
* @return bool
+ * @api
*/
public function isStateProvinceRequired();
@@ -148,6 +169,7 @@ interface AbstractCarrierInterface
* Check if city option required
*
* @return bool
+ * @api
*/
public function isCityRequired();
@@ -156,6 +178,7 @@ interface AbstractCarrierInterface
*
* @param string|null $countryId
* @return bool
+ * @api
*/
public function isZipCodeRequired($countryId = null);
@@ -164,6 +187,7 @@ interface AbstractCarrierInterface
*
* @param mixed $debugData
* @return void
+ * @api
*/
public function debugData($debugData);
@@ -171,6 +195,7 @@ interface AbstractCarrierInterface
* Getter for carrier code
*
* @return string
+ * @api
*/
public function getCarrierCode();
@@ -179,6 +204,7 @@ interface AbstractCarrierInterface
*
* @param \Magento\Framework\Object $params
* @return array
+ * @api
*/
public function getContentTypes(\Magento\Framework\Object $params);
}
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index e4f38e73beec05dc3b6955429b04c0ffa6af97e8..99e544593f16bc73c2b191233afa2ffe99184657 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -157,6 +157,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @param string $code
* @return $this
+ * @api
*/
public function setActiveFlag($code = 'active')
{
@@ -179,6 +180,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @param string $tracking
* @return string|false
+ * @api
*/
public function getTrackingInfo($tracking)
{
@@ -249,6 +251,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
* @param RateRequest $request
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @api
*/
public function getAllItems(RateRequest $request)
{
@@ -279,12 +282,12 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
/**
* Processing additional validation to check if carrier applicable.
*
- * @param RateRequest $request
- * @return $this|bool|Error
+ * @param \Magento\Framework\Object $request
+ * @return $this|bool|\Magento\Framework\Object
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
- public function proccessAdditionalValidation(RateRequest $request)
+ public function proccessAdditionalValidation(\Magento\Framework\Object $request)
{
//Skip by item validation if there is no items in request
if (!count($this->getAllItems($request))) {
@@ -523,6 +526,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @todo implement rollback logic
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function rollBack($data)
{
@@ -572,6 +576,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
* @param null|string $countyDest
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @api
*/
public function isGirthAllowed($countyDest = null)
{
@@ -581,6 +586,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
/**
* @param \Magento\Framework\Object|null $request
* @return $this
+ * @api
*/
public function setRawRequest($request)
{
@@ -594,6 +600,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
* @param string $cost
* @param string $method
* @return float|string
+ * @api
*/
public function getMethodPrice($cost, $method = '')
{
@@ -615,6 +622,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
* @param string $customSimplexml
*
* @return \SimpleXMLElement|bool
+ * @api
*/
public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
{
diff --git a/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php b/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
index 980fe636356a5edcac7dc153e174085d21ac2c28..f422d20a9e3a3ed33ce3c5f560c1d4d57589d84a 100644
--- a/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
+++ b/app/code/Magento/Shipping/Model/Carrier/CarrierInterface.php
@@ -11,6 +11,7 @@ interface CarrierInterface
* Check if carrier has shipping tracking option available
*
* @return boolean
+ * @api
*/
public function isTrackingAvailable();
@@ -18,6 +19,7 @@ interface CarrierInterface
* Get allowed shipping methods
*
* @return array
+ * @api
*/
public function getAllowedMethods();
}
diff --git a/app/code/Magento/Shipping/Model/CarrierFactory.php b/app/code/Magento/Shipping/Model/CarrierFactory.php
index ac7dcc25146347f60e41e5e6696a02b171dc1c1a..699a7a3be09aa754363f208b337b5d3e416fa832 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactory.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactory.php
@@ -5,8 +5,9 @@
*/
namespace Magento\Shipping\Model;
-use Magento\Quote\Model\Quote\Address\CarrierFactoryInterface;
-
+/**
+ * Class CarrierFactory
+ */
class CarrierFactory implements CarrierFactoryInterface
{
/**
diff --git a/app/code/Magento/Quote/Model/Quote/Address/CarrierFactoryInterface.php b/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
similarity index 83%
rename from app/code/Magento/Quote/Model/Quote/Address/CarrierFactoryInterface.php
rename to app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
index 9cd570db6feeccecbecad70df05a0ba2a58ab44e..2c0ac4c801d2f21ae0746930329689e5fb0f2e11 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/CarrierFactoryInterface.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactoryInterface.php
@@ -3,8 +3,13 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Quote\Model\Quote\Address;
+namespace Magento\Shipping\Model;
+use Magento\Shipping\Model\Carrier\AbstractCarrierInterface;
+
+/**
+ * Interface CarrierFactoryInterface
+ */
interface CarrierFactoryInterface
{
/**
@@ -12,6 +17,7 @@ interface CarrierFactoryInterface
*
* @param string $carrierCode
* @return bool|AbstractCarrierInterface
+ * @api
*/
public function get($carrierCode);
@@ -21,6 +27,7 @@ interface CarrierFactoryInterface
* @param string $carrierCode
* @param int|null $storeId
* @return bool|AbstractCarrierInterface
+ * @api
*/
public function create($carrierCode, $storeId = null);
@@ -29,6 +36,7 @@ interface CarrierFactoryInterface
*
* @param string $carrierCode
* @return bool|AbstractCarrierInterface
+ * @api
*/
public function getIfActive($carrierCode);
@@ -38,6 +46,7 @@ interface CarrierFactoryInterface
* @param string $carrierCode
* @param null|int $storeId
* @return bool|AbstractCarrierInterface
+ * @api
*/
public function createIfActive($carrierCode, $storeId = null);
}
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
index 4bc12ca36516585e31b7e146693ef2641dcbe5b7..6a60d69bdfe58eb6a6b84bb625f86082c9108820 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
@@ -16,9 +16,9 @@ class AddCommentTest extends \PHPUnit_Framework_TestCase
protected $shipmentLoaderMock;
/**
- * @var \Magento\Sales\Model\Order\Email\Sender\ShipmentSender|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $shipmentSenderMock;
+ protected $shipmentCommentSenderMock;
/**
* @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
@@ -69,8 +69,8 @@ class AddCommentTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->shipmentSenderMock = $this->getMock(
- 'Magento\Sales\Model\Order\Email\Sender\ShipmentSender',
+ $this->shipmentCommentSenderMock = $this->getMock(
+ 'Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender',
['send', '__wakeup'],
[],
'',
@@ -139,7 +139,7 @@ class AddCommentTest extends \PHPUnit_Framework_TestCase
$this->controller = new \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddComment(
$contextMock,
$this->shipmentLoaderMock,
- $this->shipmentSenderMock,
+ $this->shipmentCommentSenderMock,
$this->resultLayoutFactoryMock
);
}
@@ -210,7 +210,7 @@ class AddCommentTest extends \PHPUnit_Framework_TestCase
->method('load')
->will($this->returnValue($this->shipmentMock));
$this->shipmentMock->expects($this->once())->method('addComment');
- $this->shipmentSenderMock->expects($this->once())->method('send');
+ $this->shipmentCommentSenderMock->expects($this->once())->method('send');
$this->shipmentMock->expects($this->once())->method('save');
$layoutMock = $this->getMock('Magento\Framework\View\Layout', ['getBlock'], [], '', false);
$blockMock = $this->getMock('Magento\Shipping\Block\Adminhtml\View\Comments', ['toHtml'], [], '', false);
@@ -318,7 +318,7 @@ class AddCommentTest extends \PHPUnit_Framework_TestCase
->method('load')
->will($this->returnValue($this->shipmentMock));
$this->shipmentMock->expects($this->once())->method('addComment');
- $this->shipmentSenderMock->expects($this->once())->method('send');
+ $this->shipmentCommentSenderMock->expects($this->once())->method('send');
$this->shipmentMock->expects($this->once())->method('save')->will($this->throwException(new \Exception()));
$this->exceptionResponse();
diff --git a/app/code/Magento/Shipping/etc/di.xml b/app/code/Magento/Shipping/etc/di.xml
index 92fad82f65d25fb31c36ebc8f3de56a5b3abb8d7..9b785dac596f1f2a0bf2addc690fa8ca8cec1799 100644
--- a/app/code/Magento/Shipping/etc/di.xml
+++ b/app/code/Magento/Shipping/etc/di.xml
@@ -7,6 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Quote\Model\Quote\Address\RateCollectorInterface" type="Magento\Shipping\Model\Shipping" />
- <preference for="Magento\Quote\Model\Quote\Address\CarrierFactoryInterface" type="Magento\Shipping\Model\CarrierFactory" />
+ <preference for="Magento\Shipping\Model\CarrierFactoryInterface" type="Magento\Shipping\Model\CarrierFactory" />
<preference for="Magento\Shipping\Model\Carrier\Source\GenericInterface" type="\Magento\Shipping\Model\Carrier\Source\GenericDefault" />
</config>
diff --git a/app/code/Magento/Sitemap/Setup/InstallSchema.php b/app/code/Magento/Sitemap/Setup/InstallSchema.php
index 202d222ec8ff8e06d4ece30cc339308959836f52..bca997246b74da37d27c3a02b1d842b71f37a7a9 100644
--- a/app/code/Magento/Sitemap/Setup/InstallSchema.php
+++ b/app/code/Magento/Sitemap/Setup/InstallSchema.php
@@ -73,7 +73,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'XML Sitemap'
diff --git a/app/code/Magento/Store/Setup/InstallSchema.php b/app/code/Magento/Store/Setup/InstallSchema.php
index f76cc884777a8f1165ae5a6dbbcf61cac9124d4d..948659c8c34228615d5fff9fef35276b9f806984 100644
--- a/app/code/Magento/Store/Setup/InstallSchema.php
+++ b/app/code/Magento/Store/Setup/InstallSchema.php
@@ -133,7 +133,6 @@ class InstallSchema implements InstallSchemaInterface
'website_id',
$installer->getTable('store_website'),
'website_id',
- Table::ACTION_CASCADE,
Table::ACTION_CASCADE
)->setComment(
'Store Groups'
@@ -209,14 +208,12 @@ class InstallSchema implements InstallSchemaInterface
'group_id',
$installer->getTable('store_group'),
'group_id',
- Table::ACTION_CASCADE,
Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('store', 'website_id', 'store_website', 'website_id'),
'website_id',
$installer->getTable('store_website'),
'website_id',
- Table::ACTION_CASCADE,
Table::ACTION_CASCADE
)->setComment(
'Stores'
diff --git a/app/code/Magento/Tax/Setup/InstallSchema.php b/app/code/Magento/Tax/Setup/InstallSchema.php
index 85218d2195b724907b3cc59c0ac0b10612f3904c..6d708d5862f56f6560bbc0a8515d9ccfd9f99a77 100644
--- a/app/code/Magento/Tax/Setup/InstallSchema.php
+++ b/app/code/Magento/Tax/Setup/InstallSchema.php
@@ -228,14 +228,12 @@ class InstallSchema implements InstallSchemaInterface
'product_tax_class_id',
$setup->getTable('tax_class'),
'class_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('tax_calculation', 'customer_tax_class_id', 'tax_class', 'class_id'),
'customer_tax_class_id',
$setup->getTable('tax_class'),
'class_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName(
@@ -247,7 +245,6 @@ class InstallSchema implements InstallSchemaInterface
'tax_calculation_rate_id',
$setup->getTable('tax_calculation_rate'),
'tax_calculation_rate_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName(
@@ -259,7 +256,6 @@ class InstallSchema implements InstallSchemaInterface
'tax_calculation_rule_id',
$setup->getTable('tax_calculation_rule'),
'tax_calculation_rule_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Tax Calculation'
@@ -306,7 +302,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$setup->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName(
@@ -318,7 +313,6 @@ class InstallSchema implements InstallSchemaInterface
'tax_calculation_rate_id',
$setup->getTable('tax_calculation_rate'),
'tax_calculation_rate_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Tax Calculation Rate Title'
@@ -394,7 +388,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$setup->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Tax Order Aggregation'
@@ -492,21 +485,18 @@ class InstallSchema implements InstallSchemaInterface
'associated_item_id',
$setup->getTable('sales_order_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('sales_order_tax_item', 'tax_id', 'sales_order_tax', 'tax_id'),
'tax_id',
$setup->getTable('sales_order_tax'),
'tax_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('sales_order_tax_item', 'item_id', 'sales_order_item', 'item_id'),
'item_id',
$setup->getTable('sales_order_item'),
'item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Sales Order Tax Item'
diff --git a/app/code/Magento/Theme/Setup/InstallSchema.php b/app/code/Magento/Theme/Setup/InstallSchema.php
index f2135e0c1e4df8f03743be922c9e3aafe05026d5..b7f6d0edb3775a0f668233ab6bf758beea3ff807 100644
--- a/app/code/Magento/Theme/Setup/InstallSchema.php
+++ b/app/code/Magento/Theme/Setup/InstallSchema.php
@@ -150,7 +150,6 @@ class InstallSchema implements InstallSchemaInterface
'theme_id',
$installer->getTable('theme'),
'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Core theme files'
@@ -200,7 +199,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Design Changes'
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
index cb439cd4ea692ffe840a80d5434b9e683c132169..d8ee45c4f15f067f6744c7c93071470040539b1f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
@@ -85,7 +85,7 @@ class FaviconTest extends \PHPUnit_Framework_TestCase
public function testGetFaviconFile()
{
$scopeConfigValue = 'path';
- $urlToMediaDir = 'http://magneto.url/pub/media/';
+ $urlToMediaDir = 'http://magento.url/pub/media/';
$expectedFile = ImageFavicon::UPLOAD_DIR . '/' . $scopeConfigValue;
$expectedUrl = $urlToMediaDir . $expectedFile;
diff --git a/app/code/Magento/Translation/Setup/InstallSchema.php b/app/code/Magento/Translation/Setup/InstallSchema.php
index a7d4df05902bc0c50d9c3854fd40e503abe1a090..24afcc20396939c02e7360d551364a7ff521c879 100644
--- a/app/code/Magento/Translation/Setup/InstallSchema.php
+++ b/app/code/Magento/Translation/Setup/InstallSchema.php
@@ -96,7 +96,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment('Translations');
$installer->getConnection()->createTable($table);
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index e88b68ea433cafc08dba11c7c4dbec7547c6aaf8..3085a8b35c988766d5d48820d5727fc498c1bf65 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -184,10 +184,10 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
/**
* Collect and get rates
*
- * @param RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return Result|bool|null
*/
- public function collectRates(RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag($this->_activeFlag)) {
return false;
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 49976c39fef46b183e6fd46190f5a28edfd11336..2d7845696c840f6695756459fa162e9c1832b5b5 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -177,10 +177,10 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
/**
* Collect and get rates
*
- * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
+ * @param \Magento\Framework\Object $request
* @return Result|bool|null
*/
- public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $request)
+ public function collectRates(\Magento\Framework\Object $request)
{
if (!$this->getConfigFlag($this->_activeFlag)) {
return false;
diff --git a/app/code/Magento/Variable/Setup/InstallSchema.php b/app/code/Magento/Variable/Setup/InstallSchema.php
index b2af66d257b7c3df5099a247c97239de561ed245..043ccaad3360d650fcaa4507c0699c9595d646cb 100644
--- a/app/code/Magento/Variable/Setup/InstallSchema.php
+++ b/app/code/Magento/Variable/Setup/InstallSchema.php
@@ -17,6 +17,7 @@ class InstallSchema implements InstallSchemaInterface
{
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
{
@@ -135,7 +136,6 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
);
$connection->addForeignKey(
@@ -144,12 +144,9 @@ class InstallSchema implements InstallSchemaInterface
'variable_id',
$installer->getTable('variable'),
'variable_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
);
$installer->endSetup();
-
}
-
}
diff --git a/app/code/Magento/Weee/Setup/InstallSchema.php b/app/code/Magento/Weee/Setup/InstallSchema.php
index c304dd40f5a099ea51e588c7fd3c35fca3adb148..6c098098c409cd434c84066bb8fdbb861a210012 100644
--- a/app/code/Magento/Weee/Setup/InstallSchema.php
+++ b/app/code/Magento/Weee/Setup/InstallSchema.php
@@ -86,28 +86,24 @@ class InstallSchema implements InstallSchemaInterface
'country',
$setup->getTable('directory_country'),
'country_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('weee_tax', 'entity_id', 'catalog_product_entity', 'entity_id'),
'entity_id',
$setup->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('weee_tax', 'website_id', 'store_website', 'website_id'),
'website_id',
$setup->getTable('store_website'),
'website_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$setup->getFkName('weee_tax', 'attribute_id', 'eav_attribute', 'attribute_id'),
'attribute_id',
$setup->getTable('eav_attribute'),
'attribute_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Weee Tax'
diff --git a/app/code/Magento/Widget/Setup/InstallSchema.php b/app/code/Magento/Widget/Setup/InstallSchema.php
index 4d71df5ef6ca67596d40ec2228ec75ca5f1d3966..60a95b70f7b5c931436a7fe6bd81e554bd6e3b62 100644
--- a/app/code/Magento/Widget/Setup/InstallSchema.php
+++ b/app/code/Magento/Widget/Setup/InstallSchema.php
@@ -167,7 +167,6 @@ class InstallSchema implements InstallSchemaInterface
'theme_id',
$installer->getTable('theme'),
'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Instances of Widget for Package Theme'
@@ -235,7 +234,6 @@ class InstallSchema implements InstallSchemaInterface
'instance_id',
$installer->getTable('widget_instance'),
'instance_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Instance of Widget on Page'
@@ -275,7 +273,6 @@ class InstallSchema implements InstallSchemaInterface
'page_id',
$installer->getTable('widget_instance_page'),
'page_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName(
@@ -287,7 +284,6 @@ class InstallSchema implements InstallSchemaInterface
'layout_update_id',
$installer->getTable('layout_update'),
'layout_update_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Layout updates'
@@ -380,7 +376,6 @@ class InstallSchema implements InstallSchemaInterface
'layout_update_id',
$installer->getTable('layout_update'),
'layout_update_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addIndex(
$installer->getIdxName(
@@ -394,14 +389,12 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
$installer->getFkName('layout_link', 'theme_id', 'theme', 'theme_id'),
'theme_id',
$installer->getTable('theme'),
'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Layout Link'
diff --git a/app/code/Magento/Wishlist/Setup/InstallSchema.php b/app/code/Magento/Wishlist/Setup/InstallSchema.php
index cde21e7ff48653f2f09dbe0a05429befc21ce0f8..f2894e5fbec2ea9c8218117e9112f810a8562b0b 100644
--- a/app/code/Magento/Wishlist/Setup/InstallSchema.php
+++ b/app/code/Magento/Wishlist/Setup/InstallSchema.php
@@ -76,7 +76,6 @@ class InstallSchema implements InstallSchemaInterface
'customer_id',
$installer->getTable('customer_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Wishlist main Table'
@@ -138,7 +137,6 @@ class InstallSchema implements InstallSchemaInterface
'wishlist_id',
$installer->getTable('wishlist'),
'wishlist_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addIndex(
$installer->getIdxName('wishlist_item', 'product_id'),
@@ -148,7 +146,6 @@ class InstallSchema implements InstallSchemaInterface
'product_id',
$installer->getTable('catalog_product_entity'),
'entity_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addIndex(
$installer->getIdxName('wishlist_item', 'store_id'),
@@ -158,8 +155,7 @@ class InstallSchema implements InstallSchemaInterface
'store_id',
$installer->getTable('store'),
'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+ \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
)->setComment(
'Wishlist items'
);
@@ -205,7 +201,6 @@ class InstallSchema implements InstallSchemaInterface
'wishlist_item_id',
$installer->getTable('wishlist_item'),
'wishlist_item_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Wishlist Item Option Table'
diff --git a/composer.json b/composer.json
index c8721c87609c6a84b5b35d2abd2e15b2f0fddbdb..907d23ff711529e697064e42d0eab2a6c2465669 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,7 @@
"magento/module-backend": "self.version",
"magento/module-backup": "self.version",
"magento/module-bundle": "self.version",
+ "magento/module-cache-invalidate": "self.version",
"magento/module-captcha": "self.version",
"magento/module-catalog": "self.version",
"magento/module-catalog-import-export": "self.version",
diff --git a/composer.lock b/composer.lock
index 836bc0e434ca242ec373c47128e7f0c5e5b9bd16..1850375542413cf443c72fd68f36fd6fe6b21d7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "974fa7d59a25f8a31c70ea53068944cd",
+ "hash": "35d05640e3dc260b7a5b09310611194a",
"packages": [
{
"name": "composer/composer",
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/QuoteTest.php
deleted file mode 100644
index 7b3f1e37c8db98dd810ec1553d1033b9159022dd..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/QuoteTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Model\Resource;
-
-class QuoteTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Quote\Model\Resource\Quote
- */
- protected $_resourceModel;
-
- protected function setUp()
- {
- $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Quote\Model\Resource\Quote'
- );
- }
-
- /**
- * @magentoDataFixture Magento/Sales/_files/order.php
- */
- public function testIsOrderIncrementIdUsedNumericIncrementId()
- {
- $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('100000001'));
- }
-
- /**
- * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
- */
- public function testIsOrderIncrementIdUsedAlphanumericIncrementId()
- {
- $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('M00000001'));
- }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index 1862adfcee81f7a0d9a509e88b0d51b9febd2b05..c476e27898e83aa6c0632abe182c97d668349729 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -48,7 +48,7 @@ $quote->setCustomerIsGuest(
'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
- 'test01'
+ '100000001'
)->setBillingAddress(
$billingAddress
)->setShippingAddress(
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 8add6d7a5b35655d6d8618c05420ed60767d4d55..834e90911948bcba3d3ecc1a6dd945fbd9ef8988 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -322,7 +322,7 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
/**
* Collect redundant dependencies
- *
+ * @SuppressWarnings(PHPMD.NPathComplexity)
* @test
* @depends testUndeclared
*/
@@ -331,6 +331,7 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
foreach (array_keys(self::$_mapDependencies) as $module) {
$declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
$found = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+ $found['Magento\Framework'] = 'Magento\Framework';
$this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
}
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 7baeb9bac60b7ecbb782de7407a87d7033367831..6a1f2846a85df46a6293a7fc8c210feddce5d60d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2155,4 +2155,13 @@ return [
['_isCacheEnabled', 'Magento\Eav\Model\Config'],
['_createCustomerAttribute', '\Magento\Customer\Model\Customer'],
['prepareCatalogProductPriceIndexTable', 'Magento\CatalogRule\Model\Observer'],
+ ['joinOrders', 'Magento\Reports\Model\Resource\Customer\Collection'],
+ ['addOrdersCount', 'Magento\Reports\Model\Resource\Customer\Collection'],
+ ['addSumAvgTotals', 'Magento\Reports\Model\Resource\Customer\Collection'],
+ ['orderByTotalAmount', 'Magento\Reports\Model\Resource\Customer\Collection'],
+ ['addOrdersCount', 'Magento\Reports\Model\Resource\Product\Collection'],
+ ['addOrderedQty', 'Magento\Reports\Model\Resource\Product\Collection'],
+ ['prepareForProductsInCarts', 'Magento\Reports\Model\Resource\Quote\Collection'],
+ ['getOrdersSubSelect', 'Magento\Reports\Model\Resource\Quote\Collection'],
+ ['isOrderIncrementIdUsed', 'Magento\Quote\Model\Resource\Quote'],
];
diff --git a/dev/tools/performance-toolkit/fixtures/configurable_products.php b/dev/tools/performance-toolkit/fixtures/configurable_products.php
index af3a5b5c6cd2bbc1da4eb0aa299971b436b43f69..a3aa8f8ba8d244eba56a8ca2e184be05f7cdbbce 100644
--- a/dev/tools/performance-toolkit/fixtures/configurable_products.php
+++ b/dev/tools/performance-toolkit/fixtures/configurable_products.php
@@ -885,7 +885,7 @@ class ConfigurableProductsFixture extends \Magento\ToolkitFramework\Fixture
/** @var \Magento\ImportExport\Model\Import $import */
$import = $this->application->getObjectManager()->create(
'Magento\ImportExport\Model\Import',
- ['data' => ['entity' => 'catalog_product', 'behavior' => 'append']]
+ ['data' => ['entity' => 'catalog_product', 'behavior' => 'replace']]
);
$source = new \Magento\ToolkitFramework\ImportExport\Fixture\Complex\Generator($pattern, $configurablesCount);
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 84ab04e316702c3f3575d9b6bff71bf5db92aff6..ac5f33263ec03c3ac9452229a31c8d0d71690272 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -375,7 +375,6 @@ interface AdapterInterface
$refTableName,
$refColumnName,
$onDelete = self::FK_ACTION_CASCADE,
- $onUpdate = self::FK_ACTION_CASCADE,
$purge = false,
$schemaName = null,
$refSchemaName = null
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index c46f71cf9ebe447a028d6ce512819631ebd463e9..f3bf8e12d893c11bd321989e4786d1d65893976d 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -1071,7 +1071,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* REF_TABLE_NAME => string; reference table name
* REF_COLUMN_NAME => string; reference column name
* ON_DELETE => string; action type on delete row
- * ON_UPDATE => string; action type on update row
*
* @param string $tableName
* @param string $schemaName
@@ -1101,8 +1100,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
'REF_SHEMA_NAME' => isset($match[4]) ? $match[4] : $schemaName,
'REF_TABLE_NAME' => $match[5],
'REF_COLUMN_NAME' => $match[6],
- 'ON_DELETE' => isset($match[7]) ? $match[8] : '',
- 'ON_UPDATE' => isset($match[9]) ? $match[10] : '',
+ 'ON_DELETE' => isset($match[7]) ? $match[8] : ''
];
}
@@ -1173,10 +1171,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
unset($columnDefinition['identity'], $columnDefinition['primary'], $columnDefinition['comment']);
$onDelete = $options['ON_DELETE'];
- $onUpdate = $options['ON_UPDATE'];
- if ($onDelete == AdapterInterface::FK_ACTION_SET_NULL
- || $onUpdate == AdapterInterface::FK_ACTION_SET_NULL) {
+ if ($onDelete == AdapterInterface::FK_ACTION_SET_NULL) {
$columnDefinition['nullable'] = true;
}
$this->modifyColumn($options['TABLE_NAME'], $options['COLUMN_NAME'], $columnDefinition);
@@ -1186,8 +1182,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
$options['COLUMN_NAME'],
$options['REF_TABLE_NAME'],
$options['REF_COLUMN_NAME'],
- ($onDelete) ? $onDelete : AdapterInterface::FK_ACTION_NO_ACTION,
- ($onUpdate) ? $onUpdate : AdapterInterface::FK_ACTION_NO_ACTION
+ ($onDelete) ? $onDelete : AdapterInterface::FK_ACTION_NO_ACTION
);
}
}
@@ -1633,15 +1628,13 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
$keyData['REF_COLUMN_NAME']
);
$onDelete = $this->_getDdlAction($keyData['ON_DELETE']);
- $onUpdate = $this->_getDdlAction($keyData['ON_UPDATE']);
$table->addForeignKey(
$fkName,
$keyData['COLUMN_NAME'],
$keyData['REF_TABLE_NAME'],
$keyData['REF_COLUMN_NAME'],
- $onDelete,
- $onUpdate
+ $onDelete
);
}
@@ -2139,16 +2132,13 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
if (!empty($relations)) {
foreach ($relations as $fkData) {
$onDelete = $this->_getDdlAction($fkData['ON_DELETE']);
- $onUpdate = $this->_getDdlAction($fkData['ON_UPDATE']);
-
$definition[] = sprintf(
- ' CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s ON UPDATE %s',
+ ' CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) ON DELETE %s',
$this->quoteIdentifier($fkData['FK_NAME']),
$this->quoteIdentifier($fkData['COLUMN_NAME']),
$this->quoteIdentifier($fkData['REF_TABLE_NAME']),
$this->quoteIdentifier($fkData['REF_COLUMN_NAME']),
- $onDelete,
- $onUpdate
+ $onDelete
);
}
}
@@ -2579,7 +2569,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param string $refTableName
* @param string $refColumnName
* @param string $onDelete
- * @param string $onUpdate
* @param bool $purge trying remove invalid data
* @param string $schemaName
* @param string $refSchemaName
@@ -2593,7 +2582,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
$refTableName,
$refColumnName,
$onDelete = AdapterInterface::FK_ACTION_CASCADE,
- $onUpdate = AdapterInterface::FK_ACTION_CASCADE,
$purge = false,
$schemaName = null,
$refSchemaName = null
@@ -2616,9 +2604,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
if ($onDelete !== null) {
$query .= ' ON DELETE ' . strtoupper($onDelete);
}
- if ($onUpdate !== null) {
- $query .= ' ON UPDATE ' . strtoupper($onUpdate);
- }
$result = $this->rawQuery($query);
$this->resetDdlCache($tableName);
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Table.php b/lib/internal/Magento/Framework/DB/Ddl/Table.php
index e42dfa1f6c2d7914b07c10931b5eed2a00805312..eee5ed9bc320a574eec14163bcf05fa4b21fd353 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Table.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Table.php
@@ -405,12 +405,11 @@ class Table
* @param string $refTable the reference table name
* @param string $refColumn the reference table column name
* @param string $onDelete the action on delete row
- * @param string $onUpdate the action on update
* @return $this
* @throws \Zend_Db_Exception
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
- public function addForeignKey($fkName, $column, $refTable, $refColumn, $onDelete = null, $onUpdate = null)
+ public function addForeignKey($fkName, $column, $refTable, $refColumn, $onDelete = null)
{
$upperName = strtoupper($fkName);
@@ -429,23 +428,12 @@ class Table
$onDelete = self::ACTION_NO_ACTION;
}
- switch ($onUpdate) {
- case self::ACTION_CASCADE:
- case self::ACTION_RESTRICT:
- case self::ACTION_SET_DEFAULT:
- case self::ACTION_SET_NULL:
- break;
- default:
- $onUpdate = self::ACTION_NO_ACTION;
- }
-
$this->_foreignKeys[$upperName] = [
'FK_NAME' => $fkName,
'COLUMN_NAME' => $column,
'REF_TABLE_NAME' => $refTable,
'REF_COLUMN_NAME' => $refColumn,
- 'ON_DELETE' => $onDelete,
- 'ON_UPDATE' => $onUpdate,
+ 'ON_DELETE' => $onDelete
];
return $this;
diff --git a/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php b/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php
index 9dc45f4008b201640712a5a12c5177f2bb61a8b1..1bb6e276c9761f3e69dfc02f3870c9466d845328 100644
--- a/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php
+++ b/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php
@@ -120,7 +120,7 @@ class LibraryTest extends \PHPUnit_Framework_TestCase
$this->libraryDirectoryMock->expects($this->any())->method('search')->will($this->returnValue($libraryFiles));
$this->libraryDirectoryMock->expects($this->any())->method('getAbsolutePath')->will($this->returnCallback(
function ($file) {
- return '/opt/Magneto/lib/' . $file;
+ return '/opt/Magento/lib/' . $file;
}
));
$themePath = '/var/Magento/ATheme';
diff --git a/lib/internal/Magento/Framework/View/Element/BlockFactory.php b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
index 8832e6e40bb890555a14ca090d48a841ef1e537c..08f66289fb1082e5712e97c53fc8f2cd8558d8bd 100644
--- a/lib/internal/Magento/Framework/View/Element/BlockFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
@@ -42,7 +42,7 @@ class BlockFactory
$blockName = ltrim($blockName, '\\');
$block = $this->objectManager->create($blockName, $arguments);
if (!$block instanceof BlockInterface) {
- throw new \LogicException($blockName . ' does not implemented BlockInterface');
+ throw new \LogicException($blockName . ' does not implement BlockInterface');
}
if ($block instanceof Template) {
$block->setTemplateContext($block);