diff --git a/.htaccess.sample b/.htaccess.sample index 8e6e702ced716..3c412725f2134 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -111,7 +111,8 @@ ############################################ ## enable rewrites - Options +FollowSymLinks + # The following line has better security but add some performance overhead - see https://httpd.apache.org/docs/2.4/en/misc/perf-tuning.html + Options -FollowSymLinks +SymLinksIfOwnerMatch RewriteEngine on ############################################ diff --git a/COPYING.txt b/COPYING.txt index d2cbcd01539dd..2ba7d78d58a25 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,4 +1,4 @@ -Copyright © 2013-2017 Magento, Inc. +Copyright © 2013-2018 Magento, Inc. Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license diff --git a/README.md b/README.md index 9b1aa1b7b3e28..c72357db26d16 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results. ## Magento system requirements -[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html) +[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html) ## Install Magento To install Magento, see either: * [Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento. -* [Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html) +* [Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)

Contributing to the Magento 2 code base

Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions. @@ -22,8 +22,8 @@ To learn about issues, click [here][2]. To open an issue, click [here][3]. To suggest documentation improvements, click [here][4]. -[1]: -[2]: +[1]: +[2]: [3]: [4]: @@ -38,8 +38,10 @@ To suggest documentation improvements, click [here][4]. | ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. | | ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. | | ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. | -| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. | -| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. | +| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. | +| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. | + +To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)

Reporting security issues

diff --git a/app/bootstrap.php b/app/bootstrap.php index 6701a9f4dd51e..ba62b296bd49c 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -14,12 +14,12 @@ if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) { if (PHP_SAPI == 'cli') { echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' . - 'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html'; + 'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html'; } else { echo <<

Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read - + Magento System Requirements. HTML; @@ -49,12 +49,13 @@ unset($_SERVER['ORIG_PATH_INFO']); } -if (!empty($_SERVER['MAGE_PROFILER']) +if ( + (!empty($_SERVER['MAGE_PROFILER']) || file_exists(BP . '/var/profiler.flag')) && isset($_SERVER['HTTP_ACCEPT']) && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false ) { \Magento\Framework\Profiler::applyConfig( - $_SERVER['MAGE_PROFILER'], + (isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')), BP, !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' ); diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php index 1766425fb19b1..d3b0b8501c864 100644 --- a/app/code/Magento/AdminNotification/Model/Feed.php +++ b/app/code/Magento/AdminNotification/Model/Feed.php @@ -214,9 +214,6 @@ public function getFeedData() ); $curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0'); $data = $curl->read(); - if ($data === false) { - return false; - } $data = preg_split('/^\r?$/m', $data, 2); $data = trim($data[1]); $curl->close(); diff --git a/app/code/Magento/AdminNotification/Setup/InstallSchema.php b/app/code/Magento/AdminNotification/Setup/InstallSchema.php deleted file mode 100644 index 081be974dc809..0000000000000 --- a/app/code/Magento/AdminNotification/Setup/InstallSchema.php +++ /dev/null @@ -1,124 +0,0 @@ -startSetup(); - /** - * Create table 'adminnotification_inbox' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('adminnotification_inbox') - )->addColumn( - 'notification_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Notification id' - )->addColumn( - 'severity', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Problem type' - )->addColumn( - 'date_added', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Create date' - )->addColumn( - 'title', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Title' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'url', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Url' - )->addColumn( - 'is_read', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Flag if notification read' - )->addColumn( - 'is_remove', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Flag if notification might be removed' - )->addIndex( - $installer->getIdxName('adminnotification_inbox', ['severity']), - ['severity'] - )->addIndex( - $installer->getIdxName('adminnotification_inbox', ['is_read']), - ['is_read'] - )->addIndex( - $installer->getIdxName('adminnotification_inbox', ['is_remove']), - ['is_remove'] - )->setComment( - 'Adminnotification Inbox' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'admin_system_messages' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('admin_system_messages') - )->addColumn( - 'identity', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 100, - ['nullable' => false, 'primary' => true], - 'Message id' - )->addColumn( - 'severity', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Problem type' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Create date' - )->setComment( - 'Admin System Messages' - ); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml new file mode 100644 index 0000000000000..6d969b3f0090a --- /dev/null +++ b/app/code/Magento/AdminNotification/etc/db_schema.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ diff --git a/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..df5e14e066636 --- /dev/null +++ b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json @@ -0,0 +1,32 @@ +{ + "adminnotification_inbox": { + "column": { + "notification_id": true, + "severity": true, + "date_added": true, + "title": true, + "description": true, + "url": true, + "is_read": true, + "is_remove": true + }, + "index": { + "ADMINNOTIFICATION_INBOX_SEVERITY": true, + "ADMINNOTIFICATION_INBOX_IS_READ": true, + "ADMINNOTIFICATION_INBOX_IS_REMOVE": true + }, + "constraint": { + "PRIMARY": true + } + }, + "admin_system_messages": { + "column": { + "identity": true, + "severity": true, + "created_at": true + }, + "constraint": { + "PRIMARY": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php index 23829d3725119..0e8acb37104e6 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php @@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices() ? $rowData[self::COL_TIER_PRICE] : 0, 'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT ? $rowData[self::COL_TIER_PRICE] : null, - 'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE]) + 'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE]) ]; } } diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php index 5111b4932d7a8..9a380ff75da24 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php @@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class) + $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class) ->setMethods(['getBaseCurrency']) ->disableOriginalConstructor() ->getMock(); diff --git a/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php b/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php index 600c192a262bd..44c54f67da759 100644 --- a/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php +++ b/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php @@ -22,6 +22,9 @@ class JsonConverter implements ConverterInterface */ private $serializer; + /** + * @param Json $serializer + */ public function __construct(Json $serializer) { $this->serializer = $serializer; diff --git a/app/code/Magento/Authorization/Setup/InstallSchema.php b/app/code/Magento/Authorization/Setup/InstallSchema.php deleted file mode 100644 index 9471b448ea3b4..0000000000000 --- a/app/code/Magento/Authorization/Setup/InstallSchema.php +++ /dev/null @@ -1,150 +0,0 @@ -startSetup(); - - if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) { - /** - * Create table 'authorization_role' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('authorization_role') - )->addColumn( - 'role_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Role ID' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Parent Role ID' - )->addColumn( - 'tree_level', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Role Tree Level' - )->addColumn( - 'sort_order', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Role Sort Order' - )->addColumn( - 'role_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 1, - ['nullable' => false, 'default' => '0'], - 'Role Type' - )->addColumn( - 'user_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'User ID' - )->addColumn( - 'user_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 16, - ['nullable' => true, 'default' => null], - 'User Type' - )->addColumn( - 'role_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - ['nullable' => true, 'default' => null], - 'Role Name' - )->addIndex( - $installer->getIdxName('authorization_role', ['parent_id', 'sort_order']), - ['parent_id', 'sort_order'] - )->addIndex( - $installer->getIdxName('authorization_role', ['tree_level']), - ['tree_level'] - )->setComment( - 'Admin Role Table' - ); - $installer->getConnection()->createTable($table); - } - - if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) { - /** - * Create table 'authorization_rule' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('authorization_rule') - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule ID' - )->addColumn( - 'role_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Role ID' - )->addColumn( - 'resource_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true, 'default' => null], - 'Resource ID' - )->addColumn( - 'privileges', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 20, - ['nullable' => true], - 'Privileges' - )->addColumn( - 'permission', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 10, - [], - 'Permission' - )->addIndex( - $installer->getIdxName('authorization_rule', ['resource_id', 'role_id']), - ['resource_id', 'role_id'] - )->addIndex( - $installer->getIdxName('authorization_rule', ['role_id', 'resource_id']), - ['role_id', 'resource_id'] - )->addForeignKey( - $installer->getFkName('authorization_rule', 'role_id', 'authorization_role', 'role_id'), - 'role_id', - $installer->getTable('authorization_role'), - 'role_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Admin Rule Table' - ); - $installer->getConnection()->createTable($table); - } - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml new file mode 100644 index 0000000000000..ef615b4508a89 --- /dev/null +++ b/app/code/Magento/Authorization/etc/db_schema.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ diff --git a/app/code/Magento/Authorization/etc/db_schema_whitelist.json b/app/code/Magento/Authorization/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..eb9256e415593 --- /dev/null +++ b/app/code/Magento/Authorization/etc/db_schema_whitelist.json @@ -0,0 +1,38 @@ +{ + "authorization_role": { + "column": { + "role_id": true, + "parent_id": true, + "tree_level": true, + "sort_order": true, + "role_type": true, + "user_id": true, + "user_type": true, + "role_name": true + }, + "index": { + "AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true, + "AUTHORIZATION_ROLE_TREE_LEVEL": true + }, + "constraint": { + "PRIMARY": true + } + }, + "authorization_rule": { + "column": { + "rule_id": true, + "role_id": true, + "resource_id": true, + "privileges": true, + "permission": true + }, + "index": { + "AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true, + "AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true + }, + "constraint": { + "PRIMARY": true, + "AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php index bdd0c4a424e99..ea73b4b734569 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php @@ -122,7 +122,7 @@ public function execute() /** * Place order for checkout flow * - * @return string + * @return void */ protected function placeCheckoutOrder() { diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php index e14358396aa70..82c36bf3a1fe4 100644 --- a/app/code/Magento/Backend/Block/Cache.php +++ b/app/code/Magento/Backend/Block/Cache.php @@ -22,24 +22,29 @@ protected function _construct() $this->_headerText = __('Cache Storage Management'); parent::_construct(); $this->buttonList->remove('add'); - $this->buttonList->add( - 'flush_magento', - [ - 'label' => __('Flush Magento Cache'), - 'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')', - 'class' => 'primary flush-cache-magento' - ] - ); - $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?'); - $this->buttonList->add( - 'flush_system', - [ - 'label' => __('Flush Cache Storage'), - 'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')', - 'class' => 'flush-cache-storage' - ] - ); + if ($this->_authorization->isAllowed('Magento_Backend::flush_magento_cache')) { + $this->buttonList->add( + 'flush_magento', + [ + 'label' => __('Flush Magento Cache'), + 'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')', + 'class' => 'primary flush-cache-magento' + ] + ); + } + + if ($this->_authorization->isAllowed('Magento_Backend::flush_cache_storage')) { + $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?'); + $this->buttonList->add( + 'flush_system', + [ + 'label' => __('Flush Cache Storage'), + 'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')', + 'class' => 'flush-cache-storage' + ] + ); + } } /** diff --git a/app/code/Magento/Backend/Block/Cache/Permissions.php b/app/code/Magento/Backend/Block/Cache/Permissions.php new file mode 100644 index 0000000000000..272a603145f09 --- /dev/null +++ b/app/code/Magento/Backend/Block/Cache/Permissions.php @@ -0,0 +1,62 @@ +authorization = $authorization; + } + + /** + * @return bool + */ + public function hasAccessToFlushCatalogImages() + { + return $this->authorization->isAllowed('Magento_Backend::flush_catalog_images'); + } + /** + * @return bool + */ + public function hasAccessToFlushJsCss() + { + return $this->authorization->isAllowed('Magento_Backend::flush_js_css'); + } + /** + * @return bool + */ + public function hasAccessToFlushStaticFiles() + { + return $this->authorization->isAllowed('Magento_Backend::flush_static_files'); + } + /** + * @return bool + */ + public function hasAccessToAdditionalActions() + { + return ($this->hasAccessToFlushCatalogImages() + || $this->hasAccessToFlushJsCss() + || $this->hasAccessToFlushStaticFiles()); + } +} diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php index 9d9409fba093b..50279786c0a5b 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php +++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php @@ -92,7 +92,7 @@ protected function _prepareCollection() protected function _afterLoadCollection() { foreach ($this->getCollection() as $item) { - $item->getCustomer() ?: $item->setCustomer('Guest'); + $item->getCustomer() ?: $item->setCustomer($item->getBillingAddress()->getName()); } return $this; } diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php index f19799d2e4939..034887c67d1ee 100644 --- a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php +++ b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php @@ -37,7 +37,7 @@ protected function _prepareForm() ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']] ); - $this->_prepareStoreFieldSet($form); + $this->_prepareStoreFieldset($form); $form->addField( 'store_type', diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php index d9b00d2ba2503..662cbedaed8db 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php @@ -3,8 +3,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Backend\Block\Widget\Grid; +use Magento\Backend\Block\Template\Context; +use Magento\Framework\App\ObjectManager; +use Magento\Framework\AuthorizationInterface; +use Magento\Framework\DataObject; +use Magento\Framework\Json\EncoderInterface; + /** * Grid widget massaction default block * @@ -14,4 +21,72 @@ */ class Massaction extends \Magento\Backend\Block\Widget\Grid\Massaction\AbstractMassaction { + /** + * @var AuthorizationInterface + */ + private $authorization; + + /** + * Map bind item id to a particular acl type + * itemId => acl + * + * @var array + */ + private $restrictions = [ + 'enable' => 'Magento_Backend::toggling_cache_type', + 'disable' => 'Magento_Backend::toggling_cache_type', + 'refresh' => 'Magento_Backend::refresh_cache_type', + ]; + + /** + * Massaction constructor. + * + * @param Context $context + * @param EncoderInterface $jsonEncoder + * @param array $data + * @param AuthorizationInterface $authorization + */ + public function __construct( + Context $context, + EncoderInterface $jsonEncoder, + array $data = [], + AuthorizationInterface $authorization = null + ) { + $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class); + + parent::__construct($context, $jsonEncoder, $data); + } + + /** + * {@inheritdoc} + * + * @param string $itemId + * @param array|DataObject $item + * + * @return $this + */ + public function addItem($itemId, $item) + { + if (!$this->isRestricted($itemId)) { + parent::addItem($itemId, $item); + } + + return $this; + } + + /** + * Check if access to action restricted + * + * @param string $itemId + * + * @return bool + */ + private function isRestricted(string $itemId): bool + { + if (!key_exists($itemId, $this->restrictions)) { + return false; + } + + return !$this->authorization->isAllowed($this->restrictions[$itemId]); + } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 1895bd08c464f..7a926b1c09c3e 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -11,6 +11,13 @@ class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::flush_catalog_images'; + /** * Clean JS/css files cache * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 521cb9806a135..72f23ab65cf8a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -11,6 +11,13 @@ class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::flush_js_css'; + /** * Clean JS/css files cache * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php index adfbf7cfe63c8..27ae2fc31e150 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php @@ -10,6 +10,13 @@ class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::flush_static_files'; + /** * Clean static files cache * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php index 2f9dc9ad6a7a5..ca89ea58fa6f3 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php @@ -8,6 +8,13 @@ class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::flush_cache_storage'; + /** * Flush cache storage * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php index 0f55a59353d65..f0fed159e0f22 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php @@ -8,6 +8,13 @@ class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::flush_magento_cache'; + /** * Flush all magento cache * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php index 204105852b9f1..2bfa937b06b77 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php @@ -16,6 +16,13 @@ */ class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::toggling_cache_type'; + /** * @var State */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php index 32acf47887c44..113e0f2d8961b 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php @@ -16,6 +16,13 @@ */ class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::toggling_cache_type'; + /** * @var State */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php index e18aa1555e11b..3843b030afb3d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php @@ -11,6 +11,13 @@ class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache { + /** + * Authorization level of a basic admin session + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_Backend::refresh_cache_type'; + /** * Mass action for cache refresh * diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index e8251b5be6030..ce59d2fd48e5a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -34,7 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); - $resultPage->setStatusHeader(404, '1.1', 'Forbidden'); + $resultPage->setStatusHeader(404, '1.1', 'Not Found'); $resultPage->setHeader('Status', '404 File not found'); $resultPage->addHandle('adminhtml_noroute'); return $resultPage; diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php index c9bce1cbf3888..421885a0c32a3 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -54,9 +54,9 @@ public function execute() $user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId); $user->setId($userId) - ->setUsername($this->getRequest()->getParam('username', false)) - ->setFirstname($this->getRequest()->getParam('firstname', false)) - ->setLastname($this->getRequest()->getParam('lastname', false)) + ->setUserName($this->getRequest()->getParam('username', false)) + ->setFirstName($this->getRequest()->getParam('firstname', false)) + ->setLastName($this->getRequest()->getParam('lastname', false)) ->setEmail(strtolower($this->getRequest()->getParam('email', false))); if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) { diff --git a/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php b/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php new file mode 100644 index 0000000000000..6975b8ac092ad --- /dev/null +++ b/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php @@ -0,0 +1,76 @@ +objectManager = new ObjectManager($this); + + $this->mockAuthorization = $this->getMockBuilder(Authorization::class) + ->disableOriginalConstructor() + ->setMethods(['isAllowed']) + ->getMock(); + + $this->permissions = new Permissions($this->mockAuthorization); + } + + public function testHasAccessToFlushCatalogImages() + { + $this->mockAuthorization->expects($this->atLeastOnce()) + ->method('isAllowed') + ->with('Magento_Backend::flush_catalog_images') + ->willReturn(true); + + $this->assertTrue($this->permissions->hasAccessToFlushCatalogImages()); + } + + public function testHasAccessToFlushJsCss() + { + $this->mockAuthorization->expects($this->atLeastOnce()) + ->method('isAllowed') + ->with('Magento_Backend::flush_js_css') + ->willReturn(true); + + $this->assertTrue($this->permissions->hasAccessToFlushJsCss()); + } + + public function testHasAccessToFlushStaticFiles() + { + $this->mockAuthorization->expects($this->atLeastOnce()) + ->method('isAllowed') + ->with('Magento_Backend::flush_static_files') + ->willReturn(true); + + $this->assertTrue($this->permissions->hasAccessToFlushStaticFiles()); + } +} diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php index be171a8ed40bf..df242a4cf6129 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php @@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns() public function testGetRowUrlIfUrlPathNotSet() { - $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass())); + $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass())); } public function testGetRowUrl() diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php index da13af87b71ea..c5c56fd75fbe7 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php @@ -351,7 +351,7 @@ public function testSetGetGrid() $this->_block->setFilter('StdClass'); - $grid = new \StdClass(); + $grid = new \stdClass(); $this->_block->setGrid($grid); $this->assertEquals($grid, $this->_block->getGrid()); } diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php index bb389a996e1ed..29ce448a04ecb 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php @@ -10,6 +10,7 @@ namespace Magento\Backend\Test\Unit\Block\Widget\Grid; use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker; +use Magento\Framework\Authorization; class MassactionTest extends \PHPUnit\Framework\TestCase { @@ -43,6 +44,11 @@ class MassactionTest extends \PHPUnit\Framework\TestCase */ protected $_requestMock; + /** + * @var Authorization|\PHPUnit_Framework_MockObject_MockObject + */ + protected $_authorizationMock; + /** * @var VisibilityChecker|\PHPUnit_Framework_MockObject_MockObject */ @@ -86,11 +92,17 @@ protected function setUp() $this->visibilityCheckerMock = $this->getMockBuilder(VisibilityChecker::class) ->getMockForAbstractClass(); + $this->_authorizationMock = $this->getMockBuilder(Authorization::class) + ->disableOriginalConstructor() + ->setMethods(['isAllowed']) + ->getMock(); + $arguments = [ 'layout' => $this->_layoutMock, 'request' => $this->_requestMock, 'urlBuilder' => $this->_urlModelMock, - 'data' => ['massaction_id_field' => 'test_id', 'massaction_id_filter' => 'test_id'] + 'data' => ['massaction_id_field' => 'test_id', 'massaction_id_filter' => 'test_id'], + 'authorization' => $this->_authorizationMock, ]; $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); @@ -145,6 +157,10 @@ public function testItemsProcessing($itemId, $item, $expectedItem) ->method('getUrl') ->willReturnMap($urlReturnValueMap); + $this->_authorizationMock->expects($this->any()) + ->method('isAllowed') + ->willReturn(true); + $this->_block->addItem($itemId, $item); $this->assertEquals(1, $this->_block->getCount()); @@ -184,6 +200,28 @@ public function itemsProcessingDataProvider() "id" => 'test_id2', ] ) + ], + [ + 'enabled', + new \Magento\Framework\DataObject(["label" => "Test Item Enabled", "url" => "*/*/test2"]), + new \Magento\Framework\DataObject( + [ + "label" => "Test Item Enabled", + "url" => "http://localhost/index.php/backend/admin/test/test2", + "id" => 'enabled', + ] + ) + ], + [ + 'refresh', + new \Magento\Framework\DataObject(["label" => "Test Item Refresh", "url" => "*/*/test2"]), + new \Magento\Framework\DataObject( + [ + "label" => "Test Item Refresh", + "url" => "http://localhost/index.php/backend/admin/test/test2", + "id" => 'refresh', + ] + ) ] ]; } @@ -237,7 +275,7 @@ public function testGetGridIdsJsonWithoutUseSelectAll() public function testGetGridIdsJsonWithUseSelectAll(array $items, $result) { $this->_block->setUseSelectAll(true); - + if ($this->_block->getMassactionIdField()) { $massActionIdField = $this->_block->getMassactionIdField(); } else { @@ -290,14 +328,20 @@ public function dataProviderGetGridIdsJsonWithUseSelectAll() * @param int $count * @param bool $withVisibilityChecker * @param bool $isVisible + * @param bool $isAllowed + * * @dataProvider addItemDataProvider */ - public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isVisible) + public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isVisible, $isAllowed) { $this->visibilityCheckerMock->expects($this->any()) ->method('isVisible') ->willReturn($isVisible); + $this->_authorizationMock->expects($this->any()) + ->method('isAllowed') + ->willReturn($isAllowed); + if ($withVisibilityChecker) { $item['visible'] = $this->visibilityCheckerMock; } @@ -311,7 +355,7 @@ public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isV ->willReturnMap($urlReturnValueMap); $this->_block->addItem($itemId, $item); - $this->assertEquals($count, $this->_block->getCount()); + $this->assertEquals($count, $this->_block->getCount(), $itemId); } /** @@ -325,7 +369,8 @@ public function addItemDataProvider() 'item' => ['label' => 'Test 1', 'url' => '*/*/test1'], 'count' => 1, 'withVisibilityChecker' => false, - '$isVisible' => false, + 'isVisible' => false, + 'isAllowed' => true, ], [ 'itemId' => 'test2', @@ -333,21 +378,56 @@ public function addItemDataProvider() 'count' => 1, 'withVisibilityChecker' => false, 'isVisible' => true, + 'isAllowed' => true, ], [ - 'itemId' => 'test1', - 'item' => ['label' => 'Test 1. Hide', 'url' => '*/*/test1'], + 'itemId' => 'test3', + 'item' => ['label' => 'Test 3. Hide', 'url' => '*/*/test3'], 'count' => 0, 'withVisibilityChecker' => true, 'isVisible' => false, + 'isAllowed' => true, ], [ - 'itemId' => 'test2', - 'item' => ['label' => 'Test 2. Does not hide', 'url' => '*/*/test2'], + 'itemId' => 'test4', + 'item' => ['label' => 'Test 4. Does not hide', 'url' => '*/*/test4'], 'count' => 1, 'withVisibilityChecker' => true, 'isVisible' => true, - ] + 'isAllowed' => true, + ], + [ + 'itemId' => 'enable', + 'item' => ['label' => 'Test 5. Not restricted', 'url' => '*/*/test5'], + 'count' => 1, + 'withVisibilityChecker' => true, + 'isVisible' => true, + 'isAllowed' => true, + ], + [ + 'itemId' => 'enable', + 'item' => ['label' => 'Test 5. restricted', 'url' => '*/*/test5'], + 'count' => 0, + 'withVisibilityChecker' => true, + 'isVisible' => true, + 'isAllowed' => false, + ], + [ + 'itemId' => 'refresh', + 'item' => ['label' => 'Test 6. Not Restricted', 'url' => '*/*/test6'], + 'count' => 1, + 'withVisibilityChecker' => true, + 'isVisible' => true, + 'isAllowed' => true, + ], + [ + 'itemId' => 'refresh', + 'item' => ['label' => 'Test 6. Restricted', 'url' => '*/*/test6'], + 'count' => 0, + 'withVisibilityChecker' => true, + 'isVisible' => true, + 'isAllowed' => false, + ], ]; } } diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml index af4ab5856e94c..cf9471e75bed9 100644 --- a/app/code/Magento/Backend/etc/acl.xml +++ b/app/code/Magento/Backend/etc/acl.xml @@ -38,7 +38,21 @@ - + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml index 050115087c26e..b9ebeb227b764 100644 --- a/app/code/Magento/Backend/etc/adminhtml/di.xml +++ b/app/code/Magento/Backend/etc/adminhtml/di.xml @@ -145,6 +145,9 @@ Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED + + + diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml index 92df39bd65ee4..04bfe76bce9e7 100644 --- a/app/code/Magento/Backend/etc/adminhtml/system.xml +++ b/app/code/Magento/Backend/etc/adminhtml/system.xml @@ -231,7 +231,7 @@ Magento\Directory\Model\Config\Source\Country - + Magento\Directory\Model\Config\Source\Country diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml index ab5ddc414b51f..4bbe70b6cdb92 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml @@ -11,7 +11,11 @@ - + + + Magento\Backend\Block\Cache\Permissions + + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml index 40b7173f47417..8feccc9cf1b8f 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml @@ -29,7 +29,7 @@ data-mage-init='{"dropdown":{}}' data-toggle="dropdown"> - +

    @@ -39,7 +39,7 @@ href="getUrl('adminhtml/system_account/index') ?>" getUiId('user', 'account', 'settings') ?> title="escapeHtml(__('Account Setting')) ?>"> - (escapeHtml($block->getUser()->getUsername()) ?>) + (escapeHtml($block->getUser()->getUserName()) ?>) diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml index 84bbc4ea601ef..8e30afdf51f7f 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml @@ -5,34 +5,39 @@ */ // @codingStandardsIgnoreFile + +/** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */ +$permissions = $block->getData('permissions'); ?> -
    -

    - -

    -

    - - -

    -

    - - -

    - isInProductionMode()): - ?> -

    - - -

    - - getChildHtml() ?> -
    +hasAccessToAdditionalActions()): ?> +
    + hasAccessToFlushCatalogImages()): ?> +

    + escapeHtml(__('Additional Cache Management')); ?> +

    +

    + + escapeHtml(__('Pregenerated product images files')); ?> +

    + + hasAccessToFlushJsCss()): ?> +

    + + escapeHtml(__('Themes JavaScript and CSS files combined to one file')) ?> +

    + + isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()): ?> +

    + + escapeHtml(__('Preprocessed view files and static files')); ?> +

    + + getChildHtml() ?> +
    + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml index a528133b2bc3a..b50183ced29b4 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml @@ -28,16 +28,16 @@ diff --git a/app/code/Magento/Review/view/frontend/web/js/validate-review.js b/app/code/Magento/Review/view/frontend/web/js/validate-review.js new file mode 100644 index 0000000000000..e3f57eaf8cd33 --- /dev/null +++ b/app/code/Magento/Review/view/frontend/web/js/validate-review.js @@ -0,0 +1,18 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'jquery/ui', + 'jquery/validate', + 'mage/translate' +], function ($) { + 'use strict'; + + $.validator.addMethod( + 'rating-required', function (value) { + return value !== undefined; + }, $.mage.__('Please select one of each of the ratings above.')); +}); diff --git a/app/code/Magento/Robots/Controller/Index/Index.php b/app/code/Magento/Robots/Controller/Index/Index.php index b94626e93432d..679066d723dce 100644 --- a/app/code/Magento/Robots/Controller/Index/Index.php +++ b/app/code/Magento/Robots/Controller/Index/Index.php @@ -43,6 +43,7 @@ public function execute() /** @var Page $resultPage */ $resultPage = $this->resultPageFactory->create(true); $resultPage->addHandle('robots_index_index'); + $resultPage->setHeader('Content-Type', 'text/plain'); return $resultPage; } } diff --git a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php index 22a69cc13bd52..d3a7a97c7ea80 100644 --- a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php @@ -51,6 +51,9 @@ public function testExecute() $resultPageMock->expects($this->once()) ->method('addHandle') ->with('robots_index_index'); + $resultPageMock->expects($this->once()) + ->method('setHeader') + ->with('Content-Type', 'text/plain'); $this->resultPageFactory->expects($this->any()) ->method('create') diff --git a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php index 2fdb960521a97..6e685a9a9b978 100644 --- a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php +++ b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php @@ -81,7 +81,7 @@ public function bindRuleToEntity($ruleIds, $entityIds, $entityType) try { $this->_multiplyBunchInsert($ruleIds, $entityIds, $entityType); } catch (\Exception $e) { - $this->getConnection()->rollback(); + $this->getConnection()->rollBack(); throw $e; } diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php index 85b0ed891b64f..f335705e3deee 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php @@ -160,4 +160,22 @@ public function convertPrice($value, $format = true) ) : $this->priceCurrency->convert($value, $this->getStore()); } + + /** + * If item is quote or wishlist we need to get product from it. + * + * @param $item + * + * @return Product + */ + public function getProduct($item) + { + if ($item instanceof Product) { + $product = $item; + } else { + $product = $item->getProduct(); + } + + return $product; + } } diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php index a80be58bc003e..dd8845008d79e 100644 --- a/app/code/Magento/Sales/Helper/Guest.php +++ b/app/code/Magento/Sales/Helper/Guest.php @@ -178,6 +178,9 @@ public function loadValidOrder(App\RequestInterface $request) public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage) { $breadcrumbs = $resultPage->getLayout()->getBlock('breadcrumbs'); + if (!$breadcrumbs) { + return; + } $breadcrumbs->addCrumb( 'home', [ diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index 732ad6ba2cf6c..9847c600e691e 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -8,7 +8,12 @@ use Magento\Customer\Api\AddressMetadataInterface; use Magento\Customer\Model\Metadata\Form as CustomerForm; +use Magento\Framework\Api\ExtensibleDataObjectConverter; +use Magento\Framework\App\ObjectManager; +use Magento\Quote\Model\Quote\Address; use Magento\Quote\Model\Quote\Item; +use Magento\Sales\Api\Data\OrderAddressInterface; +use Magento\Sales\Model\Order; /** * Order create model @@ -231,6 +236,11 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\ */ private $serializer; + /** + * @var ExtensibleDataObjectConverter + */ + private $dataObjectConverter; + /** * @param \Magento\Framework\ObjectManagerInterface $objectManager * @param \Magento\Framework\Event\ManagerInterface $eventManager @@ -261,6 +271,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\ * @param \Magento\Quote\Model\QuoteFactory $quoteFactory * @param array $data * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer + * @param ExtensibleDataObjectConverter|null $dataObjectConverter * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -292,7 +303,8 @@ public function __construct( \Magento\Sales\Api\OrderManagementInterface $orderManagement, \Magento\Quote\Model\QuoteFactory $quoteFactory, array $data = [], - \Magento\Framework\Serialize\Serializer\Json $serializer = null + \Magento\Framework\Serialize\Serializer\Json $serializer = null, + ExtensibleDataObjectConverter $dataObjectConverter = null ) { $this->_objectManager = $objectManager; $this->_eventManager = $eventManager; @@ -321,9 +333,11 @@ public function __construct( $this->dataObjectHelper = $dataObjectHelper; $this->orderManagement = $orderManagement; $this->quoteFactory = $quoteFactory; - $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance() + $this->serializer = $serializer ?: ObjectManager::getInstance() ->get(\Magento\Framework\Serialize\Serializer\Json::class); parent::__construct($data); + $this->dataObjectConverter = $dataObjectConverter ?: ObjectManager::getInstance() + ->get(ExtensibleDataObjectConverter::class); } /** @@ -510,9 +524,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order) $shippingAddress = $order->getShippingAddress(); if ($shippingAddress) { - $addressDiff = array_diff_assoc($shippingAddress->getData(), $order->getBillingAddress()->getData()); - unset($addressDiff['address_type'], $addressDiff['entity_id']); - $shippingAddress->setSameAsBilling(empty($addressDiff)); + $shippingAddress->setSameAsBilling($this->isAddressesAreEqual($order)); } $this->_initBillingAddressFromOrder($order); @@ -1454,33 +1466,37 @@ public function getBillingAddress() */ public function setBillingAddress($address) { - if (is_array($address)) { - $billingAddress = $this->_objectManager->create( - \Magento\Quote\Model\Quote\Address::class - )->setData( - $address - )->setAddressType( - \Magento\Quote\Model\Quote\Address::TYPE_BILLING - ); - $this->_setQuoteAddress($billingAddress, $address); - /** - * save_in_address_book is not a valid attribute and is filtered out by _setQuoteAddress, - * that is why it should be added after _setQuoteAddress call - */ - $saveInAddressBook = (int)(!empty($address['save_in_address_book'])); - $billingAddress->setData('save_in_address_book', $saveInAddressBook); - - if (!$this->getQuote()->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) { - $shippingAddress = clone $billingAddress; - $shippingAddress->setSameAsBilling(true); - $shippingAddress->setSaveInAddressBook(false); - $address['save_in_address_book'] = 0; - $this->setShippingAddress($address); - } + if (!is_array($address)) { + return $this; + } + + $billingAddress = $this->_objectManager->create(Address::class) + ->setData($address) + ->setAddressType(Address::TYPE_BILLING); - $this->getQuote()->setBillingAddress($billingAddress); + $this->_setQuoteAddress($billingAddress, $address); + + /** + * save_in_address_book is not a valid attribute and is filtered out by _setQuoteAddress, + * that is why it should be added after _setQuoteAddress call + */ + $saveInAddressBook = (int)(!empty($address['save_in_address_book'])); + $billingAddress->setData('save_in_address_book', $saveInAddressBook); + + $quote = $this->getQuote(); + if (!$quote->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) { + $address['save_in_address_book'] = 0; + $this->setShippingAddress($address); } + // not assigned billing address should be saved as new + // but if quote already has the billing address it won't be overridden + if (empty($billingAddress->getCustomerAddressId())) { + $billingAddress->setCustomerAddressId(null); + $quote->getBillingAddress()->setCustomerAddressId(null); + } + $quote->setBillingAddress($billingAddress); + return $this; } @@ -1782,6 +1798,7 @@ public function _prepareCustomer() $address = $this->getShippingAddress()->setCustomerId($this->getQuote()->getCustomer()->getId()); $this->setShippingAddress($address); } + $this->getBillingAddress()->setCustomerId($customer->getId()); $this->getQuote()->updateCustomerData($this->getQuote()->getCustomer()); $customer = $this->getQuote()->getCustomer(); @@ -2010,4 +2027,26 @@ protected function _getNewCustomerEmail() return $email; } + + /** + * Checks id shipping and billing addresses are equal. + * + * @param Order $order + * @return bool + */ + private function isAddressesAreEqual(Order $order) + { + $shippingAddress = $order->getShippingAddress(); + $billingAddress = $order->getBillingAddress(); + $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], OrderAddressInterface::class); + $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], OrderAddressInterface::class); + unset( + $shippingData['address_type'], + $shippingData['entity_id'], + $billingData['address_type'], + $billingData['entity_id'] + ); + + return $shippingData == $billingData; + } } diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php index 1c7514142678b..e00eda647dc8d 100644 --- a/app/code/Magento/Sales/Model/Order/Config.php +++ b/app/code/Magento/Sales/Model/Order/Config.php @@ -122,8 +122,14 @@ public function getStateDefaultStatus($state) */ public function getStatusLabel($code) { - $code = $this->maskStatusForArea($this->state->getAreaCode(), $code); + $area = $this->state->getAreaCode(); + $code = $this->maskStatusForArea($area, $code); $status = $this->orderStatusFactory->create()->load($code); + + if ($area == 'adminhtml') { + return $status->getLabel(); + } + return $status->getStoreLabel(); } @@ -211,7 +217,7 @@ public function getStateStatuses($state, $addLabels = true) foreach ($collection as $item) { $status = $item->getData('status'); if ($addLabels) { - $statuses[$status] = $item->getStoreLabel(); + $statuses[$status] = $this->getStatusLabel($status); } else { $statuses[] = $status; } diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php index c09a5da9177c3..19aac897c21e2 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php @@ -7,10 +7,12 @@ namespace Magento\Sales\Model\Order; use Magento\Framework\Api\AttributeValueFactory; +use Magento\Framework\App\ObjectManager; use Magento\Framework\Pricing\PriceCurrencyInterface; use Magento\Sales\Api\Data\CreditmemoInterface; use Magento\Sales\Model\AbstractModel; use Magento\Sales\Model\EntityInterface; +use Magento\Sales\Model\Order\InvoiceFactory; /** * Order creditmemo model @@ -112,6 +114,11 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt */ protected $priceCurrency; + /** + * @var InvoiceFactory + */ + private $invoiceFactory; + /** * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry @@ -128,6 +135,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection * @param array $data + * @param InvoiceFactory $invoiceFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -145,7 +153,8 @@ public function __construct( PriceCurrencyInterface $priceCurrency, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, - array $data = [] + array $data = [], + InvoiceFactory $invoiceFactory = null ) { $this->_creditmemoConfig = $creditmemoConfig; $this->_orderFactory = $orderFactory; @@ -155,6 +164,7 @@ public function __construct( $this->_commentFactory = $commentFactory; $this->_commentCollectionFactory = $commentCollectionFactory; $this->priceCurrency = $priceCurrency; + $this->invoiceFactory = $invoiceFactory ?: ObjectManager::getInstance()->get(InvoiceFactory::class); parent::__construct( $context, $registry, @@ -377,6 +387,9 @@ public function canRefund() */ public function getInvoice() { + if (!$this->getData('invoice') instanceof \Magento\Sales\Api\Data\InvoiceInterface && $this->getInvoiceId()) { + $this->setInvoice($this->invoiceFactory->create()->load($this->getInvoiceId())); + } return $this->getData('invoice'); } @@ -1505,6 +1518,5 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensi { return $this->_setExtensionAttributes($extensionAttributes); } - //@codeCoverageIgnoreEnd } diff --git a/app/code/Magento/Sales/Model/Order/CustomerManagement.php b/app/code/Magento/Sales/Model/Order/CustomerManagement.php index bf54e65d0ce10..466f3ff8adddb 100644 --- a/app/code/Magento/Sales/Model/Order/CustomerManagement.php +++ b/app/code/Magento/Sales/Model/Order/CustomerManagement.php @@ -131,6 +131,7 @@ public function create($orderId) $customer = $this->customerFactory->create(['data' => $customerData]); $account = $this->accountManagement->createAccount($customer); $order->setCustomerId($account->getId()); + $order->setCustomerIsGuest(0); $this->orderRepository->save($order); return $account; diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php index 93c6f19b08690..7ec089b882972 100644 --- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php +++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Model\Order\Email; +use Magento\Framework\App\ObjectManager; use Magento\Framework\Mail\Template\TransportBuilder; +use Magento\Framework\Mail\Template\TransportBuilderByStore; use Magento\Sales\Model\Order\Email\Container\IdentityInterface; use Magento\Sales\Model\Order\Email\Container\Template; @@ -26,19 +28,29 @@ class SenderBuilder */ protected $transportBuilder; + /** + * @var TransportBuilderByStore + */ + private $transportBuilderByStore; + /** * @param Template $templateContainer * @param IdentityInterface $identityContainer * @param TransportBuilder $transportBuilder + * @param TransportBuilderByStore $transportBuilderByStore */ public function __construct( Template $templateContainer, IdentityInterface $identityContainer, - TransportBuilder $transportBuilder + TransportBuilder $transportBuilder, + TransportBuilderByStore $transportBuilderByStore = null ) { $this->templateContainer = $templateContainer; $this->identityContainer = $identityContainer; $this->transportBuilder = $transportBuilder; + $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get( + TransportBuilderByStore::class + ); } /** @@ -98,6 +110,9 @@ protected function configureEmailTemplate() $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId()); $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions()); $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars()); - $this->transportBuilder->setFrom($this->identityContainer->getEmailIdentity()); + $this->transportBuilderByStore->setFromByStore( + $this->identityContainer->getEmailIdentity(), + $this->identityContainer->getStore()->getId() + ); } } diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php index 8c018ecee544b..f600c65e05f52 100644 --- a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php +++ b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php @@ -43,6 +43,7 @@ public function getOrderItemId() public function setOrderItemId($orderItemId) { $this->orderItemId = $orderItemId; + return $this; } /** @@ -59,6 +60,7 @@ public function getQty() public function setQty($qty) { $this->qty = $qty; + return $this; } /** diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php index f95a3206ce786..5ecbbd777a14e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php @@ -50,6 +50,10 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object) $object->setBillingAddressId($object->getOrder()->getBillingAddress()->getId()); } + if (!$object->getInvoiceId() && $object->getInvoice()) { + $object->setInvoiceId($object->getInvoice()->getId()); + } + return parent::_beforeSave($object); } } diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php index 2f08c26de9058..24f56c0dbd595 100644 --- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php +++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php @@ -195,7 +195,7 @@ public function refund( */ protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo) { - if ($creditmemo->getId()) { + if ($creditmemo->getId() && $creditmemo->getState() != \Magento\Sales\Model\Order\Creditmemo::STATE_OPEN) { throw new \Magento\Framework\Exception\LocalizedException( __('We cannot register an existing credit memo.') ); diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php deleted file mode 100644 index 3c1da7add06ec..0000000000000 --- a/app/code/Magento/Sales/Setup/InstallSchema.php +++ /dev/null @@ -1,5573 +0,0 @@ -startSetup(); - - /** - * Create table 'sales_order' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'State' - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Status' - )->addColumn( - 'coupon_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Coupon Code' - )->addColumn( - 'protect_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Protect Code' - )->addColumn( - 'shipping_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Description' - )->addColumn( - 'is_virtual', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Virtual' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Customer Id' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Amount' - )->addColumn( - 'base_discount_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Canceled' - )->addColumn( - 'base_discount_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Invoiced' - )->addColumn( - 'base_discount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Refunded' - )->addColumn( - 'base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Grand Total' - )->addColumn( - 'base_shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Amount' - )->addColumn( - 'base_shipping_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Canceled' - )->addColumn( - 'base_shipping_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Invoiced' - )->addColumn( - 'base_shipping_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Refunded' - )->addColumn( - 'base_shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Tax Amount' - )->addColumn( - 'base_shipping_tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Tax Refunded' - )->addColumn( - 'base_subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal' - )->addColumn( - 'base_subtotal_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Canceled' - )->addColumn( - 'base_subtotal_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Invoiced' - )->addColumn( - 'base_subtotal_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Refunded' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Amount' - )->addColumn( - 'base_tax_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Canceled' - )->addColumn( - 'base_tax_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Invoiced' - )->addColumn( - 'base_tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Refunded' - )->addColumn( - 'base_to_global_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Global Rate' - )->addColumn( - 'base_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Order Rate' - )->addColumn( - 'base_total_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Canceled' - )->addColumn( - 'base_total_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Invoiced' - )->addColumn( - 'base_total_invoiced_cost', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Invoiced Cost' - )->addColumn( - 'base_total_offline_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Offline Refunded' - )->addColumn( - 'base_total_online_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Online Refunded' - )->addColumn( - 'base_total_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Paid' - )->addColumn( - 'base_total_qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Qty Ordered' - )->addColumn( - 'base_total_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Refunded' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Amount' - )->addColumn( - 'discount_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Canceled' - )->addColumn( - 'discount_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Invoiced' - )->addColumn( - 'discount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Refunded' - )->addColumn( - 'grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Grand Total' - )->addColumn( - 'shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Amount' - )->addColumn( - 'shipping_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Canceled' - )->addColumn( - 'shipping_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Invoiced' - )->addColumn( - 'shipping_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Refunded' - )->addColumn( - 'shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Tax Amount' - )->addColumn( - 'shipping_tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Tax Refunded' - )->addColumn( - 'store_to_base_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Base Rate' - )->addColumn( - 'store_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Order Rate' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'subtotal_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Canceled' - )->addColumn( - 'subtotal_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Invoiced' - )->addColumn( - 'subtotal_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Refunded' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Amount' - )->addColumn( - 'tax_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Canceled' - )->addColumn( - 'tax_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Invoiced' - )->addColumn( - 'tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Refunded' - )->addColumn( - 'total_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Canceled' - )->addColumn( - 'total_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Invoiced' - )->addColumn( - 'total_offline_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Offline Refunded' - )->addColumn( - 'total_online_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Online Refunded' - )->addColumn( - 'total_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Paid' - )->addColumn( - 'total_qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Qty Ordered' - )->addColumn( - 'total_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Refunded' - )->addColumn( - 'can_ship_partially', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Can Ship Partially' - )->addColumn( - 'can_ship_partially_item', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Can Ship Partially Item' - )->addColumn( - 'customer_is_guest', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Customer Is Guest' - )->addColumn( - 'customer_note_notify', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Customer Note Notify' - )->addColumn( - 'billing_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Billing Address Id' - )->addColumn( - 'customer_group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [], - 'Customer Group Id' - )->addColumn( - 'edit_increment', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Edit Increment' - )->addColumn( - 'email_sent', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Email Sent' - )->addColumn( - 'send_email', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Send Email' - )->addColumn( - 'forced_shipment_with_invoice', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Forced Do Shipment With Invoice' - )->addColumn( - 'payment_auth_expiration', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Payment Authorization Expiration' - )->addColumn( - 'quote_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Quote Address Id' - )->addColumn( - 'quote_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Quote Id' - )->addColumn( - 'shipping_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipping Address Id' - )->addColumn( - 'adjustment_negative', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Negative' - )->addColumn( - 'adjustment_positive', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Positive' - )->addColumn( - 'base_adjustment_negative', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Adjustment Negative' - )->addColumn( - 'base_adjustment_positive', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Adjustment Positive' - )->addColumn( - 'base_shipping_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Discount Amount' - )->addColumn( - 'base_subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Incl Tax' - )->addColumn( - 'base_total_due', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Due' - )->addColumn( - 'payment_authorization_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Payment Authorization Amount' - )->addColumn( - 'shipping_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Discount Amount' - )->addColumn( - 'subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Incl Tax' - )->addColumn( - 'total_due', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Due' - )->addColumn( - 'weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Weight' - )->addColumn( - 'customer_dob', - \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME, - null, - [], - 'Customer Dob' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Increment Id' - )->addColumn( - 'applied_rule_ids', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Applied Rule Ids' - )->addColumn( - 'base_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Base Currency Code' - )->addColumn( - 'customer_email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Email' - )->addColumn( - 'customer_firstname', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Firstname' - )->addColumn( - 'customer_lastname', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Lastname' - )->addColumn( - 'customer_middlename', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Middlename' - )->addColumn( - 'customer_prefix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Customer Prefix' - )->addColumn( - 'customer_suffix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Customer Suffix' - )->addColumn( - 'customer_taxvat', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Customer Taxvat' - )->addColumn( - 'discount_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Discount Description' - )->addColumn( - 'ext_customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Ext Customer Id' - )->addColumn( - 'ext_order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Ext Order Id' - )->addColumn( - 'global_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Global Currency Code' - )->addColumn( - 'hold_before_state', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Hold Before State' - )->addColumn( - 'hold_before_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Hold Before Status' - )->addColumn( - 'order_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Order Currency Code' - )->addColumn( - 'original_increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Original Increment Id' - )->addColumn( - 'relation_child_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Relation Child Id' - )->addColumn( - 'relation_child_real_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Relation Child Real Id' - )->addColumn( - 'relation_parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Relation Parent Id' - )->addColumn( - 'relation_parent_real_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Relation Parent Real Id' - )->addColumn( - 'remote_ip', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Remote Ip' - )->addColumn( - 'shipping_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Shipping Method' - )->addColumn( - 'store_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Store Currency Code' - )->addColumn( - 'store_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Store Name' - )->addColumn( - 'x_forwarded_for', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'X Forwarded For' - )->addColumn( - 'customer_note', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Customer Note' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addColumn( - 'total_item_count', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Total Item Count' - )->addColumn( - 'customer_gender', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Customer Gender' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'shipping_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Discount Tax Compensation Amount' - )->addColumn( - 'base_shipping_discount_tax_compensation_amnt', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Discount Tax Compensation Amount' - )->addColumn( - 'discount_tax_compensation_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Invoiced' - )->addColumn( - 'base_discount_tax_compensation_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Invoiced' - )->addColumn( - 'discount_tax_compensation_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Refunded' - )->addColumn( - 'base_discount_tax_compensation_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Refunded' - )->addColumn( - 'shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Incl Tax' - )->addColumn( - 'base_shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Incl Tax' - )->addColumn( - 'coupon_rule_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Coupon Sales Rule Name' - )->addIndex( - $installer->getIdxName('sales_order', ['status']), - ['status'] - )->addIndex( - $installer->getIdxName('sales_order', ['state']), - ['state'] - )->addIndex( - $installer->getIdxName('sales_order', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName( - 'sales_order', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_order', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_order', ['customer_id']), - ['customer_id'] - )->addIndex( - $installer->getIdxName('sales_order', ['ext_order_id']), - ['ext_order_id'] - )->addIndex( - $installer->getIdxName('sales_order', ['quote_id']), - ['quote_id'] - )->addIndex( - $installer->getIdxName('sales_order', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_order', ['send_email']), - ['send_email'] - )->addIndex( - $installer->getIdxName('sales_order', ['email_sent']), - ['email_sent'] - )->addForeignKey( - $installer->getFkName('sales_order', 'customer_id', 'customer_entity', 'entity_id'), - 'customer_id', - $installer->getTable('customer_entity'), - 'entity_id', - \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 - )->setComment( - 'Sales Flat Order' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_grid' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_grid') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Status' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'store_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Store Name' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Customer Id' - )->addColumn( - 'base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Grand Total' - )->addColumn( - 'base_total_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Paid' - )->addColumn( - 'grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Grand Total' - )->addColumn( - 'total_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Paid' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'base_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Base Currency Code' - )->addColumn( - 'order_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Order Currency Code' - )->addColumn( - 'shipping_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Name' - )->addColumn( - 'billing_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Name' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Updated At' - )->addColumn( - 'billing_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Address' - )->addColumn( - 'shipping_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Address' - )->addColumn( - 'shipping_information', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Method Name' - )->addColumn( - 'customer_email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Customer Email' - )->addColumn( - 'customer_group', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Customer Group' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'shipping_and_handling', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping and handling amount' - )->addColumn( - 'customer_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Customer Name' - )->addColumn( - 'payment_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Payment Method' - )->addColumn( - 'total_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Refunded' - )->addIndex( - $installer->getIdxName('sales_order_grid', ['status']), - ['status'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['base_grand_total']), - ['base_grand_total'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['base_total_paid']), - ['base_total_paid'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['grand_total']), - ['grand_total'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['total_paid']), - ['total_paid'] - )->addIndex( - $installer->getIdxName( - 'sales_order_grid', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['shipping_name']), - ['shipping_name'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['billing_name']), - ['billing_name'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['customer_id']), - ['customer_id'] - )->addIndex( - $installer->getIdxName('sales_order_grid', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName( - 'sales_order_grid', - [ - 'increment_id', - 'billing_name', - 'shipping_name', - 'shipping_address', - 'billing_address', - 'customer_name', - 'customer_email' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT - ), - [ - 'increment_id', - 'billing_name', - 'shipping_name', - 'shipping_address', - 'billing_address', - 'customer_name', - 'customer_email' - ], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT] - )->setComment( - 'Sales Flat Order Grid' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_address' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_address') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Parent Id' - )->addColumn( - 'customer_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Customer Address Id' - )->addColumn( - 'quote_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Quote Address Id' - )->addColumn( - 'region_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Region Id' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Customer Id' - )->addColumn( - 'fax', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Fax' - )->addColumn( - 'region', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Region' - )->addColumn( - 'postcode', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Postcode' - )->addColumn( - 'lastname', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Lastname' - )->addColumn( - 'street', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Street' - )->addColumn( - 'city', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'City' - )->addColumn( - 'email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Email' - )->addColumn( - 'telephone', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Phone Number' - )->addColumn( - 'country_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 2, - [], - 'Country Id' - )->addColumn( - 'firstname', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Firstname' - )->addColumn( - 'address_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Address Type' - )->addColumn( - 'prefix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Prefix' - )->addColumn( - 'middlename', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Middlename' - )->addColumn( - 'suffix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Suffix' - )->addColumn( - 'company', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Company' - )->addIndex( - $installer->getIdxName('sales_order_address', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_order_address', 'parent_id', 'sales_order', 'entity_id'), - 'parent_id', - $installer->getTable('sales_order'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Order Address' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_status_history' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_status_history') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'is_customer_notified', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Is Customer Notified' - )->addColumn( - 'is_visible_on_front', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Is Visible On Front' - )->addColumn( - 'comment', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Comment' - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Status' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'entity_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => true], - 'Shows what entity history is bind to.' - )->addIndex( - $installer->getIdxName('sales_order_status_history', ['parent_id']), - ['parent_id'] - )->addIndex( - $installer->getIdxName('sales_order_status_history', ['created_at']), - ['created_at'] - )->addForeignKey( - $installer->getFkName('sales_order_status_history', 'parent_id', 'sales_order', 'entity_id'), - '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 Status History' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_item' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_item') - )->addColumn( - 'item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Item Id' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Order Id' - )->addColumn( - 'parent_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Parent Item Id' - )->addColumn( - 'quote_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Quote Item Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Product Id' - )->addColumn( - 'product_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Product Type' - )->addColumn( - 'product_options', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Product Options' - )->addColumn( - 'weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Weight' - )->addColumn( - 'is_virtual', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Virtual' - )->addColumn( - 'sku', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Sku' - )->addColumn( - 'name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Name' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'applied_rule_ids', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Applied Rule Ids' - )->addColumn( - 'additional_data', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Data' - )->addColumn( - 'is_qty_decimal', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Qty Decimal' - )->addColumn( - 'no_discount', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'No Discount' - )->addColumn( - 'qty_backordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Backordered' - )->addColumn( - 'qty_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Canceled' - )->addColumn( - 'qty_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Invoiced' - )->addColumn( - 'qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Ordered' - )->addColumn( - 'qty_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Refunded' - )->addColumn( - 'qty_shipped', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Qty Shipped' - )->addColumn( - 'base_cost', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Cost' - )->addColumn( - 'price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Price' - )->addColumn( - 'base_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Base Price' - )->addColumn( - 'original_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Original Price' - )->addColumn( - 'base_original_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Original Price' - )->addColumn( - 'tax_percent', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Tax Percent' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Tax Amount' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Tax Amount' - )->addColumn( - 'tax_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Tax Invoiced' - )->addColumn( - 'base_tax_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Tax Invoiced' - )->addColumn( - 'discount_percent', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Discount Percent' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Discount Amount' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Discount Amount' - )->addColumn( - 'discount_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Discount Invoiced' - )->addColumn( - 'base_discount_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Discount Invoiced' - )->addColumn( - 'amount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Amount Refunded' - )->addColumn( - 'base_amount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Base Amount Refunded' - )->addColumn( - 'row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Row Total' - )->addColumn( - 'base_row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Base Row Total' - )->addColumn( - 'row_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Row Invoiced' - )->addColumn( - 'base_row_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Base Row Invoiced' - )->addColumn( - 'row_weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['default' => '0.0000'], - 'Row Weight' - )->addColumn( - 'base_tax_before_discount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Before Discount' - )->addColumn( - 'tax_before_discount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Before Discount' - )->addColumn( - 'ext_order_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Ext Order Item Id' - )->addColumn( - 'locked_do_invoice', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Locked Do Invoice' - )->addColumn( - 'locked_do_ship', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Locked Do Ship' - )->addColumn( - 'price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price Incl Tax' - )->addColumn( - 'base_price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Price Incl Tax' - )->addColumn( - 'row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total Incl Tax' - )->addColumn( - 'base_row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Row Total Incl Tax' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'discount_tax_compensation_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Invoiced' - )->addColumn( - 'base_discount_tax_compensation_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Invoiced' - )->addColumn( - 'discount_tax_compensation_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Refunded' - )->addColumn( - 'base_discount_tax_compensation_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Refunded' - )->addColumn( - 'tax_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Canceled' - )->addColumn( - 'discount_tax_compensation_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Canceled' - )->addColumn( - 'tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Refunded' - )->addColumn( - 'base_tax_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Refunded' - )->addColumn( - 'discount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Refunded' - )->addColumn( - 'base_discount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Refunded' - )->addIndex( - $installer->getIdxName('sales_order_item', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_order_item', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_order_item', 'order_id', 'sales_order', 'entity_id'), - 'order_id', - $installer->getTable('sales_order'), - 'entity_id', - \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 - )->setComment( - 'Sales Flat Order Item' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_payment' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_payment') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'base_shipping_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Captured' - )->addColumn( - 'shipping_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Captured' - )->addColumn( - 'amount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount Refunded' - )->addColumn( - 'base_amount_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Paid' - )->addColumn( - 'amount_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount Canceled' - )->addColumn( - 'base_amount_authorized', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Authorized' - )->addColumn( - 'base_amount_paid_online', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Paid Online' - )->addColumn( - 'base_amount_refunded_online', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Refunded Online' - )->addColumn( - 'base_shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Amount' - )->addColumn( - 'shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Amount' - )->addColumn( - 'amount_paid', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount Paid' - )->addColumn( - 'amount_authorized', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount Authorized' - )->addColumn( - 'base_amount_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Ordered' - )->addColumn( - 'base_shipping_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Refunded' - )->addColumn( - 'shipping_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Refunded' - )->addColumn( - 'base_amount_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Refunded' - )->addColumn( - 'amount_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount Ordered' - )->addColumn( - 'base_amount_canceled', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount Canceled' - )->addColumn( - 'quote_payment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Quote Payment Id' - )->addColumn( - 'additional_data', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Data' - )->addColumn( - 'cc_exp_month', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 12, - [], - 'Cc Exp Month' - )->addColumn( - 'cc_ss_start_year', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 12, - [], - 'Cc Ss Start Year' - )->addColumn( - 'echeck_bank_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Echeck Bank Name' - )->addColumn( - 'method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Method' - )->addColumn( - 'cc_debug_request_body', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Debug Request Body' - )->addColumn( - 'cc_secure_verify', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Secure Verify' - )->addColumn( - 'protection_eligibility', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Protection Eligibility' - )->addColumn( - 'cc_approval', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Approval' - )->addColumn( - 'cc_last_4', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 100, - [], - 'Cc Last 4' - )->addColumn( - 'cc_status_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Status Description' - )->addColumn( - 'echeck_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Echeck Type' - )->addColumn( - 'cc_debug_response_serialized', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Debug Response Serialized' - )->addColumn( - 'cc_ss_start_month', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Cc Ss Start Month' - )->addColumn( - 'echeck_account_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Echeck Account Type' - )->addColumn( - 'last_trans_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Last Trans Id' - )->addColumn( - 'cc_cid_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Cid Status' - )->addColumn( - 'cc_owner', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Cc Owner' - )->addColumn( - 'cc_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Type' - )->addColumn( - 'po_number', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Po Number' - )->addColumn( - 'cc_exp_year', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 4, - ['nullable' => true, 'default' => null], - 'Cc Exp Year' - )->addColumn( - 'cc_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 4, - [], - 'Cc Status' - )->addColumn( - 'echeck_routing_number', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Echeck Routing Number' - )->addColumn( - 'account_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Account Status' - )->addColumn( - 'anet_trans_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Anet Trans Method' - )->addColumn( - 'cc_debug_response_body', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Debug Response Body' - )->addColumn( - 'cc_ss_issue', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Ss Issue' - )->addColumn( - 'echeck_account_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Echeck Account Name' - )->addColumn( - 'cc_avs_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Avs Status' - )->addColumn( - 'cc_number_enc', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Cc Number Enc' - )->addColumn( - 'cc_trans_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Cc Trans Id' - )->addColumn( - 'address_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Address Status' - )->addColumn( - 'additional_information', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Information' - )->addIndex( - $installer->getIdxName('sales_order_payment', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_order_payment', 'parent_id', 'sales_order', 'entity_id'), - 'parent_id', - $installer->getTable('sales_order'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Order Payment' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipment' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipment') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'total_weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Weight' - )->addColumn( - 'total_qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Qty' - )->addColumn( - 'email_sent', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Email Sent' - )->addColumn( - 'send_email', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Send Email' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Customer Id' - )->addColumn( - 'shipping_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipping Address Id' - )->addColumn( - 'billing_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Billing Address Id' - )->addColumn( - 'shipment_status', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipment Status' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addColumn( - 'packages', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '20000', - [], - 'Packed Products in Packages' - )->addColumn( - 'shipping_label', - \Magento\Framework\DB\Ddl\Table::TYPE_VARBINARY, - '2m', - [], - 'Shipping Label Content' - )->addColumn( - 'customer_note', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - null, - [], - 'Customer Note' - )->addColumn( - 'customer_note_notify', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Customer Note Notify' - )->addIndex( - $installer->getIdxName('sales_shipment', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_shipment', ['total_qty']), - ['total_qty'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_shipment', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_shipment', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_shipment', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_shipment', ['send_email']), - ['send_email'] - )->addIndex( - $installer->getIdxName('sales_shipment', ['email_sent']), - ['email_sent'] - )->addForeignKey( - $installer->getFkName('sales_shipment', 'order_id', 'sales_order', 'entity_id'), - 'order_id', - $installer->getTable('sales_order'), - 'entity_id', - \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 - )->setComment( - 'Sales Flat Shipment' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipment_grid' - * - * @add order_id, shipping_description - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipment_grid') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false], - 'Order Increment Id' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'order_created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false], - 'Order Increment Id' - )->addColumn( - 'customer_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - ['nullable' => false], - 'Customer Name' - )->addColumn( - 'total_qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Qty' - )->addColumn( - 'shipment_status', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipment Status' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Order' - )->addColumn( - 'billing_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Address' - )->addColumn( - 'shipping_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Address' - )->addColumn( - 'billing_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Billing Name' - )->addColumn( - 'shipping_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Shipping Name' - )->addColumn( - 'customer_email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Email' - )->addColumn( - 'customer_group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [], - 'Customer Group Id' - )->addColumn( - 'payment_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Payment Method' - )->addColumn( - 'shipping_information', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Method Name' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Updated At' - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - [ - 'increment_id', - 'store_id' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - ['store_id'] - ), - ['store_id'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - ['total_qty'] - ), - ['total_qty'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - ['order_increment_id'] - ), - ['order_increment_id'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - ['shipment_status'] - ), - ['shipment_status'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - ['order_status'] - ), - ['order_status'] - )->addIndex( - $installer->getIdxName('sales_shipment_grid', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_shipment_grid', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_shipment_grid', ['order_created_at']), - ['order_created_at'] - )->addIndex( - $installer->getIdxName('sales_shipment_grid', ['shipping_name']), - ['shipping_name'] - )->addIndex( - $installer->getIdxName('sales_shipment_grid', ['billing_name']), - ['billing_name'] - )->addIndex( - $installer->getIdxName( - 'sales_shipment_grid', - [ - 'increment_id', - 'order_increment_id', - 'shipping_name', - 'customer_name', - 'customer_email', - 'billing_address', - 'shipping_address' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT - ), - [ - 'increment_id', - 'order_increment_id', - 'shipping_name', - 'customer_name', - 'customer_email', - 'billing_address', - 'shipping_address' - ], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT] - )->setComment( - 'Sales Flat Shipment Grid' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipment_item' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipment_item') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total' - )->addColumn( - 'price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price' - )->addColumn( - 'weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Weight' - )->addColumn( - 'qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Qty' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Product Id' - )->addColumn( - 'order_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Order Item Id' - )->addColumn( - 'additional_data', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Data' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Name' - )->addColumn( - 'sku', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Sku' - )->addIndex( - $installer->getIdxName('sales_shipment_item', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_shipment_item', 'parent_id', 'sales_shipment', 'entity_id'), - 'parent_id', - $installer->getTable('sales_shipment'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Shipment Item' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipment_track' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipment_track') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'weight', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Weight' - )->addColumn( - 'qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Qty' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'track_number', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Number' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'title', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Title' - )->addColumn( - 'carrier_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Carrier Code' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addIndex( - $installer->getIdxName('sales_shipment_track', ['parent_id']), - ['parent_id'] - )->addIndex( - $installer->getIdxName('sales_shipment_track', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_shipment_track', ['created_at']), - ['created_at'] - )->addForeignKey( - $installer->getFkName('sales_shipment_track', 'parent_id', 'sales_shipment', 'entity_id'), - 'parent_id', - $installer->getTable('sales_shipment'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Shipment Track' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipment_comment' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipment_comment') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'is_customer_notified', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Is Customer Notified' - )->addColumn( - 'is_visible_on_front', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Is Visible On Front' - )->addColumn( - 'comment', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Comment' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addIndex( - $installer->getIdxName('sales_shipment_comment', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_shipment_comment', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_shipment_comment', 'parent_id', 'sales_shipment', 'entity_id'), - 'parent_id', - $installer->getTable('sales_shipment'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Shipment Comment' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoice' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoice') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true, 'identity' => true], - 'Entity Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Grand Total' - )->addColumn( - 'shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Tax Amount' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Amount' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Amount' - )->addColumn( - 'store_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Order Rate' - )->addColumn( - 'base_shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Tax Amount' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Amount' - )->addColumn( - 'base_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Order Rate' - )->addColumn( - 'grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Grand Total' - )->addColumn( - 'shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Amount' - )->addColumn( - 'subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Incl Tax' - )->addColumn( - 'base_subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Incl Tax' - )->addColumn( - 'store_to_base_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Base Rate' - )->addColumn( - 'base_shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Amount' - )->addColumn( - 'total_qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Qty' - )->addColumn( - 'base_to_global_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Global Rate' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'base_subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Amount' - )->addColumn( - 'billing_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Billing Address Id' - )->addColumn( - 'is_used_for_refund', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Used For Refund' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'email_sent', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Email Sent' - )->addColumn( - 'send_email', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Send Email' - )->addColumn( - 'can_void_flag', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Can Void Flag' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'State' - )->addColumn( - 'shipping_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipping Address Id' - )->addColumn( - 'store_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Store Currency Code' - )->addColumn( - 'transaction_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Transaction Id' - )->addColumn( - 'order_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Order Currency Code' - )->addColumn( - 'base_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Base Currency Code' - )->addColumn( - 'global_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Global Currency Code' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'shipping_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Discount Tax Compensation Amount' - )->addColumn( - 'base_shipping_discount_tax_compensation_amnt', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Discount Tax Compensation Amount' - )->addColumn( - 'shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Incl Tax' - )->addColumn( - 'base_shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Incl Tax' - )->addColumn( - 'base_total_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Total Refunded' - )->addColumn( - 'discount_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Discount Description' - )->addColumn( - 'customer_note', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - null, - [], - 'Customer Note' - )->addColumn( - 'customer_note_notify', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Customer Note Notify' - )->addIndex( - $installer->getIdxName('sales_invoice', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['grand_total']), - ['grand_total'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['state']), - ['state'] - )->addIndex( - $installer->getIdxName( - 'sales_invoice', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_invoice', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['send_email']), - ['send_email'] - )->addIndex( - $installer->getIdxName('sales_invoice', ['email_sent']), - ['email_sent'] - )->addForeignKey( - $installer->getFkName('sales_invoice', 'order_id', 'sales_order', 'entity_id'), - 'order_id', - $installer->getTable('sales_order'), - 'entity_id', - \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 - )->setComment( - 'Sales Flat Invoice' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoice_grid' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoice_grid') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'State' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'store_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Store Name' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'order_increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Increment Id' - )->addColumn( - 'order_created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Order Created At' - )->addColumn( - 'customer_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Customer Name' - )->addColumn( - 'customer_email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Customer Email' - )->addColumn( - 'customer_group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [], - 'Customer Group Id' - )->addColumn( - 'payment_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Payment Method' - )->addColumn( - 'store_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Store Currency Code' - )->addColumn( - 'order_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Order Currency Code' - )->addColumn( - 'base_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Base Currency Code' - )->addColumn( - 'global_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Global Currency Code' - )->addColumn( - 'billing_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Name' - )->addColumn( - 'billing_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Address' - )->addColumn( - 'shipping_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Address' - )->addColumn( - 'shipping_information', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Method Name' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'shipping_and_handling', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping and handling amount' - )->addColumn( - 'grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Grand Total' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Updated At' - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['grand_total']), - ['grand_total'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['state']), - ['state'] - )->addIndex( - $installer->getIdxName( - 'sales_invoice_grid', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['order_increment_id']), - ['order_increment_id'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['order_created_at']), - ['order_created_at'] - )->addIndex( - $installer->getIdxName('sales_invoice_grid', ['billing_name']), - ['billing_name'] - )->addIndex( - $installer->getIdxName( - 'sales_invoice_grid', - [ - 'increment_id', - 'order_increment_id', - 'billing_name', - 'billing_address', - 'shipping_address', - 'customer_name', - 'customer_email' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT - ), - [ - 'increment_id', - 'order_increment_id', - 'billing_name', - 'billing_address', - 'shipping_address', - 'customer_name', - 'customer_email' - ], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT] - )->setComment( - 'Sales Flat Invoice Grid' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoice_item' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoice_item') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'base_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Price' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Amount' - )->addColumn( - 'base_row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Row Total' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Amount' - )->addColumn( - 'row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Amount' - )->addColumn( - 'price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price Incl Tax' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Amount' - )->addColumn( - 'base_price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Price Incl Tax' - )->addColumn( - 'qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Qty' - )->addColumn( - 'base_cost', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Cost' - )->addColumn( - 'price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price' - )->addColumn( - 'base_row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Row Total Incl Tax' - )->addColumn( - 'row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total Incl Tax' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Product Id' - )->addColumn( - 'order_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Order Item Id' - )->addColumn( - 'additional_data', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Data' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'sku', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Sku' - )->addColumn( - 'name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Name' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'tax_ratio', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 512, - [], - 'Ratio of tax invoiced over tax of the order item' - )->addIndex( - $installer->getIdxName('sales_invoice_item', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_invoice_item', 'parent_id', 'sales_invoice', 'entity_id'), - 'parent_id', - $installer->getTable('sales_invoice'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Invoice Item' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoice_comment' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoice_comment') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'is_customer_notified', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Customer Notified' - )->addColumn( - 'is_visible_on_front', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Is Visible On Front' - )->addColumn( - 'comment', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Comment' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addIndex( - $installer->getIdxName('sales_invoice_comment', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_invoice_comment', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_invoice_comment', 'parent_id', 'sales_invoice', 'entity_id'), - 'parent_id', - $installer->getTable('sales_invoice'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Invoice Comment' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_creditmemo' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_creditmemo') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'adjustment_positive', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Positive' - )->addColumn( - 'base_shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Tax Amount' - )->addColumn( - 'store_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Order Rate' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Amount' - )->addColumn( - 'base_to_order_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Order Rate' - )->addColumn( - 'grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Grand Total' - )->addColumn( - 'base_adjustment_negative', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Adjustment Negative' - )->addColumn( - 'base_subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal Incl Tax' - )->addColumn( - 'shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Amount' - )->addColumn( - 'subtotal_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal Incl Tax' - )->addColumn( - 'adjustment_negative', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Negative' - )->addColumn( - 'base_shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Amount' - )->addColumn( - 'store_to_base_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Store To Base Rate' - )->addColumn( - 'base_to_global_rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base To Global Rate' - )->addColumn( - 'base_adjustment', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Adjustment' - )->addColumn( - 'base_subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Subtotal' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Amount' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'adjustment', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment' - )->addColumn( - 'base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Grand Total' - )->addColumn( - 'base_adjustment_positive', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Adjustment Positive' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Amount' - )->addColumn( - 'shipping_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Tax Amount' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Amount' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'email_sent', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Email Sent' - )->addColumn( - 'send_email', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Send Email' - )->addColumn( - 'creditmemo_status', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Creditmemo Status' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'State' - )->addColumn( - 'shipping_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Shipping Address Id' - )->addColumn( - 'billing_address_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Billing Address Id' - )->addColumn( - 'invoice_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Invoice Id' - )->addColumn( - 'store_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Store Currency Code' - )->addColumn( - 'order_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Order Currency Code' - )->addColumn( - 'base_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Base Currency Code' - )->addColumn( - 'global_currency_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 3, - [], - 'Global Currency Code' - )->addColumn( - 'transaction_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Transaction Id' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated At' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'shipping_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Discount Tax Compensation Amount' - )->addColumn( - 'base_shipping_discount_tax_compensation_amnt', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Discount Tax Compensation Amount' - )->addColumn( - 'shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping Incl Tax' - )->addColumn( - 'base_shipping_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Shipping Incl Tax' - )->addColumn( - 'discount_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Discount Description' - )->addColumn( - 'customer_note', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - null, - [], - 'Customer Note' - )->addColumn( - 'customer_note_notify', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Customer Note Notify' - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['creditmemo_status']), - ['creditmemo_status'] - )->addIndex( - $installer->getIdxName( - 'sales_creditmemo', - ['increment_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['state']), - ['state'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['send_email']), - ['send_email'] - )->addIndex( - $installer->getIdxName('sales_creditmemo', ['email_sent']), - ['email_sent'] - )->addForeignKey( - $installer->getFkName('sales_creditmemo', 'order_id', 'sales_order', 'entity_id'), - 'order_id', - $installer->getTable('sales_order'), - 'entity_id', - \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 - )->setComment( - 'Sales Flat Creditmemo' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_creditmemo_grid' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_creditmemo_grid') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Increment Id' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Created At' - )->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Updated At' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'order_increment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Increment Id' - )->addColumn( - 'order_created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Order Created At' - )->addColumn( - 'billing_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Name' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Status' - )->addColumn( - 'base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Grand Total' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Order Status' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'billing_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Billing Address' - )->addColumn( - 'shipping_address', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Address' - )->addColumn( - 'customer_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - ['nullable' => false], - 'Customer Name' - )->addColumn( - 'customer_email', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - [], - 'Customer Email' - )->addColumn( - 'customer_group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [], - 'Customer Group Id' - )->addColumn( - 'payment_method', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Payment Method' - )->addColumn( - 'shipping_information', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Method Name' - )->addColumn( - 'subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Subtotal' - )->addColumn( - 'shipping_and_handling', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Shipping and handling amount' - )->addColumn( - 'adjustment_positive', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Positive' - )->addColumn( - 'adjustment_negative', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Adjustment Negative' - )->addColumn( - 'order_base_grand_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Order Grand Total' - )->addIndex( - $installer->getIdxName( - 'sales_creditmemo_grid', - [ - 'increment_id', - 'store_id' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['increment_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['order_increment_id']), - ['order_increment_id'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['updated_at']), - ['updated_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['order_created_at']), - ['order_created_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['state']), - ['state'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['billing_name']), - ['billing_name'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['order_status']), - ['order_status'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['base_grand_total']), - ['base_grand_total'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['order_base_grand_total']), - ['order_base_grand_total'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_grid', ['order_id']), - ['order_id'] - )->addIndex( - $installer->getIdxName( - 'sales_creditmemo_grid', - [ - 'increment_id', - 'order_increment_id', - 'billing_name', - 'billing_address', - 'shipping_address', - 'customer_name', - 'customer_email' - ], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT - ), - [ - 'increment_id', - 'order_increment_id', - 'billing_name', - 'billing_address', - 'shipping_address', - 'customer_name', - 'customer_email' - ], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT] - )->setComment( - 'Sales Flat Creditmemo Grid' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_creditmemo_item' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_creditmemo_item') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'base_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Price' - )->addColumn( - 'tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Tax Amount' - )->addColumn( - 'base_row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Row Total' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Amount' - )->addColumn( - 'row_total', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total' - )->addColumn( - 'base_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Amount' - )->addColumn( - 'price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price Incl Tax' - )->addColumn( - 'base_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Tax Amount' - )->addColumn( - 'base_price_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Price Incl Tax' - )->addColumn( - 'qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Qty' - )->addColumn( - 'base_cost', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Cost' - )->addColumn( - 'price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Price' - )->addColumn( - 'base_row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Row Total Incl Tax' - )->addColumn( - 'row_total_incl_tax', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Row Total Incl Tax' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Product Id' - )->addColumn( - 'order_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Order Item Id' - )->addColumn( - 'additional_data', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Additional Data' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'sku', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Sku' - )->addColumn( - 'name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Name' - )->addColumn( - 'discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Discount Tax Compensation Amount' - )->addColumn( - 'base_discount_tax_compensation_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Discount Tax Compensation Amount' - )->addColumn( - 'tax_ratio', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 512, - [], - 'Ratio of tax in the creditmemo item over tax of the order item' - )->addIndex( - $installer->getIdxName('sales_creditmemo_item', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_creditmemo_item', 'parent_id', 'sales_creditmemo', 'entity_id'), - 'parent_id', - $installer->getTable('sales_creditmemo'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Creditmemo Item' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_creditmemo_comment' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_creditmemo_comment') - )->addColumn( - 'entity_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Parent Id' - )->addColumn( - 'is_customer_notified', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [], - 'Is Customer Notified' - )->addColumn( - 'is_visible_on_front', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Is Visible On Front' - )->addColumn( - 'comment', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Comment' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addIndex( - $installer->getIdxName('sales_creditmemo_comment', ['created_at']), - ['created_at'] - )->addIndex( - $installer->getIdxName('sales_creditmemo_comment', ['parent_id']), - ['parent_id'] - )->addForeignKey( - $installer->getFkName('sales_creditmemo_comment', 'parent_id', 'sales_creditmemo', 'entity_id'), - 'parent_id', - $installer->getTable('sales_creditmemo'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Flat Creditmemo Comment' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoiced_aggregated' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoiced_aggregated') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'orders_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Orders Invoiced' - )->addColumn( - 'invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced' - )->addColumn( - 'invoiced_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced Captured' - )->addColumn( - 'invoiced_not_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced Not Captured' - )->addIndex( - $installer->getIdxName( - 'sales_invoiced_aggregated', - ['period', 'store_id', 'order_status'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_invoiced_aggregated', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_invoiced_aggregated', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Invoiced Aggregated' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_invoiced_aggregated_order' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_invoiced_aggregated_order') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - ['nullable' => false, 'default' => false], - 'Order Status' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'orders_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Orders Invoiced' - )->addColumn( - 'invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced' - )->addColumn( - 'invoiced_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced Captured' - )->addColumn( - 'invoiced_not_captured', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Invoiced Not Captured' - )->addIndex( - $installer->getIdxName( - 'sales_invoiced_aggregated_order', - ['period', 'store_id', 'order_status'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_invoiced_aggregated_order', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_invoiced_aggregated_order', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Invoiced Aggregated Order' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_aggregated_created' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_aggregated_created') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - ['nullable' => false, 'default' => false], - 'Order Status' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'total_qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Qty Ordered' - )->addColumn( - 'total_qty_invoiced', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Qty Invoiced' - )->addColumn( - 'total_income_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Income Amount' - )->addColumn( - 'total_revenue_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Revenue Amount' - )->addColumn( - 'total_profit_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Profit Amount' - )->addColumn( - 'total_invoiced_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Invoiced Amount' - )->addColumn( - 'total_canceled_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Canceled Amount' - )->addColumn( - 'total_paid_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Paid Amount' - )->addColumn( - 'total_refunded_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Refunded Amount' - )->addColumn( - 'total_tax_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Tax Amount' - )->addColumn( - 'total_tax_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Tax Amount Actual' - )->addColumn( - 'total_shipping_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Shipping Amount' - )->addColumn( - 'total_shipping_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Shipping Amount Actual' - )->addColumn( - 'total_discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Discount Amount' - )->addColumn( - 'total_discount_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Total Discount Amount Actual' - )->addIndex( - $installer->getIdxName( - 'sales_order_aggregated_created', - ['period', 'store_id', 'order_status'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_order_aggregated_created', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_order_aggregated_created', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Order Aggregated Created' - ); - $installer->getConnection()->createTable($table); - - $installer->getConnection()->createTable( - $installer->getConnection()->createTableByDdl( - $installer->getTable('sales_order_aggregated_created'), - $installer->getTable('sales_order_aggregated_updated') - ) - ); - - /** - * Create table 'sales_payment_transaction' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_payment_transaction') - )->addColumn( - 'transaction_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Transaction Id' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Parent Id' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Order Id' - )->addColumn( - 'payment_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Payment Id' - )->addColumn( - 'txn_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 100, - [], - 'Txn Id' - )->addColumn( - 'parent_txn_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 100, - [], - 'Parent Txn Id' - )->addColumn( - 'txn_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 15, - [], - 'Txn Type' - )->addColumn( - 'is_closed', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '1'], - 'Is Closed' - )->addColumn( - 'additional_information', - \Magento\Framework\DB\Ddl\Table::TYPE_BLOB, - '64K', - [], - 'Additional Information' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created At' - )->addIndex( - $installer->getIdxName( - 'sales_payment_transaction', - ['order_id', 'payment_id', 'txn_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['order_id', 'payment_id', 'txn_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_payment_transaction', ['parent_id']), - ['parent_id'] - )->addIndex( - $installer->getIdxName('sales_payment_transaction', ['payment_id']), - ['payment_id'] - )->addForeignKey( - $installer->getFkName('sales_payment_transaction', 'order_id', 'sales_order', 'entity_id'), - 'order_id', - $installer->getTable('sales_order'), - 'entity_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName( - 'sales_payment_transaction', - 'parent_id', - 'sales_payment_transaction', - 'transaction_id' - ), - 'parent_id', - $installer->getTable('sales_payment_transaction'), - 'transaction_id', - \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 - )->setComment( - 'Sales Payment Transaction' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_refunded_aggregated' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_refunded_aggregated') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - ['nullable' => false, 'default' => false], - 'Order Status' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Refunded' - )->addColumn( - 'online_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Online Refunded' - )->addColumn( - 'offline_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Offline Refunded' - )->addIndex( - $installer->getIdxName( - 'sales_refunded_aggregated', - ['period', 'store_id', 'order_status'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_refunded_aggregated', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_refunded_aggregated', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Refunded Aggregated' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_refunded_aggregated_order' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_refunded_aggregated_order') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Refunded' - )->addColumn( - 'online_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Online Refunded' - )->addColumn( - 'offline_refunded', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Offline Refunded' - )->addIndex( - $installer->getIdxName( - 'sales_refunded_aggregated_order', - ['period', 'store_id', 'order_status'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_refunded_aggregated_order', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_refunded_aggregated_order', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Refunded Aggregated Order' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipping_aggregated' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipping_aggregated') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'shipping_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Description' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'total_shipping', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Shipping' - )->addColumn( - 'total_shipping_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Shipping Actual' - )->addIndex( - $installer->getIdxName( - 'sales_shipping_aggregated', - ['period', 'store_id', 'order_status', 'shipping_description'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status', 'shipping_description'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_shipping_aggregated', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_shipping_aggregated', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Shipping Aggregated' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_shipping_aggregated_order' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_shipping_aggregated_order') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'shipping_description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Shipping Description' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'total_shipping', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Shipping' - )->addColumn( - 'total_shipping_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Total Shipping Actual' - )->addIndex( - $installer->getIdxName( - 'sales_shipping_aggregated_order', - ['period', 'store_id', 'order_status', 'shipping_description'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status', 'shipping_description'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_shipping_aggregated_order', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_shipping_aggregated_order', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL - )->setComment( - 'Sales Shipping Aggregated Order' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_bestsellers_aggregated_daily' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_bestsellers_aggregated_daily') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Product Id' - )->addColumn( - 'product_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Product Name' - )->addColumn( - 'product_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Product Price' - )->addColumn( - 'qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Qty Ordered' - )->addColumn( - 'rating_pos', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Rating Pos' - )->addIndex( - $installer->getIdxName( - 'sales_bestsellers_aggregated_daily', - ['period', 'store_id', 'product_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'product_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_daily', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_daily', ['product_id']), - ['product_id'] - )->addForeignKey( - $installer->getFkName('sales_bestsellers_aggregated_daily', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Bestsellers Aggregated Daily' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_bestsellers_aggregated_monthly' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_bestsellers_aggregated_monthly') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Product Id' - )->addColumn( - 'product_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Product Name' - )->addColumn( - 'product_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Product Price' - )->addColumn( - 'qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Qty Ordered' - )->addColumn( - 'rating_pos', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Rating Pos' - )->addIndex( - $installer->getIdxName( - 'sales_bestsellers_aggregated_monthly', - ['period', 'store_id', 'product_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'product_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_monthly', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_monthly', ['product_id']), - ['product_id'] - )->addForeignKey( - $installer->getFkName('sales_bestsellers_aggregated_monthly', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Bestsellers Aggregated Monthly' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_bestsellers_aggregated_yearly' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_bestsellers_aggregated_yearly') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'product_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Product Id' - )->addColumn( - 'product_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Product Name' - )->addColumn( - 'product_price', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Product Price' - )->addColumn( - 'qty_ordered', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false, 'default' => '0.0000'], - 'Qty Ordered' - )->addColumn( - 'rating_pos', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Rating Pos' - )->addIndex( - $installer->getIdxName( - 'sales_bestsellers_aggregated_yearly', - ['period', 'store_id', 'product_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'product_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_yearly', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('sales_bestsellers_aggregated_yearly', ['product_id']), - ['product_id'] - )->addForeignKey( - $installer->getFkName('sales_bestsellers_aggregated_yearly', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Bestsellers Aggregated Yearly' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_tax' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_tax') - )->addColumn( - 'tax_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Tax Id' - )->addColumn( - 'order_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Order Id' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Code' - )->addColumn( - 'title', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Title' - )->addColumn( - 'percent', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Percent' - )->addColumn( - 'amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Amount' - )->addColumn( - 'priority', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Priority' - )->addColumn( - 'position', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Position' - )->addColumn( - 'base_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Amount' - )->addColumn( - 'process', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false], - 'Process' - )->addColumn( - 'base_real_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - [], - 'Base Real Amount' - )->addIndex( - $installer->getIdxName('sales_order_tax', ['order_id', 'priority', 'position']), - ['order_id', 'priority', 'position'] - )->setComment( - 'Sales Order Tax Table' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_tax_item' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('sales_order_tax_item') - )->addColumn( - 'tax_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Tax Item Id' - )->addColumn( - 'tax_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Tax Id' - )->addColumn( - 'item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => true], - 'Item Id' - )->addColumn( - 'tax_percent', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Real Tax Percent For Item' - )->addColumn( - 'amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Tax amount for the item and tax rate' - )->addColumn( - 'base_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Base tax amount for the item and tax rate' - )->addColumn( - 'real_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Real tax amount for the item and tax rate' - )->addColumn( - 'real_base_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Real base tax amount for the item and tax rate' - )->addColumn( - 'associated_item_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => true, 'unsigned' => true], - 'Id of the associated item' - )->addColumn( - 'taxable_item_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false], - 'Type of the taxable item' - )->addIndex( - $setup->getIdxName('sales_order_tax_item', ['item_id']), - ['item_id'] - )->addIndex( - $setup->getIdxName( - 'sales_order_tax_item', - ['tax_id', 'item_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['tax_id', 'item_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addForeignKey( - $setup->getFkName('sales_order_tax_item', 'associated_item_id', 'sales_order_item', 'item_id'), - 'associated_item_id', - $setup->getTable('sales_order_item'), - 'item_id', - \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 - )->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 - )->setComment( - 'Sales Order Tax Item' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'sales_order_status' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_status') - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false, 'primary' => true], - 'Status' - )->addColumn( - 'label', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - ['nullable' => false], - 'Label' - )->setComment( - 'Sales Order Status Table' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_status_state' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_status_state') - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false, 'primary' => true], - 'Status' - )->addColumn( - 'state', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false, 'primary' => true], - 'Label' - )->addColumn( - 'is_default', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Is Default' - )->addColumn( - 'visible_on_front', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - 1, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Visible on front' - )->addForeignKey( - $installer->getFkName('sales_order_status_state', 'status', 'sales_order_status', 'status'), - 'status', - $installer->getTable('sales_order_status'), - 'status', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Order Status Table' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'sales_order_status_label' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sales_order_status_label') - )->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false, 'primary' => true], - 'Status' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Store Id' - )->addColumn( - 'label', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - ['nullable' => false], - 'Label' - )->addIndex( - $installer->getIdxName('sales_order_status_label', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sales_order_status_label', 'status', 'sales_order_status', 'status'), - 'status', - $installer->getTable('sales_order_status'), - 'status', - \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 - )->setComment( - 'Sales Order Status Label Table' - ); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Sales/Setup/SalesSetup.php b/app/code/Magento/Sales/Setup/SalesSetup.php index ec8f7ce0f14d2..cfaa9106d1c7c 100644 --- a/app/code/Magento/Sales/Setup/SalesSetup.php +++ b/app/code/Magento/Sales/Setup/SalesSetup.php @@ -302,11 +302,6 @@ public function getEncryptor() return $this->encryptor; } - /** - * Get sales connection - * - * @return \Magento\Framework\DB\Adapter\AdapterInterface - */ public function getConnection() { return $this->getSetup()->getConnection(self::$connectionName); diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php deleted file mode 100644 index 5dbf71e69e9b8..0000000000000 --- a/app/code/Magento/Sales/Setup/UpgradeSchema.php +++ /dev/null @@ -1,144 +0,0 @@ -startSetup(); - if (version_compare($context->getVersion(), '2.0.2', '<')) { - $connection = $installer->getConnection(self::$connectionName); - //sales_bestsellers_aggregated_daily - $connection->dropForeignKey( - $installer->getTable('sales_bestsellers_aggregated_daily', self::$connectionName), - $installer->getFkName( - 'sales_bestsellers_aggregated_daily', - 'product_id', - 'catalog_product_entity', - 'entity_id', - self::$connectionName - ) - ); - //sales_bestsellers_aggregated_monthly - $connection->dropForeignKey( - $installer->getTable('sales_bestsellers_aggregated_monthly', self::$connectionName), - $installer->getFkName( - 'sales_bestsellers_aggregated_monthly', - 'product_id', - 'catalog_product_entity', - 'entity_id', - self::$connectionName - ) - ); - - //sales_bestsellers_aggregated_yearly - $connection->dropForeignKey( - $installer->getTable('sales_bestsellers_aggregated_yearly', self::$connectionName), - $installer->getFkName( - 'sales_bestsellers_aggregated_yearly', - 'product_id', - 'catalog_product_entity', - 'entity_id', - self::$connectionName - ) - ); - - $installer->endSetup(); - } - if (version_compare($context->getVersion(), '2.0.3', '<')) { - $this->addColumnBaseGrandTotal($installer); - $this->addIndexBaseGrandTotal($installer); - } - if (version_compare($context->getVersion(), '2.0.4', '<')) { - $tables = [ - 'sales_invoice_grid', - 'sales_order', - 'sales_shipment_grid', - ]; - foreach ($tables as $table) { - $salesConnection = $setup->getConnection(self::$connectionName); - $salesConnection->modifyColumn( - $installer->getTable($table, self::$connectionName), - 'customer_group_id', - ['type' => 'integer'] - ); - } - } - if (version_compare($context->getVersion(), '2.0.5', '<')) { - $connection = $installer->getConnection(self::$connectionName); - $connection->modifyColumn( - $installer->getTable('sales_order_payment', self::$connectionName), - 'cc_number_enc', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 'length' => 128 - ] - ); - } - if (version_compare($context->getVersion(), '2.0.7', '<')) { - $connection = $installer->getConnection(self::$connectionName); - $connection->modifyColumn( - $installer->getTable('sales_order', self::$connectionName), - 'shipping_method', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 'length' => 120 - ] - ); - } - } - - /** - * @param SchemaSetupInterface $installer - * @return void - */ - private function addColumnBaseGrandTotal(SchemaSetupInterface $installer) - { - $connection = $installer->getConnection(self::$connectionName); - $connection->addColumn( - $installer->getTable('sales_invoice_grid', self::$connectionName), - 'base_grand_total', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - 'nullable' => true, - 'length' => '12,4', - 'comment' => 'Base Grand Total', - 'after' => 'grand_total' - ] - ); - } - - /** - * @param SchemaSetupInterface $installer - * @return void - */ - private function addIndexBaseGrandTotal(SchemaSetupInterface $installer) - { - $connection = $installer->getConnection(self::$connectionName); - $connection->addIndex( - $installer->getTable('sales_invoice_grid', self::$connectionName), - $installer->getIdxName('sales_invoice_grid', ['base_grand_total'], '', self::$connectionName), - ['base_grand_total'] - ); - } -} diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php index 20f7a7061b6b0..a390c43276085 100644 --- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php +++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php @@ -84,7 +84,7 @@ public function testGetItemRenderer() */ public function testGetItemRendererThrowsExceptionForNonexistentRenderer() { - $renderer = $this->createMock(\StdClass::class); + $renderer = $this->createMock(\stdClass::class); $layout = $this->createPartialMock( \Magento\Framework\View\Layout::class, ['getChildName', 'getBlock', '__wakeup'] diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php index 311e5f697675b..a34373f516c42 100644 --- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php +++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php @@ -62,7 +62,7 @@ public function testGetItemRenderer() */ public function testGetItemRendererThrowsExceptionForNonexistentRenderer() { - $renderer = $this->createMock(\StdClass::class); + $renderer = $this->createMock(\stdClass::class); $layout = $this->createPartialMock( \Magento\Framework\View\Layout::class, ['getChildName', 'getBlock', '__wakeup'] diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php index 447fd7791ecbd..e010674ca354e 100644 --- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php +++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php @@ -3,8 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create; +use Magento\Catalog\Model\Product; use Magento\Catalog\Pricing\Price\FinalPrice; class AbstractCreateTest extends \PHPUnit\Framework\TestCase @@ -67,4 +69,34 @@ public function testGetItemPrice() ->willReturn($resultPrice); $this->assertEquals($resultPrice, $this->model->getItemPrice($this->productMock)); } + + /** + * @param $item + * + * @dataProvider getProductDataProvider + */ + public function testGetProduct($item) + { + $product = $this->model->getProduct($item); + + self::assertInstanceOf(Product::class, $product); + } + + /** + * DataProvider for testGetProduct. + * + * @return array + */ + public function getProductDataProvider() + { + $productMock = $this->createMock(Product::class); + + $itemMock = $this->createMock(\Magento\Wishlist\Model\Item::class); + $itemMock->expects($this->once())->method('getProduct')->willReturn($productMock); + + return [ + [$productMock], + [$itemMock], + ]; + } } diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php index 3bdbacadad230..3dab9178739b8 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php @@ -6,8 +6,25 @@ namespace Magento\Sales\Test\Unit\Model\AdminOrder; +use Magento\Backend\Model\Session\Quote as SessionQuote; +use Magento\Customer\Api\Data\AttributeMetadataInterface; +use Magento\Customer\Api\Data\CustomerInterface; +use Magento\Customer\Api\Data\CustomerInterfaceFactory; +use Magento\Customer\Api\Data\GroupInterface; +use Magento\Customer\Api\GroupRepositoryInterface; +use Magento\Customer\Model\Customer\Mapper; +use Magento\Customer\Model\Metadata\Form; +use Magento\Customer\Model\Metadata\FormFactory; +use Magento\Framework\Api\DataObjectHelper; +use Magento\Framework\App\RequestInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Quote\Model\Quote; +use Magento\Quote\Model\Quote\Address; +use Magento\Quote\Model\Quote\Item; +use Magento\Quote\Model\Quote\Item\Updater; +use Magento\Sales\Model\AdminOrder\Create; use Magento\Sales\Model\AdminOrder\Product; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -17,169 +34,74 @@ class CreateTest extends \PHPUnit\Framework\TestCase { const CUSTOMER_ID = 1; - /** @var \Magento\Sales\Model\AdminOrder\Create */ - protected $adminOrderCreate; - - /** @var \Magento\Backend\Model\Session\Quote|\PHPUnit_Framework_MockObject_MockObject */ - protected $sessionQuoteMock; - - /** @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject */ - protected $formFactoryMock; - - /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */ - protected $customerFactoryMock; - - /** @var \Magento\Quote\Model\Quote\Item\Updater|\PHPUnit_Framework_MockObject_MockObject */ - protected $itemUpdater; - - /** @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject */ - protected $customerMapper; - /** - * @var Product\Quote\Initializer|\PHPUnit_Framework_MockObject_MockObject + * @var Create */ - protected $quoteInitializerMock; + private $adminOrderCreate; /** - * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var SessionQuote|MockObject */ - protected $customerRepositoryMock; + private $sessionQuote; /** - * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var FormFactory|MockObject */ - protected $addressRepositoryMock; + private $formFactory; /** - * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject + * @var CustomerInterfaceFactory|MockObject */ - protected $addressFactoryMock; + private $customerFactory; /** - * @var \Magento\Customer\Api\GroupRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Updater|MockObject */ - protected $groupRepositoryMock; + private $itemUpdater; /** - * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Mapper|MockObject */ - protected $scopeConfigMock; + private $customerMapper; /** - * @var \Magento\Sales\Model\AdminOrder\EmailSender|\PHPUnit_Framework_MockObject_MockObject + * @var GroupRepositoryInterface|MockObject */ - protected $emailSenderMock; + private $groupRepository; /** - * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject + * @var DataObjectHelper|MockObject */ - protected $accountManagementMock; + private $dataObjectHelper; - /** - * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject - */ - protected $dataObjectHelper; - - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ - protected $objectFactory; - - /** - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - */ protected function setUp() { - $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class); - $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); - $registryMock = $this->createMock(\Magento\Framework\Registry::class); - $configMock = $this->createMock(\Magento\Sales\Model\Config::class); - $this->sessionQuoteMock = $this->createMock(\Magento\Backend\Model\Session\Quote::class); - $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class); - $copyMock = $this->createMock(\Magento\Framework\DataObject\Copy::class); - $messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class); - $this->formFactoryMock = $this->createPartialMock( - \Magento\Customer\Model\Metadata\FormFactory::class, - ['create'] - ); - $this->customerFactoryMock = $this->createPartialMock( - \Magento\Customer\Api\Data\CustomerInterfaceFactory::class, - ['create'] - ); + $this->sessionQuote = $this->createMock(SessionQuote::class); + $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']); + $this->customerFactory = $this->createPartialMock(CustomerInterfaceFactory::class, ['create']); - $this->itemUpdater = $this->createMock(\Magento\Quote\Model\Quote\Item\Updater::class); + $this->itemUpdater = $this->createMock(Updater::class); - $this->objectFactory = $this->getMockBuilder(\Magento\Framework\DataObject\Factory::class) + $this->customerMapper = $this->getMockBuilder(Mapper::class) + ->setMethods(['toFlatArray']) ->disableOriginalConstructor() - ->setMethods(['create']) ->getMock(); - $this->customerMapper = $this->getMockBuilder( - \Magento\Customer\Model\Customer\Mapper::class - )->setMethods(['toFlatArray'])->disableOriginalConstructor()->getMock(); - - $this->quoteInitializerMock = $this->createMock( - \Magento\Sales\Model\AdminOrder\Product\Quote\Initializer::class - ); - $this->customerRepositoryMock = $this->getMockForAbstractClass( - \Magento\Customer\Api\CustomerRepositoryInterface::class, - [], - '', - false - ); - $this->addressRepositoryMock = $this->getMockForAbstractClass( - \Magento\Customer\Api\AddressRepositoryInterface::class, - [], - '', - false - ); - $this->addressFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class); - $this->groupRepositoryMock = $this->getMockForAbstractClass( - \Magento\Customer\Api\GroupRepositoryInterface::class, - [], - '', - false - ); - $this->scopeConfigMock = $this->getMockForAbstractClass( - \Magento\Framework\App\Config\ScopeConfigInterface::class, - [], - '', - false - ); - $this->emailSenderMock = $this->createMock(\Magento\Sales\Model\AdminOrder\EmailSender::class); - $this->accountManagementMock = $this->getMockForAbstractClass( - \Magento\Customer\Api\AccountManagementInterface::class, - [], - '', - false - ); - $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class) + $this->groupRepository = $this->getMockForAbstractClass(GroupRepositoryInterface::class); + $this->dataObjectHelper = $this->getMockBuilder(DataObjectHelper::class) ->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->adminOrderCreate = $objectManagerHelper->getObject( - \Magento\Sales\Model\AdminOrder\Create::class, + Create::class, [ - 'objectManager' => $objectManagerMock, - 'eventManager' => $eventManagerMock, - 'coreRegistry' => $registryMock, - 'salesConfig' => $configMock, - 'quoteSession' => $this->sessionQuoteMock, - 'logger' => $loggerMock, - 'objectCopyService' => $copyMock, - 'messageManager' => $messageManagerMock, - 'quoteInitializer' => $this->quoteInitializerMock, - 'customerRepository' => $this->customerRepositoryMock, - 'addressRepository' => $this->addressRepositoryMock, - 'addressFactory' => $this->addressFactoryMock, - 'metadataFormFactory' => $this->formFactoryMock, - 'customerFactory' => $this->customerFactoryMock, - 'groupRepository' => $this->groupRepositoryMock, + 'quoteSession' => $this->sessionQuote, + 'metadataFormFactory' => $this->formFactory, + 'customerFactory' => $this->customerFactory, + 'groupRepository' => $this->groupRepository, 'quoteItemUpdater' => $this->itemUpdater, 'customerMapper' => $this->customerMapper, - 'objectFactory' => $this->objectFactory, - 'accountManagement' => $this->accountManagementMock, 'dataObjectHelper' => $this->dataObjectHelper, ] ); @@ -194,65 +116,60 @@ public function testSetAccountData() ]; $attributeMocks = []; - foreach ($attributes as $attribute) { - $attributeMock = $this->createMock(\Magento\Customer\Api\Data\AttributeMetadataInterface::class); - - $attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attribute[0])); + foreach ($attributes as $value) { + $attribute = $this->createMock(AttributeMetadataInterface::class); + $attribute->method('getAttributeCode') + ->willReturn($value[0]); - $attributeMocks[] = $attributeMock; + $attributeMocks[] = $attribute; } - $customerGroupMock = $this->getMockForAbstractClass( - \Magento\Customer\Api\Data\GroupInterface::class, - [], - '', - false, - true, - true, - ['getTaxClassId'] - ); - $customerGroupMock->expects($this->once())->method('getTaxClassId')->will($this->returnValue($taxClassId)); - $customerFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class); - $customerFormMock->expects($this->any()) - ->method('getAttributes') - ->will($this->returnValue([$attributeMocks[1]])); - $customerFormMock->expects($this->any())->method('extractData')->will($this->returnValue([])); - $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue(['group_id' => 1])); - - $customerFormMock->expects($this->any()) - ->method('prepareRequest') - ->will($this->returnValue($this->createMock(\Magento\Framework\App\RequestInterface::class))); - - $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class); - $this->customerMapper->expects($this->atLeastOnce()) + $customerGroup = $this->getMockForAbstractClass(GroupInterface::class); + $customerGroup->method('getTaxClassId') + ->willReturn($taxClassId); + $customerForm = $this->createMock(Form::class); + $customerForm->method('getAttributes') + ->willReturn([$attributeMocks[1]]); + $customerForm + ->method('extractData') + ->willReturn([]); + $customerForm + ->method('restoreData') + ->willReturn(['group_id' => 1]); + + $customerForm->method('prepareRequest') + ->willReturn($this->createMock(RequestInterface::class)); + + $customer = $this->createMock(CustomerInterface::class); + $this->customerMapper->expects(self::atLeastOnce()) ->method('toFlatArray') ->willReturn(['group_id' => 1]); - $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); - $quoteMock->expects($this->any())->method('getCustomer')->will($this->returnValue($customerMock)); - $quoteMock->expects($this->once()) - ->method('addData') - ->with( - [ - 'customer_group_id' => $attributes[1][1], - 'customer_tax_class_id' => $taxClassId - ] - ); - $this->dataObjectHelper->expects($this->once()) - ->method('populateWithArray') + $quote = $this->createMock(Quote::class); + $quote->method('getCustomer')->willReturn($customer); + $quote->method('addData')->with( + [ + 'customer_group_id' => $attributes[1][1], + 'customer_tax_class_id' => $taxClassId + ] + ); + $this->dataObjectHelper->method('populateWithArray') ->with( - $customerMock, + $customer, ['group_id' => 1], - \Magento\Customer\Api\Data\CustomerInterface::class + CustomerInterface::class ); - $this->formFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerFormMock)); - $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock)); - $this->customerFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerMock)); + $this->formFactory->method('create') + ->willReturn($customerForm); + $this->sessionQuote + ->method('getQuote') + ->willReturn($quote); + $this->customerFactory->method('create') + ->willReturn($customer); - $this->groupRepositoryMock->expects($this->once()) - ->method('getById') - ->will($this->returnValue($customerGroupMock)); + $this->groupRepository->method('getById') + ->willReturn($customerGroup); $this->adminOrderCreate->setAccountData(['group_id' => 1]); } @@ -260,7 +177,7 @@ public function testSetAccountData() public function testUpdateQuoteItemsNotArray() { $object = $this->adminOrderCreate->updateQuoteItems('string'); - $this->assertEquals($this->adminOrderCreate, $object); + self::assertEquals($this->adminOrderCreate, $object); } public function testUpdateQuoteItemsEmptyConfiguredOption() @@ -273,22 +190,21 @@ public function testUpdateQuoteItemsEmptyConfiguredOption() ] ]; - $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class); + $item = $this->createMock(Item::class); - $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); - $quoteMock->expects($this->once()) - ->method('getItemById') - ->will($this->returnValue($itemMock)); + $quote = $this->createMock(Quote::class); + $quote->method('getItemById') + ->willReturn($item); - $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock)); - $this->itemUpdater->expects($this->once()) - ->method('update') - ->with($this->equalTo($itemMock), $this->equalTo($items[1])) - ->will($this->returnSelf()); + $this->sessionQuote->method('getQuote') + ->willReturn($quote); + $this->itemUpdater->method('update') + ->with(self::equalTo($item), self::equalTo($items[1])) + ->willReturnSelf(); $this->adminOrderCreate->setRecollect(false); $object = $this->adminOrderCreate->updateQuoteItems($items); - $this->assertEquals($this->adminOrderCreate, $object); + self::assertEquals($this->adminOrderCreate, $object); } public function testUpdateQuoteItemsWithConfiguredOption() @@ -302,49 +218,50 @@ public function testUpdateQuoteItemsWithConfiguredOption() ] ]; - $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class); - $itemMock->expects($this->once()) - ->method('getQty') - ->will($this->returnValue($qty)); + $item = $this->createMock(Item::class); + $item->method('getQty') + ->willReturn($qty); - $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); - $quoteMock->expects($this->once()) - ->method('updateItem') - ->will($this->returnValue($itemMock)); + $quote = $this->createMock(Quote::class); + $quote->method('updateItem') + ->willReturn($item); - $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock)); + $this->sessionQuote + ->method('getQuote') + ->willReturn($quote); $expectedInfo = $items[1]; $expectedInfo['qty'] = $qty; - $this->itemUpdater->expects($this->once()) - ->method('update') - ->with($this->equalTo($itemMock), $this->equalTo($expectedInfo)); + $this->itemUpdater->method('update') + ->with(self::equalTo($item), self::equalTo($expectedInfo)); $this->adminOrderCreate->setRecollect(false); $object = $this->adminOrderCreate->updateQuoteItems($items); - $this->assertEquals($this->adminOrderCreate, $object); + self::assertEquals($this->adminOrderCreate, $object); } public function testApplyCoupon() { - $couponCode = ''; - $quoteMock = $this->createPartialMock( - \Magento\Quote\Model\Quote::class, - ['getShippingAddress', 'setCouponCode'] - ); - $this->sessionQuoteMock->expects($this->once())->method('getQuote')->willReturn($quoteMock); - - $addressMock = $this->createPartialMock( - \Magento\Quote\Model\Quote\Address::class, - ['setCollectShippingRates', 'setFreeShipping'] - ); - $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($addressMock); - $quoteMock->expects($this->once())->method('setCouponCode')->with($couponCode)->willReturnSelf(); - - $addressMock->expects($this->once())->method('setCollectShippingRates')->with(true)->willReturnSelf(); - $addressMock->expects($this->once())->method('setFreeShipping')->with(0)->willReturnSelf(); + $couponCode = '123'; + $quote = $this->createPartialMock(Quote::class, ['getShippingAddress', 'setCouponCode']); + $this->sessionQuote->method('getQuote') + ->willReturn($quote); + + $address = $this->createPartialMock(Address::class, ['setCollectShippingRates', 'setFreeShipping']); + $quote->method('getShippingAddress') + ->willReturn($address); + $quote->method('setCouponCode') + ->with($couponCode) + ->willReturnSelf(); + + $address->method('setCollectShippingRates') + ->with(true) + ->willReturnSelf(); + $address->method('setFreeShipping') + ->with(0) + ->willReturnSelf(); $object = $this->adminOrderCreate->applyCoupon($couponCode); - $this->assertEquals($this->adminOrderCreate, $object); + self::assertEquals($this->adminOrderCreate, $object); } } diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php index f3a35e485c166..86419c0c905b6 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php @@ -23,18 +23,41 @@ class ConfigTest extends \PHPUnit\Framework\TestCase */ protected $orderStatusCollectionFactoryMock; + /** + * @var \Magento\Sales\Model\Order\StatusFactory|\PHPUnit_Framework_MockObject_MockObject + */ + protected $statusFactoryMock; + + /** + * @var \Magento\Sales\Model\Order\Status + */ + protected $orderStatusModel; + + /** + * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeManagerMock; + protected function setUp() { - $orderStatusFactory = $this->createMock(\Magento\Sales\Model\Order\StatusFactory::class); + $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + + $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class); + $this->orderStatusModel = $objectManager->getObject(\Magento\Sales\Model\Order\Status::class, [ + 'storeManager' => $this->storeManagerMock, + ]); + $this->statusFactoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\StatusFactory::class) + ->setMethods(['load', 'create']) + ->getMock(); $this->orderStatusCollectionFactoryMock = $this->createPartialMock( \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory::class, ['create'] ); - $this->salesConfig = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this)) + $this->salesConfig = $objectManager ->getObject( \Magento\Sales\Model\Order\Config::class, [ - 'orderStatusFactory' => $orderStatusFactory, + 'orderStatusFactory' => $this->statusFactoryMock, 'orderStatusCollectionFactory' => $this->orderStatusCollectionFactoryMock ] ); @@ -147,6 +170,22 @@ public function testGetStatuses($state, $joinLabels, $collectionData, $expectedR ->method('joinStates') ->will($this->returnValue($collectionData)); + $this->statusFactoryMock->method('create') + ->willReturnSelf(); + + $this->statusFactoryMock->method('load') + ->willReturn($this->orderStatusModel); + + $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class); + $storeMock->method('getId') + ->willReturn(1); + + $this->storeManagerMock->method('getStore') + ->with($this->anything()) + ->willReturn($storeMock); + + $this->orderStatusModel->setData('store_labels', [1 => 'Pending label']); + $result = $this->salesConfig->getStateStatuses($state, $joinLabels); $this->assertSame($expectedResult, $result); diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php index 5319aa510bedf..38209bb22aef4 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php @@ -3,8 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Sales\Test\Unit\Model\Order\Email; +use Magento\Framework\Mail\Template\TransportBuilderByStore; use Magento\Sales\Model\Order\Email\SenderBuilder; class SenderBuilderTest extends \PHPUnit\Framework\TestCase @@ -29,6 +31,16 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase */ protected $transportBuilder; + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $storeMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $transportBuilderByStore; + protected function setUp() { $templateId = 'test_template_id'; @@ -42,7 +54,11 @@ protected function setUp() ['getTemplateVars', 'getTemplateOptions', 'getTemplateId'] ); - $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']); + $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, [ + 'getStoreId', + '__wakeup', + 'getId', + ]); $this->identityContainerMock = $this->createPartialMock( \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class, @@ -52,15 +68,24 @@ protected function setUp() 'getCustomerName', 'getTemplateOptions', 'getEmailCopyTo', - 'getCopyMethod' + 'getCopyMethod', + 'getStore', ] ); - $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class, [ - 'addTo', 'addBcc', 'getTransport', - 'setTemplateIdentifier', 'setTemplateOptions', 'setTemplateVars', - 'setFrom', - ]); + $this->transportBuilder = $this->createPartialMock( + \Magento\Framework\Mail\Template\TransportBuilder::class, + [ + 'addTo', + 'addBcc', + 'getTransport', + 'setTemplateIdentifier', + 'setTemplateOptions', + 'setTemplateVars', + ] + ); + + $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class); $this->templateContainerMock->expects($this->once()) ->method('getTemplateId') @@ -84,8 +109,8 @@ protected function setUp() $this->identityContainerMock->expects($this->once()) ->method('getEmailIdentity') ->will($this->returnValue($emailIdentity)); - $this->transportBuilder->expects($this->once()) - ->method('setFrom') + $this->transportBuilderByStore->expects($this->once()) + ->method('setFromByStore') ->with($this->equalTo($emailIdentity)); $this->identityContainerMock->expects($this->once()) @@ -95,7 +120,8 @@ protected function setUp() $this->senderBuilder = new SenderBuilder( $this->templateContainerMock, $this->identityContainerMock, - $this->transportBuilder + $this->transportBuilder, + $this->transportBuilderByStore ); } @@ -119,6 +145,12 @@ public function testSend() $this->identityContainerMock->expects($this->once()) ->method('getCustomerName') ->will($this->returnValue($customerName)); + $this->identityContainerMock->expects($this->once()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->once()) + ->method('getId') + ->willReturn(1); $this->transportBuilder->expects($this->once()) ->method('addTo') ->with($this->equalTo($customerEmail), $this->equalTo($customerName)); @@ -145,7 +177,12 @@ public function testSendCopyTo() $this->transportBuilder->expects($this->once()) ->method('addTo') ->with($this->equalTo('example@mail.com')); - + $this->identityContainerMock->expects($this->once()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->once()) + ->method('getId') + ->willReturn(1); $this->transportBuilder->expects($this->once()) ->method('getTransport') ->will($this->returnValue($transportMock)); diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php index 70e5ad127e44c..293c2eea1231d 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php @@ -179,7 +179,7 @@ public function testDecrypt() */ public function testSetAdditionalInformationException() { - $this->info->setAdditionalInformation('object', new \StdClass()); + $this->info->setAdditionalInformation('object', new \stdClass()); } /** diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php index c91d4edb155a4..0761b5abb5d45 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php @@ -19,7 +19,7 @@ public function testInsertTotals() // Setup parameters, that will be passed to the tested model method $page = $this->createMock(\Zend_Pdf_Page::class); - $order = new \StdClass(); + $order = new \stdClass(); $source = $this->createMock(\Magento\Sales\Model\Order\Invoice::class); $source->expects($this->any())->method('getOrder')->will($this->returnValue($order)); diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php index b1b51c3f12330..b808a4139e84e 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php @@ -87,7 +87,7 @@ protected function setUp() public function testRead() { $expectedResult = new \stdClass(); - $constraint = function (\DOMDOcument $actual) { + $constraint = function (\DOMDocument $actual) { try { $expected = __DIR__ . '/_files/pdf_merged.xml'; \PHPUnit\Framework\Assert::assertXmlStringEqualsXmlFile($expected, $actual->saveXML()); diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php index 9ecab6cf9ab52..2e668f0b0d6f1 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php @@ -243,6 +243,78 @@ public function testRefund() $this->assertSame($creditMemoMock, $this->creditmemoService->refund($creditMemoMock, true)); } + public function testRefundPendingCreditMemo() + { + $creditMemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class) + ->setMethods(['getId', 'getOrder', 'getState', 'getInvoice']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $creditMemoMock->expects($this->once())->method('getId')->willReturn(444); + $creditMemoMock->expects($this->once())->method('getState') + ->willReturn(\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN); + $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock(); + + $creditMemoMock->expects($this->atLeastOnce())->method('getOrder')->willReturn($orderMock); + $orderMock->expects($this->once())->method('getBaseTotalRefunded')->willReturn(0); + $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10); + $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10); + + $this->priceCurrencyMock->expects($this->any()) + ->method('round') + ->willReturnArgument(0); + + // Set payment adapter dependency + $refundAdapterMock = $this->getMockBuilder(\Magento\Sales\Model\Order\RefundAdapterInterface::class) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->objectManagerHelper->setBackwardCompatibleProperty( + $this->creditmemoService, + 'refundAdapter', + $refundAdapterMock + ); + + // Set resource dependency + $resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class) + ->disableOriginalConstructor() + ->getMock(); + $this->objectManagerHelper->setBackwardCompatibleProperty( + $this->creditmemoService, + 'resource', + $resourceMock + ); + + // Set order repository dependency + $orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->objectManagerHelper->setBackwardCompatibleProperty( + $this->creditmemoService, + 'orderRepository', + $orderRepositoryMock + ); + + $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $resourceMock->expects($this->once())->method('getConnection')->with('sales')->willReturn($adapterMock); + $adapterMock->expects($this->once())->method('beginTransaction'); + $refundAdapterMock->expects($this->once()) + ->method('refund') + ->with($creditMemoMock, $orderMock, false) + ->willReturn($orderMock); + $orderRepositoryMock->expects($this->once()) + ->method('save') + ->with($orderMock); + $creditMemoMock->expects($this->once()) + ->method('getInvoice') + ->willReturn(null); + $adapterMock->expects($this->once())->method('commit'); + $this->creditmemoRepositoryMock->expects($this->once()) + ->method('save'); + + $this->assertSame($creditMemoMock, $this->creditmemoService->refund($creditMemoMock, true)); + } + /** * @expectedExceptionMessage The most money available to refund is 1. * @expectedException \Magento\Framework\Exception\LocalizedException diff --git a/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php b/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php new file mode 100644 index 0000000000000..51ff936fd5ef7 --- /dev/null +++ b/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php @@ -0,0 +1,89 @@ +moduleDataSetupMock = $this->getMockBuilder(\Magento\Framework\Setup\ModuleDataSetupInterface::class) + ->getMockForAbstractClass(); + $this->contextMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Setup\Context::class) + ->disableOriginalConstructor() + ->getMock(); + $this->cacheMock = $this->getMockBuilder(\Magento\Framework\App\CacheInterface::class) + ->getMockForAbstractClass(); + $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class) + ->disableOriginalConstructor() + ->getMock(); + $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) + ->getMockForAbstractClass(); + + $this->objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $this->objectManagerHelper->getObject( + \Magento\Sales\Setup\SalesSetup::class, + [ + 'setup' => $this->moduleDataSetupMock, + 'context' => $this->contextMock, + 'cache' => $this->cacheMock, + 'attrGroupCollectionFactory' => $this->collectionFactoryMock, + 'config' => $this->scopeConfigMock + ] + ); + } + + public function testGetConnection() + { + $this->moduleDataSetupMock->expects($this->once()) + ->method('getConnection') + ->with('sales'); + $this->model->getConnection(); + } +} diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php index 1a903ab68952c..c79b06da60c4e 100644 --- a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php +++ b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php @@ -47,7 +47,7 @@ public function testPrepareDataSource() { $itemName = 'itemName'; $oldItemValue = "itemValue\n"; - $newItemValue = 'itemValue
    '; + $newItemValue = "itemValue
    \n"; $dataSource = [ 'data' => [ 'items' => [ @@ -57,7 +57,7 @@ public function testPrepareDataSource() ]; $this->model->setData('name', $itemName); - $this->escaper->expects($this->once())->method('escapeHtml')->with($newItemValue)->willReturnArgument(0); + $this->escaper->expects($this->any())->method('escapeHtml')->with($oldItemValue)->willReturnArgument(0); $dataSource = $this->model->prepareDataSource($dataSource); $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]); } diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php index 23a6e7a41a5b7..d900bb7ba670f 100644 --- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php +++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php @@ -49,9 +49,7 @@ public function prepareDataSource(array $dataSource) { if (isset($dataSource['data']['items'])) { foreach ($dataSource['data']['items'] as & $item) { - $item[$this->getData('name')] = $this->escaper->escapeHtml( - str_replace("\n", '
    ', $item[$this->getData('name')]) - ); + $item[$this->getData('name')] = nl2br($this->escaper->escapeHtml($item[$this->getData('name')])); } } diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml new file mode 100644 index 0000000000000..c084a5b87b109 --- /dev/null +++ b/app/code/Magento/Sales/etc/db_schema.xml @@ -0,0 +1,2063 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Sales/etc/db_schema_whitelist.json b/app/code/Magento/Sales/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..415ee7f0b26c1 --- /dev/null +++ b/app/code/Magento/Sales/etc/db_schema_whitelist.json @@ -0,0 +1,1248 @@ +{ + "sales_order": { + "column": { + "entity_id": true, + "state": true, + "status": true, + "coupon_code": true, + "protect_code": true, + "shipping_description": true, + "is_virtual": true, + "store_id": true, + "customer_id": true, + "base_discount_amount": true, + "base_discount_canceled": true, + "base_discount_invoiced": true, + "base_discount_refunded": true, + "base_grand_total": true, + "base_shipping_amount": true, + "base_shipping_canceled": true, + "base_shipping_invoiced": true, + "base_shipping_refunded": true, + "base_shipping_tax_amount": true, + "base_shipping_tax_refunded": true, + "base_subtotal": true, + "base_subtotal_canceled": true, + "base_subtotal_invoiced": true, + "base_subtotal_refunded": true, + "base_tax_amount": true, + "base_tax_canceled": true, + "base_tax_invoiced": true, + "base_tax_refunded": true, + "base_to_global_rate": true, + "base_to_order_rate": true, + "base_total_canceled": true, + "base_total_invoiced": true, + "base_total_invoiced_cost": true, + "base_total_offline_refunded": true, + "base_total_online_refunded": true, + "base_total_paid": true, + "base_total_qty_ordered": true, + "base_total_refunded": true, + "discount_amount": true, + "discount_canceled": true, + "discount_invoiced": true, + "discount_refunded": true, + "grand_total": true, + "shipping_amount": true, + "shipping_canceled": true, + "shipping_invoiced": true, + "shipping_refunded": true, + "shipping_tax_amount": true, + "shipping_tax_refunded": true, + "store_to_base_rate": true, + "store_to_order_rate": true, + "subtotal": true, + "subtotal_canceled": true, + "subtotal_invoiced": true, + "subtotal_refunded": true, + "tax_amount": true, + "tax_canceled": true, + "tax_invoiced": true, + "tax_refunded": true, + "total_canceled": true, + "total_invoiced": true, + "total_offline_refunded": true, + "total_online_refunded": true, + "total_paid": true, + "total_qty_ordered": true, + "total_refunded": true, + "can_ship_partially": true, + "can_ship_partially_item": true, + "customer_is_guest": true, + "customer_note_notify": true, + "billing_address_id": true, + "customer_group_id": true, + "edit_increment": true, + "email_sent": true, + "send_email": true, + "forced_shipment_with_invoice": true, + "payment_auth_expiration": true, + "quote_address_id": true, + "quote_id": true, + "shipping_address_id": true, + "adjustment_negative": true, + "adjustment_positive": true, + "base_adjustment_negative": true, + "base_adjustment_positive": true, + "base_shipping_discount_amount": true, + "base_subtotal_incl_tax": true, + "base_total_due": true, + "payment_authorization_amount": true, + "shipping_discount_amount": true, + "subtotal_incl_tax": true, + "total_due": true, + "weight": true, + "customer_dob": true, + "increment_id": true, + "applied_rule_ids": true, + "base_currency_code": true, + "customer_email": true, + "customer_firstname": true, + "customer_lastname": true, + "customer_middlename": true, + "customer_prefix": true, + "customer_suffix": true, + "customer_taxvat": true, + "discount_description": true, + "ext_customer_id": true, + "ext_order_id": true, + "global_currency_code": true, + "hold_before_state": true, + "hold_before_status": true, + "order_currency_code": true, + "original_increment_id": true, + "relation_child_id": true, + "relation_child_real_id": true, + "relation_parent_id": true, + "relation_parent_real_id": true, + "remote_ip": true, + "shipping_method": true, + "store_currency_code": true, + "store_name": true, + "x_forwarded_for": true, + "customer_note": true, + "created_at": true, + "updated_at": true, + "total_item_count": true, + "customer_gender": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "shipping_discount_tax_compensation_amount": true, + "base_shipping_discount_tax_compensation_amnt": true, + "discount_tax_compensation_invoiced": true, + "base_discount_tax_compensation_invoiced": true, + "discount_tax_compensation_refunded": true, + "base_discount_tax_compensation_refunded": true, + "shipping_incl_tax": true, + "base_shipping_incl_tax": true, + "coupon_rule_name": true + }, + "index": { + "SALES_ORDER_STATUS": true, + "SALES_ORDER_STATE": true, + "SALES_ORDER_STORE_ID": true, + "SALES_ORDER_CREATED_AT": true, + "SALES_ORDER_CUSTOMER_ID": true, + "SALES_ORDER_EXT_ORDER_ID": true, + "SALES_ORDER_QUOTE_ID": true, + "SALES_ORDER_UPDATED_AT": true, + "SALES_ORDER_SEND_EMAIL": true, + "SALES_ORDER_EMAIL_SENT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true, + "SALES_ORDER_STORE_ID_STORE_STORE_ID": true, + "SALES_ORDER_INCREMENT_ID_STORE_ID": true + } + }, + "sales_order_grid": { + "column": { + "entity_id": true, + "status": true, + "store_id": true, + "store_name": true, + "customer_id": true, + "base_grand_total": true, + "base_total_paid": true, + "grand_total": true, + "total_paid": true, + "increment_id": true, + "base_currency_code": true, + "order_currency_code": true, + "shipping_name": true, + "billing_name": true, + "created_at": true, + "updated_at": true, + "billing_address": true, + "shipping_address": true, + "shipping_information": true, + "customer_email": true, + "customer_group": true, + "subtotal": true, + "shipping_and_handling": true, + "customer_name": true, + "payment_method": true, + "total_refunded": true + }, + "index": { + "SALES_ORDER_GRID_STATUS": true, + "SALES_ORDER_GRID_STORE_ID": true, + "SALES_ORDER_GRID_BASE_GRAND_TOTAL": true, + "SALES_ORDER_GRID_BASE_TOTAL_PAID": true, + "SALES_ORDER_GRID_GRAND_TOTAL": true, + "SALES_ORDER_GRID_TOTAL_PAID": true, + "SALES_ORDER_GRID_SHIPPING_NAME": true, + "SALES_ORDER_GRID_BILLING_NAME": true, + "SALES_ORDER_GRID_CREATED_AT": true, + "SALES_ORDER_GRID_CUSTOMER_ID": true, + "SALES_ORDER_GRID_UPDATED_AT": true, + "FTI_65B9E9925EC58F0C7C2E2F6379C233E7": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_GRID_INCREMENT_ID_STORE_ID": true + } + }, + "sales_order_address": { + "column": { + "entity_id": true, + "parent_id": true, + "customer_address_id": true, + "quote_address_id": true, + "region_id": true, + "customer_id": true, + "fax": true, + "region": true, + "postcode": true, + "lastname": true, + "street": true, + "city": true, + "email": true, + "telephone": true, + "country_id": true, + "firstname": true, + "address_type": true, + "prefix": true, + "middlename": true, + "suffix": true, + "company": true, + "vat_id": true, + "vat_is_valid": true, + "vat_request_id": true, + "vat_request_date": true, + "vat_request_success": true + }, + "index": { + "SALES_ORDER_ADDRESS_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_ADDRESS_PARENT_ID_SALES_ORDER_ENTITY_ID": true + } + }, + "sales_order_status_history": { + "column": { + "entity_id": true, + "parent_id": true, + "is_customer_notified": true, + "is_visible_on_front": true, + "comment": true, + "status": true, + "created_at": true, + "entity_name": true + }, + "index": { + "SALES_ORDER_STATUS_HISTORY_PARENT_ID": true, + "SALES_ORDER_STATUS_HISTORY_CREATED_AT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_STATUS_HISTORY_PARENT_ID_SALES_ORDER_ENTITY_ID": true + } + }, + "sales_order_item": { + "column": { + "item_id": true, + "order_id": true, + "parent_item_id": true, + "quote_item_id": true, + "store_id": true, + "created_at": true, + "updated_at": true, + "product_id": true, + "product_type": true, + "product_options": true, + "weight": true, + "is_virtual": true, + "sku": true, + "name": true, + "description": true, + "applied_rule_ids": true, + "additional_data": true, + "is_qty_decimal": true, + "no_discount": true, + "qty_backordered": true, + "qty_canceled": true, + "qty_invoiced": true, + "qty_ordered": true, + "qty_refunded": true, + "qty_shipped": true, + "base_cost": true, + "price": true, + "base_price": true, + "original_price": true, + "base_original_price": true, + "tax_percent": true, + "tax_amount": true, + "base_tax_amount": true, + "tax_invoiced": true, + "base_tax_invoiced": true, + "discount_percent": true, + "discount_amount": true, + "base_discount_amount": true, + "discount_invoiced": true, + "base_discount_invoiced": true, + "amount_refunded": true, + "base_amount_refunded": true, + "row_total": true, + "base_row_total": true, + "row_invoiced": true, + "base_row_invoiced": true, + "row_weight": true, + "base_tax_before_discount": true, + "tax_before_discount": true, + "ext_order_item_id": true, + "locked_do_invoice": true, + "locked_do_ship": true, + "price_incl_tax": true, + "base_price_incl_tax": true, + "row_total_incl_tax": true, + "base_row_total_incl_tax": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "discount_tax_compensation_invoiced": true, + "base_discount_tax_compensation_invoiced": true, + "discount_tax_compensation_refunded": true, + "base_discount_tax_compensation_refunded": true, + "tax_canceled": true, + "discount_tax_compensation_canceled": true, + "tax_refunded": true, + "base_tax_refunded": true, + "discount_refunded": true, + "base_discount_refunded": true + }, + "index": { + "SALES_ORDER_ITEM_ORDER_ID": true, + "SALES_ORDER_ITEM_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_ITEM_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "SALES_ORDER_ITEM_STORE_ID_STORE_STORE_ID": true + } + }, + "sales_order_payment": { + "column": { + "entity_id": true, + "parent_id": true, + "base_shipping_captured": true, + "shipping_captured": true, + "amount_refunded": true, + "base_amount_paid": true, + "amount_canceled": true, + "base_amount_authorized": true, + "base_amount_paid_online": true, + "base_amount_refunded_online": true, + "base_shipping_amount": true, + "shipping_amount": true, + "amount_paid": true, + "amount_authorized": true, + "base_amount_ordered": true, + "base_shipping_refunded": true, + "shipping_refunded": true, + "base_amount_refunded": true, + "amount_ordered": true, + "base_amount_canceled": true, + "quote_payment_id": true, + "additional_data": true, + "cc_exp_month": true, + "cc_ss_start_year": true, + "echeck_bank_name": true, + "method": true, + "cc_debug_request_body": true, + "cc_secure_verify": true, + "protection_eligibility": true, + "cc_approval": true, + "cc_last_4": true, + "cc_status_description": true, + "echeck_type": true, + "cc_debug_response_serialized": true, + "cc_ss_start_month": true, + "echeck_account_type": true, + "last_trans_id": true, + "cc_cid_status": true, + "cc_owner": true, + "cc_type": true, + "po_number": true, + "cc_exp_year": true, + "cc_status": true, + "echeck_routing_number": true, + "account_status": true, + "anet_trans_method": true, + "cc_debug_response_body": true, + "cc_ss_issue": true, + "echeck_account_name": true, + "cc_avs_status": true, + "cc_number_enc": true, + "cc_trans_id": true, + "address_status": true, + "additional_information": true + }, + "index": { + "SALES_ORDER_PAYMENT_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_PAYMENT_PARENT_ID_SALES_ORDER_ENTITY_ID": true + } + }, + "sales_shipment": { + "column": { + "entity_id": true, + "store_id": true, + "total_weight": true, + "total_qty": true, + "email_sent": true, + "send_email": true, + "order_id": true, + "customer_id": true, + "shipping_address_id": true, + "billing_address_id": true, + "shipment_status": true, + "increment_id": true, + "created_at": true, + "updated_at": true, + "packages": true, + "shipping_label": true, + "customer_note": true, + "customer_note_notify": true + }, + "index": { + "SALES_SHIPMENT_STORE_ID": true, + "SALES_SHIPMENT_TOTAL_QTY": true, + "SALES_SHIPMENT_ORDER_ID": true, + "SALES_SHIPMENT_CREATED_AT": true, + "SALES_SHIPMENT_UPDATED_AT": true, + "SALES_SHIPMENT_SEND_EMAIL": true, + "SALES_SHIPMENT_EMAIL_SENT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "SALES_SHIPMENT_STORE_ID_STORE_STORE_ID": true, + "SALES_SHIPMENT_INCREMENT_ID_STORE_ID": true + } + }, + "sales_shipment_grid": { + "column": { + "entity_id": true, + "increment_id": true, + "store_id": true, + "order_increment_id": true, + "order_id": true, + "order_created_at": true, + "customer_name": true, + "total_qty": true, + "shipment_status": true, + "order_status": true, + "billing_address": true, + "shipping_address": true, + "billing_name": true, + "shipping_name": true, + "customer_email": true, + "customer_group_id": true, + "payment_method": true, + "shipping_information": true, + "created_at": true, + "updated_at": true + }, + "index": { + "SALES_SHIPMENT_GRID_STORE_ID": true, + "SALES_SHIPMENT_GRID_TOTAL_QTY": true, + "SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID": true, + "SALES_SHIPMENT_GRID_SHIPMENT_STATUS": true, + "SALES_SHIPMENT_GRID_ORDER_STATUS": true, + "SALES_SHIPMENT_GRID_CREATED_AT": true, + "SALES_SHIPMENT_GRID_UPDATED_AT": true, + "SALES_SHIPMENT_GRID_ORDER_CREATED_AT": true, + "SALES_SHIPMENT_GRID_SHIPPING_NAME": true, + "SALES_SHIPMENT_GRID_BILLING_NAME": true, + "FTI_086B40C8955F167B8EA76653437879B4": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID": true + } + }, + "sales_shipment_item": { + "column": { + "entity_id": true, + "parent_id": true, + "row_total": true, + "price": true, + "weight": true, + "qty": true, + "product_id": true, + "order_item_id": true, + "additional_data": true, + "description": true, + "name": true, + "sku": true + }, + "index": { + "SALES_SHIPMENT_ITEM_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPMENT_ITEM_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true + } + }, + "sales_shipment_track": { + "column": { + "entity_id": true, + "parent_id": true, + "weight": true, + "qty": true, + "order_id": true, + "track_number": true, + "description": true, + "title": true, + "carrier_code": true, + "created_at": true, + "updated_at": true + }, + "index": { + "SALES_SHIPMENT_TRACK_PARENT_ID": true, + "SALES_SHIPMENT_TRACK_ORDER_ID": true, + "SALES_SHIPMENT_TRACK_CREATED_AT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPMENT_TRACK_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true + } + }, + "sales_shipment_comment": { + "column": { + "entity_id": true, + "parent_id": true, + "is_customer_notified": true, + "is_visible_on_front": true, + "comment": true, + "created_at": true + }, + "index": { + "SALES_SHIPMENT_COMMENT_CREATED_AT": true, + "SALES_SHIPMENT_COMMENT_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPMENT_COMMENT_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true + } + }, + "sales_invoice": { + "column": { + "entity_id": true, + "store_id": true, + "base_grand_total": true, + "shipping_tax_amount": true, + "tax_amount": true, + "base_tax_amount": true, + "store_to_order_rate": true, + "base_shipping_tax_amount": true, + "base_discount_amount": true, + "base_to_order_rate": true, + "grand_total": true, + "shipping_amount": true, + "subtotal_incl_tax": true, + "base_subtotal_incl_tax": true, + "store_to_base_rate": true, + "base_shipping_amount": true, + "total_qty": true, + "base_to_global_rate": true, + "subtotal": true, + "base_subtotal": true, + "discount_amount": true, + "billing_address_id": true, + "is_used_for_refund": true, + "order_id": true, + "email_sent": true, + "send_email": true, + "can_void_flag": true, + "state": true, + "shipping_address_id": true, + "store_currency_code": true, + "transaction_id": true, + "order_currency_code": true, + "base_currency_code": true, + "global_currency_code": true, + "increment_id": true, + "created_at": true, + "updated_at": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "shipping_discount_tax_compensation_amount": true, + "base_shipping_discount_tax_compensation_amnt": true, + "shipping_incl_tax": true, + "base_shipping_incl_tax": true, + "base_total_refunded": true, + "discount_description": true, + "customer_note": true, + "customer_note_notify": true + }, + "index": { + "SALES_INVOICE_STORE_ID": true, + "SALES_INVOICE_GRAND_TOTAL": true, + "SALES_INVOICE_ORDER_ID": true, + "SALES_INVOICE_STATE": true, + "SALES_INVOICE_CREATED_AT": true, + "SALES_INVOICE_UPDATED_AT": true, + "SALES_INVOICE_SEND_EMAIL": true, + "SALES_INVOICE_EMAIL_SENT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "SALES_INVOICE_STORE_ID_STORE_STORE_ID": true, + "SALES_INVOICE_INCREMENT_ID_STORE_ID": true + } + }, + "sales_invoice_grid": { + "column": { + "entity_id": true, + "increment_id": true, + "state": true, + "store_id": true, + "store_name": true, + "order_id": true, + "order_increment_id": true, + "order_created_at": true, + "customer_name": true, + "customer_email": true, + "customer_group_id": true, + "payment_method": true, + "store_currency_code": true, + "order_currency_code": true, + "base_currency_code": true, + "global_currency_code": true, + "billing_name": true, + "billing_address": true, + "shipping_address": true, + "shipping_information": true, + "subtotal": true, + "shipping_and_handling": true, + "grand_total": true, + "created_at": true, + "updated_at": true, + "base_grand_total": true + }, + "index": { + "SALES_INVOICE_GRID_STORE_ID": true, + "SALES_INVOICE_GRID_GRAND_TOTAL": true, + "SALES_INVOICE_GRID_ORDER_ID": true, + "SALES_INVOICE_GRID_STATE": true, + "SALES_INVOICE_GRID_ORDER_INCREMENT_ID": true, + "SALES_INVOICE_GRID_CREATED_AT": true, + "SALES_INVOICE_GRID_UPDATED_AT": true, + "SALES_INVOICE_GRID_ORDER_CREATED_AT": true, + "SALES_INVOICE_GRID_BILLING_NAME": true, + "FTI_95D9C924DD6A8734EB8B5D01D60F90DE": true, + "SALES_INVOICE_GRID_BASE_GRAND_TOTAL": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID": true + } + }, + "sales_invoice_item": { + "column": { + "entity_id": true, + "parent_id": true, + "base_price": true, + "tax_amount": true, + "base_row_total": true, + "discount_amount": true, + "row_total": true, + "base_discount_amount": true, + "price_incl_tax": true, + "base_tax_amount": true, + "base_price_incl_tax": true, + "qty": true, + "base_cost": true, + "price": true, + "base_row_total_incl_tax": true, + "row_total_incl_tax": true, + "product_id": true, + "order_item_id": true, + "additional_data": true, + "description": true, + "sku": true, + "name": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "tax_ratio": true + }, + "index": { + "SALES_INVOICE_ITEM_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICE_ITEM_PARENT_ID_SALES_INVOICE_ENTITY_ID": true + } + }, + "sales_invoice_comment": { + "column": { + "entity_id": true, + "parent_id": true, + "is_customer_notified": true, + "is_visible_on_front": true, + "comment": true, + "created_at": true + }, + "index": { + "SALES_INVOICE_COMMENT_CREATED_AT": true, + "SALES_INVOICE_COMMENT_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICE_COMMENT_PARENT_ID_SALES_INVOICE_ENTITY_ID": true + } + }, + "sales_creditmemo": { + "column": { + "entity_id": true, + "store_id": true, + "adjustment_positive": true, + "base_shipping_tax_amount": true, + "store_to_order_rate": true, + "base_discount_amount": true, + "base_to_order_rate": true, + "grand_total": true, + "base_adjustment_negative": true, + "base_subtotal_incl_tax": true, + "shipping_amount": true, + "subtotal_incl_tax": true, + "adjustment_negative": true, + "base_shipping_amount": true, + "store_to_base_rate": true, + "base_to_global_rate": true, + "base_adjustment": true, + "base_subtotal": true, + "discount_amount": true, + "subtotal": true, + "adjustment": true, + "base_grand_total": true, + "base_adjustment_positive": true, + "base_tax_amount": true, + "shipping_tax_amount": true, + "tax_amount": true, + "order_id": true, + "email_sent": true, + "send_email": true, + "creditmemo_status": true, + "state": true, + "shipping_address_id": true, + "billing_address_id": true, + "invoice_id": true, + "store_currency_code": true, + "order_currency_code": true, + "base_currency_code": true, + "global_currency_code": true, + "transaction_id": true, + "increment_id": true, + "created_at": true, + "updated_at": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "shipping_discount_tax_compensation_amount": true, + "base_shipping_discount_tax_compensation_amnt": true, + "shipping_incl_tax": true, + "base_shipping_incl_tax": true, + "discount_description": true, + "customer_note": true, + "customer_note_notify": true + }, + "index": { + "SALES_CREDITMEMO_STORE_ID": true, + "SALES_CREDITMEMO_ORDER_ID": true, + "SALES_CREDITMEMO_CREDITMEMO_STATUS": true, + "SALES_CREDITMEMO_STATE": true, + "SALES_CREDITMEMO_CREATED_AT": true, + "SALES_CREDITMEMO_UPDATED_AT": true, + "SALES_CREDITMEMO_SEND_EMAIL": true, + "SALES_CREDITMEMO_EMAIL_SENT": true + }, + "constraint": { + "PRIMARY": true, + "SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID": true, + "SALES_CREDITMEMO_INCREMENT_ID_STORE_ID": true + } + }, + "sales_creditmemo_grid": { + "column": { + "entity_id": true, + "increment_id": true, + "created_at": true, + "updated_at": true, + "order_id": true, + "order_increment_id": true, + "order_created_at": true, + "billing_name": true, + "state": true, + "base_grand_total": true, + "order_status": true, + "store_id": true, + "billing_address": true, + "shipping_address": true, + "customer_name": true, + "customer_email": true, + "customer_group_id": true, + "payment_method": true, + "shipping_information": true, + "subtotal": true, + "shipping_and_handling": true, + "adjustment_positive": true, + "adjustment_negative": true, + "order_base_grand_total": true + }, + "index": { + "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID": true, + "SALES_CREDITMEMO_GRID_CREATED_AT": true, + "SALES_CREDITMEMO_GRID_UPDATED_AT": true, + "SALES_CREDITMEMO_GRID_ORDER_CREATED_AT": true, + "SALES_CREDITMEMO_GRID_STATE": true, + "SALES_CREDITMEMO_GRID_BILLING_NAME": true, + "SALES_CREDITMEMO_GRID_ORDER_STATUS": true, + "SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL": true, + "SALES_CREDITMEMO_GRID_STORE_ID": true, + "SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL": true, + "SALES_CREDITMEMO_GRID_ORDER_ID": true, + "FTI_32B7BA885941A8254EE84AE650ABDC86": true + }, + "constraint": { + "PRIMARY": true, + "SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID": true + } + }, + "sales_creditmemo_item": { + "column": { + "entity_id": true, + "parent_id": true, + "base_price": true, + "tax_amount": true, + "base_row_total": true, + "discount_amount": true, + "row_total": true, + "base_discount_amount": true, + "price_incl_tax": true, + "base_tax_amount": true, + "base_price_incl_tax": true, + "qty": true, + "base_cost": true, + "price": true, + "base_row_total_incl_tax": true, + "row_total_incl_tax": true, + "product_id": true, + "order_item_id": true, + "additional_data": true, + "description": true, + "sku": true, + "name": true, + "discount_tax_compensation_amount": true, + "base_discount_tax_compensation_amount": true, + "tax_ratio": true + }, + "index": { + "SALES_CREDITMEMO_ITEM_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_CREDITMEMO_ITEM_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID": true + } + }, + "sales_creditmemo_comment": { + "column": { + "entity_id": true, + "parent_id": true, + "is_customer_notified": true, + "is_visible_on_front": true, + "comment": true, + "created_at": true + }, + "index": { + "SALES_CREDITMEMO_COMMENT_CREATED_AT": true, + "SALES_CREDITMEMO_COMMENT_PARENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_CREDITMEMO_COMMENT_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID": true + } + }, + "sales_invoiced_aggregated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "orders_invoiced": true, + "invoiced": true, + "invoiced_captured": true, + "invoiced_not_captured": true + }, + "index": { + "SALES_INVOICED_AGGREGATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICED_AGGREGATED_STORE_ID_STORE_STORE_ID": true, + "SALES_INVOICED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_invoiced_aggregated_order": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "orders_invoiced": true, + "invoiced": true, + "invoiced_captured": true, + "invoiced_not_captured": true + }, + "index": { + "SALES_INVOICED_AGGREGATED_ORDER_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_INVOICED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true, + "SALES_INVOICED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_order_aggregated_created": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "total_qty_ordered": true, + "total_qty_invoiced": true, + "total_income_amount": true, + "total_revenue_amount": true, + "total_profit_amount": true, + "total_invoiced_amount": true, + "total_canceled_amount": true, + "total_paid_amount": true, + "total_refunded_amount": true, + "total_tax_amount": true, + "total_tax_amount_actual": true, + "total_shipping_amount": true, + "total_shipping_amount_actual": true, + "total_discount_amount": true, + "total_discount_amount_actual": true + }, + "index": { + "SALES_ORDER_AGGREGATED_CREATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID": true, + "SALES_ORDER_AGGREGATED_CREATED_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_order_aggregated_updated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "total_qty_ordered": true, + "total_qty_invoiced": true, + "total_income_amount": true, + "total_revenue_amount": true, + "total_profit_amount": true, + "total_invoiced_amount": true, + "total_canceled_amount": true, + "total_paid_amount": true, + "total_refunded_amount": true, + "total_tax_amount": true, + "total_tax_amount_actual": true, + "total_shipping_amount": true, + "total_shipping_amount_actual": true, + "total_discount_amount": true, + "total_discount_amount_actual": true + }, + "index": { + "SALES_ORDER_AGGREGATED_UPDATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true, + "SALES_ORDER_AGGREGATED_UPDATED_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_payment_transaction": { + "column": { + "transaction_id": true, + "parent_id": true, + "order_id": true, + "payment_id": true, + "txn_id": true, + "parent_txn_id": true, + "txn_type": true, + "is_closed": true, + "additional_information": true, + "created_at": true + }, + "index": { + "SALES_PAYMENT_TRANSACTION_PARENT_ID": true, + "SALES_PAYMENT_TRANSACTION_PAYMENT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_PAYMENT_TRANSACTION_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "FK_B99FF1A06402D725EBDB0F3A7ECD47A2": true, + "SALES_PAYMENT_TRANSACTION_PAYMENT_ID_SALES_ORDER_PAYMENT_ENTT_ID": true, + "SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID": true + } + }, + "sales_refunded_aggregated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "refunded": true, + "online_refunded": true, + "offline_refunded": true + }, + "index": { + "SALES_REFUNDED_AGGREGATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_REFUNDED_AGGREGATED_STORE_ID_STORE_STORE_ID": true, + "SALES_REFUNDED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_refunded_aggregated_order": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "orders_count": true, + "refunded": true, + "online_refunded": true, + "offline_refunded": true + }, + "index": { + "SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true, + "SALES_REFUNDED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS": true + } + }, + "sales_shipping_aggregated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "shipping_description": true, + "orders_count": true, + "total_shipping": true, + "total_shipping_actual": true + }, + "index": { + "SALES_SHIPPING_AGGREGATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPPING_AGGREGATED_STORE_ID_STORE_STORE_ID": true, + "SALES_SHPP_AGGRED_PERIOD_STORE_ID_ORDER_STS_SHPP_DESCRIPTION": true + } + }, + "sales_shipping_aggregated_order": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "shipping_description": true, + "orders_count": true, + "total_shipping": true, + "total_shipping_actual": true + }, + "index": { + "SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true, + "UNQ_C05FAE47282EEA68654D0924E946761F": true + } + }, + "sales_bestsellers_aggregated_daily": { + "column": { + "id": true, + "period": true, + "store_id": true, + "product_id": true, + "product_name": true, + "product_price": true, + "qty_ordered": true, + "rating_pos": true + }, + "index": { + "SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_DAILY_PRODUCT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_DAILY_PERIOD_STORE_ID_PRODUCT_ID": true + } + }, + "sales_bestsellers_aggregated_monthly": { + "column": { + "id": true, + "period": true, + "store_id": true, + "product_id": true, + "product_name": true, + "product_price": true, + "qty_ordered": true, + "rating_pos": true + }, + "index": { + "SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_MONTHLY_PRODUCT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_MONTHLY_PERIOD_STORE_ID_PRODUCT_ID": true + } + }, + "sales_bestsellers_aggregated_yearly": { + "column": { + "id": true, + "period": true, + "store_id": true, + "product_id": true, + "product_name": true, + "product_price": true, + "qty_ordered": true, + "rating_pos": true + }, + "index": { + "SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_YEARLY_PRODUCT_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID": true, + "SALES_BESTSELLERS_AGGREGATED_YEARLY_PERIOD_STORE_ID_PRODUCT_ID": true + } + }, + "sales_order_tax": { + "column": { + "tax_id": true, + "order_id": true, + "code": true, + "title": true, + "percent": true, + "amount": true, + "priority": true, + "position": true, + "base_amount": true, + "process": true, + "base_real_amount": true + }, + "index": { + "SALES_ORDER_TAX_ORDER_ID_PRIORITY_POSITION": true + }, + "constraint": { + "PRIMARY": true + } + }, + "sales_order_tax_item": { + "column": { + "tax_item_id": true, + "tax_id": true, + "item_id": true, + "tax_percent": true, + "amount": true, + "base_amount": true, + "real_amount": true, + "real_base_amount": true, + "associated_item_id": true, + "taxable_item_type": true + }, + "index": { + "SALES_ORDER_TAX_ITEM_ITEM_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_TAX_ITEM_ASSOCIATED_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID": true, + "SALES_ORDER_TAX_ITEM_TAX_ID_SALES_ORDER_TAX_TAX_ID": true, + "SALES_ORDER_TAX_ITEM_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID": true, + "SALES_ORDER_TAX_ITEM_TAX_ID_ITEM_ID": true + } + }, + "sales_order_status": { + "column": { + "status": true, + "label": true + }, + "constraint": { + "PRIMARY": true + } + }, + "sales_order_status_state": { + "column": { + "status": true, + "state": true, + "is_default": true, + "visible_on_front": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_STATUS_STATE_STATUS_SALES_ORDER_STATUS_STATUS": true + } + }, + "sales_order_status_label": { + "column": { + "status": true, + "store_id": true, + "label": true + }, + "index": { + "SALES_ORDER_STATUS_LABEL_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALES_ORDER_STATUS_LABEL_STATUS_SALES_ORDER_STATUS_STATUS": true, + "SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml index 2ca2420934519..2dbf717f73439 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml @@ -67,11 +67,7 @@ canDisplayPrice()): ?> - getDataId() == 'cart'): ?> - getItemPrice($_item->getProduct()) ?> - - getItemPrice($_item) ?> - + getItemPrice($block->getProduct($_item)) ?> diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml index 1ec51ffb793c6..6ac6e13a873ed 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml @@ -5,7 +5,7 @@ */ // @codingStandardsIgnoreFile - +/** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */ ?>
    canAddComment()):?> diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml index ecc2b5beee321..10b7b1c028c66 100644 --- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml @@ -35,7 +35,13 @@ - + + + + * + + + diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml index 3ec450a570b46..ac1233c5e4961 100644 --- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml @@ -35,7 +35,13 @@ - + + + + * + + + diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml index 27cef50742163..6db77a79b8c14 100644 --- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml +++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml @@ -35,7 +35,13 @@ - + + + + * + + + diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index 629b7ac93ecee..8990ea8d3f75b 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -55,7 +55,8 @@ define([ } }); - var searchButton = new ControlButton(jQuery.mage.__('Add Products')), + var searchButtonId = 'add_products', + searchButton = new ControlButton(jQuery.mage.__('Add Products'), searchButtonId), searchAreaId = this.getAreaId('search'); searchButton.onClick = function() { $(searchAreaId).show(); @@ -74,7 +75,7 @@ define([ this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function(proceed) { proceed(); - if ($(searchAreaId) && !$(searchAreaId).visible()) { + if ($(searchAreaId) && !$(searchAreaId).visible() && !$(searchButtonId)) { this.addControlButton(searchButton); } }); @@ -157,6 +158,7 @@ define([ } if(this.addresses[id]){ this.fillAddressFields(container, this.addresses[id]); + } else{ this.fillAddressFields(container, {}); @@ -190,43 +192,53 @@ define([ } }, - changeAddressField : function(event){ - var field = Event.element(event); - var re = /[^\[]*\[([^\]]*)_address\]\[([^\]]*)\](\[(\d)\])?/; - var matchRes = field.name.match(re); + /** + * Triggers on each form's element changes. + * + * @param {Object} event + */ + changeAddressField: function (event) { + var field = Event.element(event), + re = /[^\[]*\[([^\]]*)_address\]\[([^\]]*)\](\[(\d)\])?/, + matchRes = field.name.match(re), + type, + name, + data; if (!matchRes) { return; } - var type = matchRes[1]; - var name = matchRes[2]; - var data; + type = matchRes[1]; + name = matchRes[2]; - if(this.isBillingField(field.id)){ - data = this.serializeData(this.billingAddressContainer) - } - else{ - data = this.serializeData(this.shippingAddressContainer) + if (this.isBillingField(field.id)) { + data = this.serializeData(this.billingAddressContainer); + } else { + data = this.serializeData(this.shippingAddressContainer); } data = data.toObject(); - if( (type == 'billing' && this.shippingAsBilling) - || (type == 'shipping' && !this.shippingAsBilling) ) { + if (type === 'billing' && this.shippingAsBilling || type === 'shipping' && !this.shippingAsBilling) { data['reset_shipping'] = true; } - data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value; + data['order[' + type + '_address][customer_address_id]'] = null; + data['shipping_as_billing'] = jQuery('[name="shipping_same_as_billing"]').is(':checked') ? 1 : 0; + + if (name === 'customer_address_id') { + data['order[' + type + '_address][customer_address_id]'] = + $('order-' + type + '_address_customer_address_id').value; + } if (data['reset_shipping']) { this.resetShippingMethod(data); } else { this.saveData(data); - if (name == 'country_id' || name == 'customer_address_id') { + + if (name === 'country_id' || name === 'customer_address_id') { this.loadArea(['shipping_method', 'billing_method', 'totals', 'items'], true, data); } - // added for reloading of default sender and default recipient for giftmessages - //this.loadArea(['giftmessage'], true, data); } }, @@ -1383,12 +1395,15 @@ define([ _label: '', _node: null, - initialize: function(label){ + initialize: function(label, id){ this._label = label; this._node = new Element('button', { 'class': 'action-secondary action-add', 'type': 'button' }); + if (typeof id !== 'undefined') { + this._node.setAttribute('id', id) + } }, onClick: function(){ diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml index 20c2c1869fedb..1fca65932b0b0 100644 --- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml @@ -31,6 +31,6 @@ getQty() * 1 ?> - getItemPrice($_item) ?> + getItemPrice($_item->getOrderItem()) ?> diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php index 108cc341253ae..1e8fbf43ec3bc 100644 --- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php @@ -136,6 +136,7 @@ public function asHtml() * * @param \Magento\Framework\Model\AbstractModel $model * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function validate(\Magento\Framework\Model\AbstractModel $model) { @@ -145,8 +146,22 @@ public function validate(\Magento\Framework\Model\AbstractModel $model) $attr = $this->getAttribute(); $total = 0; foreach ($model->getQuote()->getAllVisibleItems() as $item) { - if (parent::validate($item)) { - $total += $item->getData($attr); + $hasValidChild = false; + $useChildrenTotal = ($item->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE); + $childrenAttrTotal = 0; + $children = $item->getChildren(); + if (!empty($children)) { + foreach ($children as $child) { + if (parent::validate($child)) { + $hasValidChild = true; + if ($useChildrenTotal) { + $childrenAttrTotal += $child->getData($attr); + } + } + } + } + if ($hasValidChild || parent::validate($item)) { + $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr)); } } return $this->validateAttribute($total); diff --git a/app/code/Magento/SalesRule/Setup/InstallSchema.php b/app/code/Magento/SalesRule/Setup/InstallSchema.php deleted file mode 100644 index e49933c211d20..0000000000000 --- a/app/code/Magento/SalesRule/Setup/InstallSchema.php +++ /dev/null @@ -1,794 +0,0 @@ -startSetup(); - $customerGroupTable = $setup->getConnection()->describeTable($setup->getTable('customer_group')); - $customerGroupIdType = $customerGroupTable['customer_group_id']['DATA_TYPE'] == 'int' - ? \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER : $customerGroupTable['customer_group_id']['DATA_TYPE']; - /** - * Create table 'salesrule' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule') - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule Id' - )->addColumn( - 'name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Name' - )->addColumn( - 'description', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Description' - )->addColumn( - 'from_date', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - ['nullable' => true, 'default' => null], - 'From' - )->addColumn( - 'to_date', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - ['nullable' => true, 'default' => null], - 'To' - )->addColumn( - 'uses_per_customer', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Uses Per Customer' - )->addColumn( - 'is_active', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false, 'default' => '0'], - 'Is Active' - )->addColumn( - 'conditions_serialized', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '2M', - [], - 'Conditions Serialized' - )->addColumn( - 'actions_serialized', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '2M', - [], - 'Actions Serialized' - )->addColumn( - 'stop_rules_processing', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false, 'default' => '1'], - 'Stop Rules Processing' - )->addColumn( - 'is_advanced', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '1'], - 'Is Advanced' - )->addColumn( - 'product_ids', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - '64k', - [], - 'Product Ids' - )->addColumn( - 'sort_order', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Sort Order' - )->addColumn( - 'simple_action', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Simple Action' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Discount Amount' - )->addColumn( - 'discount_qty', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - [], - 'Discount Qty' - )->addColumn( - 'discount_step', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Discount Step' - )->addColumn( - 'apply_to_shipping', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Apply To Shipping' - )->addColumn( - 'times_used', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Times Used' - )->addColumn( - 'is_rss', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false, 'default' => '0'], - 'Is Rss' - )->addColumn( - 'coupon_type', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '1'], - 'Coupon Type' - )->addColumn( - 'use_auto_generation', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => false, 'nullable' => false, 'default' => 0], - 'Use Auto Generation' - )->addColumn( - 'uses_per_coupon', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => 0], - 'User Per Coupon' - )->addIndex( - $installer->getIdxName('salesrule', ['is_active', 'sort_order', 'to_date', 'from_date']), - ['is_active', 'sort_order', 'to_date', 'from_date'] - )->setComment( - 'Salesrule' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_coupon' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_coupon') - )->addColumn( - 'coupon_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Coupon Id' - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Rule Id' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Code' - )->addColumn( - 'usage_limit', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Usage Limit' - )->addColumn( - 'usage_per_customer', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Usage Per Customer' - )->addColumn( - 'times_used', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Times Used' - )->addColumn( - 'expiration_date', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - [], - 'Expiration Date' - )->addColumn( - 'is_primary', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Is Primary' - )->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => true], - 'Coupon Code Creation Date' - )->addColumn( - 'type', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => true, 'default' => 0], - 'Coupon Code Type' - )->addIndex( - $installer->getIdxName( - 'salesrule_coupon', - ['code'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['code'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName( - 'salesrule_coupon', - ['rule_id', 'is_primary'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['rule_id', 'is_primary'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('salesrule_coupon', ['rule_id']), - ['rule_id'] - )->addForeignKey( - $installer->getFkName('salesrule_coupon', 'rule_id', 'salesrule', 'rule_id'), - 'rule_id', - $installer->getTable('salesrule'), - 'rule_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Salesrule Coupon' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_coupon_usage' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_coupon_usage') - )->addColumn( - 'coupon_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Coupon Id' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Customer Id' - )->addColumn( - 'times_used', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Times Used' - )->addIndex( - $installer->getIdxName('salesrule_coupon_usage', ['customer_id']), - ['customer_id'] - )->addForeignKey( - $installer->getFkName('salesrule_coupon_usage', 'coupon_id', 'salesrule_coupon', 'coupon_id'), - 'coupon_id', - $installer->getTable('salesrule_coupon'), - 'coupon_id', - \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 - )->setComment( - 'Salesrule Coupon Usage' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_customer' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_customer') - )->addColumn( - 'rule_customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule Customer Id' - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Rule Id' - )->addColumn( - 'customer_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Customer Id' - )->addColumn( - 'times_used', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Times Used' - )->addIndex( - $installer->getIdxName('salesrule_customer', ['rule_id', 'customer_id']), - ['rule_id', 'customer_id'] - )->addIndex( - $installer->getIdxName('salesrule_customer', ['customer_id', 'rule_id']), - ['customer_id', 'rule_id'] - )->addForeignKey( - $installer->getFkName('salesrule_customer', 'customer_id', 'customer_entity', 'entity_id'), - 'customer_id', - $installer->getTable('customer_entity'), - 'entity_id', - \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 - )->setComment( - 'Salesrule Customer' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_label' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_label') - )->addColumn( - 'label_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Label Id' - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'Rule Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false], - 'Store Id' - )->addColumn( - 'label', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Label' - )->addIndex( - $installer->getIdxName( - 'salesrule_label', - ['rule_id', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['rule_id', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('salesrule_label', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('salesrule_label', 'rule_id', 'salesrule', 'rule_id'), - 'rule_id', - $installer->getTable('salesrule'), - 'rule_id', - \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 - )->setComment( - 'Salesrule Label' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_product_attribute' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_product_attribute') - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule Id' - )->addColumn( - 'website_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Website Id' - )->addColumn( - 'customer_group_id', - $customerGroupIdType, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Customer Group Id' - )->addColumn( - 'attribute_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Attribute Id' - )->addIndex( - $installer->getIdxName('salesrule_product_attribute', ['website_id']), - ['website_id'] - )->addIndex( - $installer->getIdxName('salesrule_product_attribute', ['customer_group_id']), - ['customer_group_id'] - )->addIndex( - $installer->getIdxName('salesrule_product_attribute', ['attribute_id']), - ['attribute_id'] - )->addForeignKey( - $installer->getFkName('salesrule_product_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'), - 'attribute_id', - $installer->getTable('eav_attribute'), - 'attribute_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName( - 'salesrule_product_attribute', - 'customer_group_id', - 'customer_group', - 'customer_group_id' - ), - 'customer_group_id', - $installer->getTable('customer_group'), - 'customer_group_id', - \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 - )->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 - )->setComment( - 'Salesrule Product Attribute' - ); - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_coupon_aggregated' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_coupon_aggregated') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - ['nullable' => false], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'coupon_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Coupon Code' - )->addColumn( - 'coupon_uses', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Coupon Uses' - )->addColumn( - 'subtotal_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Subtotal Amount' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Discount Amount' - )->addColumn( - 'total_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Total Amount' - )->addColumn( - 'subtotal_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Subtotal Amount Actual' - )->addColumn( - 'discount_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Discount Amount Actual' - )->addColumn( - 'total_amount_actual', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Total Amount Actual' - )->addColumn( - 'rule_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Rule Name' - )->addIndex( - $installer->getIdxName( - 'salesrule_coupon_aggregated', - ['period', 'store_id', 'order_status', 'coupon_code'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status', 'coupon_code'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('salesrule_coupon_aggregated', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('salesrule_coupon_aggregated', ['rule_name']), - ['rule_name'] - )->addForeignKey( - $installer->getFkName('salesrule_coupon_aggregated', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Coupon Aggregated' - ); - $installer->getConnection()->createTable($table); - - $installer->getConnection()->createTable( - $installer->getConnection()->createTableByDdl( - $installer->getTable('salesrule_coupon_aggregated'), - $installer->getTable('salesrule_coupon_aggregated_updated') - ) - ); - - /** - * Create table 'salesrule_coupon_aggregated_order' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('salesrule_coupon_aggregated_order') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - ['nullable' => false], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Order Status' - )->addColumn( - 'coupon_code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - [], - 'Coupon Code' - )->addColumn( - 'coupon_uses', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'default' => '0'], - 'Coupon Uses' - )->addColumn( - 'subtotal_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Subtotal Amount' - )->addColumn( - 'discount_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Discount Amount' - )->addColumn( - 'total_amount', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - [12, 4], - ['nullable' => false, 'default' => '0.0000'], - 'Total Amount' - )->addColumn( - 'rule_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Rule Name' - )->addIndex( - $installer->getIdxName( - 'salesrule_coupon_aggregated_order', - ['period', 'store_id', 'order_status', 'coupon_code'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['period', 'store_id', 'order_status', 'coupon_code'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('salesrule_coupon_aggregated_order', ['store_id']), - ['store_id'] - )->addIndex( - $installer->getIdxName('salesrule_coupon_aggregated_order', ['rule_name']), - ['rule_name'] - )->addForeignKey( - $installer->getFkName('salesrule_coupon_aggregated_order', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Coupon Aggregated Order' - ); - $installer->getConnection()->createTable($table); - - $websitesTable = $installer->getTable('store_website'); - $customerGroupsTable = $installer->getTable('customer_group'); - $rulesWebsitesTable = $installer->getTable('salesrule_website'); - $rulesCustomerGroupsTable = $installer->getTable('salesrule_customer_group'); - - /** - * Create table 'salesrule_website' if not exists. This table will be used instead of - * column website_ids of main catalog rules table - */ - $table = $installer->getConnection()->newTable( - $rulesWebsitesTable - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule Id' - )->addColumn( - 'website_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Website Id' - )->addIndex( - $installer->getIdxName('salesrule_website', ['website_id']), - ['website_id'] - )->addForeignKey( - $installer->getFkName('salesrule_website', 'rule_id', 'salesrule', 'rule_id'), - 'rule_id', - $installer->getTable('salesrule'), - 'rule_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName('salesrule_website', 'website_id', 'store_website', 'website_id'), - 'website_id', - $websitesTable, - 'website_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Rules To Websites Relations' - ); - - $installer->getConnection()->createTable($table); - - /** - * Create table 'salesrule_customer_group' if not exists. This table will be used instead of - * column customer_group_ids of main catalog rules table - */ - $table = $installer->getConnection()->newTable( - $rulesCustomerGroupsTable - )->addColumn( - 'rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Rule Id' - )->addColumn( - 'customer_group_id', - $customerGroupIdType, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => true], - 'Customer Group Id' - )->addIndex( - $installer->getIdxName('salesrule_customer_group', ['customer_group_id']), - ['customer_group_id'] - )->addForeignKey( - $installer->getFkName('salesrule_customer_group', 'rule_id', 'salesrule', 'rule_id'), - 'rule_id', - $installer->getTable('salesrule'), - 'rule_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName( - 'salesrule_customer_group', - 'customer_group_id', - 'customer_group', - 'customer_group_id' - ), - 'customer_group_id', - $customerGroupsTable, - 'customer_group_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Sales Rules To Customer Groups Relations' - ); - - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php b/app/code/Magento/SalesRule/Setup/UpgradeSchema.php deleted file mode 100644 index c39536d121064..0000000000000 --- a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php +++ /dev/null @@ -1,53 +0,0 @@ -startSetup(); - - if (version_compare($context->getVersion(), '2.0.1', '<')) { - $this->addDefaultValueForDiscountStep($setup); - } - - $setup->endSetup(); - } - - /** - * Add default value of 0 for the discount step column - * @param SchemaSetupInterface $setup - * @return void - */ - private function addDefaultValueForDiscountStep(SchemaSetupInterface $setup) - { - $connection = $setup->getConnection(); - $connection->modifyColumn( - $setup->getTable('salesrule'), - 'discount_step', - [ - 'type' => Table::TYPE_INTEGER, - 'unsigned' => true, - 'nullable' => false, - 'default' => '0', - 'comment' => 'Discount Step', - ] - ); - } -} diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml new file mode 100644 index 0000000000000..ed205d88d9a2d --- /dev/null +++ b/app/code/Magento/SalesRule/etc/db_schema.xml @@ -0,0 +1,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/SalesRule/etc/db_schema_whitelist.json b/app/code/Magento/SalesRule/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..e72a0c687331a --- /dev/null +++ b/app/code/Magento/SalesRule/etc/db_schema_whitelist.json @@ -0,0 +1,230 @@ +{ + "salesrule": { + "column": { + "rule_id": true, + "name": true, + "description": true, + "from_date": true, + "to_date": true, + "uses_per_customer": true, + "is_active": true, + "conditions_serialized": true, + "actions_serialized": true, + "stop_rules_processing": true, + "is_advanced": true, + "product_ids": true, + "sort_order": true, + "simple_action": true, + "discount_amount": true, + "discount_qty": true, + "discount_step": true, + "apply_to_shipping": true, + "times_used": true, + "is_rss": true, + "coupon_type": true, + "use_auto_generation": true, + "uses_per_coupon": true + }, + "index": { + "SALESRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE": true + }, + "constraint": { + "PRIMARY": true + } + }, + "salesrule_coupon": { + "column": { + "coupon_id": true, + "rule_id": true, + "code": true, + "usage_limit": true, + "usage_per_customer": true, + "times_used": true, + "expiration_date": true, + "is_primary": true, + "created_at": true, + "type": true + }, + "index": { + "SALESRULE_COUPON_RULE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_COUPON_RULE_ID_SALESRULE_RULE_ID": true, + "SALESRULE_COUPON_CODE": true, + "SALESRULE_COUPON_RULE_ID_IS_PRIMARY": true + } + }, + "salesrule_coupon_usage": { + "column": { + "coupon_id": true, + "customer_id": true, + "times_used": true + }, + "index": { + "SALESRULE_COUPON_USAGE_CUSTOMER_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_COUPON_USAGE_COUPON_ID_SALESRULE_COUPON_COUPON_ID": true, + "SALESRULE_COUPON_USAGE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true + } + }, + "salesrule_customer": { + "column": { + "rule_customer_id": true, + "rule_id": true, + "customer_id": true, + "times_used": true + }, + "index": { + "SALESRULE_CUSTOMER_RULE_ID_CUSTOMER_ID": true, + "SALESRULE_CUSTOMER_CUSTOMER_ID_RULE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_CUSTOMER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true, + "SALESRULE_CUSTOMER_RULE_ID_SALESRULE_RULE_ID": true + } + }, + "salesrule_label": { + "column": { + "label_id": true, + "rule_id": true, + "store_id": true, + "label": true + }, + "index": { + "SALESRULE_LABEL_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_LABEL_RULE_ID_SALESRULE_RULE_ID": true, + "SALESRULE_LABEL_STORE_ID_STORE_STORE_ID": true, + "SALESRULE_LABEL_RULE_ID_STORE_ID": true + } + }, + "salesrule_product_attribute": { + "column": { + "rule_id": true, + "website_id": true, + "customer_group_id": true, + "attribute_id": true + }, + "index": { + "SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID": true, + "SALESRULE_PRODUCT_ATTRIBUTE_CUSTOMER_GROUP_ID": true, + "SALESRULE_PRODUCT_ATTRIBUTE_ATTRIBUTE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_PRD_ATTR_ATTR_ID_EAV_ATTR_ATTR_ID": true, + "SALESRULE_PRD_ATTR_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true, + "SALESRULE_PRODUCT_ATTRIBUTE_RULE_ID_SALESRULE_RULE_ID": true, + "SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true + } + }, + "salesrule_coupon_aggregated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "coupon_code": true, + "coupon_uses": true, + "subtotal_amount": true, + "discount_amount": true, + "total_amount": true, + "subtotal_amount_actual": true, + "discount_amount_actual": true, + "total_amount_actual": true, + "rule_name": true + }, + "index": { + "SALESRULE_COUPON_AGGREGATED_STORE_ID": true, + "SALESRULE_COUPON_AGGREGATED_RULE_NAME": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_COUPON_AGGREGATED_STORE_ID_STORE_STORE_ID": true, + "SALESRULE_COUPON_AGGRED_PERIOD_STORE_ID_ORDER_STS_COUPON_CODE": true + } + }, + "salesrule_coupon_aggregated_updated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "coupon_code": true, + "coupon_uses": true, + "subtotal_amount": true, + "discount_amount": true, + "total_amount": true, + "subtotal_amount_actual": true, + "discount_amount_actual": true, + "total_amount_actual": true, + "rule_name": true + }, + "index": { + "SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID": true, + "SALESRULE_COUPON_AGGREGATED_UPDATED_RULE_NAME": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true, + "UNQ_7196FA120A4F0F84E1B66605E87E213E": true + } + }, + "salesrule_coupon_aggregated_order": { + "column": { + "id": true, + "period": true, + "store_id": true, + "order_status": true, + "coupon_code": true, + "coupon_uses": true, + "subtotal_amount": true, + "discount_amount": true, + "total_amount": true, + "rule_name": true + }, + "index": { + "SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID": true, + "SALESRULE_COUPON_AGGREGATED_ORDER_RULE_NAME": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true, + "UNQ_1094D1FBBCBB11704A29DEF3ACC37D2B": true + } + }, + "salesrule_website": { + "column": { + "rule_id": true, + "website_id": true + }, + "index": { + "SALESRULE_WEBSITE_WEBSITE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_WEBSITE_RULE_ID_SALESRULE_RULE_ID": true, + "SALESRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true + } + }, + "salesrule_customer_group": { + "column": { + "rule_id": true, + "customer_group_id": true + }, + "index": { + "SALESRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID": true + }, + "constraint": { + "PRIMARY": true, + "SALESRULE_CUSTOMER_GROUP_RULE_ID_SALESRULE_RULE_ID": true, + "SALESRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html index 7246460382fa7..d622b5ea5762d 100644 --- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html +++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html @@ -27,7 +27,7 @@ id="discount-code" name="discount_code" data-validate="{'required-entry':true}" - data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " /> + data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
    diff --git a/app/code/Magento/SalesSequence/Setup/InstallSchema.php b/app/code/Magento/SalesSequence/Setup/InstallSchema.php deleted file mode 100644 index a73d892b5ea2a..0000000000000 --- a/app/code/Magento/SalesSequence/Setup/InstallSchema.php +++ /dev/null @@ -1,156 +0,0 @@ -startSetup(); - /** - * Create table 'sales_sequence_profile' - */ - $table = $installer->getConnection(self::$connectionName)->newTable( - $installer->getTable('sales_sequence_profile', self::$connectionName) - )->addColumn( - 'profile_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'meta_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false] - )->addColumn( - 'prefix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => true, 'primary' => false], - 'Prefix' - )->addColumn( - 'suffix', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => true, 'primary' => false], - 'Suffix' - )->addColumn( - 'start_value', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'unsigned' => true, 'primary' => false, 'default' => 1], - 'Start value for sequence' - )->addColumn( - 'step', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'unsigned' => true, 'primary' => false, 'default' => 1], - 'Step for sequence' - )->addColumn( - 'max_value', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'unsigned' => true, 'primary' => false], - 'MaxValue for sequence' - )->addColumn( - 'warning_value', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'unsigned' => true, 'primary' => false], - 'WarningValue for sequence' - )->addColumn( - 'is_active', - \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN, - null, - ['nullable' => false, 'default' => 0], - 'isActive flag' - )->addIndex( - $installer->getIdxName( - 'sales_sequence_profile', - ['meta_id', 'prefix', 'suffix'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE, - '', - self::$connectionName - ), - ['meta_id', 'prefix', 'suffix'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addForeignKey( - $installer->getFkName( - 'sales_sequence_profile', - 'meta_id', - 'sales_sequence_meta', - 'meta_id', - self::$connectionName - ), - 'meta_id', - $installer->getTable('sales_sequence_meta', self::$connectionName), - 'meta_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ); - $installer->getConnection(self::$connectionName)->createTable($table); - - /** - * Create table 'sales_sequence_meta' - */ - $table = $installer->getConnection(self::$connectionName)->newTable( - $installer->getTable('sales_sequence_meta', self::$connectionName) - )->addColumn( - 'meta_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'entity_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false, 'primary' => false], - 'Prefix' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'primary' => false], - 'Store Id' - )->addColumn( - 'sequence_table', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false], - 'table for sequence' - )->addIndex( - $installer->getIdxName( - 'sales_sequence_meta', - ['entity_type', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE, - '', - self::$connectionName - ), - ['entity_type', 'store_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - ); - $installer->getConnection(self::$connectionName)->createTable($table); - $installer->endSetup(); - } -} diff --git a/app/code/Magento/SalesSequence/etc/db_schema.xml b/app/code/Magento/SalesSequence/etc/db_schema.xml new file mode 100644 index 0000000000000..1f63c1c93a18a --- /dev/null +++ b/app/code/Magento/SalesSequence/etc/db_schema.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json b/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..37a5d715ab024 --- /dev/null +++ b/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json @@ -0,0 +1,32 @@ +{ + "sales_sequence_profile": { + "column": { + "profile_id": true, + "meta_id": true, + "prefix": true, + "suffix": true, + "start_value": true, + "step": true, + "max_value": true, + "warning_value": true, + "is_active": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SEQUENCE_PROFILE_META_ID_SALES_SEQUENCE_META_META_ID": true, + "SALES_SEQUENCE_PROFILE_META_ID_PREFIX_SUFFIX": true + } + }, + "sales_sequence_meta": { + "column": { + "meta_id": true, + "entity_type": true, + "store_id": true, + "sequence_table": true + }, + "constraint": { + "PRIMARY": true, + "SALES_SEQUENCE_META_ENTITY_TYPE_STORE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php index f3ad8a39de00e..e813d7342761f 100644 --- a/app/code/Magento/Search/Helper/Data.php +++ b/app/code/Magento/Search/Helper/Data.php @@ -124,7 +124,7 @@ public function getSuggestUrl() { return $this->_getUrl( 'search/ajax/suggest', - ['_secure' => $this->storeManager->getStore()->isCurrentlySecure()] + ['_secure' => $this->_getRequest()->isSecure()] ); } diff --git a/app/code/Magento/Search/Setup/InstallSchema.php b/app/code/Magento/Search/Setup/InstallSchema.php deleted file mode 100644 index 5aba160381d0a..0000000000000 --- a/app/code/Magento/Search/Setup/InstallSchema.php +++ /dev/null @@ -1,138 +0,0 @@ -startSetup(); - - /** - * Create table 'search_query' - */ - $table = $installer->getConnection() - ->newTable($installer->getTable('search_query')) - ->addColumn( - 'query_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Query ID' - ) - ->addColumn( - 'query_text', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Query text' - ) - ->addColumn( - 'num_results', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Num results' - ) - ->addColumn( - 'popularity', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Popularity' - ) - ->addColumn( - 'redirect', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Redirect' - ) - ->addColumn( - 'synonym_for', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Synonym for' - ) - ->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store ID' - ) - ->addColumn( - 'display_in_terms', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false, 'default' => '1'], - 'Display in terms' - ) - ->addColumn( - 'is_active', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['default' => '1'], - 'Active status' - ) - ->addColumn( - 'is_processed', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['default' => '0'], - 'Processed status' - ) - ->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Updated at' - ) - ->addIndex( - $installer->getIdxName('search_query', ['query_text', 'store_id', 'popularity']), - ['query_text', 'store_id', 'popularity'] - ) - ->addIndex( - $installer->getIdxName('search_query', 'store_id'), - 'store_id' - ) - ->addIndex( - $installer->getIdxName('search_query', 'is_processed'), - 'is_processed' - ) - ->addIndex( - $installer->getIdxName('search_query', 'synonym_for'), - 'synonym_for' - ) - ->addForeignKey( - $installer->getFkName('search_query', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->setComment('Search query table'); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Search/Setup/UpgradeSchema.php b/app/code/Magento/Search/Setup/UpgradeSchema.php deleted file mode 100644 index ba725d968ca33..0000000000000 --- a/app/code/Magento/Search/Setup/UpgradeSchema.php +++ /dev/null @@ -1,176 +0,0 @@ -getConnection(); - if (version_compare($context->getVersion(), '2.0.1') < 0) { - $connection->dropIndex( - $setup->getTable('search_query'), - $installer->getIdxName('search_query', ['query_text', 'store_id']) - ); - $connection->addIndex( - $setup->getTable('search_query'), - $installer->getIdxName( - 'search_query', - ['query_text', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['query_text', 'store_id'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ); - } - - if (version_compare($context->getVersion(), '2.0.2') < 0) { - /** - * Create table 'search_synonyms' - */ - $table = $connection - ->newTable($installer->getTable('search_synonyms')) - ->addColumn( - 'group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Synonyms Group Id' - ) - ->addColumn( - 'synonyms', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 65535, - ['nullable' => false], - 'list of synonyms making up this group' - ) - ->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store Id - identifies the store view these synonyms belong to' - ) - ->addIndex( - $setup->getIdxName( - $installer->getTable('search_synonyms'), - ['synonyms'], - AdapterInterface::INDEX_TYPE_FULLTEXT - ), - ['synonyms'], - ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT] - ) - ->addIndex( - $installer->getIdxName('search_synonyms', 'store_id'), - ['store_id'], - ['type' => AdapterInterface::INDEX_TYPE_INDEX] - ) - ->addForeignKey( - $installer->getFkName('search_synonyms', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->setComment('table storing various synonyms groups per store view'); - - $connection->createTable($table); - } - - if (version_compare($context->getVersion(), '2.0.3') < 0) { - // Drop and recreate 'search_synonyms' table - $connection->dropTable($installer->getTable('search_synonyms')); - - $table = $connection - ->newTable($installer->getTable('search_synonyms')) - ->addColumn( - 'group_id', - \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Synonyms Group Id' - ) - ->addColumn( - 'synonyms', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 65535, - ['nullable' => false], - 'list of synonyms making up this group' - ) - ->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store Id - identifies the store view these synonyms belong to' - ) - ->addColumn( - 'website_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Website Id - identifies the website id these synonyms belong to' - ) - ->addIndex( - $setup->getIdxName( - $installer->getTable('search_synonyms'), - ['synonyms'], - AdapterInterface::INDEX_TYPE_FULLTEXT - ), - ['synonyms'], - ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT] - ) - ->addIndex( - $installer->getIdxName('search_synonyms', 'store_id'), - ['store_id'], - ['type' => AdapterInterface::INDEX_TYPE_INDEX] - ) - ->addIndex( - $installer->getIdxName('search_synonyms', 'website_id'), - ['website_id'], - ['type' => AdapterInterface::INDEX_TYPE_INDEX] - ) - ->addForeignKey( - $installer->getFkName('search_synonyms', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->addForeignKey( - $installer->getFkName('search_synonyms', 'website_id', 'store_website', 'website_id'), - 'website_id', - $installer->getTable('store_website'), - 'website_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->setComment('table storing various synonyms groups'); - - $connection->createTable($table); - } - - if (version_compare($context->getVersion(), '2.0.4') < 0) { - $connection->dropIndex( - $setup->getTable('search_query'), - $installer->getIdxName('search_query', 'synonym_for') - ); - $connection->dropColumn($setup->getTable('search_query'), 'synonym_for'); - } - } -} diff --git a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php index 5cfde7e8efda9..291362734feff 100644 --- a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php +++ b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Search\Test\Unit\Helper; /** @@ -43,6 +44,11 @@ class DataTest extends \PHPUnit\Framework\TestCase */ protected $storeManagerMock; + /** + * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $urlBuilderMock; + protected function setUp() { $this->stringMock = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class); @@ -53,9 +59,14 @@ protected function setUp() ->disableOriginalConstructor() ->setMethods([]) ->getMock(); + $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class) + ->setMethods(['getUrl']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); $this->contextMock = $this->createMock(\Magento\Framework\App\Helper\Context::class); $this->contextMock->expects($this->any())->method('getScopeConfig')->willReturn($this->scopeConfigMock); $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock); + $this->contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock); $this->model = new \Magento\Search\Helper\Data( $this->contextMock, @@ -126,4 +137,39 @@ public function queryTextDataProvider() ['testtest', 7, 'testtes'], ]; } + + /** + * Test getSuggestUrl() take into consideration type of request(secure, non-secure). + * + * @dataProvider getSuggestUrlDataProvider + * @param bool $isSecure + * @return void + */ + public function testGetSuggestUrl(bool $isSecure) + { + $this->requestMock->expects(self::once()) + ->method('isSecure') + ->willReturn($isSecure); + $this->urlBuilderMock->expects(self::once()) + ->method('getUrl') + ->with(self::identicalTo('search/ajax/suggest'), self::identicalTo(['_secure' => $isSecure])); + $this->model->getSuggestUrl(); + } + + /** + * Provide test data for testGetSuggestUrl() test. + * + * @return array + */ + public function getSuggestUrlDataProvider() + { + return [ + 'non-secure' => [ + 'isSecure' => false, + ], + 'secure' => [ + 'secure' => true, + ], + ]; + } } diff --git a/app/code/Magento/Search/etc/db_schema.xml b/app/code/Magento/Search/etc/db_schema.xml new file mode 100644 index 0000000000000..54fac0778d469 --- /dev/null +++ b/app/code/Magento/Search/etc/db_schema.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Search/etc/db_schema_whitelist.json b/app/code/Magento/Search/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..72b417b976862 --- /dev/null +++ b/app/code/Magento/Search/etc/db_schema_whitelist.json @@ -0,0 +1,46 @@ +{ + "search_query": { + "column": { + "query_id": true, + "query_text": true, + "num_results": true, + "popularity": true, + "redirect": true, + "synonym_for": true, + "store_id": true, + "display_in_terms": true, + "is_active": true, + "is_processed": true, + "updated_at": true + }, + "index": { + "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": true, + "SEARCH_QUERY_STORE_ID": true, + "SEARCH_QUERY_IS_PROCESSED": true, + "SEARCH_QUERY_SYNONYM_FOR": true + }, + "constraint": { + "PRIMARY": true, + "SEARCH_QUERY_STORE_ID_STORE_STORE_ID": true, + "SEARCH_QUERY_QUERY_TEXT_STORE_ID": true + } + }, + "search_synonyms": { + "column": { + "group_id": true, + "synonyms": true, + "store_id": true, + "website_id": true + }, + "index": { + "SEARCH_SYNONYMS_SYNONYMS": true, + "SEARCH_SYNONYMS_STORE_ID": true, + "SEARCH_SYNONYMS_WEBSITE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SEARCH_SYNONYMS_STORE_ID_STORE_STORE_ID": true, + "SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml index c4297b404717c..2ea87be13d5e3 100644 --- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml +++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml @@ -9,7 +9,7 @@ helper('Magento\Search\Helper\Data'); +$helper = $this->helper(\Magento\Search\Helper\Data::class); ?>
    @@ -23,7 +23,7 @@ $helper = $this->helper('Magento\Search\Helper\Data'); $block->getRequest()->isSecure()]) ?>", + "url":"getSuggestUrl()?>", "destinationSelector":"#search_autocomplete"} }' type="text" diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js index 7b2c7003074cb..e8598f46eb5be 100644 --- a/app/code/Magento/Search/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -286,46 +286,50 @@ define([ $.getJSON(this.options.url, { q: value }, $.proxy(function (data) { - $.each(data, function (index, element) { - var html; - - element.index = index; - html = template({ - data: element + if (data.length) { + $.each(data, function (index, element) { + var html; + + element.index = index; + html = template({ + data: element + }); + dropdown.append(html); }); - dropdown.append(html); - }); - this.responseList.indexList = this.autoComplete.html(dropdown) - .css(clonePosition) - .show() - .find(this.options.responseFieldElements + ':visible'); - - this._resetResponseList(false); - this.element.removeAttr('aria-activedescendant'); - - if (this.responseList.indexList.length) { - this._updateAriaHasPopup(true); - } else { - this._updateAriaHasPopup(false); - } - this.responseList.indexList - .on('click', function (e) { - this.responseList.selected = $(e.currentTarget); - this.searchForm.trigger('submit'); - }.bind(this)) - .on('mouseenter mouseleave', function (e) { - this.responseList.indexList.removeClass(this.options.selectClass); - $(e.target).addClass(this.options.selectClass); - this.responseList.selected = $(e.target); - this.element.attr('aria-activedescendant', $(e.target).attr('id')); - }.bind(this)) - .on('mouseout', function (e) { - if (!this._getLastElement() && this._getLastElement().hasClass(this.options.selectClass)) { - $(e.target).removeClass(this.options.selectClass); - this._resetResponseList(false); - } - }.bind(this)); + this.responseList.indexList = this.autoComplete.html(dropdown) + .css(clonePosition) + .show() + .find(this.options.responseFieldElements + ':visible'); + + this._resetResponseList(false); + this.element.removeAttr('aria-activedescendant'); + + if (this.responseList.indexList.length) { + this._updateAriaHasPopup(true); + } else { + this._updateAriaHasPopup(false); + } + + this.responseList.indexList + .on('click', function (e) { + this.responseList.selected = $(e.currentTarget); + this.searchForm.trigger('submit'); + }.bind(this)) + .on('mouseenter mouseleave', function (e) { + this.responseList.indexList.removeClass(this.options.selectClass); + $(e.target).addClass(this.options.selectClass); + this.responseList.selected = $(e.target); + this.element.attr('aria-activedescendant', $(e.target).attr('id')); + }.bind(this)) + .on('mouseout', function (e) { + if (!this._getLastElement() && + this._getLastElement().hasClass(this.options.selectClass)) { + $(e.target).removeClass(this.options.selectClass); + this._resetResponseList(false); + } + }.bind(this)); + } }, this)); } else { this._resetResponseList(true); diff --git a/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php b/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php index efb5749ba16f0..334449d74d195 100644 --- a/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php +++ b/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php @@ -42,7 +42,7 @@ public function __construct( */ protected function _construct() { - $this->_init(\Magento\Security\Setup\InstallSchema::ADMIN_SESSIONS_DB_TABLE_NAME, 'id'); + $this->_init('admin_user_session', 'id'); } /** diff --git a/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php b/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php index e012ca9fe9bc3..ba1af428316d5 100644 --- a/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php +++ b/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php @@ -37,7 +37,7 @@ public function __construct( */ protected function _construct() { - $this->_init(\Magento\Security\Setup\InstallSchema::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, 'id'); + $this->_init('password_reset_request_event', 'id'); } /** diff --git a/app/code/Magento/Security/Setup/InstallSchema.php b/app/code/Magento/Security/Setup/InstallSchema.php deleted file mode 100644 index c66383d778d69..0000000000000 --- a/app/code/Magento/Security/Setup/InstallSchema.php +++ /dev/null @@ -1,172 +0,0 @@ -startSetup(); - - /** - * Create table 'admin_user_session' - */ - $table = $installer->getConnection() - ->newTable($installer->getTable(self::ADMIN_SESSIONS_DB_TABLE_NAME)) - ->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity ID' - ) - ->addColumn( - 'session_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 128, - ['nullable' => false], - 'Session id value' - ) - ->addColumn( - 'user_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => true], - 'Admin User ID' - ) - ->addColumn( - 'status', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '1'], - 'Current Session status' - ) - ->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Created Time' - ) - ->addColumn( - 'updated_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE], - 'Update Time' - ) - ->addColumn( - 'ip', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 15, - ['nullable' => false], - 'Remote user IP' - ) - ->addIndex( - $installer->getIdxName(self::ADMIN_SESSIONS_DB_TABLE_NAME, ['session_id']), - ['session_id'] - ) - ->addIndex( - $installer->getIdxName(self::ADMIN_SESSIONS_DB_TABLE_NAME, ['user_id']), - ['user_id'] - ) - ->addForeignKey( - $installer->getFkName( - self::ADMIN_SESSIONS_DB_TABLE_NAME, - 'user_id', - self::ADMIN_USER_DB_TABLE_NAME, - 'user_id' - ), - 'user_id', - $installer->getTable(self::ADMIN_USER_DB_TABLE_NAME), - 'user_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->setComment('Admin User sessions table'); - $installer->getConnection()->createTable($table); - - /** - * Create table 'password_reset_request_event' - */ - $table = $installer->getConnection() - ->newTable($installer->getTable(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME)) - ->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Entity ID' - ) - ->addColumn( - 'request_type', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false], - 'Type of the event under a security control' - ) - ->addColumn( - 'account_reference', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true, 'default' => null], - 'An identifier for existing account or another target' - ) - ->addColumn( - 'created_at', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT], - 'Timestamp when the event occurs' - ) - ->addColumn( - 'ip', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 15, - ['nullable' => false], - 'Remote user IP' - ) - ->addIndex( - $installer->getIdxName(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, ['account_reference']), - ['account_reference'] - ) - ->addIndex( - $installer->getIdxName(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, ['created_at']), - ['created_at'] - ) - ->setComment('Password Reset Request Event under a security control'); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Security/Setup/UpgradeSchema.php b/app/code/Magento/Security/Setup/UpgradeSchema.php deleted file mode 100644 index 4fdf12f672e94..0000000000000 --- a/app/code/Magento/Security/Setup/UpgradeSchema.php +++ /dev/null @@ -1,52 +0,0 @@ -startSetup(); - - if (version_compare($context->getVersion(), '2.0.1', '<')) { - $setup->getConnection()->changeColumn( - $setup->getTable(\Magento\Security\Setup\InstallSchema::ADMIN_SESSIONS_DB_TABLE_NAME), - 'ip', - 'ip', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 'length' => 15, - 'nullable' => false, - 'comment' => 'Remote user IP' - ] - ); - - $setup->getConnection()->changeColumn( - $setup->getTable(\Magento\Security\Setup\InstallSchema::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME), - 'ip', - 'ip', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 'length' => 15, - 'nullable' => false, - 'comment' => 'Remote user IP' - ] - ); - } - - $setup->endSetup(); - } -} diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json index 3c47d086f33d7..e9b646cc5ca76 100644 --- a/app/code/Magento/Security/composer.json +++ b/app/code/Magento/Security/composer.json @@ -8,7 +8,8 @@ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", - "magento/module-store": "100.3.*" + "magento/module-store": "100.3.*", + "magento/module-user": "100.3.*" }, "suggest": { "magento/module-customer": "100.3.*" diff --git a/app/code/Magento/Security/etc/db_schema.xml b/app/code/Magento/Security/etc/db_schema.xml new file mode 100644 index 0000000000000..017cdd551dc8a --- /dev/null +++ b/app/code/Magento/Security/etc/db_schema.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Security/etc/db_schema_whitelist.json b/app/code/Magento/Security/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..c9115aed6fb82 --- /dev/null +++ b/app/code/Magento/Security/etc/db_schema_whitelist.json @@ -0,0 +1,37 @@ +{ + "admin_user_session": { + "column": { + "id": true, + "session_id": true, + "user_id": true, + "status": true, + "created_at": true, + "updated_at": true, + "ip": true + }, + "index": { + "ADMIN_USER_SESSION_SESSION_ID": true, + "ADMIN_USER_SESSION_USER_ID": true + }, + "constraint": { + "PRIMARY": true, + "ADMIN_USER_SESSION_USER_ID_ADMIN_USER_USER_ID": true + } + }, + "password_reset_request_event": { + "column": { + "id": true, + "request_type": true, + "account_reference": true, + "created_at": true, + "ip": true + }, + "index": { + "PASSWORD_RESET_REQUEST_EVENT_ACCOUNT_REFERENCE": true, + "PASSWORD_RESET_REQUEST_EVENT_CREATED_AT": true + }, + "constraint": { + "PRIMARY": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/SendFriend/Setup/InstallSchema.php b/app/code/Magento/SendFriend/Setup/InstallSchema.php deleted file mode 100644 index 0e5db032da32e..0000000000000 --- a/app/code/Magento/SendFriend/Setup/InstallSchema.php +++ /dev/null @@ -1,66 +0,0 @@ -startSetup(); - - $table = $installer->getConnection()->newTable( - $installer->getTable('sendfriend_log') - )->addColumn( - 'log_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Log ID' - )->addColumn( - 'ip', - \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT, - '20', - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Customer IP address' - )->addColumn( - 'time', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Log time' - )->addColumn( - 'website_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Website ID' - )->addIndex( - $installer->getIdxName('sendfriend_log', 'ip'), - 'ip' - )->addIndex( - $installer->getIdxName('sendfriend_log', 'time'), - 'time' - )->setComment( - 'Send to friend function log storage table' - ); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/SendFriend/etc/db_schema.xml b/app/code/Magento/SendFriend/etc/db_schema.xml new file mode 100644 index 0000000000000..f3c0fb8d06e8f --- /dev/null +++ b/app/code/Magento/SendFriend/etc/db_schema.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/SendFriend/etc/db_schema_whitelist.json b/app/code/Magento/SendFriend/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..eebb79747432c --- /dev/null +++ b/app/code/Magento/SendFriend/etc/db_schema_whitelist.json @@ -0,0 +1,17 @@ +{ + "sendfriend_log": { + "column": { + "log_id": true, + "ip": true, + "time": true, + "website_id": true + }, + "index": { + "SENDFRIEND_LOG_IP": true, + "SENDFRIEND_LOG_TIME": true + }, + "constraint": { + "PRIMARY": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php index 5520bae0e26a8..4804efcc76ecc 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php @@ -108,6 +108,7 @@ public function execute() } $isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label']; + $responseAjax = new \Magento\Framework\DataObject(); try { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); @@ -143,7 +144,6 @@ public function execute() $shipment->register(); $shipment->getOrder()->setCustomerNoteNotify(!empty($data['send_email'])); - $responseAjax = new \Magento\Framework\DataObject(); if ($isNeedCreateLabel) { $this->labelGenerator->create($shipment, $this->_request); diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php index c2535336495f7..835454389cf7a 100644 --- a/app/code/Magento/Shipping/Helper/Data.php +++ b/app/code/Magento/Shipping/Helper/Data.php @@ -9,6 +9,10 @@ */ namespace Magento\Shipping\Helper; +use Magento\Framework\App\ObjectManager; +use Magento\Framework\UrlInterface; +use Magento\Store\Model\StoreManagerInterface; + class Data extends \Magento\Framework\App\Helper\AbstractHelper { /** @@ -19,19 +23,28 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper protected $_allowedHashKeys = ['ship_id', 'order_id', 'track_id']; /** - * @var \Magento\Store\Model\StoreManagerInterface + * @var StoreManagerInterface */ protected $_storeManager; + /** + * @var UrlInterface|null + */ + private $url; + /** * @param \Magento\Framework\App\Helper\Context $context - * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param StoreManagerInterface $storeManager + * @param UrlInterface|null $url */ public function __construct( \Magento\Framework\App\Helper\Context $context, - \Magento\Store\Model\StoreManagerInterface $storeManager + StoreManagerInterface $storeManager, + UrlInterface $url = null ) { $this->_storeManager = $storeManager; + $this->url = $url ?: ObjectManager::getInstance()->get(UrlInterface::class); + parent::__construct($context); } @@ -63,12 +76,13 @@ protected function _getTrackingUrl($key, $model, $method = 'getId') { $urlPart = "{$key}:{$model->{$method}()}:{$model->getProtectCode()}"; $params = [ + '_scope' => $model->getStoreId(), + '_nosid' => true, '_direct' => 'shipping/tracking/popup', '_query' => ['hash' => $this->urlEncoder->encode($urlPart)] ]; - $storeModel = $this->_storeManager->getStore($model->getStoreId()); - return $storeModel->getUrl('', $params); + return $this->url->getUrl('', $params); } /** diff --git a/app/code/Magento/Shipping/etc/adminhtml/di.xml b/app/code/Magento/Shipping/etc/adminhtml/di.xml index 54d5d9664e66f..36bd1ae9d3505 100644 --- a/app/code/Magento/Shipping/etc/adminhtml/di.xml +++ b/app/code/Magento/Shipping/etc/adminhtml/di.xml @@ -7,4 +7,11 @@ --> + + + + + Magento\Framework\Url + + diff --git a/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js b/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js deleted file mode 100644 index f46ad4192d170..0000000000000 --- a/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ - -define([ - 'jquery', - 'Magento_Ui/js/modal/modal', - 'mage/translate' -], function ($, modal, $t) { - 'use strict'; - - return function (config, element) { - config.buttons = [ - { - text: $t('Print'), - 'class': 'action action-primary', - - /** - * Click handler - */ - click: function () { - window.location.href = this.options.url; - } - }, { - text: $t('Cancel'), - 'class': 'action action-secondary', - - /** - * Click handler - */ - click: function () { - this.closeModal(); - } - } - ]; - modal(config, element); - }; -}); diff --git a/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php new file mode 100644 index 0000000000000..f7611660b93a1 --- /dev/null +++ b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php @@ -0,0 +1,29 @@ +caseManagement = $caseManagement; + + parent::__construct($context, $data); + } + + /** + * Gets case entity associated with order id. + * + * @return CaseInterface|null + */ + private function getCaseEntity() + { + if ($this->caseEntity === false) { + $this->caseEntity = $this->caseManagement->getByOrderId( + $this->getOrderId() + ); + } + + return $this->caseEntity; + } + + /** + * Default getter for case properties + * + * @param mixed $defaultValue + * @param callable $callback + * @return mixed + */ + private function getCaseProperty($defaultValue, callable $callback) + { + return $this->isEmptyCase() ? $defaultValue : call_user_func($callback); + } + + /** + * Checks if case is exists for order + * + * @return bool + * @since 100.2.0 + */ + public function isEmptyCase() + { + return $this->getCaseEntity() === null; + } + + /** + * Gets case guarantee disposition status. + * + * @return string + * @since 100.2.0 + */ + public function getCaseGuaranteeDisposition() + { + return $this->getCaseProperty('', function () { + $guaranteeStatusMap = [ + CaseInterface::GUARANTEE_APPROVED => __('Approved'), + CaseInterface::GUARANTEE_DECLINED => __('Declined'), + CaseInterface::GUARANTEE_PENDING => __('Pending'), + CaseInterface::GUARANTEE_CANCELED => __('Canceled'), + CaseInterface::GUARANTEE_IN_REVIEW => __('In Review'), + CaseInterface::GUARANTEE_UNREQUESTED => __('Unrequested') + ]; + + $status = isset($guaranteeStatusMap[$this->getCaseEntity()->getGuaranteeDisposition()]) ? + $guaranteeStatusMap[$this->getCaseEntity()->getGuaranteeDisposition()] : + ''; + + return $status; + }); + } + + /** + * Retrieves current order Id. + * + * @return integer + */ + private function getOrderId() + { + return (int) $this->getRequest()->getParam('order_id'); + } +} diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php new file mode 100644 index 0000000000000..7964d6b1af397 --- /dev/null +++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php @@ -0,0 +1,60 @@ +getOriginalData(); + if (!empty($originalData['handler_url'])) { + $url = $this->getStoreUrl(); + $url .= $originalData['handler_url']; + } + + return '

    ' . $this->escapeHtml($url) . '

    '; + } + + /** + * @inheritdoc + */ + protected function _isInheritCheckboxRequired(AbstractElement $element) + { + return false; + } + + /** + * Return base store URL. + * + * @return string + */ + private function getStoreUrl() + { + $website = $this->_storeManager->getWebsite($this->getRequest()->getParam('website')); + + $isSecure = $this->_scopeConfig->isSetFlag( + Store::XML_PATH_SECURE_IN_FRONTEND, + ScopeInterface::SCOPE_WEBSITE, + $website->getCode() + ); + + $configPath = $isSecure ? Store::XML_PATH_SECURE_BASE_LINK_URL : Store::XML_PATH_UNSECURE_BASE_LINK_URL; + + return $this->_scopeConfig->getValue($configPath, ScopeInterface::SCOPE_WEBSITE, $website->getCode()); + } +} diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php new file mode 100644 index 0000000000000..c18c3dc596e21 --- /dev/null +++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php @@ -0,0 +1,31 @@ +getGroup(); + + if (!empty($groupConfig['more_url']) && !empty($element->getComment())) { + $comment = $element->getComment(); + $comment .= '

    ' . + $this->escapeHtml(__('Learn more')) . '

    '; + $element->setComment($comment); + } + + return parent::_getHeaderCommentHtml($element); + } +} diff --git a/app/code/Magento/Signifyd/Block/Fingerprint.php b/app/code/Magento/Signifyd/Block/Fingerprint.php new file mode 100644 index 0000000000000..7afa092b3d0da --- /dev/null +++ b/app/code/Magento/Signifyd/Block/Fingerprint.php @@ -0,0 +1,90 @@ +signifydOrderSessionId = $signifydOrderSessionId; + $this->config = $config; + $this->quoteSession = $quoteSession; + } + + /** + * Returns a unique Signifyd order session id. + * + * @return string + * @since 100.2.0 + */ + public function getSignifydOrderSessionId() + { + $quoteId = $this->quoteSession->getQuote()->getId(); + + return $this->signifydOrderSessionId->get($quoteId); + } + + /** + * Checks if module is enabled. + * + * @return boolean + * @since 100.2.0 + */ + public function isModuleActive() + { + return $this->config->isActive(); + } +} diff --git a/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php new file mode 100644 index 0000000000000..12bd773d35a2f --- /dev/null +++ b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php @@ -0,0 +1,139 @@ +webhookRequest = $webhookRequest; + $this->logger = $logger; + $this->webhookMessageReader = $webhookMessageReader; + $this->caseUpdatingServiceFactory = $caseUpdatingServiceFactory; + $this->webhookRequestValidator = $webhookRequestValidator; + $this->caseRepository = $caseRepository; + $this->config = $config; + } + + /** + * Processes webhook request data and updates case entity + * + * @return void + */ + public function execute() + { + if ($this->config->isDebugModeEnabled()) { + $this->logger->debug($this->webhookRequest->getEventTopic() . '|' . $this->webhookRequest->getBody()); + } + + if (!$this->webhookRequestValidator->validate($this->webhookRequest)) { + $this->_redirect('noroute'); + return; + } + + $webhookMessage = $this->webhookMessageReader->read($this->webhookRequest); + if ($webhookMessage->getEventTopic() === self::$eventTopicTest) { + return; + } + + $data = $webhookMessage->getData(); + if (empty($data['caseId'])) { + $this->_redirect('noroute'); + return; + } + + $case = $this->caseRepository->getByCaseId($data['caseId']); + if ($case === null) { + $this->_redirect('noroute'); + return; + } + + $caseUpdatingService = $this->caseUpdatingServiceFactory->create($webhookMessage->getEventTopic()); + try { + $caseUpdatingService->update($case, $data); + } catch (LocalizedException $e) { + $this->getResponse()->setHttpResponseCode(400); + $this->logger->critical($e); + } + } +} diff --git a/app/code/Magento/Signifyd/LICENSE.txt b/app/code/Magento/Signifyd/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/Signifyd/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/Signifyd/LICENSE_AFL.txt b/app/code/Magento/Signifyd/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/Signifyd/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/Signifyd/Model/CaseEntity.php b/app/code/Magento/Signifyd/Model/CaseEntity.php new file mode 100644 index 0000000000000..c11c72db79f16 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseEntity.php @@ -0,0 +1,249 @@ +serializer = $serializer; + parent::__construct($context, $registry, $resource, $resourceCollection, $data); + } + + /** + * @inheritdoc + */ + protected function _construct() + { + $this->_init(ResourceModel\CaseEntity::class); + } + + /** + * @inheritdoc + */ + public function getEntityId() + { + return (int) $this->getData('entity_id'); + } + + /** + * @inheritdoc + */ + public function setEntityId($id) + { + $this->setData('entity_id', (int) $id); + return $this; + } + + /** + * @inheritdoc + */ + public function getCaseId() + { + return (int) $this->getData('case_id'); + } + + /** + * @inheritdoc + */ + public function setCaseId($id) + { + $this->setData('case_id', (int) $id); + return $this; + } + + /** + * @inheritdoc + */ + public function isGuaranteeEligible() + { + $value = $this->getData('guarantee_eligible'); + return ($value === null) ? $value : (bool) $value; + } + + /** + * @inheritdoc + */ + public function setGuaranteeEligible($guaranteeEligible) + { + $this->setData('guarantee_eligible', $guaranteeEligible); + return $this; + } + + /** + * @inheritdoc + */ + public function getGuaranteeDisposition() + { + return (string) $this->getData('guarantee_disposition'); + } + + /** + * @inheritdoc + */ + public function setGuaranteeDisposition($disposition) + { + $this->setData('guarantee_disposition', (string) $disposition); + return $this; + } + + /** + * @inheritdoc + */ + public function getStatus() + { + return (string) $this->getData('status'); + } + + /** + * @inheritdoc + */ + public function setStatus($status) + { + $this->setData('status', (string) $status); + return $this; + } + + /** + * @inheritdoc + */ + public function getScore() + { + return (int) $this->getData('score'); + } + + /** + * @inheritdoc + */ + public function setScore($score) + { + $this->setData('score', (int) $score); + return $this; + } + + /** + * @inheritdoc + */ + public function getOrderId() + { + return (int) $this->getData('order_id'); + } + + /** + * @inheritdoc + */ + public function setOrderId($orderId) + { + $this->setData('order_id', (int) $orderId); + return $this; + } + + /** + * @inheritdoc + */ + public function getAssociatedTeam() + { + $teamData = $this->getData('associated_team'); + return empty($teamData) ? [] : $this->serializer->unserialize($teamData); + } + + /** + * @inheritdoc + */ + public function setAssociatedTeam(array $team) + { + $this->setData('associated_team', $this->serializer->serialize($team)); + return $this; + } + + /** + * @inheritdoc + */ + public function getReviewDisposition() + { + return (string) $this->getData('review_disposition'); + } + + /** + * @inheritdoc + */ + public function setReviewDisposition($disposition) + { + $this->setData('review_disposition', (string) $disposition); + return $this; + } + + /** + * @inheritdoc + */ + public function getCreatedAt() + { + return $this->getData('created_at'); + } + + /** + * @inheritdoc + */ + public function setCreatedAt($datetime) + { + $this->setData('created_at', $datetime); + return $this; + } + + /** + * @inheritdoc + */ + public function getUpdatedAt() + { + return $this->getData('updated_at'); + } + + /** + * @inheritdoc + */ + public function setUpdatedAt($datetime) + { + $this->setData('updated_at', $datetime); + return $this; + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseManagement.php b/app/code/Magento/Signifyd/Model/CaseManagement.php new file mode 100644 index 0000000000000..1913f1e7a17b3 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseManagement.php @@ -0,0 +1,93 @@ +caseRepository = $caseRepository; + $this->caseFactory = $caseFactory; + $this->searchCriteriaBuilder = $searchCriteriaBuilder; + $this->filterBuilder = $filterBuilder; + } + + /** + * @inheritdoc + */ + public function create($orderId) + { + /** @var \Magento\Signifyd\Api\Data\CaseInterface $case */ + $case = $this->caseFactory->create(); + $case->setOrderId($orderId) + ->setStatus(CaseInterface::STATUS_PENDING) + ->setGuaranteeDisposition(CaseInterface::GUARANTEE_PENDING); + try { + return $this->caseRepository->save($case); + } catch (DuplicateException $e) { + throw new AlreadyExistsException(__('This order already has associated case entity'), $e); + } + } + + /** + * @inheritdoc + */ + public function getByOrderId($orderId) + { + $filters = [ + $this->filterBuilder->setField('order_id') + ->setValue($orderId) + ->create() + ]; + $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)->create(); + $items = $this->caseRepository->getList($searchCriteria)->getItems(); + return !empty($items) ? array_pop($items) : null; + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseRepository.php b/app/code/Magento/Signifyd/Model/CaseRepository.php new file mode 100644 index 0000000000000..ea3ea3e67aafd --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseRepository.php @@ -0,0 +1,134 @@ +collectionProcessor = $collectionProcessor; + $this->collectionFactory = $collectionFactory; + $this->searchResultsFactory = $searchResultsFactory; + $this->caseFactory = $caseFactory; + $this->resourceModel = $resourceModel; + } + + /** + * @inheritdoc + */ + public function save(CaseInterface $case) + { + /** @var CaseEntity $case */ + $this->resourceModel->save($case); + + return $case; + } + + /** + * @inheritdoc + */ + public function getById($id) + { + /** @var CaseEntity $case */ + $case = $this->caseFactory->create(); + $this->resourceModel->load($case, $id); + + return $case; + } + + /** + * @inheritdoc + */ + public function getByCaseId($caseId) + { + /** @var CaseEntity $case */ + $case = $this->caseFactory->create(); + $this->resourceModel->load($case, $caseId, 'case_id'); + + return $case->getEntityId() ? $case : null; + } + + /** + * @inheritdoc + */ + public function delete(CaseInterface $case) + { + $this->resourceModel->delete($case); + + return true; + } + + /** + * @inheritdoc + */ + public function getList(SearchCriteriaInterface $searchCriteria) + { + /** @var Collection $collection */ + $collection = $this->collectionFactory->create(); + $this->collectionProcessor->process($searchCriteria, $collection); + + /** @var CaseSearchResultsInterface $searchResults */ + $searchResults = $this->searchResultsFactory->create(); + $searchResults->setSearchCriteria($searchCriteria); + $searchResults->setItems($collection->getItems()); + + return $searchResults; + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php new file mode 100644 index 0000000000000..8413838bd7d5f --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php @@ -0,0 +1,101 @@ +caseManagement = $caseManagement; + $this->signifydGateway = $signifydGateway; + $this->logger = $logger; + $this->caseRepository = $caseRepository; + $this->orderGridUpdater = $orderGridUpdater; + $this->orderStateService = $orderStateService; + } + + /** + * {@inheritdoc} + */ + public function createForOrder($orderId) + { + $case = $this->caseManagement->create($orderId); + $this->orderGridUpdater->update($orderId); + + try { + $caseId = $this->signifydGateway->createCase($orderId); + } catch (GatewayException $e) { + $this->logger->error($e->getMessage()); + return true; + } + + $case->setCaseId($caseId); + $this->caseRepository->save($case); + $this->orderStateService->updateByCase($case); + + return true; + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php new file mode 100644 index 0000000000000..295d7f13fb0ac --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php @@ -0,0 +1,23 @@ +messageGenerator = $messageGenerator; + $this->caseRepository = $caseRepository; + $this->commentsHistoryUpdater = $commentsHistoryUpdater; + $this->orderGridUpdater = $orderGridUpdater; + $this->orderStateService = $orderStateService; + } + + /** + * Updates Signifyd Case entity by received data. + * + * @param CaseInterface $case + * @param array $data + * @return void + * @throws NotFoundException + * @throws LocalizedException + */ + public function update(CaseInterface $case, array $data) + { + if (empty($case->getEntityId()) || empty($case->getCaseId())) { + throw new LocalizedException(__('The case entity should not be empty.')); + } + + try { + $previousDisposition = $case->getGuaranteeDisposition(); + $this->setCaseData($case, $data); + $orderHistoryComment = $this->messageGenerator->generate($data); + $case = $this->caseRepository->save($case); + $this->orderGridUpdater->update($case->getOrderId()); + $this->commentsHistoryUpdater->addComment($case, $orderHistoryComment); + if ($case->getGuaranteeDisposition() !== $previousDisposition) { + $this->orderStateService->updateByCase($case); + } + } catch (\Exception $e) { + throw new LocalizedException(__('Cannot update Case entity.'), $e); + } + } + + /** + * Sets data to case entity. + * + * @param CaseInterface $case + * @param array $data + * @return void + */ + private function setCaseData(CaseInterface $case, array $data) + { + // list of keys which should not be replaced, like order id + $notResolvedKeys = [ + 'orderId' + ]; + foreach ($data as $key => $value) { + $methodName = 'set' . ucfirst($key); + if (!in_array($key, $notResolvedKeys) && method_exists($case, $methodName)) { + call_user_func([$case, $methodName], $value); + } + } + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php new file mode 100644 index 0000000000000..5415044b5edc4 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php @@ -0,0 +1,78 @@ +objectManager = $objectManager; + $this->generatorFactory = $generatorFactory; + $this->config = $config; + } + + /** + * Creates instance of service updating case. + * As param retrieves type of message generator. + * + * @param string $type + * @return UpdatingServiceInterface + * @throws \InvalidArgumentException + */ + public function create($type) + { + if (!$this->config->isActive() || $type === self::$caseTest) { + return $this->objectManager->create(StubUpdatingService::class); + } + + $messageGenerator = $this->generatorFactory->create($type); + $service = $this->objectManager->create(UpdatingService::class, [ + 'messageGenerator' => $messageGenerator + ]); + + return $service; + } +} diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php new file mode 100644 index 0000000000000..daa7b40bfd674 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php @@ -0,0 +1,23 @@ +historyFactory = $historyFactory; + $this->historyRepository = $historyRepository; + } + + /** + * Adds comment to case related order. + * Throws an exception if cannot save history comment. + * + * @param CaseInterface $case + * @param Phrase $message + * @param string $status + * @return void + */ + public function addComment(CaseInterface $case, Phrase $message, $status = '') + { + if (!$message->getText()) { + return; + } + + /** @var \Magento\Sales\Api\Data\OrderStatusHistoryInterface $history */ + $history = $this->historyFactory->create(); + $history->setParentId($case->getOrderId()) + ->setComment($message) + ->setEntityName('order') + ->setStatus($status); + $this->historyRepository->save($history); + } +} diff --git a/app/code/Magento/Signifyd/Model/Config.php b/app/code/Magento/Signifyd/Model/Config.php new file mode 100644 index 0000000000000..b68380ee15bf3 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/Config.php @@ -0,0 +1,93 @@ +scopeConfig = $scopeConfig; + } + + /** + * If this config option set to false no Signifyd integration should be available + * (only possibility to configure Signifyd setting in admin) + * + * @return bool + */ + public function isActive() + { + $enabled = $this->scopeConfig->isSetFlag( + 'fraud_protection/signifyd/active', + ScopeInterface::SCOPE_STORE + ); + return $enabled; + } + + /** + * Signifyd API Key used for authentication. + * + * @see https://www.signifyd.com/docs/api/#/introduction/authentication + * @see https://app.signifyd.com/settings + * + * @return string + */ + public function getApiKey() + { + $apiKey = $this->scopeConfig->getValue( + 'fraud_protection/signifyd/api_key', + ScopeInterface::SCOPE_STORE + ); + return $apiKey; + } + + /** + * Base URL to Signifyd REST API. + * Usually equals to https://api.signifyd.com/v2 and should not be changed + * + * @return string + */ + public function getApiUrl() + { + $apiUrl = $this->scopeConfig->getValue( + 'fraud_protection/signifyd/api_url', + ScopeInterface::SCOPE_STORE + ); + return $apiUrl; + } + + /** + * If is "true" extra information about interaction with Signifyd API are written to debug.log file + * + * @return bool + */ + public function isDebugModeEnabled() + { + $debugModeEnabled = $this->scopeConfig->isSetFlag( + 'fraud_protection/signifyd/debug', + ScopeInterface::SCOPE_STORE + ); + return $debugModeEnabled; + } +} diff --git a/app/code/Magento/Signifyd/Model/CustomerOrders.php b/app/code/Magento/Signifyd/Model/CustomerOrders.php new file mode 100644 index 0000000000000..c326cf06424c0 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/CustomerOrders.php @@ -0,0 +1,173 @@ +searchCriteriaBuilder = $searchCriteriaBuilder; + $this->filterBuilder = $filterBuilder; + $this->orderRepository = $orderRepository; + $this->currencyFactory = $currencyFactory; + $this->logger = $logger; + } + + /** + * Returns aggregated customer orders count and total amount in USD. + * + * Returned array contains next keys: + * aggregateOrderCount - total count of orders placed by this account since it was created, including the current + * aggregateOrderDollars - total amount spent by this account since it was created, including the current order + * + * @param int $customerId + * @return array + */ + public function getAggregatedOrdersInfo($customerId) + { + $result = [ + 'aggregateOrderCount' => null, + 'aggregateOrderDollars' => null + ]; + + $customerOrders = $this->getCustomerOrders($customerId); + if (!empty($customerOrders)) { + try { + $orderTotalDollars = 0.0; + foreach ($customerOrders as $order) { + $orderTotalDollars += $this->getUsdOrderTotal( + $order->getBaseGrandTotal(), + $order->getBaseCurrencyCode() + ); + } + $result = [ + 'aggregateOrderCount' => count($customerOrders), + 'aggregateOrderDollars' => $orderTotalDollars + ]; + } catch (Exception $e) { + $this->logger->error($e->getMessage()); + } + } + + return $result; + } + + /** + * Returns customer orders. + * + * @param int $customerId + * @return OrderInterface[] + */ + private function getCustomerOrders($customerId) + { + $filters = [ + $this->filterBuilder->setField(OrderInterface::CUSTOMER_ID)->setValue($customerId)->create() + ]; + $this->searchCriteriaBuilder->addFilters($filters); + $searchCriteria = $this->searchCriteriaBuilder->create(); + $searchResults = $this->orderRepository->getList($searchCriteria); + + return $searchResults->getItems(); + } + + /** + * Returns amount in USD. + * + * @param float $amount + * @param string $currency + * @return float + */ + private function getUsdOrderTotal($amount, $currency) + { + if ($currency === self::$usdCurrencyCode) { + return $amount; + } + + $operationCurrency = $this->getCurrencyByCode($currency); + + return $operationCurrency->convert($amount, self::$usdCurrencyCode); + } + + /** + * Returns currency by currency code. + * + * @param string|null $currencyCode + * @return Currency + */ + private function getCurrencyByCode($currencyCode) + { + if (isset($this->currencies[$currencyCode])) { + return $this->currencies[$currencyCode]; + } + + /** @var Currency $currency */ + $currency = $this->currencyFactory->create(); + $this->currencies[$currencyCode] = $currency->load($currencyCode); + + return $this->currencies[$currencyCode]; + } +} diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php new file mode 100644 index 0000000000000..65bede6f0cea5 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php @@ -0,0 +1,84 @@ +caseManagement = $caseManagement; + $this->orderRepository = $orderRepository; + } + + /** + * Checks if it is possible to create Guarantee for order and case. + * + * @param int $orderId + * @return bool + */ + public function isAvailable($orderId) + { + $case = $this->caseManagement->getByOrderId($orderId); + if ($case === null) { + return false; + } + + if (in_array($case->getGuaranteeDisposition(), [null, $case::GUARANTEE_CANCELED])) { + return false; + } + + $order = $this->getOrder($orderId); + if (null === $order) { + return false; + } + + return true; + } + + /** + * Returns order by id + * + * @param int $orderId + * @return OrderInterface|null + */ + private function getOrder($orderId) + { + try { + $order = $this->orderRepository->get($orderId); + } catch (InputException $e) { + return null; + } catch (NoSuchEntityException $e) { + return null; + } + + return $order; + } +} diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php new file mode 100644 index 0000000000000..b30efac8c2190 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php @@ -0,0 +1,94 @@ +caseManagement = $caseManagement; + $this->serviceFactory = $serviceFactory; + $this->gateway = $gateway; + $this->cancelGuaranteeAbility = $cancelGuaranteeAbility; + $this->logger = $logger; + } + + /** + * @inheritdoc + */ + public function cancelForOrder($orderId) + { + if (!$this->cancelGuaranteeAbility->isAvailable($orderId)) { + return false; + } + + $caseEntity = $this->caseManagement->getByOrderId($orderId); + + try { + $disposition = $this->gateway->cancelGuarantee($caseEntity->getCaseId()); + } catch (GatewayException $e) { + $this->logger->error($e->getMessage()); + return false; + } + + $updatingService = $this->serviceFactory->create('guarantees/cancel'); + $data = [ + 'guaranteeDisposition' => $disposition + ]; + $updatingService->update($caseEntity, $data); + + return true; + } +} diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php new file mode 100644 index 0000000000000..15addba3ec4fd --- /dev/null +++ b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php @@ -0,0 +1,124 @@ +caseManagement = $caseManagement; + $this->orderRepository = $orderRepository; + $this->dateTimeFactory = $dateTimeFactory; + } + + /** + * Checks if it is possible to create Guarantee for order and case. + * + * @param int $orderId + * @return bool + */ + public function isAvailable($orderId) + { + $case = $this->caseManagement->getByOrderId($orderId); + if (null === $case) { + return false; + } + + if ($case->isGuaranteeEligible() === false) { + return false; + } + + $order = $this->getOrder($orderId); + if (null === $order) { + return false; + } + + if (in_array($order->getState(), [Order::STATE_CANCELED, Order::STATE_CLOSED])) { + return false; + } + + if ($this->isOrderOlderThen(static::$guarantyEligibleDays, $order)) { + return false; + } + + return true; + } + + /** + * Checks if Guarantee submit is applicable for order. + * + * @param OrderInterface $order + * @param int $days number of days from the order creation date to submit a case for Guarantee. + * @return bool + */ + private function isOrderOlderThen($days, OrderInterface $order) + { + $orderCreateDate = $this->dateTimeFactory->create($order->getCreatedAt(), new \DateTimeZone('UTC')); + $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC')); + + return $orderCreateDate->diff($currentDate)->days >= $days; + } + + /** + * Returns order by id + * + * @param int $orderId + * @return OrderInterface|null + */ + private function getOrder($orderId) + { + try { + $order = $this->orderRepository->get($orderId); + } catch (InputException $e) { + return null; + } catch (NoSuchEntityException $e) { + return null; + } + + return $order; + } +} diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php new file mode 100644 index 0000000000000..4080aee453f18 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php @@ -0,0 +1,97 @@ +caseManagement = $caseManagement; + $this->caseUpdatingServiceFactory = $caseUpdatingServiceFactory; + $this->gateway = $gateway; + $this->createGuaranteeAbility = $createGuaranteeAbility; + $this->logger = $logger; + } + + /** + * @inheritdoc + */ + public function createForOrder($orderId) + { + if (!$this->createGuaranteeAbility->isAvailable($orderId)) { + return false; + } + + $caseEntity = $this->caseManagement->getByOrderId($orderId); + + try { + $disposition = $this->gateway->submitCaseForGuarantee($caseEntity->getCaseId()); + } catch (GatewayException $e) { + $this->logger->error($e->getMessage()); + return false; + } + + $updatingService = $this->caseUpdatingServiceFactory->create('guarantees/creation'); + $data = [ + 'caseId' => $caseEntity->getCaseId(), + 'guaranteeDisposition' => $disposition + ]; + $updatingService->update($caseEntity, $data); + + return true; + } +} diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php new file mode 100644 index 0000000000000..d0e89854e3909 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php @@ -0,0 +1,51 @@ +caseRepository = $caseRepository; + } + + /** + * @inheritdoc + */ + public function generate(array $data) + { + if (empty($data['caseId'])) { + throw new GeneratorException(__('The "%1" should not be empty.', 'caseId')); + } + + $caseEntity = $this->caseRepository->getByCaseId($data['caseId']); + + if ($caseEntity === null) { + throw new GeneratorException(__('Case entity not found.')); + } + + return __( + 'Case Update: New score for the order is %1. Previous score was %2.', + !empty($data['score']) ? $data['score'] : 0, + $caseEntity->getScore() + ); + } +} diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php new file mode 100644 index 0000000000000..103cb9fc1e2d3 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php @@ -0,0 +1,19 @@ +objectManager = $objectManager; + } + + /** + * Creates instance of message generator. + * Throws exception if type of message generator does not have implementations. + * + * @param string $type + * @return GeneratorInterface + * @throws \InvalidArgumentException + */ + public function create($type) + { + $className = PatternGenerator::class; + switch ($type) { + case self::$caseCreation: + $classConfig = [ + 'template' => 'Signifyd Case %1 has been created for order.', + 'requiredParams' => ['caseId'] + ]; + break; + case self::$caseRescore: + $classConfig = []; + $className = CaseRescore::class; + break; + case self::$caseReview: + $classConfig = [ + 'template' => 'Case Update: Case Review was completed. Review Deposition is %1.', + 'requiredParams' => ['reviewDisposition'] + ]; + break; + case self::$guaranteeCompletion: + $classConfig = [ + 'template' => 'Case Update: Guarantee Disposition is %1.', + 'requiredParams' => ['guaranteeDisposition'] + ]; + break; + case self::$guaranteeCreation: + $classConfig = [ + 'template' => 'Case Update: Case is submitted for guarantee.' + ]; + break; + case self::$guaranteeCancel: + $classConfig = [ + 'template' => 'Case Update: Case guarantee has been cancelled.' + ]; + break; + default: + throw new \InvalidArgumentException('Specified message type does not supported.'); + } + + return $this->objectManager->create($className, $classConfig); + } +} diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php new file mode 100644 index 0000000000000..385cbe35f05ac --- /dev/null +++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php @@ -0,0 +1,21 @@ +template = $template; + $this->requiredParams = $requiredParams; + } + + /** + * @inheritdoc + */ + public function generate(array $data) + { + $placeholders = []; + foreach ($this->requiredParams as $param) { + if (empty($data[$param])) { + throw new GeneratorException(__('The "%1" should not be empty.', $param)); + } + $placeholders[] = $data[$param]; + } + return __($this->template, ...$placeholders); + } +} diff --git a/app/code/Magento/Signifyd/Model/OrderStateService.php b/app/code/Magento/Signifyd/Model/OrderStateService.php new file mode 100644 index 0000000000000..2b3f0e155981e --- /dev/null +++ b/app/code/Magento/Signifyd/Model/OrderStateService.php @@ -0,0 +1,119 @@ +orderFactory = $orderFactory; + $this->orderManagement = $orderManagement; + $this->commentsHistoryUpdater = $commentsHistoryUpdater; + } + + /** + * Updates order state depending on case guarantee disposition status. + * + * @param CaseInterface $case + * @return void + */ + public function updateByCase(CaseInterface $case) + { + $orderId = $case->getOrderId(); + + switch ($case->getGuaranteeDisposition()) { + case CaseInterface::GUARANTEE_APPROVED: + $this->unHold($orderId); + break; + case CaseInterface::GUARANTEE_DECLINED: + $this->hold($orderId); + break; + case CaseInterface::GUARANTEE_PENDING: + if ($this->hold($orderId)) { + $this->commentsHistoryUpdater->addComment( + $case, + __('Awaiting the Signifyd guarantee disposition.'), + Order::STATE_HOLDED + ); + } + break; + } + } + + /** + * Tries to unhold the order. + * + * @param int $orderId + * @return bool + */ + private function unHold($orderId) + { + $order = $this->getOrder($orderId); + if ($order->canUnhold()) { + return $this->orderManagement->unHold($orderId); + } + + return false; + } + + /** + * Tries to hold the order. + * + * @param int $orderId + * @return bool + */ + private function hold($orderId) + { + $order = $this->getOrder($orderId); + if ($order->canHold()) { + return $this->orderManagement->hold($orderId); + } + + return false; + } + + /** + * Returns the order. + * + * @param int $orderId + * @return Order + */ + private function getOrder($orderId) + { + return $this->orderFactory->create()->load($orderId); + } +} diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php new file mode 100644 index 0000000000000..cdf9041510b45 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php @@ -0,0 +1,40 @@ +paymentMethodMapping = $paymentMapping; + } + + /** + * Gets the Sygnifyd payment method by the order's payment method. + * + * @param string $paymentMethod + * @return string + */ + public function getSignifydPaymentMethodCode($paymentMethod) + { + return $this->paymentMethodMapping->get($paymentMethod, ''); + } +} diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php new file mode 100644 index 0000000000000..5c3f23bb92729 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php @@ -0,0 +1,88 @@ +getElementsByTagName(self::$paymentMethodNodeType); + $paymentsList = []; + foreach ($paymentMethods as $paymentMethod) { + $paymentsList += $this->getPaymentMethodMapping($paymentMethod); + } + + return $paymentsList; + } + + /** + * Adds a payment method as key and a Sygnifyd payment method as value + * in the payment list array + * + * @param \DOMElement $payment + * @return array + * @throws ValidationSchemaException + */ + private function getPaymentMethodMapping(\DOMElement $payment) + { + $paymentMethodCode = $this->readSubnodeValue($payment, self::$magentoCodeNodeType); + $signifyPaymentMethodCode = $this->readSubnodeValue($payment, self::$signifydCodeNodeType); + + return [$paymentMethodCode => $signifyPaymentMethodCode]; + } + + /** + * Reads node value by node type + * + * @param \DOMElement $element + * @param string $subNodeType + * @return mixed + * @throws ValidationSchemaException + */ + private function readSubnodeValue(\DOMElement $element, $subNodeType) + { + $domList = $element->getElementsByTagName($subNodeType); + if (empty($domList[0])) { + throw new ValidationSchemaException(__('Only single entrance of "%1" node is required.', $subNodeType)); + } + + $subNodeValue = trim($domList[0]->nodeValue); + if (!$subNodeValue) { + throw new ValidationSchemaException(__('Not empty value for "%1" node is required.', $subNodeType)); + } + + return $subNodeValue; + } +} diff --git a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php new file mode 100644 index 0000000000000..a26beda520944 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php @@ -0,0 +1,109 @@ +config = $config; + $this->objectManager = $objectManager; + $this->avsDefaultAdapter = $avsDefaultAdapter; + $this->cvvDefaultAdapter = $cvvDefaultAdapter; + } + + /** + * Creates instance of CVV code verification. + * Exception will be thrown if CVV mapper does not implement PaymentVerificationInterface. + * + * @param string $paymentCode + * @return PaymentVerificationInterface + * @throws \Exception + */ + public function createPaymentCvv($paymentCode) + { + return $this->create($this->cvvDefaultAdapter, $paymentCode, 'cvv_ems_adapter'); + } + + /** + * Creates instance of AVS code verification. + * Exception will be thrown if AVS mapper does not implement PaymentVerificationInterface. + * + * @param string $paymentCode + * @return PaymentVerificationInterface + * @throws \Exception + */ + public function createPaymentAvs($paymentCode) + { + return $this->create($this->avsDefaultAdapter, $paymentCode, 'avs_ems_adapter'); + } + + /** + * Creates instance of PaymentVerificationInterface. + * Default implementation will be returned if payment method does not implement PaymentVerificationInterface. + * + * @param PaymentVerificationInterface $defaultAdapter + * @param string $paymentCode + * @param string $configKey + * @return PaymentVerificationInterface + * @throws ConfigurationMismatchException If payment verification instance + * does not implement PaymentVerificationInterface. + */ + private function create(PaymentVerificationInterface $defaultAdapter, $paymentCode, $configKey) + { + $this->config->setMethodCode($paymentCode); + $verificationClass = $this->config->getValue($configKey); + if ($verificationClass === null) { + return $defaultAdapter; + } + $mapper = $this->objectManager->create($verificationClass); + if (!$mapper instanceof PaymentVerificationInterface) { + throw new ConfigurationMismatchException( + __('%1 must implement %2', $verificationClass, PaymentVerificationInterface::class) + ); + } + return $mapper; + } +} diff --git a/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php new file mode 100644 index 0000000000000..618d74b2a52e9 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php @@ -0,0 +1,37 @@ +code = $code; + } + + /** + * @inheritdoc + */ + public function getCode(OrderPaymentInterface $orderPayment) + { + return $this->code; + } +} diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php new file mode 100644 index 0000000000000..9be02719545c7 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php @@ -0,0 +1,40 @@ +backendQuoteSession = $backendQuoteSession; + } + + /** + * @inheritdoc + */ + public function getQuote() + { + return $this->backendQuoteSession->getQuote(); + } +} diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php new file mode 100644 index 0000000000000..44c226ae4a47e --- /dev/null +++ b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php @@ -0,0 +1,39 @@ +checkoutSession = $checkoutSession; + } + + /** + * @inheritdoc + */ + public function getQuote() + { + return $this->checkoutSession->getQuote(); + } +} diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php new file mode 100644 index 0000000000000..14958ac65a6ee --- /dev/null +++ b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php @@ -0,0 +1,19 @@ +_init('signifyd_case', 'entity_id'); + } +} diff --git a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php new file mode 100644 index 0000000000000..92e233dd42dbc --- /dev/null +++ b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php @@ -0,0 +1,24 @@ +_init(CaseEntity::class, CaseResourceModel::class); + } +} diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php new file mode 100644 index 0000000000000..360225ae37b7b --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php @@ -0,0 +1,54 @@ +caseEntity = $caseEntity; + } + + /** + * @inheritdoc + */ + public function getIds($mainTableName, $gridTableName) + { + $connection = $this->caseEntity->getConnection(); + $select = $connection->select() + ->from($this->caseEntity->getMainTable(), ['order_id']) + ->joinLeft( + [$gridTableName => $connection->getTableName($gridTableName)], + sprintf( + '%s.%s = %s.%s', + $this->caseEntity->getMainTable(), + 'order_id', + $gridTableName, + 'entity_id' + ), + [] + ) + ->where('guarantee_disposition != signifyd_guarantee_status'); + + return $connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN); + } +} diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php new file mode 100644 index 0000000000000..fff42b300be58 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php @@ -0,0 +1,55 @@ +globalConfig = $globalConfig; + $this->entityGrid = $entityGrid; + } + + /** + * Handles synchronous updating order entity in grid. + * + * Works only if asynchronous grid indexing is disabled + * in global settings. + * + * @param int $orderId + * @return void + */ + public function update($orderId) + { + if (!$this->globalConfig->getValue('dev/grid/async_indexing')) { + $this->entityGrid->refresh($orderId); + } + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php new file mode 100644 index 0000000000000..73338c8ea4d62 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php @@ -0,0 +1,39 @@ +requestData = $requestData; + parent::__construct($message, $code, $previous); + } + + /** + * Gets request data for unsuccessful request in JSON format + * @return string + */ + public function getRequestData() + { + return $this->requestData; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php new file mode 100644 index 0000000000000..0950ca1e22cfa --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php @@ -0,0 +1,48 @@ +requestBuilder = $requestBuilder; + } + + /** + * Perform call to Signifyd API. + * + * Method returns associative array that corresponds to successful result. + * Current implementation do not expose details in case of failure. + * + * @param string $url + * @param string $method + * @param array $params + * @return array + */ + public function makeApiCall($url, $method, array $params = []) + { + $result = $this->requestBuilder->doRequest($url, $method, $params); + + return $result; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php new file mode 100644 index 0000000000000..41006bd7d1e0e --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php @@ -0,0 +1,142 @@ +config = $config; + $this->clientFactory = $clientFactory; + $this->dataEncoder = $dataEncoder; + } + + /** + * Creates and configures HTTP client. + * + * @param string $url + * @param string $method + * @param array $params + * @return ZendClient + */ + public function create($url, $method, array $params = []) + { + $apiKey = $this->getApiKey(); + $apiUrl = $this->buildFullApiUrl($url); + + $client = $this->createNewClient(); + $client->setHeaders( + self::$authorizationType, + sprintf('Basic %s', base64_encode($apiKey)) + ); + if (!empty($params)) { + $encodedData = $this->dataEncoder->encode($params); + $client->setRawData($encodedData, self::$jsonDataType); + } + $client->setMethod($method); + $client->setUri($apiUrl); + + return $client; + } + + /** + * @return ZendClient + */ + private function createNewClient() + { + return $this->clientFactory->create(); + } + + /** + * Signifyd API key for merchant account. + * + * @see https://www.signifyd.com/docs/api/#/introduction/authentication + * @return string + */ + private function getApiKey() + { + return $this->config->getApiKey(); + } + + /** + * Full URL for Singifyd API based on relative URL. + * + * @param string $url + * @return string + */ + private function buildFullApiUrl($url) + { + $baseApiUrl = $this->getBaseApiUrl(); + $fullUrl = $baseApiUrl . self::$urlSeparator . ltrim($url, self::$urlSeparator); + + return $fullUrl; + } + + /** + * Base Sigifyd API URL without trailing slash. + * + * @return string + */ + private function getBaseApiUrl() + { + $baseApiUrl = $this->config->getApiUrl(); + + return rtrim($baseApiUrl, self::$urlSeparator); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php new file mode 100644 index 0000000000000..2ab4395e1990d --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php @@ -0,0 +1,64 @@ +clientCreator = $clientCreator; + $this->requestSender = $requestSender; + $this->responseHandler = $responseHandler; + } + + /** + * Creates HTTP client for API call. + * + * @param string $url + * @param string $method + * @param array $params + * @return array + */ + public function doRequest($url, $method, array $params = []) + { + $client = $this->clientCreator->create($url, $method, $params); + $response = $this->requestSender->send($client); + $result = $this->responseHandler->handle($response); + + return $result; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php new file mode 100644 index 0000000000000..38128a799fd59 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php @@ -0,0 +1,73 @@ +debuggerFactory = $debuggerFactory; + } + + /** + * Sends HTTP request to Signifyd API with configured client. + * + * Each request/response pair is handled by debugger. + * If debug mode for Signifyd integration enabled in configuration + * debug information is recorded to debug.log. + * + * @param ZendClient $client + * @return \Zend_Http_Response + * @throws ApiCallException + */ + public function send(ZendClient $client) + { + try { + $response = $client->request(); + + $this->debuggerFactory->create()->success( + $client->getUri(true), + $client->getLastRequest(), + $response->getStatus() . ' ' . $response->getMessage(), + $response->getBody() + ); + + return $response; + } catch (\Exception $e) { + $this->debuggerFactory->create()->failure( + $client->getUri(true), + $client->getLastRequest(), + $e + ); + + throw new ApiCallException( + 'Unable to process Signifyd API: ' . $e->getMessage(), + $e->getCode(), + $e, + $client->getLastRequest() + ); + } + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php new file mode 100644 index 0000000000000..614e59b7c29a2 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php @@ -0,0 +1,124 @@ + 'Bad Request - The request could not be parsed. Response: %s', + 401 => 'Unauthorized - user is not logged in, could not be authenticated. Response: %s', + 403 => 'Forbidden - Cannot access resource. Response: %s', + 404 => 'Not Found - resource does not exist. Response: %s', + 409 => 'Conflict - with state of the resource on server. Can occur with (too rapid) PUT requests. Response: %s', + 500 => 'Server error. Response: %s' + ]; + + /** + * Unexpected Signifyd API response message. + * + * @var string + */ + private static $unexpectedResponse = 'Unexpected Signifyd API response code "%s" with content "%s".'; + + /** + * @var DecoderInterface + */ + private $dataDecoder; + + /** + * ResponseHandler constructor. + * + * @param DecoderInterface $dataDecoder + */ + public function __construct( + DecoderInterface $dataDecoder + ) { + $this->dataDecoder = $dataDecoder; + } + + /** + * Reads result of successful operation and throws exception in case of any failure. + * + * @param \Zend_Http_Response $response + * @return array + * @throws ApiCallException + */ + public function handle(\Zend_Http_Response $response) + { + $responseCode = $response->getStatus(); + + if (!in_array($responseCode, self::$successResponseCodes)) { + $errorMessage = $this->buildApiCallFailureMessage($response); + throw new ApiCallException($errorMessage); + } + + $responseBody = (string)$response->getBody(); + + if (self::$phpVersionId < 70000 && empty($responseBody)) { + /* + * Only since PHP 7.0 empty string treated as JSON syntax error + * http://php.net/manual/en/function.json-decode.php + */ + throw new ApiCallException('Response is not valid JSON: Decoding failed: Syntax error'); + } + + try { + $decodedResponseBody = $this->dataDecoder->decode($responseBody); + } catch (\Exception $e) { + throw new ApiCallException( + 'Response is not valid JSON: ' . $e->getMessage(), + $e->getCode(), + $e + ); + } + + return $decodedResponseBody; + } + + /** + * Error message for request rejected by Signify. + * + * @param \Zend_Http_Response $response + * @return string + */ + private function buildApiCallFailureMessage(\Zend_Http_Response $response) + { + $responseBody = $response->getBody(); + + if (key_exists($response->getStatus(), self::$failureResponses)) { + return sprintf(self::$failureResponses[$response->getStatus()], $responseBody); + } + + return sprintf( + self::$unexpectedResponse, + $response->getStatus(), + $responseBody + ); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php new file mode 100644 index 0000000000000..7057313b5e415 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php @@ -0,0 +1,33 @@ + Configuration > Sales > Fraud Detection > Signifyd > Debug) + */ +class DebuggerFactory +{ + /** + * @var ObjectManagerInterface + */ + private $objectManager; + + /** + * @var Config + */ + private $config; + + /** + * DebuggerFactory constructor. + * + * @param bjectManagerInterface $objectManager + * @param Config $config + */ + public function __construct( + ObjectManagerInterface $objectManager, + Config $config + ) { + $this->objectManager = $objectManager; + $this->config = $config; + } + + /** + * Create debugger instance + * + * @return DebuggerInterface + */ + public function create() + { + if (!$this->config->isDebugModeEnabled()) { + return $this->objectManager->get(BlackHole::class); + } + + return $this->objectManager->get(Log::class); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php new file mode 100644 index 0000000000000..f4a2f9cc56a8f --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php @@ -0,0 +1,35 @@ +logger = $logger; + } + + /** + * {@inheritdoc} + */ + public function success($requestUrl, $requestData, $responseStatus, $responseBody) + { + $requestInfo = $this->buildRequestInfo($requestUrl, $requestData); + $responseInfo = $this->buildResponseInfo($responseStatus, $responseBody); + + $info = $requestInfo + . $responseInfo; + + $this->writeToLog($info); + } + + /** + * {@inheritdoc} + */ + public function failure($requestUrl, $requestData, Exception $exception) + { + $requestInfo = $this->buildRequestInfo($requestUrl, $requestData); + $exceptionInfo = $this->buildExceptionInfo($exception); + + $info = $requestInfo + . $exceptionInfo; + + $this->writeToLog($info); + } + + /** + * Build string with request URL and body + * + * @param string $requestUrl + * @param string $requestData + * @return string + */ + private function buildRequestInfo($requestUrl, $requestData) + { + $infoContent = $this->buildInfoSection('URL', $requestUrl) + . $this->buildInfoSection('Body', $requestData); + + $info = $this->buildInfoSection('Request', $infoContent); + return $info; + } + + /** + * Build string with response status code and body + * + * @param string $responseStatus + * @param string $responseBody + * @return string + */ + private function buildResponseInfo($responseStatus, $responseBody) + { + $infoContent = $this->buildInfoSection('Status', $responseStatus) + . $this->buildInfoSection('Body', $responseBody); + + $info = $this->buildInfoSection('Response', $infoContent); + return $info; + } + + /** + * Build string with exception information + * + * @param Exception $exception + * @return string + */ + private function buildExceptionInfo(Exception $exception) + { + $infoContent = (string)$exception; + $info = $this->buildInfoSection('Exception', $infoContent); + return $info; + } + + /** + * Write debug information to log file (var/log/debug.log by default) + * + * @param string $info + * @return void + */ + private function writeToLog($info) + { + $logMessage = $this->buildInfoSection('Signifyd API integration debug info', $info); + $this->logger->debug($logMessage); + } + + /** + * Build unified debug section string + * + * @param string $title + * @param string $content + * @return string + */ + private function buildInfoSection($title, $content) + { + $formattedInfo = $title . ":\n" + . $this->addIndent($content) . "\n"; + return $formattedInfo; + } + + /** + * Add indent to each line in content + * + * @param string $content + * @param string $indent + * @return string + */ + private function addIndent($content, $indent = ' ') + { + $contentLines = explode("\n", $content); + $contentLinesWithIndent = array_map(function ($line) use ($indent) { + return $indent . $line; + }, $contentLines); + $content = implode("\n", $contentLinesWithIndent); + return $content; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php new file mode 100644 index 0000000000000..ddcaa6cd696f2 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php @@ -0,0 +1,175 @@ +createCaseBuilder = $createCaseBuilder; + $this->apiClient = $apiClient; + } + + /** + * Returns id of created case (investigation) on Signifyd service + * @see https://www.signifyd.com/docs/api/#/reference/cases/create-a-case + * + * @param int $orderId + * @return int Signifyd case (investigation) identifier + * @throws GatewayException + */ + public function createCase($orderId) + { + $caseParams = $this->createCaseBuilder->build($orderId); + + $caseCreationResult = $this->apiClient->makeApiCall( + '/cases', + 'POST', + $caseParams + ); + + if (!isset($caseCreationResult['investigationId'])) { + throw new GatewayException('Expected field "investigationId" missed.'); + } + + return (int)$caseCreationResult['investigationId']; + } + + /** + * Returns guaranty decision result + * @see https://www.signifyd.com/docs/api/#/reference/guarantees/submit-a-case-for-guarantee + * + * @param int $signifydCaseId + * @return string + * @throws GatewayException + */ + public function submitCaseForGuarantee($signifydCaseId) + { + $guaranteeCreationResult = $this->apiClient->makeApiCall( + '/guarantees', + 'POST', + [ + 'caseId' => $signifydCaseId, + ] + ); + + $disposition = $this->processDispositionResult($guaranteeCreationResult); + return $disposition; + } + + /** + * Sends request to cancel guarantee and returns disposition. + * + * @see https://www.signifyd.com/docs/api/#/reference/guarantees/submit-a-case-for-guarantee/cancel-guarantee + * @param int $caseId + * @return string + * @throws GatewayException + */ + public function cancelGuarantee($caseId) + { + $result = $this->apiClient->makeApiCall( + '/cases/' . $caseId . '/guarantee', + 'PUT', + [ + 'guaranteeDisposition' => self::GUARANTEE_CANCELED + ] + ); + + $disposition = $this->processDispositionResult($result); + if ($disposition !== self::GUARANTEE_CANCELED) { + throw new GatewayException("API returned unexpected disposition: $disposition."); + } + + return $disposition; + } + + /** + * Processes result from Signifyd API. + * Throws the GatewayException is result does not contain guarantee disposition in response or + * disposition has unknown status. + * + * @param array $result + * @return string + * @throws GatewayException + */ + private function processDispositionResult(array $result) + { + if (!isset($result['disposition'])) { + throw new GatewayException('Expected field "disposition" missed.'); + } + + $disposition = strtoupper($result['disposition']); + + if (!in_array($disposition, [ + self::GUARANTEE_APPROVED, + self::GUARANTEE_DECLINED, + self::GUARANTEE_PENDING, + self::GUARANTEE_CANCELED, + self::GUARANTEE_IN_REVIEW, + self::GUARANTEE_UNREQUESTED + ])) { + throw new GatewayException( + sprintf('API returns unknown guaranty disposition "%s".', $disposition) + ); + } + + return $disposition; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php new file mode 100644 index 0000000000000..666217f8ccc85 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php @@ -0,0 +1,14 @@ + $this->getStreetLine(1, $address->getStreet()), + 'unit' => $this->getStreetLine(2, $address->getStreet()), + 'city' => $address->getCity(), + 'provinceCode' => $address->getRegionCode(), + 'postalCode' => $address->getPostcode(), + 'countryCode' => $address->getCountryId() + ]; + } + + /** + * Get street line by number + * + * @param int $number + * @param string[]|null $street + * @return string + */ + private function getStreetLine($number, $street) + { + $lines = is_array($street) ? $street : []; + + return isset($lines[$number - 1]) ? $lines[$number - 1] : ''; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php new file mode 100644 index 0000000000000..5e3a1a83e7aeb --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php @@ -0,0 +1,56 @@ +addressBuilder = $addressBuilder; + } + + /** + * Returns card data params based on payment and billing address info + * + * @param Order $order + * @return array + */ + public function build(Order $order) + { + $result = []; + $address = $order->getBillingAddress(); + if ($address === null) { + return $result; + } + + $payment = $order->getPayment(); + $result = [ + 'card' => [ + 'cardHolderName' => $address->getFirstname() . ' ' . $address->getLastname(), + 'last4' => $payment->getCcLast4(), + 'expiryMonth' => $payment->getCcExpMonth(), + 'expiryYear' => $payment->getCcExpYear(), + 'billingAddress' => $this->addressBuilder->build($address) + ] + ]; + + return $result; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php new file mode 100644 index 0000000000000..8db06473b96d8 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php @@ -0,0 +1,50 @@ +productMetadata = $productMetadata; + } + + /** + * Returns version info + * + * @return array + */ + public function build() + { + return [ + 'platformAndClient' => [ + 'storePlatform' => $this->productMetadata->getName() . ' ' . $this->productMetadata->getEdition(), + 'storePlatformVersion' => $this->productMetadata->getVersion(), + 'signifydClientApp' => $this->productMetadata->getName(), + 'signifydClientAppVersion' => self::$clientVersion, + ] + ]; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php new file mode 100644 index 0000000000000..3e41003d47842 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php @@ -0,0 +1,131 @@ +orderFactory = $orderFactory; + $this->purchaseBuilder = $purchaseBuilder; + $this->cardBuilder = $cardBuilder; + $this->recipientBuilder = $recipientBuilder; + $this->sellerBuilder = $sellerBuilder; + $this->clientVersionBuilder = $clientVersionBuilder; + $this->userAccountBuilder = $userAccountBuilder; + } + + /** + * @inheritdoc + */ + public function build($orderId) + { + /* @var $order \Magento\Sales\Model\Order */ + $order = $this->orderFactory->create()->load($orderId); + + return $this->removeEmptyValues( + array_merge( + $this->purchaseBuilder->build($order), + $this->cardBuilder->build($order), + $this->recipientBuilder->build($order), + $this->userAccountBuilder->build($order), + $this->sellerBuilder->build($order), + $this->clientVersionBuilder->build() + ) + ); + } + + /** + * Remove empty and null values. + * + * @param array $data + * @return array + */ + private function removeEmptyValues($data) + { + foreach ($data as $key => $value) { + if (is_array($value)) { + $data[$key] = $this->removeEmptyValues($data[$key]); + } + + if ($this->isEmpty($data[$key])) { + unset($data[$key]); + } + } + + return $data; + } + + /** + * Empty values are null, empty string and empty array. + * + * @param mixed $value + * @return bool + */ + private function isEmpty($value) + { + return $value === null || (is_array($value) && empty($value)); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php new file mode 100644 index 0000000000000..56662f69e7c5a --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php @@ -0,0 +1,22 @@ +dateTimeFactory = $dateTimeFactory; + $this->scope = $scope; + $this->signifydOrderSessionId = $signifydOrderSessionId; + $this->paymentVerificationFactory = $paymentVerificationFactory; + $this->paymentMethodMapper = $paymentMethodMapper; + } + + /** + * Returns purchase data params + * + * @param Order $order + * @return array + */ + public function build(Order $order) + { + $orderPayment = $order->getPayment(); + $createdAt = $this->dateTimeFactory->create( + $order->getCreatedAt(), + new \DateTimeZone('UTC') + ); + + $result = [ + 'purchase' => [ + 'orderSessionId' => $this->signifydOrderSessionId->get($order->getQuoteId()), + 'browserIpAddress' => $order->getRemoteIp(), + 'orderId' => $order->getIncrementId(), + 'createdAt' => $createdAt->format(\DateTime::ATOM), + 'paymentGateway' => $this->getPaymentGateway($orderPayment->getMethod()), + 'transactionId' => $orderPayment->getLastTransId(), + 'currency' => $order->getOrderCurrencyCode(), + 'avsResponseCode' => $this->getAvsCode($orderPayment), + 'cvvResponseCode' => $this->getCvvCode($orderPayment), + 'orderChannel' => $this->getOrderChannel(), + 'totalPrice' => $order->getGrandTotal(), + 'paymentMethod' => $this->paymentMethodMapper + ->getSignifydPaymentMethodCode($orderPayment->getMethod()) + ], + ]; + + $shippingDescription = $order->getShippingDescription(); + if ($shippingDescription !== null) { + $result['purchase']['shipments'] = [ + [ + 'shipper' => $this->getShipper($order->getShippingDescription()), + 'shippingMethod' => $this->getShippingMethod($order->getShippingDescription()), + 'shippingPrice' => $order->getShippingAmount() + ] + ]; + } + + $products = $this->getProducts($order); + if (!empty($products)) { + $result['purchase']['products'] = $products; + } + + return $result; + } + + /** + * Returns the products purchased in the transaction. + * + * @param Order $order + * @return array + */ + private function getProducts(Order $order) + { + $result = []; + foreach ($order->getAllItems() as $orderItem) { + $result[] = [ + 'itemId' => $orderItem->getSku(), + 'itemName' => $orderItem->getName(), + 'itemPrice' => $orderItem->getPrice(), + 'itemQuantity' => (int)$orderItem->getQtyOrdered(), + 'itemUrl' => $orderItem->getProduct()->getProductUrl(), + 'itemWeight' => $orderItem->getProduct()->getWeight() + ]; + } + + return $result; + } + + /** + * Returns the name of the shipper + * + * @param string $shippingDescription + * @return string + */ + private function getShipper($shippingDescription) + { + $result = explode(' - ', $shippingDescription, 2); + + return count($result) == 2 ? $result[0] : ''; + } + + /** + * Returns the type of the shipment method used + * + * @param string $shippingDescription + * @return string + */ + private function getShippingMethod($shippingDescription) + { + $result = explode(' - ', $shippingDescription, 2); + + return count($result) == 2 ? $result[1] : ''; + } + + /** + * Returns the gateway that processed the transaction. For PayPal orders should be paypal_account. + * + * @param string $gatewayCode + * @return string + */ + private function getPaymentGateway($gatewayCode) + { + $payPalCodeList = [ + 'paypal_express', + 'braintree_paypal', + 'payflowpro', + 'payflow_express', + 'payflow_link', + 'payflow_advanced', + 'hosted_pro', + ]; + return in_array($gatewayCode, $payPalCodeList) ? 'paypal_account' : $gatewayCode; + } + + /** + * Returns WEB for web-orders, PHONE for orders created by Admin + * + * @return string + */ + private function getOrderChannel() + { + return $this->scope->getCurrentScope() === Area::AREA_ADMINHTML ? 'PHONE' : 'WEB'; + } + + /** + * Gets AVS code for order payment method. + * + * @param OrderPaymentInterface $orderPayment + * @return string + */ + private function getAvsCode(OrderPaymentInterface $orderPayment) + { + $avsAdapter = $this->paymentVerificationFactory->createPaymentAvs($orderPayment->getMethod()); + return $avsAdapter->getCode($orderPayment); + } + + /** + * Gets CVV code for order payment method. + * + * @param OrderPaymentInterface $orderPayment + * @return string + */ + private function getCvvCode(OrderPaymentInterface $orderPayment) + { + $cvvAdapter = $this->paymentVerificationFactory->createPaymentCvv($orderPayment->getMethod()); + return $cvvAdapter->getCode($orderPayment); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php new file mode 100644 index 0000000000000..d9d26c8943b88 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php @@ -0,0 +1,55 @@ +addressBuilder = $addressBuilder; + } + + /** + * Returns recipient data params based on shipping address + * + * @param Order $order + * @return array + */ + public function build(Order $order) + { + $result = []; + $address = $order->getShippingAddress(); + if ($address === null) { + return $result; + } + + $result = [ + 'recipient' => [ + 'fullName' => $address->getName(), + 'confirmationEmail' => $address->getEmail(), + 'confirmationPhone' => $address->getTelephone(), + 'organization' => $address->getCompany(), + 'deliveryAddress' => $this->addressBuilder->build($address) + ] + ]; + + return $result; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php new file mode 100644 index 0000000000000..b2cf0401b247f --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php @@ -0,0 +1,136 @@ +scopeConfig = $scopeConfig; + $this->regionFactory = $regionFactory; + } + + /** + * Returns seller data params + * + * @param Order $order + * @return array + */ + public function build(Order $order) + { + $store = $order->getStore(); + + return [ + 'seller' => [ + 'name' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_NAME, $store), + 'domain' => $this->getPublicDomain($store), + 'shipFromAddress' => [ + 'streetAddress' => $this->getConfigValue(Shipment::XML_PATH_STORE_ADDRESS1, $store), + 'unit' => $this->getConfigValue(Shipment::XML_PATH_STORE_ADDRESS2, $store), + 'city' => $this->getConfigValue(Shipment::XML_PATH_STORE_CITY, $store), + 'provinceCode' => $this->getRegionCodeById( + $this->getConfigValue(Shipment::XML_PATH_STORE_REGION_ID, $store) + ), + 'postalCode' => $this->getConfigValue(Shipment::XML_PATH_STORE_ZIP, $store), + 'countryCode' => $this->getConfigValue(Shipment::XML_PATH_STORE_COUNTRY_ID, $store), + ], + 'corporateAddress' => [ + 'streetAddress' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_STREET_LINE1, $store), + 'unit' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_STREET_LINE2, $store), + 'city' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_CITY, $store), + 'provinceCode' => $this->getRegionCodeById( + $this->getConfigValue(Information::XML_PATH_STORE_INFO_REGION_CODE, $store) + ), + 'postalCode' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_POSTCODE, $store), + 'countryCode' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_COUNTRY_CODE, $store), + ] + ] + ]; + } + + /** + * Returns region code by id + * + * @param int $regionId + * @return string + */ + private function getRegionCodeById($regionId) + { + if (!isset($this->regionCodes[$regionId])) { + $this->regionCodes[$regionId] = $this->regionFactory->create()->load($regionId)->getCode(); + } + + return $this->regionCodes[$regionId]; + } + + /** + * Returns value from config + * + * @param string $value + * @param StoreInterface $store + * @return mixed + */ + private function getConfigValue($value, StoreInterface $store) + { + return $this->scopeConfig->getValue( + $value, + ScopeInterface::SCOPE_STORE, + $store + ); + } + + /** + * Returns public domain name + * + * @param StoreInterface $store + * @return string|null null if no DNS records corresponding to a current host found + */ + private function getPublicDomain(StoreInterface $store) + { + $baseUrl = $store->getBaseUrl(); + $domain = parse_url($baseUrl, PHP_URL_HOST); + if (\function_exists('checkdnsrr') && false === \checkdnsrr($domain)) { + return null; + } + + return $domain; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php new file mode 100644 index 0000000000000..0da49b85da869 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php @@ -0,0 +1,100 @@ +customerRepository = $customerRepository; + $this->dateTimeFactory = $dateTimeFactory; + $this->customerOrders = $customerOrders; + } + + /** + * Returns user account data params. + * Only for registered customers. + * + * @param Order $order + * @return array + */ + public function build(Order $order) + { + $result = []; + + $customerId = $order->getCustomerId(); + if (null === $customerId) { + return $result; + } + + $customer = $this->customerRepository->getById($customerId); + $result = [ + 'userAccount' => [ + 'email' => $customer->getEmail(), + 'username' => $customer->getEmail(), + 'phone' => $order->getBillingAddress()->getTelephone(), + 'accountNumber' => $customerId, + 'createdDate' => $this->formatDate($customer->getCreatedAt()), + 'lastUpdateDate' => $this->formatDate($customer->getUpdatedAt()) + ] + ]; + + $ordersInfo = $this->customerOrders->getAggregatedOrdersInfo($customerId); + if (isset($ordersInfo['aggregateOrderCount'])) { + $result['userAccount']['aggregateOrderCount'] = $ordersInfo['aggregateOrderCount']; + } + if (isset($ordersInfo['aggregateOrderDollars'])) { + $result['userAccount']['aggregateOrderDollars'] = $ordersInfo['aggregateOrderDollars']; + } + + return $result; + } + + /** + * Returns date formatted according to ISO8601. + * + * @param string $date + * @return string + */ + private function formatDate($date) + { + $result = $this->dateTimeFactory->create( + $date, + new \DateTimeZone('UTC') + ); + + return $result->format(\DateTime::ATOM); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php new file mode 100644 index 0000000000000..f77db737473c0 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php @@ -0,0 +1,64 @@ +data = $data; + $this->eventTopic = $eventTopic; + } + + /** + * Returns decoded webhook request body. + * + * @return array + */ + public function getData() + { + return $this->data; + } + + /** + * Returns event topic identifier. + * + * @return string + */ + public function getEventTopic() + { + return $this->eventTopic; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php new file mode 100644 index 0000000000000..50389102359b1 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php @@ -0,0 +1,65 @@ +dataDecoder = $decoder; + $this->webhookMessageFactory = $webhookMessageFactory; + } + + /** + * Returns webhook message data object. + * + * @param WebhookRequest $request + * @return WebhookMessage + * @throws \InvalidArgumentException + */ + public function read(WebhookRequest $request) + { + try { + $decodedData = $this->dataDecoder->decode($request->getBody()); + } catch (\Exception $e) { + throw new \InvalidArgumentException( + 'Webhook request body is not valid JSON: ' . $e->getMessage(), + $e->getCode(), + $e + ); + } + + $webhookMessage = $this->webhookMessageFactory->create( + [ + 'data' => $decodedData, + 'eventTopic' => $request->getEventTopic() + ] + ); + + return $webhookMessage; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php new file mode 100644 index 0000000000000..214ccf0eeb70f --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php @@ -0,0 +1,58 @@ +request = $request; + } + + /** + * Returns Base64 encoded output of the HMAC SHA256 encoding of the JSON body of the message. + * + * @return string + */ + public function getHash() + { + return (string)$this->request->getHeader('X-SIGNIFYD-SEC-HMAC-SHA256'); + } + + /** + * Returns event topic identifier. + * + * @return string + */ + public function getEventTopic() + { + return (string)$this->request->getHeader('X-SIGNIFYD-TOPIC'); + } + + /** + * Returns raw data from the request body. + * + * @return string + */ + public function getBody() + { + return (string)$this->request->getContent(); + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php new file mode 100644 index 0000000000000..274ef2f854684 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php @@ -0,0 +1,113 @@ +config = $config; + $this->decoder = $decoder; + } + + /** + * Validates webhook request. + * + * @param WebhookRequest $webhookRequest + * @return bool + */ + public function validate(WebhookRequest $webhookRequest) + { + $body = $webhookRequest->getBody(); + $eventTopic = $webhookRequest->getEventTopic(); + $hash = $webhookRequest->getHash(); + + return $this->isValidTopic($eventTopic) + && $this->isValidBody($body) + && $this->isValidHash($eventTopic, $body, $hash); + } + + /** + * Checks if value of topic identifier is in allowed list + * + * @param string $topic topic identifier. + * @return bool + */ + private function isValidTopic($topic) + { + return in_array($topic, $this->allowedTopicValues); + } + + /** + * Verifies a webhook request body is valid JSON and not empty. + * + * @param string $body + * @return bool + */ + private function isValidBody($body) + { + try { + $decodedBody = $this->decoder->decode($body); + } catch (\Exception $e) { + return false; + } + + return !empty($decodedBody); + } + + /** + * Verifies a webhook request has in fact come from SIGNIFYD. + * + * @param string $eventTopic + * @param string $body + * @param string $hash + * @return bool + */ + private function isValidHash($eventTopic, $body, $hash) + { + // In the case that this is a webhook test, the encoding ABCDE is allowed + $apiKey = $eventTopic == 'cases/test' ? 'ABCDE' : $this->config->getApiKey(); + $actualHash = base64_encode(hash_hmac('sha256', $body, $apiKey, true)); + + return $hash === $actualHash; + } +} diff --git a/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php new file mode 100644 index 0000000000000..52746bc4ec6c5 --- /dev/null +++ b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php @@ -0,0 +1,39 @@ +identityGenerator = $identityGenerator; + } + + /** + * Returns unique identifier through generation uuid by quote id. + * + * @param int $quoteId + * @return string + */ + public function get($quoteId) + { + return $this->identityGenerator->generateIdForData($quoteId); + } +} diff --git a/app/code/Magento/Signifyd/Observer/PlaceOrder.php b/app/code/Magento/Signifyd/Observer/PlaceOrder.php new file mode 100644 index 0000000000000..3798522dbe506 --- /dev/null +++ b/app/code/Magento/Signifyd/Observer/PlaceOrder.php @@ -0,0 +1,110 @@ +signifydIntegrationConfig = $signifydIntegrationConfig; + $this->caseCreationService = $caseCreationService; + $this->logger = $logger; + } + + /** + * {@inheritdoc} + */ + public function execute(Observer $observer) + { + if (!$this->signifydIntegrationConfig->isActive()) { + return; + } + + $orders = $this->extractOrders( + $observer->getEvent() + ); + + if (null === $orders) { + return; + } + + foreach ($orders as $order) { + $this->createCaseForOrder($order); + } + } + + /** + * Creates Signifyd case for single order with online payment method. + * + * @param OrderInterface $order + * @return void + */ + private function createCaseForOrder($order) + { + $orderId = $order->getEntityId(); + if (null === $orderId || $order->getPayment()->getMethodInstance()->isOffline()) { + return; + } + + try { + $this->caseCreationService->createForOrder($orderId); + } catch (AlreadyExistsException $e) { + $this->logger->error($e->getMessage()); + } + } + + /** + * Returns Orders entity list from Event data container + * + * @param Event $event + * @return OrderInterface[]|null + */ + private function extractOrders(Event $event) + { + $order = $event->getData('order'); + if (null !== $order) { + return [$order]; + } + + return $event->getData('orders'); + } +} diff --git a/app/code/Magento/Signifyd/Plugin/OrderPlugin.php b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php new file mode 100644 index 0000000000000..663409d0eb824 --- /dev/null +++ b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php @@ -0,0 +1,52 @@ +guaranteeCancelingService = $guaranteeCancelingService; + } + + /** + * Performs Signifyd guarantee cancel operation after order canceling + * if cancel order operation was successful. + * + * @see Order::cancel + * @param Order $order + * @param OrderInterface $result + * @return OrderInterface + */ + public function afterCancel(Order $order, $result) + { + if ($order->isCanceled()) { + $this->guaranteeCancelingService->cancelForOrder( + $order->getEntityId() + ); + } + + return $result; + } +} diff --git a/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php new file mode 100644 index 0000000000000..17cf4d7e7dbe9 --- /dev/null +++ b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php @@ -0,0 +1,67 @@ +guaranteeCancelingService = $guaranteeCancelingService; + } + + /** + * Performs Signifyd guarantee cancel operation after payment denying. + * + * @see MethodInterface::denyPayment + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * + * @param MethodInterface $subject + * @param MethodInterface|bool $result + * @param InfoInterface $payment + * @return bool|MethodInterface + */ + public function afterDenyPayment(MethodInterface $subject, $result, InfoInterface $payment) + { + if ($this->isPaymentDenied($payment, $result)) { + $this->guaranteeCancelingService->cancelForOrder($payment->getParentId()); + } + + return $result; + } + + /** + * Checks if deny payment operation was successful. + * + * Result not false check for payment methods using AbstractMethod. + * Transaction is closed check for payment methods using Gateway. + * + * @param InfoInterface $payment + * @param MethodInterface $result + * @return bool + */ + private function isPaymentDenied($payment, $result) + { + return $result !== false || $payment->getIsTransactionClosed(); + } +} diff --git a/app/code/Magento/Signifyd/README.md b/app/code/Magento/Signifyd/README.md new file mode 100644 index 0000000000000..9479972cb21b6 --- /dev/null +++ b/app/code/Magento/Signifyd/README.md @@ -0,0 +1,78 @@ +# Magento_Signifyd module + +## Overview + +The Magento_Signifyd module provides integration with the [Signifyd](https://www.signifyd.com/) fraud protection system. The integration is based on the Signifyd API; see the [Signifyd API docs](https://www.signifyd.com/docs/api/#/introduction/) for technical details. + +The module implementation allows to: + + - create a [Signifyd case](https://www.signifyd.com/docs/api/#/reference/cases) for a placed order + - automatically receive a [Signifyd guarantee](https://www.signifyd.com/docs/api/#/reference/guarantees) for a created case + - automatically cancel a guarantee when the order is canceled + +## Extensibility + +The Magento_Signifyd module does not add own Events, Layouts, and UI Components as extension points. + +### Public API + +The following interfaces (marked with the `@api` annotation) provide methods that allow to: + +`Magento\Signifyd\Api\Data\CaseInterface` (common abstraction for the Signifyd case entity): + +- set or retrieve all case data fields + +`Magento\Signifyd\Api\CaseManagementInterface`: + +- create a new case entity +- retrieve the existing case entity for a specified order + +`Magento\Signifyd\Api\CaseCreationServiceInterface`: + +- create a case entity for a specified order +- send a request through the Signifyd API to create a new case + +`Magento\Signifyd\Api\CaseRepositoryInterface`: + +- describe methods to work with a case entity + +`Magento\Signifyd\Api\GuaranteeCreationServiceInterface`: + +- send a request through the Signifyd API to create a new case guarantee + +`Magento\Signifyd\Api\GuaranteeCancelingServiceInterface`: +- send a request through the Signifyd API to cancel the Signifyd case guarantee + +`Magento\Signifyd\Api\Data\CaseSearchResultsInterface`: + +- might be used by `Magento\Signifyd\Api\CaseRepositoryInterface` to retrieve a list of case entities by specific conditions + +For information about a public API in Magento 2, see [Public interfaces & APIs](http://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html). + +## Additional information + +### Webhooks + +To update the entity data for a case or guarantee, the Magento_Signifyd module uses the [Signifyd Webhooks](https://www.signifyd.com/docs/api/#/reference/webhooks) mechanism. + +The newly created case entities have the `PENDING` status for a case and a guarantee. After receiving Webhook, both statuses are changed to appropriate Signifyd statuses. + +### Debug mode + +The Debug Mode may be enabled in the module configuration. This logs the communication data between the Magento_Signifyd module and the Signifyd service in this file: + + var/log/debug.log + +### Backward incompatible changes + +The Magento_Signifyd module does not introduce backward incompatible changes. + +You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html). + +### Processing supplementary payment information + +To improve the accuracy of Signifyd's transaction estimation, you may perform these operations (links lead to the Magento Developer Documentation Portal): + +- [Provide custom AVS/CVV mapping](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes) + +- [Retrieve payment method for a placed order](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order) diff --git a/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php b/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php new file mode 100644 index 0000000000000..164cd8018fb69 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php @@ -0,0 +1,150 @@ +context = $this->getMockBuilder(Context::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->request = $this->getMockBuilder(RequestInterface::class) + ->getMockForAbstractClass(); + + $this->context->expects(self::once()) + ->method('getRequest') + ->willReturn($this->request); + + $this->config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->caseManagement = $this->getMockBuilder(CaseManagement::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getScore']) + ->getMockForAbstractClass(); + + $this->caseInfo = $objectManager->getObject(CaseInfo::class, [ + 'context' => $this->context, + 'config' => $this->config, + 'caseManagement' => $this->caseManagement + ]); + } + + /** + * Checks label according to Signifyd Guarantee Disposition. + * + * @param string $guaranteeDisposition + * @param string $expectedLabel + * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getCaseGuaranteeDisposition() + * @dataProvider getGuaranteeLabelDataProvider + */ + public function testGetGuaranteeDisposition($guaranteeDisposition, $expectedLabel) + { + $this->caseManagement->expects(self::once()) + ->method('getByOrderId') + ->willReturn($this->caseEntity); + + $this->caseEntity->expects(self::atLeastOnce()) + ->method('getGuaranteeDisposition') + ->willReturn($guaranteeDisposition); + + self::assertEquals( + $expectedLabel, + $this->caseInfo->getCaseGuaranteeDisposition() + ); + } + + /** + * Case Guarantee Disposition and corresponding label data provider. + * + * @return array + */ + public function getGuaranteeLabelDataProvider() + { + return [ + [CaseInterface::GUARANTEE_APPROVED, __('Approved')], + [CaseInterface::GUARANTEE_DECLINED, __('Declined')], + [CaseInterface::GUARANTEE_PENDING, __('Pending')], + [CaseInterface::GUARANTEE_CANCELED, __('Canceled')], + [CaseInterface::GUARANTEE_IN_REVIEW, __('In Review')], + [CaseInterface::GUARANTEE_UNREQUESTED, __('Unrequested')], + ['Unregistered', ''] + ]; + } + + /** + * Checks case property getter with empty case. + * + * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getCaseProperty + */ + public function testCasePropertyWithEmptyCase() + { + $this->caseManagement->expects(self::once()) + ->method('getByOrderId') + ->willReturn(null); + + self::assertEquals( + '', + $this->caseInfo->getCaseGuaranteeDisposition() + ); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php new file mode 100644 index 0000000000000..1a8cfdc703247 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php @@ -0,0 +1,374 @@ +context = $this->getMockBuilder(Context::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->webhookRequest = $this->getMockBuilder(WebhookRequest::class) + ->disableOriginalConstructor() + ->getMock(); + $this->webhookMessageReader = $this->getMockBuilder(WebhookMessageReader::class) + ->disableOriginalConstructor() + ->getMock(); + $this->webhookRequestValidator = $this->getMockBuilder(WebhookRequestValidator::class) + ->disableOriginalConstructor() + ->getMock(); + $this->caseUpdatingServiceFactory = $this->getMockBuilder(UpdatingServiceFactory::class) + ->disableOriginalConstructor() + ->getMock(); + $this->logger = $this->getMockBuilder(LoggerInterface::class) + ->getMockForAbstractClass(); + + $this->response = $this->getMockBuilder(ResponseHttp::class) + ->disableOriginalConstructor() + ->getMock(); + $this->context->expects($this->once()) + ->method('getResponse') + ->willReturn($this->response); + $this->redirect = $this->getMockBuilder(RedirectInterface::class) + ->getMockForAbstractClass(); + $this->context->expects($this->once()) + ->method('getRedirect') + ->willReturn($this->redirect); + $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getByCaseId']) + ->getMockForAbstractClass(); + + $config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->setMethods(['isDebugModeEnabled', 'getByCaseId']) + ->getMock(); + $config->expects(self::any()) + ->method('getByCaseId') + ->willReturn(false); + + $this->controller = new Handler( + $this->context, + $this->webhookRequest, + $this->logger, + $this->webhookMessageReader, + $this->caseUpdatingServiceFactory, + $this->webhookRequestValidator, + $this->caseRepository, + $config + ); + } + + /** + * Successfull case + */ + public function testExecuteSuccessfully() + { + $eventTopic = 'cases/creation'; + $caseId = 1; + $data = ['score' => 200, 'caseId' => $caseId]; + + $this->webhookRequestValidator->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->getMock(); + $webhookMessage->expects($this->exactly(2)) + ->method('getEventTopic') + ->willReturn($eventTopic); + $webhookMessage->expects($this->once()) + ->method('getData') + ->willReturn($data); + $this->webhookMessageReader->expects($this->once()) + ->method('read') + ->with($this->webhookRequest) + ->willReturn($webhookMessage); + + $caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->caseRepository->expects(self::once()) + ->method('getByCaseId') + ->with(self::equalTo($caseId)) + ->willReturn($caseEntity); + + $caseUpdatingService = $this->getMockBuilder(UpdatingService::class) + ->disableOriginalConstructor() + ->getMock(); + $caseUpdatingService->expects($this->once()) + ->method('update') + ->with($caseEntity, $data); + + $this->caseUpdatingServiceFactory->expects($this->once()) + ->method('create') + ->with($eventTopic) + ->willReturn($caseUpdatingService); + + $this->controller->execute(); + } + + /** + * Case when there is exception while updating case + */ + public function testExecuteCaseUpdatingServiceException() + { + $eventTopic = 'cases/creation'; + $caseId = 1; + $data = ['score' => 200, 'caseId' => $caseId]; + + $this->webhookRequestValidator->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->getMock(); + $webhookMessage->expects($this->exactly(2)) + ->method('getEventTopic') + ->willReturn($eventTopic); + $webhookMessage->expects($this->once()) + ->method('getData') + ->willReturn($data); + $this->webhookMessageReader->expects($this->once()) + ->method('read') + ->with($this->webhookRequest) + ->willReturn($webhookMessage); + + $caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->caseRepository->expects(self::once()) + ->method('getByCaseId') + ->with(self::equalTo($caseId)) + ->willReturn($caseEntity); + + $caseUpdatingService = $this->getMockBuilder(UpdatingService::class) + ->disableOriginalConstructor() + ->getMock(); + $caseUpdatingService->expects($this->once()) + ->method('update') + ->with($caseEntity, $data) + ->willThrowException(new LocalizedException(__('Error'))); + + $this->caseUpdatingServiceFactory->expects($this->once()) + ->method('create') + ->with($eventTopic) + ->willReturn($caseUpdatingService); + + $this->response->expects($this->once()) + ->method('setHttpResponseCode') + ->with(400); + $this->logger->expects($this->once()) + ->method('critical'); + + $this->controller->execute(); + } + + /** + * Case when webhook request validation fails + */ + public function testExecuteRequestValidationFails() + { + $this->webhookRequestValidator->expects($this->once()) + ->method('validate') + ->willReturn(false); + $this->redirect->expects($this->once()) + ->method('redirect') + ->with($this->response, 'noroute', []); + $this->webhookMessageReader->expects($this->never()) + ->method('read'); + $this->caseUpdatingServiceFactory->expects($this->never()) + ->method('create'); + + $this->controller->execute(); + } + + /** + * Case when webhook request has test event topic. + */ + public function testExecuteWithTestEventTopic() + { + $this->webhookRequestValidator->expects($this->once()) + ->method('validate') + ->willReturn(true); + $this->redirect->expects($this->never()) + ->method('redirect'); + + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->getMock(); + $webhookMessage->expects($this->once()) + ->method('getEventTopic') + ->willReturn('cases/test'); + $webhookMessage->expects($this->never()) + ->method('getData'); + + $this->webhookMessageReader->expects($this->once()) + ->method('read') + ->with($this->webhookRequest) + ->willReturn($webhookMessage); + + $this->caseUpdatingServiceFactory->expects($this->never()) + ->method('create'); + + $this->controller->execute(); + } + + /** + * Checks a test case when received input data does not contain Signifyd case id. + * + * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute + */ + public function testExecuteWithMissedCaseId() + { + $this->webhookRequestValidator->expects(self::once()) + ->method('validate') + ->willReturn(true); + + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->getMock(); + $webhookMessage->expects($this->once()) + ->method('getEventTopic') + ->willReturn('cases/creation'); + $webhookMessage->expects(self::once()) + ->method('getData') + ->willReturn([ + 'orderId' => '1000101' + ]); + + $this->webhookMessageReader->expects(self::once()) + ->method('read') + ->with($this->webhookRequest) + ->willReturn($webhookMessage); + + $this->redirect->expects(self::once()) + ->method('redirect') + ->with($this->response, 'noroute', []); + + $this->controller->execute(); + } + + /** + * Checks a case when Signifyd case entity not found. + * + * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute + */ + public function testExecuteWithNotFoundCaseEntity() + { + $caseId = 123; + + $this->webhookRequestValidator->expects(self::once()) + ->method('validate') + ->willReturn(true); + + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->setMethods(['getData']) + ->getMock(); + $webhookMessage->expects(self::once()) + ->method('getData') + ->willReturn([ + 'orderId' => '1000101', + 'caseId' => $caseId + ]); + + $this->webhookMessageReader->expects(self::once()) + ->method('read') + ->with($this->webhookRequest) + ->willReturn($webhookMessage); + + $this->caseRepository->expects(self::once()) + ->method('getByCaseId') + ->with(self::equalTo($caseId)) + ->willReturn(null); + + $this->redirect->expects(self::once()) + ->method('redirect') + ->with($this->response, 'noroute', []); + + $this->controller->execute(); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php new file mode 100644 index 0000000000000..f0184c032b550 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php @@ -0,0 +1,167 @@ +config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->setMethods(['isActive']) + ->getMock(); + + $this->fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMockForAbstractClass(); + + $this->generatorFactory = $this->getMockBuilder(GeneratorFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $objectManager = new ObjectManager($this); + $this->factory = $objectManager->getObject(UpdatingServiceFactory::class, [ + 'objectManager' => $this->fakeObjectManager, + 'generatorFactory' => $this->generatorFactory, + 'config' => $this->config + ]); + } + + /** + * Checks type of instance for updating service if Signifyd is not enabled. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create + */ + public function testCreateWithInactiveConfig() + { + $type = 'cases/creation'; + $this->config->expects(self::once()) + ->method('isActive') + ->willReturn(false); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(StubUpdatingService::class) + ->willReturn(new StubUpdatingService()); + + $instance = $this->factory->create($type); + static::assertInstanceOf(StubUpdatingService::class, $instance); + } + + /** + * Checks type of instance for updating service if test type is received. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create + */ + public function testCreateWithTestType() + { + $type = 'cases/test'; + $this->config->expects(self::once()) + ->method('isActive') + ->willReturn(true); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(StubUpdatingService::class) + ->willReturn(new StubUpdatingService()); + + $instance = $this->factory->create($type); + static::assertInstanceOf(StubUpdatingService::class, $instance); + } + + /** + * Checks exception type and message for unknown case type. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Specified message type does not supported. + */ + public function testCreateWithException() + { + $type = 'cases/unknown'; + $this->config->expects(self::once()) + ->method('isActive') + ->willReturn(true); + + $this->generatorFactory->expects(self::once()) + ->method('create') + ->with($type) + ->willThrowException(new \InvalidArgumentException('Specified message type does not supported.')); + + $this->factory->create($type); + } + + /** + * Checks if factory creates correct instance of case updating service. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create + */ + public function testCreate() + { + $type = 'case/creation'; + $this->config->expects(self::once()) + ->method('isActive') + ->willReturn(true); + + $messageGenerator = $this->getMockBuilder(GeneratorInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->generatorFactory->expects(self::once()) + ->method('create') + ->with($type) + ->willReturn($messageGenerator); + + $service = $this->getMockBuilder(UpdatingService::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(UpdatingService::class, ['messageGenerator' => $messageGenerator]) + ->willReturn($service); + + $result = $this->factory->create($type); + static::assertInstanceOf(UpdatingService::class, $result); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php new file mode 100644 index 0000000000000..6eb7e5c37d5fc --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php @@ -0,0 +1,316 @@ +objectManager = new ObjectManager($this); + + $this->messageGenerator = $this->getMockBuilder(GeneratorInterface::class) + ->disableOriginalConstructor() + ->setMethods(['generate']) + ->getMock(); + + $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getByCaseId']) + ->getMockForAbstractClass(); + + $this->commentsHistoryUpdater = $this->getMockBuilder(CommentsHistoryUpdater::class) + ->disableOriginalConstructor() + ->setMethods(['addComment']) + ->getMock(); + + $this->orderGridUpdater = $this->getMockBuilder(OrderGridUpdater::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->orderStateService = $this->getMockBuilder(OrderStateService::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->service = $this->objectManager->getObject(UpdatingService::class, [ + 'messageGenerator' => $this->messageGenerator, + 'caseRepository' => $this->caseRepository, + 'commentsHistoryUpdater' => $this->commentsHistoryUpdater, + 'orderGridUpdater' => $this->orderGridUpdater, + 'orderStateService' => $this->orderStateService + ]); + } + + /** + * Checks a test case when Signifyd case is empty entity. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage The case entity should not be empty. + */ + public function testUpdateWithEmptyCaseEntity() + { + $data = []; + $caseEntity = $this->withCaseEntity(null, 123, $data); + + $this->service->update($caseEntity, $data); + } + + /** + * Checks a test case when Signifyd case id is not specified for a case entity. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage The case entity should not be empty. + */ + public function testUpdateWithEmptyCaseId() + { + $data = [ + 'caseId' => 123 + ]; + $caseEntity = $this->withCaseEntity(1, null, $data); + + $this->service->update($caseEntity, $data); + } + + /** + * Checks as test case when service cannot save Signifyd case entity + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage Cannot update Case entity. + */ + public function testUpdateWithFailedCaseSaving() + { + $caseId = 123; + $data = [ + 'caseId' => $caseId, + 'status' => CaseInterface::STATUS_OPEN, + 'orderId' => '10000012', + 'score' => 500 + ]; + + $caseEntity = $this->withCaseEntity(1, $caseId, $data); + + $this->caseRepository->expects(self::once()) + ->method('save') + ->willThrowException(new \Exception('Something wrong.')); + + $this->service->update($caseEntity, $data); + } + + /** + * Checks as test case when message generator throws an exception + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage Cannot update Case entity. + */ + public function testUpdateWithExceptionFromMessageGenerator() + { + $caseId = 123; + $data = [ + 'caseId' => $caseId + ]; + + $caseEntity = $this->withCaseEntity(1, $caseId, $data); + + $this->caseRepository->expects(self::never()) + ->method('save') + ->with($caseEntity) + ->willReturn($caseEntity); + + $this->messageGenerator->expects(self::once()) + ->method('generate') + ->with($data) + ->willThrowException(new GeneratorException(__('Cannot generate message.'))); + + $this->service->update($caseEntity, $data); + } + + /** + * Checks a test case when comments history updater throws an exception. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage Cannot update Case entity. + */ + public function testUpdateWithFailedCommentSaving() + { + $caseId = 123; + $data = [ + 'caseId' => $caseId, + 'orderId' => 1 + ]; + + $caseEntity = $this->withCaseEntity(1, $caseId, $data); + + $this->caseRepository->expects(self::once()) + ->method('save') + ->with($caseEntity) + ->willReturn($caseEntity); + + $this->orderGridUpdater->expects(self::once()) + ->method('update') + ->with($data['orderId']); + + $message = __('Message is generated.'); + $this->messageGenerator->expects(self::once()) + ->method('generate') + ->with($data) + ->willReturn($message); + + $this->commentsHistoryUpdater->expects(self::once()) + ->method('addComment') + ->with($caseEntity, $message) + ->willThrowException(new \Exception('Something wrong')); + + $this->service->update($caseEntity, $data); + } + + /** + * Checks a test case when Signifyd case entity is successfully updated and message stored in comments history. + * + * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update + */ + public function testUpdate() + { + $caseId = 123; + $data = [ + 'caseId' => $caseId, + 'orderId' => 1 + ]; + + $caseEntity = $this->withCaseEntity(21, $caseId, $data); + + $caseEntitySaved = clone $caseEntity; + $caseEntitySaved->expects(self::once()) + ->method('getGuaranteeDisposition') + ->willReturn('APPROVED'); + + $this->caseRepository->expects(self::once()) + ->method('save') + ->with($caseEntity) + ->willReturn($caseEntitySaved); + + $message = __('Message is generated.'); + $this->messageGenerator->expects(self::once()) + ->method('generate') + ->with($data) + ->willReturn($message); + + $this->orderGridUpdater->expects(self::once()) + ->method('update') + ->with($data['orderId']); + + $this->commentsHistoryUpdater->expects(self::once()) + ->method('addComment') + ->with($caseEntitySaved, $message); + + $this->orderStateService->expects(self::once()) + ->method('updateByCase') + ->with($caseEntitySaved); + + $this->service->update($caseEntity, $data); + } + + /** + * Create mock for case entity with common scenarios. + * + * @param $caseEntityId + * @param $caseId + * @param array $data + * @return CaseInterface|MockObject + */ + private function withCaseEntity($caseEntityId, $caseId, array $data = []) + { + /** @var CaseInterface|MockObject $caseEntity */ + $caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->setMethods([ + 'getEntityId', 'getCaseId', 'getOrderId', + 'setCaseId', 'setStatus', 'setOrderId', 'setScore' + ]) + ->getMockForAbstractClass(); + + $caseEntity->expects(self::any()) + ->method('getEntityId') + ->willReturn($caseEntityId); + $caseEntity->expects(self::any()) + ->method('getCaseId') + ->willReturn($caseId); + + foreach ($data as $property => $value) { + $method = 'set' . ucfirst($property); + if ($property === 'orderId') { + $caseEntity->expects(self::never()) + ->method($method); + } + $caseEntity->expects(self::any()) + ->method($method) + ->with(self::equalTo($value)) + ->willReturnSelf(); + + $method = 'get' . ucfirst($property); + $caseEntity->expects(self::any()) + ->method($method) + ->willReturn($value); + } + + return $caseEntity; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php new file mode 100644 index 0000000000000..5cbb3d8d93cdd --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php @@ -0,0 +1,176 @@ +historyFactory = $this->getMockBuilder(HistoryFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create', 'save']) + ->getMock(); + + $this->historyRepository = $this->getMockBuilder(OrderStatusHistoryRepositoryInterface::class) + ->getMockForAbstractClass(); + + $this->caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getOrderId']) + ->getMockForAbstractClass(); + + $this->initCommentMock(); + + $this->updater = $objectManager->getObject(CommentsHistoryUpdater::class, [ + 'historyFactory' => $this->historyFactory, + 'historyRepository' => $this->historyRepository + ]); + } + + /** + * Checks a test case when updater throws an exception while saving history comment. + * + * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment + * @expectedException \Exception + */ + public function testAddCommentWithException() + { + $this->caseEntity->expects(self::once()) + ->method('getOrderId') + ->willReturn(self::$orderId); + + $this->historyEntity->method('setStatus') + ->with('') + ->willReturnSelf(); + $this->historyRepository->expects(self::once()) + ->method('save') + ->with($this->historyEntity) + ->willThrowException(new \Exception('Cannot save comment message.')); + + $this->updater->addComment($this->caseEntity, __(self::$message)); + } + + /** + * Checks a test case when updater successfully saves history comment. + * + * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment + */ + public function testAddComment() + { + $this->caseEntity->expects(self::once()) + ->method('getOrderId') + ->willReturn(self::$orderId); + + $this->historyEntity->method('setStatus') + ->with(self::$status) + ->willReturnSelf(); + $this->historyRepository->expects(self::once()) + ->method('save') + ->with($this->historyEntity) + ->willReturnSelf(); + + $this->updater->addComment($this->caseEntity, __(self::$message), self::$status); + } + + /** + * Checks a test when message does not specified. + * + * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment + */ + public function testAddCommentWithoutMessage() + { + $this->caseEntity->expects(self::never()) + ->method('getOrderId'); + + $this->historyFactory->expects(self::never()) + ->method('save'); + + $phrase = ''; + $this->updater->addComment($this->caseEntity, __($phrase)); + } + + /** + * Creates mock object for history entity. + * + * @return void + */ + private function initCommentMock() + { + $this->historyEntity = $this->getMockBuilder(OrderStatusHistoryInterface::class) + ->disableOriginalConstructor() + ->setMethods(['setParentId', 'setComment', 'setEntityName', 'save']) + ->getMockForAbstractClass(); + + $this->historyFactory->method('create') + ->willReturn($this->historyEntity); + + $this->historyEntity->method('setParentId') + ->with(self::$orderId) + ->willReturnSelf(); + $this->historyEntity->method('setComment') + ->with(self::$message) + ->willReturnSelf(); + $this->historyEntity->method('setEntityName') + ->with('order') + ->willReturnSelf(); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php new file mode 100644 index 0000000000000..02d3b4b9ad7a7 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php @@ -0,0 +1,267 @@ +objectManager = new ObjectManager($this); + + $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class) + ->getMockForAbstractClass(); + + $this->logger = $this->getMockBuilder(LoggerInterface::class) + ->getMockForAbstractClass(); + + $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->model = $this->objectManager->getObject(CustomerOrders::class, [ + 'filterBuilder' => $this->filterBuilder, + 'orderRepository' => $this->orderRepository, + 'searchCriteriaBuilder' => $this->searchCriteriaBuilder, + 'logger' => $this->logger + ]); + + $this->initCurrencies(); + $this->initOrderRepository(); + + $this->objectManager->setBackwardCompatibleProperty( + $this->model, + 'currencies', + ['EUR' => $this->eurCurrency, 'UAH' => $this->uahCurrency] + ); + } + + /** + * @covers \Magento\Signifyd\Model\CustomerOrders::getAggregatedOrdersInfo() + */ + public function testGetCountAndTotalAmount() + { + $this->eurCurrency->expects($this->once()) + ->method('convert') + ->with(self::$eurAmount, 'USD') + ->willReturn(109); + + $this->uahCurrency->expects($this->once()) + ->method('convert') + ->with(self::$uahAmount, 'USD') + ->willReturn(10.35); + + $actual = $this->model->getAggregatedOrdersInfo(self::$customerId); + + static::assertEquals(3, $actual['aggregateOrderCount']); + static::assertEquals(169.35, $actual['aggregateOrderDollars']); + } + + /** + * Test case when required currency rate is absent and exception is thrown + * @covers \Magento\Signifyd\Model\CustomerOrders::getAggregatedOrdersInfo() + */ + public function testGetCountAndTotalAmountNegative() + { + $this->eurCurrency->expects($this->once()) + ->method('convert') + ->with(self::$eurAmount, 'USD') + ->willReturn(109); + + $this->uahCurrency->expects($this->once()) + ->method('convert') + ->with(self::$uahAmount, 'USD') + ->willThrowException(new \Exception()); + + $this->logger->expects($this->once()) + ->method('error'); + + $actual = $this->model->getAggregatedOrdersInfo(self::$customerId); + + $this->assertNull($actual['aggregateOrderCount']); + $this->assertNull($actual['aggregateOrderDollars']); + } + + /** + * Populate order repository with mocked orders + */ + private function initOrderRepository() + { + $this->filterBuilder->expects($this->once()) + ->method('setField') + ->willReturnSelf(); + $this->filterBuilder->expects($this->once()) + ->method('setValue') + ->willReturnSelf(); + $filter = $this->getMockBuilder(\Magento\Framework\Api\Filter::class) + ->disableOriginalConstructor() + ->getMock(); + $this->filterBuilder->expects($this->once()) + ->method('create') + ->willReturn($filter); + + $searchCriteria = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteria::class) + ->disableOriginalConstructor() + ->getMock(); + $this->searchCriteriaBuilder->expects($this->once()) + ->method('create') + ->willReturn($searchCriteria); + + $orderSearchResult = $this->getMockBuilder(OrderSearchResultInterface::class) + ->getMockForAbstractClass(); + $orderSearchResult->expects($this->once()) + ->method('getItems') + ->willReturn($this->getOrders()); + $this->orderRepository->expects($this->once()) + ->method('getList') + ->willReturn($orderSearchResult); + } + + /** + * Creates mocks for currencies + * @return void + */ + private function initCurrencies() + { + $this->eurCurrency = $this->getMockBuilder(Currency::class) + ->disableOriginalConstructor() + ->setMethods(['convert']) + ->getMock(); + + $this->uahCurrency = $this->getMockBuilder(Currency::class) + ->disableOriginalConstructor() + ->setMethods(['convert']) + ->getMock(); + } + + /** + * Get list of mocked orders with different currencies + * @return array + */ + private function getOrders() + { + $eurOrder = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode']) + ->getMock(); + + $eurOrder->expects($this->once()) + ->method('getBaseGrandTotal') + ->willReturn(self::$eurAmount); + $eurOrder->expects($this->once()) + ->method('getBaseCurrencyCode') + ->willReturn('EUR'); + + $uahOrder = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode']) + ->getMock(); + + $uahOrder->expects($this->once()) + ->method('getBaseGrandTotal') + ->willReturn(self::$uahAmount); + $uahOrder->expects($this->once()) + ->method('getBaseCurrencyCode') + ->willReturn('UAH'); + + $usdOrder = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode']) + ->getMock(); + + $usdOrder->expects($this->once()) + ->method('getBaseGrandTotal') + ->willReturn(self::$usdAmount); + $usdOrder->expects($this->once()) + ->method('getBaseCurrencyCode') + ->willReturn('USD'); + + return [$usdOrder, $eurOrder, $uahOrder]; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php new file mode 100644 index 0000000000000..f7b4e473a0ec8 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php @@ -0,0 +1,154 @@ +orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class) + ->getMockForAbstractClass(); + + $this->caseManagement = $this->getMockBuilder(CaseManagement::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->cancelGuaranteeAbility = new CancelGuaranteeAbility( + $this->caseManagement, + $this->orderRepository + ); + } + + /** + * Success test for Cancel Guarantee Request button + */ + public function testIsAvailableSuccess() + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $case->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseEntity::GUARANTEE_APPROVED); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */ + $order = $this->getMockBuilder(OrderInterface::class) + ->getMockForAbstractClass(); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willReturn($order); + + $this->assertTrue($this->cancelGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when Case entity doesn't exist for order + */ + public function testIsAvailableWithNullCase() + { + $orderId = 123; + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn(null); + + $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when Guarantee Disposition has Canceled states. + */ + public function testIsAvailableWithCanceledGuarantee() + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $case->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseEntity::GUARANTEE_CANCELED); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when order does not exist. + */ + public function testIsAvailableWithNullOrder() + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $case->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseEntity::GUARANTEE_APPROVED); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willThrowException(new NoSuchEntityException()); + + $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId)); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php new file mode 100644 index 0000000000000..f8f1d4a4522c9 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php @@ -0,0 +1,215 @@ +caseManagement = $this->getMockBuilder(CaseManagementInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getByOrderId']) + ->getMockForAbstractClass(); + + $this->updatingFactory = $this->getMockBuilder(UpdatingServiceFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->gateway = $this->getMockBuilder(Gateway::class) + ->disableOriginalConstructor() + ->setMethods(['cancelGuarantee']) + ->getMock(); + + $this->guaranteeAbility = $this->getMockBuilder(CancelGuaranteeAbility::class) + ->disableOriginalConstructor() + ->setMethods(['isAvailable']) + ->getMock(); + + $this->logger = $this->getMockBuilder(LoggerInterface::class) + ->disableOriginalConstructor() + ->setMethods(['error']) + ->getMockForAbstractClass(); + + $this->service = new CancelingService( + $this->caseManagement, + $this->updatingFactory, + $this->gateway, + $this->guaranteeAbility, + $this->logger + ); + } + + /** + * Checks a test case, when validation for a guarantee is failed. + * + * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder + */ + public function testCancelForOrderWithUnavailableDisposition() + { + $this->guaranteeAbility->expects(self::once()) + ->method('isAvailable') + ->with(self::equalTo(self::$orderId)) + ->willReturn(false); + + $this->caseManagement->expects(self::never()) + ->method('getByOrderId'); + + $this->gateway->expects(self::never()) + ->method('cancelGuarantee'); + + $this->logger->expects(self::never()) + ->method('error'); + + $this->updatingFactory->expects(self::never()) + ->method('create'); + + $result = $this->service->cancelForOrder(self::$orderId); + self::assertFalse($result); + } + + /** + * Checks a test case, when request to Signifyd API fails. + * + * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder + */ + public function testCancelForOrderWithFailedRequest() + { + $this->withCaseEntity(); + + $this->gateway->expects(self::once()) + ->method('cancelGuarantee') + ->with(self::equalTo(self::$caseId)) + ->willThrowException(new GatewayException('Something wrong.')); + + $this->logger->expects(self::once()) + ->method('error') + ->with(self::equalTo('Something wrong.')); + + $this->updatingFactory->expects(self::never()) + ->method('create'); + + $result = $this->service->cancelForOrder(self::$orderId); + self::assertFalse($result); + } + + /** + * Checks a test case, when request to Signifyd successfully processed and case entity has been updated. + * + * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder + */ + public function testCancelForOrder() + { + $case = $this->withCaseEntity(); + + $this->gateway->expects(self::once()) + ->method('cancelGuarantee') + ->with(self::equalTo(self::$caseId)) + ->willReturn(CaseInterface::GUARANTEE_CANCELED); + + $this->logger->expects(self::never()) + ->method('error'); + + $service = $this->getMockBuilder(StubUpdatingService::class) + ->setMethods(['update']) + ->getMock(); + $this->updatingFactory->expects(self::once()) + ->method('create') + ->willReturn($service); + + $service->expects(self::once()) + ->method('update') + ->with(self::equalTo($case), self::equalTo(['guaranteeDisposition' => CaseInterface::GUARANTEE_CANCELED])); + + $result = $this->service->cancelForOrder(self::$orderId); + self::assertTrue($result); + } + + /** + * Gets mock for a case entity. + * + * @return CaseInterface|MockObject + */ + private function withCaseEntity() + { + $this->guaranteeAbility->expects(self::once()) + ->method('isAvailable') + ->with(self::equalTo(self::$orderId)) + ->willReturn(true); + + $caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getCaseId']) + ->getMockForAbstractClass(); + + $this->caseManagement->expects(self::once()) + ->method('getByOrderId') + ->with(self::equalTo(self::$orderId)) + ->willReturn($caseEntity); + + $caseEntity->expects(self::once()) + ->method('getCaseId') + ->willReturn(self::$caseId); + return $caseEntity; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php new file mode 100644 index 0000000000000..7ba3ab3eef4f6 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php @@ -0,0 +1,257 @@ +dateTimeFactory = new DateTimeFactory(); + $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class) + ->getMockForAbstractClass(); + $this->caseManagement = $this->getMockBuilder(CaseManagement::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->createGuaranteeAbility = new CreateGuaranteeAbility( + $this->caseManagement, + $this->orderRepository, + $this->dateTimeFactory + ); + } + + public function testIsAvailableSuccess() + { + $orderId = 123; + $orderCreatedAt = $this->getDateAgo(6); + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $case->expects($this->once()) + ->method('isGuaranteeEligible') + ->willReturn(true); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */ + $order = $this->getMockBuilder(OrderInterface::class) + ->getMockForAbstractClass(); + $order->expects($this->once()) + ->method('getState') + ->willReturn(Order::STATE_COMPLETE); + $order->expects($this->once()) + ->method('getCreatedAt') + ->willReturn($orderCreatedAt); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willReturn($order); + + $this->assertTrue($this->createGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when Case entity doesn't exist for order + */ + public function testIsAvailableWithNullCase() + { + $orderId = 123; + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn(null); + + $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when GuaranteeEligible for Case is false + */ + public function testIsAvailableWithGuarantyEligibleFalse() + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $case->expects($this->once()) + ->method('isGuaranteeEligible') + ->willReturn(false); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when GuaranteeEligible for Case is false + */ + public function testIsAvailableWithNullOrder() + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $case->expects($this->once()) + ->method('isGuaranteeEligible') + ->willReturn(true); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willThrowException(new NoSuchEntityException()); + + $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Tests case when order has Canceled Or Closed states. + * + * @param string $state + * @dataProvider isAvailableWithCanceledOrderDataProvider + */ + public function testIsAvailableWithCanceledOrder($state) + { + $orderId = 123; + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $case->expects($this->once()) + ->method('isGuaranteeEligible') + ->willReturn(true); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */ + $order = $this->getMockBuilder(OrderInterface::class) + ->getMockForAbstractClass(); + $order->expects($this->once()) + ->method('getState') + ->willReturn($state); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willReturn($order); + + $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId)); + } + + public function isAvailableWithCanceledOrderDataProvider() + { + return [ + [Order::STATE_CANCELED], [Order::STATE_CLOSED] + ]; + } + + public function testIsAvailableWithOldOrder() + { + $orderId = 123; + $orderCreatedAt = $this->getDateAgo(8); + + /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */ + $case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $case->expects($this->once()) + ->method('isGuaranteeEligible') + ->willReturn(true); + + $this->caseManagement->expects($this->once()) + ->method('getByOrderId') + ->with($orderId) + ->willReturn($case); + + /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */ + $order = $this->getMockBuilder(OrderInterface::class) + ->getMockForAbstractClass(); + $order->expects($this->once()) + ->method('getState') + ->willReturn(Order::STATE_COMPLETE); + $order->expects($this->once()) + ->method('getCreatedAt') + ->willReturn($orderCreatedAt); + + $this->orderRepository->expects($this->once()) + ->method('get') + ->with($orderId) + ->willReturn($order); + + $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId)); + } + + /** + * Returns date N days ago + * + * @param int $days number of days that will be deducted from the current date + * @return string + */ + private function getDateAgo($days) + { + $createdAtTime = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC')); + $createdAtTime->sub(new \DateInterval('P' . $days . 'D')); + + return $createdAtTime->format('Y-m-d h:i:s'); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php new file mode 100644 index 0000000000000..a22bfe12222a6 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php @@ -0,0 +1,242 @@ +caseManagement = $this->getMockBuilder(CaseManagementInterface::class) + ->getMockForAbstractClass(); + + $caseUpdatingServiceFactory = $this->getMockBuilder(UpdatingServiceFactory::class) + ->disableOriginalConstructor() + ->getMock(); + $this->caseUpdatingService = $this->getMockBuilder(UpdatingServiceInterface::class) + ->getMockForAbstractClass(); + $caseUpdatingServiceFactory + ->method('create') + ->willReturn($this->caseUpdatingService); + + $this->gateway = $this->getMockBuilder(Gateway::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->createGuaranteeAbility = $this->getMockBuilder(CreateGuaranteeAbility::class) + ->disableOriginalConstructor() + ->setMethods(['isAvailable']) + ->getMock(); + + $this->logger = $this->getMockBuilder(LoggerInterface::class) + ->getMockForAbstractClass(); + + $this->service = new CreationService( + $this->caseManagement, + $caseUpdatingServiceFactory, + $this->gateway, + $this->createGuaranteeAbility, + $this->logger + ); + } + + /** + * Checks a test case, when guarantee ability checker does not allow to submit case for a guarantee. + * + * @covers \Magento\Signifyd\Model\Guarantee\CreationService::createForOrder + */ + public function testCreateForOrderWithNotEligibleCase() + { + $orderId = 1; + + $this->createGuaranteeAbility->expects(self::once()) + ->method('isAvailable') + ->with($orderId) + ->willReturn(false); + + $this->caseManagement->expects(self::never()) + ->method('getByOrderId'); + + $this->gateway->expects(self::never()) + ->method('submitCaseForGuarantee'); + + $result = $this->service->createForOrder($orderId); + self::assertFalse($result); + } + + public function testCreateForOrderWitCase() + { + $dummyOrderId = 1; + $dummyCaseId = 42; + $this->withCaseEntityExistsForOrderId( + $dummyOrderId, + [ + 'caseId' => $dummyCaseId, + ] + ); + + $this->gateway + ->expects($this->once()) + ->method('submitCaseForGuarantee'); + + $this->service->createForOrder($dummyOrderId); + } + + public function testCreateForOrderWithGatewayFailure() + { + $dummyOrderId = 1; + $dummyCaseId = 42; + $dummyGatewayFailureMessage = 'Everything fails sometimes'; + $this->withCaseEntityExistsForOrderId( + $dummyOrderId, + [ + 'caseId' => $dummyCaseId, + ] + ); + $this->withGatewayFailure($dummyGatewayFailureMessage); + + $this->logger + ->expects($this->once()) + ->method('error') + ->with($this->equalTo($dummyGatewayFailureMessage)); + $this->caseUpdatingService + ->expects($this->never()) + ->method('update'); + + $result = $this->service->createForOrder($dummyOrderId); + $this->assertEquals( + false, + $result, + 'Service should return false in case of gateway failure' + ); + } + + public function testCreateForOrderWithGatewaySuccess() + { + $dummyOrderId = 1; + $dummyCaseId = 42; + $dummyGuaranteeDisposition = 'foo'; + $caseEntity = $this->withCaseEntityExistsForOrderId( + $dummyOrderId, + [ + 'caseId' => $dummyCaseId, + ] + ); + $this->withGatewaySuccess($dummyGuaranteeDisposition); + + $this->caseUpdatingService + ->expects($this->once()) + ->method('update') + ->with($caseEntity, $this->equalTo([ + 'caseId' => $dummyCaseId, + 'guaranteeDisposition' => $dummyGuaranteeDisposition, + ])); + + $this->service->createForOrder($dummyOrderId); + } + + public function testCreateForOrderWithCaseUpdate() + { + $dummyOrderId = 1; + $dummyCaseId = 42; + $dummyGuaranteeDisposition = 'foo'; + $this->withCaseEntityExistsForOrderId( + $dummyOrderId, + [ + 'caseId' => $dummyCaseId, + ] + ); + $this->withGatewaySuccess($dummyGuaranteeDisposition); + + $result = $this->service->createForOrder($dummyOrderId); + $this->assertEquals( + true, + $result, + 'Service should return true in case if case update service is called' + ); + } + + private function withCaseEntityExistsForOrderId($orderId, array $caseData = []) + { + $this->createGuaranteeAbility->expects(self::once()) + ->method('isAvailable') + ->with(self::equalTo($orderId)) + ->willReturn(true); + + $dummyCaseEntity = $this->getMockBuilder(CaseInterface::class) + ->getMockForAbstractClass(); + foreach ($caseData as $caseProperty => $casePropertyValue) { + $dummyCaseEntity + ->method('get' . ucfirst($caseProperty)) + ->willReturn($casePropertyValue); + } + + $this->caseManagement + ->method('getByOrderId') + ->with($this->equalTo($orderId)) + ->willReturn($dummyCaseEntity); + + return $dummyCaseEntity; + } + + private function withGatewayFailure($failureMessage) + { + $this->gateway + ->method('submitCaseForGuarantee') + ->willThrowException(new GatewayException($failureMessage)); + } + + private function withGatewaySuccess($gatewayResult) + { + $this->gateway + ->method('submitCaseForGuarantee') + ->willReturn($gatewayResult); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php new file mode 100644 index 0000000000000..ba14036cd68d0 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php @@ -0,0 +1,148 @@ + 100, + 'score' => 200 + ]; + + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @var CaseRepositoryInterface|MockObject + */ + private $caseRepository; + + /** + * @var CaseRescore|MockObject + */ + private $caseRescore; + + /** + * @var CaseInterface|MockObject + */ + private $case; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->case = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->objectManager = new ObjectManager($this); + $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [ + 'caseRepository' => $this->caseRepository + ]); + } + + /** + * Data array without required attribute caseId. + * + * @expectedException \Magento\Signifyd\Model\MessageGenerators\GeneratorException + * @expectedExceptionMessage The "caseId" should not be empty + */ + public function testGenerateEmptyCaseIdException() + { + $this->caseRescore->generate([]); + } + + /** + * Case entity was not found in DB. + * + * @expectedException \Magento\Signifyd\Model\MessageGenerators\GeneratorException + * @expectedExceptionMessage Case entity not found. + */ + public function testGenerateNotFoundException() + { + $this->caseRepository->expects($this->once()) + ->method('getByCaseId') + ->with(self::$data['caseId']) + ->willReturn(null); + + $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [ + 'caseRepository' => $this->caseRepository + ]); + + $this->caseRescore->generate(self::$data); + } + + /** + * Generate case message with not empty previous score. + */ + public function testGenerateWithPreviousScore() + { + $this->case->expects($this->once()) + ->method('getScore') + ->willReturn(self::$data['score']); + + $this->caseRepository->expects($this->once()) + ->method('getByCaseId') + ->with(self::$data['caseId']) + ->willReturn($this->case); + + $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [ + 'caseRepository' => $this->caseRepository + ]); + + $phrase = __( + 'Case Update: New score for the order is %1. Previous score was %2.', + self::$data['score'], + self::$data['score'] + ); + + $message = $this->caseRescore->generate(self::$data); + + $this->assertEquals($phrase, $message); + } + + /** + * Generate case message with empty previous score. + */ + public function testGenerateWithoutPreviousScore() + { + $this->caseRepository->expects($this->once()) + ->method('getByCaseId') + ->with(self::$data['caseId']) + ->willReturn($this->case); + + $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [ + 'caseRepository' => $this->caseRepository + ]); + + $phrase = __( + 'Case Update: New score for the order is %1. Previous score was %2.', + self::$data['score'], + null + ); + + $message = $this->caseRescore->generate(self::$data); + + $this->assertEquals($phrase, $message); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php new file mode 100644 index 0000000000000..50f87df3b694f --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php @@ -0,0 +1,99 @@ +fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMockForAbstractClass(); + + $this->factory = $objectManager->getObject(GeneratorFactory::class, [ + 'objectManager' => $this->fakeObjectManager + ]); + } + + /** + * Checks if factory returns correct instance of message generator. + * + * @covers \Magento\Signifyd\Model\MessageGenerators\GeneratorFactory::create + * @param string $type + * @param string $className + * @dataProvider typeDataProvider + */ + public function testCreate($type, $className) + { + $generator = $this->getMockBuilder($className) + ->disableOriginalConstructor() + ->getMock(); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with($className) + ->willReturn($generator); + + $instance = $this->factory->create($type); + self::assertInstanceOf($className, $instance); + } + + /** + * Get list of available messages generators types and equal class names. + * + * @return array + */ + public function typeDataProvider() + { + return [ + ['cases/creation', PatternGenerator::class], + ['cases/review', PatternGenerator::class], + ['cases/rescore', CaseRescore::class], + ['guarantees/completion', PatternGenerator::class], + ['guarantees/creation', PatternGenerator::class], + ['guarantees/cancel', PatternGenerator::class], + ]; + } + + /** + * Checks correct exception message for unknown type of message generator. + * + * @covers \Magento\Signifyd\Model\MessageGenerators\GeneratorFactory::create + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Specified message type does not supported. + */ + public function testCreateWithException() + { + $type = 'cases/unknown'; + $this->factory->create($type); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php new file mode 100644 index 0000000000000..9d5f71f657a1e --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php @@ -0,0 +1,83 @@ +generate($data); + } + + /** + * Checks cases with different template placeholders and input data. + * + * @covers \Magento\Signifyd\Model\MessageGenerators\PatternGenerator::generate + * @param string $template + * @param array $requiredFields + * @param string $expected + * @dataProvider messageDataProvider + */ + public function testGenerate($template, array $requiredFields, $expected) + { + $data = [ + 'caseId' => 123, + 'reviewDisposition' => 'Good', + 'guaranteeDisposition' => 'Approved', + 'score' => 500, + 'case_score' => 300 + ]; + + $generator = new PatternGenerator($template, $requiredFields); + $actual = $generator->generate($data); + self::assertEquals($expected, $actual); + } + + /** + * Get list of variations with message templates, required fields and expected generated messages. + * + * @return array + */ + public function messageDataProvider() + { + return [ + [ + 'Signifyd Case %1 has been created for order.', + ['caseId'], + 'Signifyd Case 123 has been created for order.' + ], + [ + 'Case Update: Case Review was completed. Review Deposition is %1.', + ['reviewDisposition'], + 'Case Update: Case Review was completed. Review Deposition is Good.' + ], + [ + 'Case Update: New score for the order is %1. Previous score was %2.', + ['score', 'case_score'], + 'Case Update: New score for the order is 500. Previous score was 300.' + ], + [ + 'Case Update: Case is submitted for guarantee.', + [], + 'Case Update: Case is submitted for guarantee.' + ], + ]; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php new file mode 100644 index 0000000000000..3a567a79891f8 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php @@ -0,0 +1,204 @@ +orderManagement = $this->getMockBuilder(OrderManagementInterface::class) + ->getMockForAbstractClass(); + + $this->commentsHistoryUpdater = $this->getMockBuilder(CommentsHistoryUpdater::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->orderFactory = $this->getMockBuilder(OrderFactory::class) + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); + + $this->order = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->getMock(); + $this->order->expects($this->once()) + ->method('load') + ->willReturnSelf(); + + $this->orderFactory->expects($this->once()) + ->method('create') + ->willReturn($this->order); + + $this->caseEntity = $this->getMockBuilder(CaseInterface::class) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->caseEntity->expects($this->once()) + ->method('getOrderId') + ->willReturn(self::$orderId); + + $this->orderStateService = new OrderStateService( + $this->orderFactory, + $this->orderManagement, + $this->commentsHistoryUpdater + ); + } + + /** + * Tests update order state flow when case guarantee disposition is PENDING. + * + * @param bool $canHold + * @param bool $hold + * @param int $addCommentCall + * @dataProvider updateByCaseWithGuaranteePendingDataProvider + */ + public function testUpdateByCaseWithGuaranteePending($canHold, $hold, $addCommentCall) + { + $this->caseEntity->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseInterface::GUARANTEE_PENDING); + $this->order->expects($this->any()) + ->method('canHold') + ->willReturn($canHold); + $this->orderManagement->expects($this->any()) + ->method('hold') + ->willReturn($hold); + $this->commentsHistoryUpdater->expects($this->exactly($addCommentCall)) + ->method('addComment') + ->with( + $this->caseEntity, + __('Awaiting the Signifyd guarantee disposition.'), + Order::STATE_HOLDED + ); + + $this->orderStateService->updateByCase($this->caseEntity); + } + + /** + * @return array + */ + public function updateByCaseWithGuaranteePendingDataProvider() + { + return [ + ['canHold' => true, 'hold' => true, 'addCommentCall' => 1], + ['canHold' => false, 'hold' => true, 'addCommentCall' => 0], + ['canHold' => true, 'hold' => false, 'addCommentCall' => 0], + ]; + } + + /** + * Tests update order state flow when case guarantee disposition is APPROVED. + * + * @param bool $canUnhold + * @param int $unholdCall + * @dataProvider updateByCaseWithGuaranteeApprovedDataProvider + */ + public function testUpdateByCaseWithGuaranteeApproved($canUnhold, $unholdCall) + { + $this->caseEntity->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseInterface::GUARANTEE_APPROVED); + $this->order->expects($this->any()) + ->method('canUnhold') + ->willReturn($canUnhold); + $this->orderManagement->expects($this->exactly($unholdCall)) + ->method('unHold'); + $this->commentsHistoryUpdater->expects($this->never()) + ->method('addComment'); + + $this->orderStateService->updateByCase($this->caseEntity); + } + + /** + * @return array + */ + public function updateByCaseWithGuaranteeApprovedDataProvider() + { + return [ + ['canUnhold' => true, 'unholdCall' => 1], + ['canUnhold' => false, 'unholdCall' => 0] + ]; + } + + /** + * Tests update order state flow when case guarantee disposition is DECLINED. + * + * @param bool $canHold + * @param int $holdCall + * @dataProvider updateByCaseWithGuaranteeDeclinedDataProvider + */ + public function testUpdateByCaseWithGuaranteeDeclined($canHold, $holdCall) + { + $this->caseEntity->expects($this->once()) + ->method('getGuaranteeDisposition') + ->willReturn(CaseInterface::GUARANTEE_DECLINED); + $this->order->expects($this->any()) + ->method('canHold') + ->willReturn($canHold); + $this->orderManagement->expects($this->exactly($holdCall)) + ->method('hold'); + $this->commentsHistoryUpdater->expects($this->never()) + ->method('addComment'); + + $this->orderStateService->updateByCase($this->caseEntity); + } + + /** + * @return array + */ + public function updateByCaseWithGuaranteeDeclinedDataProvider() + { + return [ + ['canHold' => true, 'holdCall' => 1], + ['canHold' => false, 'holdCall' => 0] + ]; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php new file mode 100644 index 0000000000000..319229e326c4b --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php @@ -0,0 +1,76 @@ +filePath = realpath(__DIR__) . '/_files/'; + + $objectManagerHelper = new ObjectManager($this); + $this->converter = $objectManagerHelper->getObject( + XmlToArrayConfigConverter::class + ); + } + + public function testConvert() + { + $testDom = $this->filePath . 'signifyd_payment_mapping.xml'; + $dom = new \DOMDocument(); + $dom->load($testDom); + $mapping = $this->converter->convert($dom); + $expectedArray = include $this->filePath . 'expected_array.php'; + + $this->assertEquals($expectedArray, $mapping); + } + + /** + * @expectedException \Magento\Framework\Config\Dom\ValidationSchemaException + * @expectedExceptionMessage Only single entrance of "magento_code" node is required. + */ + public function testConvertEmptyPaymentMethodException() + { + $dom = new \DOMDocument(); + $element = $dom->createElement('payment_method'); + $subelement = $dom->createElement('signifyd_code', 'test'); + $element->appendChild($subelement); + $dom->appendChild($element); + + $this->converter->convert($dom); + } + + /** + * @expectedException \Magento\Framework\Config\Dom\ValidationSchemaException + * @expectedExceptionMessage Not empty value for "signifyd_code" node is required. + */ + public function testConvertEmptySygnifydPaymentMethodException() + { + $dom = new \DOMDocument(); + $element = $dom->createElement('payment_method'); + $subelement = $dom->createElement('magento_code', 'test'); + $subelement2 = $dom->createElement('signifyd_code', ''); + $element->appendChild($subelement); + $element->appendChild($subelement2); + $dom->appendChild($element); + + $this->converter->convert($dom); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php new file mode 100644 index 0000000000000..f5d3436ae6b7b --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php @@ -0,0 +1,12 @@ + 'PAYMENT_CARD', + 'payment_method_2' => 'PAYPAL_ACCOUNT', + 'payment_method_3' => 'CHECK', + 'payment_method_4' => 'CASH', + 'payment_method_5' => 'FREE' +]; diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml new file mode 100644 index 0000000000000..f70763e22c418 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml @@ -0,0 +1,32 @@ + + + + + + payment_method_1 + PAYMENT_CARD + + + payment_method_2 + PAYPAL_ACCOUNT + + + payment_method_3 + CHECK + + + payment_method_4 + CASH + + + payment_method_5 + FREE + + + diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php new file mode 100644 index 0000000000000..b0f9239d43bfa --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php @@ -0,0 +1,222 @@ +objectManager = new ObjectManager($this); + + $this->fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->config = $this->getMockBuilder(ConfigInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->avsDefaultAdapter = $this->getMockBuilder(PaymentVerificationInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->cvvDefaultAdapter = $this->getMockBuilder(PaymentVerificationInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->factory = $this->objectManager->getObject(PaymentVerificationFactory::class, [ + 'objectManager' => $this->fakeObjectManager, + 'config' => $this->config, + 'avsDefaultAdapter' => $this->avsDefaultAdapter, + 'cvvDefaultAdapter' => $this->cvvDefaultAdapter + ]); + } + + /** + * Checks a test case when factory creates CVV mapper for provided payment method. + * + * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv + */ + public function testCreatePaymentCvv() + { + $paymentMethodCode = 'exists_payment'; + + $this->config->expects(self::once()) + ->method('setMethodCode') + ->with(self::equalTo($paymentMethodCode)) + ->willReturnSelf(); + + $this->config->expects(self::once()) + ->method('getValue') + ->with('cvv_ems_adapter') + ->willReturn(PaymentVerificationInterface::class); + + /** @var PaymentVerificationInterface|MockObject $cvvAdapter */ + $cvvAdapter = $this->getMockBuilder(PaymentVerificationInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(self::equalTo(PaymentVerificationInterface::class)) + ->willReturn($cvvAdapter); + + $mapper = $this->factory->createPaymentCvv($paymentMethodCode); + self::assertInstanceOf(PaymentVerificationInterface::class, $mapper); + } + + /** + * Checks a test case, when provided payment method does not have cvv mapper. + * + * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv + */ + public function testCreateDefaultCvvMapper() + { + $paymentMethodCode = 'non_exists_payment'; + + $this->config->expects(self::once()) + ->method('setMethodCode') + ->with(self::equalTo($paymentMethodCode)) + ->willReturnSelf(); + + $this->config->expects(self::once()) + ->method('getValue') + ->with('cvv_ems_adapter') + ->willReturn(null); + + $this->fakeObjectManager->expects(self::never()) + ->method('create'); + + $mapper = $this->factory->createPaymentCvv($paymentMethodCode); + self::assertSame($this->cvvDefaultAdapter, $mapper); + } + + /** + * Checks a test case, when mapper implementation does not corresponding to PaymentVerificationInterface. + * + * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv + * @expectedException \Magento\Framework\Exception\ConfigurationMismatchException + * @expectedExceptionMessage stdClass must implement Magento\Payment\Api\PaymentVerificationInterface + */ + public function testCreateWithUnsupportedImplementation() + { + $paymentMethodCode = 'exists_payment'; + + $this->config->expects(self::once()) + ->method('setMethodCode') + ->with(self::equalTo($paymentMethodCode)) + ->willReturnSelf(); + + $this->config->expects(self::once()) + ->method('getValue') + ->with('cvv_ems_adapter') + ->willReturn(\stdClass::class); + + $cvvAdapter = new \stdClass(); + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(self::equalTo(\stdClass::class)) + ->willReturn($cvvAdapter); + + $this->factory->createPaymentCvv($paymentMethodCode); + } + + /** + * Checks a test case when factory creates AVS mapper for provided payment method. + * + * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentAvs + */ + public function testCreatePaymentAvs() + { + $paymentMethodCode = 'exists_payment'; + + $this->config->expects(self::once()) + ->method('setMethodCode') + ->with(self::equalTo($paymentMethodCode)) + ->willReturnSelf(); + + $this->config->expects(self::once()) + ->method('getValue') + ->with('avs_ems_adapter') + ->willReturn(PaymentVerificationInterface::class); + + $avsAdapter = $this->getMockBuilder(PaymentVerificationInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->fakeObjectManager->expects(self::once()) + ->method('create') + ->with(self::equalTo(PaymentVerificationInterface::class)) + ->willReturn($avsAdapter); + + $mapper = $this->factory->createPaymentAvs($paymentMethodCode); + self::assertInstanceOf(PaymentVerificationInterface::class, $mapper); + } + + /** + * Checks a test case when provided payment method does not support + */ + public function testCreateDefaultAvsMapper() + { + $paymentMethodCode = 'non_exists_payment'; + + $this->config->expects(self::once()) + ->method('setMethodCode') + ->with(self::equalTo($paymentMethodCode)) + ->willReturnSelf(); + + $this->config->expects(self::once()) + ->method('getValue') + ->with('avs_ems_adapter') + ->willReturn(null); + + $this->fakeObjectManager->expects(self::never()) + ->method('create'); + + $mapper = $this->factory->createPaymentAvs($paymentMethodCode); + self::assertSame($this->avsDefaultAdapter, $mapper); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php new file mode 100644 index 0000000000000..885c9f018a488 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php @@ -0,0 +1,72 @@ +orderGrid = $this->getMockBuilder(GridInterface::class) + ->getMockForAbstractClass(); + $this->globalConfig = $this->getMockBuilder(ScopeConfigInterface::class) + ->getMockForAbstractClass(); + + $this->model = new OrderGridUpdater($this->orderGrid, $this->globalConfig); + } + + public function testUpdateInSyncMode() + { + $orderId = 1; + + $this->globalConfig->expects($this->once()) + ->method('getValue') + ->with('dev/grid/async_indexing', 'default', null) + ->willReturn(false); + $this->orderGrid->expects($this->once()) + ->method('refresh') + ->with($orderId); + + $this->model->update($orderId); + } + + public function testUpdateInAsyncMode() + { + $orderId = 1; + + $this->globalConfig->expects($this->once()) + ->method('getValue') + ->with('dev/grid/async_indexing', 'default', null) + ->willReturn(true); + $this->orderGrid->expects($this->never()) + ->method('refresh') + ->with($orderId); + + $this->model->update($orderId); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php new file mode 100644 index 0000000000000..776e8a75b9646 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php @@ -0,0 +1,128 @@ +objectManager = new ObjectManager($this); + + $this->config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->client = $this->getMockBuilder(ZendClient::class) + ->disableOriginalConstructor() + ->setMethods(['setHeaders', 'setMethod', 'setUri', 'setRawData']) + ->getMock(); + + $this->clientFactory = $this->getMockBuilder(ZendClientFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->clientFactory->expects($this->once()) + ->method('create') + ->willReturn($this->client); + + $this->dataEncoder = $this->getMockBuilder(EncoderInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->httpClient = $this->objectManager->getObject(HttpClientFactory::class, [ + 'config' => $this->config, + 'clientFactory' => $this->clientFactory, + 'dataEncoder' => $this->dataEncoder + ]); + } + + public function testCreateHttpClient() + { + $this->config->expects($this->once()) + ->method('getApiKey') + ->willReturn('testKey'); + + $this->config->expects($this->once()) + ->method('getApiUrl') + ->willReturn('testUrl'); + + $client = $this->httpClient->create('url', 'method'); + + $this->assertInstanceOf(ZendClient::class, $client); + } + + public function testCreateWithParams() + { + $param = ['id' => 1]; + $json = '{"id":1}'; + + $this->config->expects($this->once()) + ->method('getApiKey') + ->willReturn('testKey'); + + $this->config->expects($this->once()) + ->method('getApiUrl') + ->willReturn(self::$dummy); + + $this->dataEncoder->expects($this->once()) + ->method('encode') + ->with($this->equalTo($param)) + ->willReturn($json); + + $this->client->expects($this->once()) + ->method('setRawData') + ->with($this->equalTo($json), 'application/json') + ->willReturnSelf(); + + $client = $this->httpClient->create('url', 'method', $param); + + $this->assertInstanceOf(ZendClient::class, $client); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php new file mode 100644 index 0000000000000..bf0c6ee238d5f --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php @@ -0,0 +1,179 @@ +objectManager = new ObjectManager($this); + + $this->dataDecoder = $this->getMockBuilder(DecoderInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->response = $this->getMockBuilder(Response::class) + ->disableOriginalConstructor() + ->setMethods(['getStatus', 'getBody']) + ->getMock(); + + $this->responseHandler = $this->objectManager->getObject(ResponseHandler::class, [ + 'dataDecoder' => $this->dataDecoder + ]); + } + + /** + * @dataProvider errorsProvider + */ + public function testHandleFailureMessage($code, $message) + { + $this->response->expects($this->any()) + ->method('getStatus') + ->willReturn($code); + + $this->response->expects($this->once()) + ->method('getBody') + ->willReturn(self::$errorMessage); + + try { + $this->responseHandler->handle($this->response); + } catch (ApiCallException $e) { + $this->assertEquals($e->getMessage(), sprintf($message, self::$errorMessage)); + } + } + + public function errorsProvider() + { + return [ + [400, 'Bad Request - The request could not be parsed. Response: %s'], + [401, 'Unauthorized - user is not logged in, could not be authenticated. Response: %s'], + [403, 'Forbidden - Cannot access resource. Response: %s'], + [404, 'Not Found - resource does not exist. Response: %s'], + [ + 409, + 'Conflict - with state of the resource on server. Can occur with (too rapid) PUT requests. Response: %s' + ], + [500, 'Server error. Response: %s'] + ]; + } + + /** + * @expectedException \Magento\Signifyd\Model\SignifydGateway\ApiCallException + * @expectedExceptionMessage Response is not valid JSON: Decoding failed: Syntax error + */ + public function testHandleEmptyJsonException() + { + $this->response->expects($this->any()) + ->method('getStatus') + ->willReturn(self::$successfulCode); + + $this->response->expects($this->once()) + ->method('getBody') + ->willReturn(''); + + $r = new \ReflectionObject($this->responseHandler); + $prop = $r->getProperty('phpVersionId'); + $prop->setAccessible(true); + $prop->setValue(self::$phpVersionId); + + $this->responseHandler->handle($this->response); + } + + /** + * @expectedException \Magento\Signifyd\Model\SignifydGateway\ApiCallException + * @expectedExceptionMessage Response is not valid JSON: Some error + */ + public function testHandleInvalidJson() + { + $this->response->expects($this->any()) + ->method('getStatus') + ->willReturn(self::$successfulCode); + + $this->response->expects($this->once()) + ->method('getBody') + ->willReturn('param'); + + $this->dataDecoder = $this->getMockBuilder(DecoderInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->dataDecoder->expects($this->once()) + ->method('decode') + ->with('param') + ->willThrowException(new \Exception(self::$errorMessage, 30)); + + $this->responseHandler = $this->objectManager->getObject(ResponseHandler::class, [ + 'dataDecoder' => $this->dataDecoder + ]); + + $this->responseHandler->handle($this->response); + } + + public function testHandle() + { + $this->response->expects($this->any()) + ->method('getStatus') + ->willReturn(self::$successfulCode); + + $this->response->expects($this->once()) + ->method('getBody') + ->willReturn(self::$testJson); + + $this->dataDecoder->expects($this->once()) + ->method('decode') + ->willReturn(json_decode(self::$testJson, 1)); + + $decodedResponseBody = $this->responseHandler->handle($this->response); + $this->assertEquals($decodedResponseBody, ['id' => 1]); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php new file mode 100644 index 0000000000000..f7aa65f842b91 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php @@ -0,0 +1,338 @@ +createCaseBuilder = $this->getMockBuilder(CreateCaseBuilderInterface::class) + ->getMockForAbstractClass(); + + $this->apiClient = $this->getMockBuilder(ApiClient::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->gateway = new Gateway( + $this->createCaseBuilder, + $this->apiClient + ); + } + + public function testCreateCaseForSpecifiedOrder() + { + $dummyOrderId = 1; + $dummySignifydInvestigationId = 42; + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'investigationId' => $dummySignifydInvestigationId + ]); + + $this->createCaseBuilder + ->expects($this->atLeastOnce()) + ->method('build') + ->with($this->equalTo($dummyOrderId)) + ->willReturn([]); + + $result = $this->gateway->createCase($dummyOrderId); + $this->assertEquals(42, $result); + } + + public function testCreateCaseCallsValidApiMethod() + { + $dummyOrderId = 1; + $dummySignifydInvestigationId = 42; + $this->createCaseBuilder + ->method('build') + ->willReturn([]); + + $this->apiClient + ->expects($this->atLeastOnce()) + ->method('makeApiCall') + ->with( + $this->equalTo('/cases'), + $this->equalTo('POST'), + $this->isType('array') + ) + ->willReturn([ + 'investigationId' => $dummySignifydInvestigationId + ]); + + $result = $this->gateway->createCase($dummyOrderId); + $this->assertEquals(42, $result); + } + + public function testCreateCaseNormalFlow() + { + $dummyOrderId = 1; + $dummySignifydInvestigationId = 42; + $this->createCaseBuilder + ->method('build') + ->willReturn([]); + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'investigationId' => $dummySignifydInvestigationId + ]); + + $returnedInvestigationId = $this->gateway->createCase($dummyOrderId); + $this->assertEquals( + $dummySignifydInvestigationId, + $returnedInvestigationId, + 'Method must return value specified in "investigationId" response parameter' + ); + } + + public function testCreateCaseWithFailedApiCall() + { + $dummyOrderId = 1; + $apiCallFailureMessage = 'Api call failed'; + $this->createCaseBuilder + ->method('build') + ->willReturn([]); + $this->apiClient + ->method('makeApiCall') + ->willThrowException(new ApiCallException($apiCallFailureMessage)); + + $this->expectException( + GatewayException::class, + $apiCallFailureMessage + ); + $this->gateway->createCase($dummyOrderId); + } + + public function testCreateCaseWithMissedResponseRequiredData() + { + $dummyOrderId = 1; + $this->createCaseBuilder + ->method('build') + ->willReturn([]); + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'someOtherParameter' => 'foo', + ]); + + $this->expectException(GatewayException::class); + $this->gateway->createCase($dummyOrderId); + } + + public function testCreateCaseWithAdditionalResponseData() + { + $dummyOrderId = 1; + $dummySignifydInvestigationId = 42; + $this->createCaseBuilder + ->method('build') + ->willReturn([]); + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'investigationId' => $dummySignifydInvestigationId, + 'someOtherParameter' => 'foo', + ]); + + $returnedInvestigationId = $this->gateway->createCase($dummyOrderId); + $this->assertEquals( + $dummySignifydInvestigationId, + $returnedInvestigationId, + 'Method must return value specified in "investigationId" response parameter and ignore any other parameters' + ); + } + + public function testSubmitCaseForGuaranteeCallsValidApiMethod() + { + $dummySygnifydCaseId = 42; + $dummyDisposition = 'APPROVED'; + + $this->apiClient + ->expects($this->atLeastOnce()) + ->method('makeApiCall') + ->with( + $this->equalTo('/guarantees'), + $this->equalTo('POST'), + $this->equalTo([ + 'caseId' => $dummySygnifydCaseId + ]) + )->willReturn([ + 'disposition' => $dummyDisposition + ]); + + $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + $this->assertEquals('APPROVED', $result); + } + + public function testSubmitCaseForGuaranteeWithFailedApiCall() + { + $dummySygnifydCaseId = 42; + $apiCallFailureMessage = 'Api call failed'; + + $this->apiClient + ->method('makeApiCall') + ->willThrowException(new ApiCallException($apiCallFailureMessage)); + + $this->expectException( + GatewayException::class, + $apiCallFailureMessage + ); + $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + $this->assertEquals('Api call failed', $result); + } + + public function testSubmitCaseForGuaranteeReturnsDisposition() + { + $dummySygnifydCaseId = 42; + $dummyDisposition = 'APPROVED'; + $dummyGuaranteeId = 123; + $dummyRereviewCount = 0; + + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'guaranteeId' => $dummyGuaranteeId, + 'disposition' => $dummyDisposition, + 'rereviewCount' => $dummyRereviewCount, + ]); + + $actualDisposition = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + $this->assertEquals( + $dummyDisposition, + $actualDisposition, + 'Method must return guarantee disposition retrieved in Signifyd API response as a result' + ); + } + + public function testSubmitCaseForGuaranteeWithMissedDisposition() + { + $dummySygnifydCaseId = 42; + $dummyGuaranteeId = 123; + $dummyRereviewCount = 0; + + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'guaranteeId' => $dummyGuaranteeId, + 'rereviewCount' => $dummyRereviewCount, + ]); + + $this->expectException(GatewayException::class); + $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + } + + public function testSubmitCaseForGuaranteeWithUnexpectedDisposition() + { + $dummySygnifydCaseId = 42; + $dummyUnexpectedDisposition = 'UNEXPECTED'; + + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'disposition' => $dummyUnexpectedDisposition, + ]); + + $this->expectException(GatewayException::class); + $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + $this->assertEquals('UNEXPECTED', $result); + } + + /** + * @dataProvider supportedGuaranteeDispositionsProvider + */ + public function testSubmitCaseForGuaranteeWithExpectedDisposition($dummyExpectedDisposition) + { + $dummySygnifydCaseId = 42; + + $this->apiClient + ->method('makeApiCall') + ->willReturn([ + 'disposition' => $dummyExpectedDisposition, + ]); + + try { + $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); + $this->assertEquals($dummyExpectedDisposition, $result); + } catch (GatewayException $e) { + $this->fail(sprintf( + 'Expected disposition "%s" was not accepted with message "%s"', + $dummyExpectedDisposition, + $e->getMessage() + )); + } + } + + /** + * Checks a test case when guarantee for a case is successfully canceled + * + * @covers \Magento\Signifyd\Model\SignifydGateway\Gateway::cancelGuarantee + */ + public function testCancelGuarantee() + { + $caseId = 123; + + $this->apiClient->expects(self::once()) + ->method('makeApiCall') + ->with('/cases/' . $caseId . '/guarantee', 'PUT', ['guaranteeDisposition' => Gateway::GUARANTEE_CANCELED]) + ->willReturn(['disposition' => Gateway::GUARANTEE_CANCELED]); + + $result = $this->gateway->cancelGuarantee($caseId); + self::assertEquals(Gateway::GUARANTEE_CANCELED, $result); + } + + /** + * Checks a case when API request returns unexpected guarantee disposition. + * + * @covers \Magento\Signifyd\Model\SignifydGateway\Gateway::cancelGuarantee + * @expectedException \Magento\Signifyd\Model\SignifydGateway\GatewayException + * @expectedExceptionMessage API returned unexpected disposition: DECLINED. + */ + public function testCancelGuaranteeWithUnexpectedDisposition() + { + $caseId = 123; + + $this->apiClient->expects(self::once()) + ->method('makeApiCall') + ->with('/cases/' . $caseId . '/guarantee', 'PUT', ['guaranteeDisposition' => Gateway::GUARANTEE_CANCELED]) + ->willReturn(['disposition' => Gateway::GUARANTEE_DECLINED]); + + $result = $this->gateway->cancelGuarantee($caseId); + $this->assertEquals(Gateway::GUARANTEE_CANCELED, $result); + } + + public function supportedGuaranteeDispositionsProvider() + { + return [ + 'APPROVED' => ['APPROVED'], + 'DECLINED' => ['DECLINED'], + 'PENDING' => ['PENDING'], + 'CANCELED' => ['CANCELED'], + 'IN_REVIEW' => ['IN_REVIEW'], + 'UNREQUESTED' => ['UNREQUESTED'], + ]; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php new file mode 100644 index 0000000000000..0dfdf4980fb58 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php @@ -0,0 +1,114 @@ +decoder = $this->getMockBuilder(DecoderInterface::class) + ->getMockForAbstractClass(); + + $this->webhookMessageFactory = $this->getMockBuilder(WebhookMessageFactory::class) + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); + + $this->webhookRequest = $this->getMockBuilder(WebhookRequest::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->model = new WebhookMessageReader( + $this->decoder, + $this->webhookMessageFactory + ); + } + + /** + * Tests successful reading webhook message from request. + * + */ + public function testReadSuccess() + { + $rawBody = 'body'; + $topic = 'topic'; + $decodedData = ['status' => "DISMISSED", 'orderId' => '19418']; + + $this->webhookRequest->expects($this->once()) + ->method('getBody') + ->willReturn($rawBody); + $this->webhookRequest->expects($this->once()) + ->method('getEventTopic') + ->willReturn('topic'); + $this->decoder->expects($this->once()) + ->method('decode') + ->with($rawBody) + ->willReturn($decodedData); + $webhookMessage = $this->getMockBuilder(WebhookMessage::class) + ->disableOriginalConstructor() + ->getMock(); + $this->webhookMessageFactory->expects($this->once()) + ->method('create') + ->with( + [ + 'data' => $decodedData, + 'eventTopic' => $topic + ] + ) + ->willReturn($webhookMessage); + + $this->assertEquals( + $webhookMessage, + $this->model->read($this->webhookRequest) + ); + } + + /** + * Tests reading failure webhook message from request. + * + * @expectedException \InvalidArgumentException + */ + public function testReadFail() + { + $this->decoder->expects($this->once()) + ->method('decode') + ->willThrowException(new \Exception('Error')); + + $this->model->read($this->webhookRequest); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php new file mode 100644 index 0000000000000..5ae6b95a77548 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php @@ -0,0 +1,231 @@ +config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->decoder = $this->getMockBuilder(DecoderInterface::class) + ->getMockForAbstractClass(); + + $this->model = new WebhookRequestValidator( + $this->config, + $this->decoder + ); + } + + /** + * Tests successful cases. + * + * @param string $body + * @param string $topic + * @param string $hash + * @param int$callConfigCount + * @dataProvider validateSuccessDataProvider + */ + public function testValidateSuccess($body, $topic, $hash, $callConfigCount) + { + $this->config->expects($this->exactly($callConfigCount)) + ->method('getApiKey') + ->willReturn('GpFZZnxGgIxuI8BazSm3v6eGK'); + + $this->decoder->expects($this->once()) + ->method('decode') + ->with($body) + ->willReturn(['status' => "DISMISSED", 'orderId' => '19418']); + + $webhookRequest = $this->createWebhookRequest($body, $topic, $hash); + + $this->assertTrue( + $this->model->validate($webhookRequest) + ); + } + + /** + * @case 1. All data are correct, event topic has real value + * @case 2. All data are correct, event topic has test value + * @return array + */ + public function validateSuccessDataProvider() + { + return [ + 1 => [ + 'body' => '{ status: "DISMISSED", orderId: "19418" }', + 'topic' => 'cases/creation', + 'hash' => 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q=', + 'callConfigCount' => 1 + ], + 2 => [ + 'body' => '{ status: "DISMISSED", orderId: "19418" }', + 'topic' => 'cases/test', + 'hash' => '6npAahliNbzYo/Qi4+g+JeqPhLFgg19sIbuxDLmvobw=', + 'callConfigCount' => 0 + ] + ]; + } + + /** + * Case with wrong event topic + * + * @param string $topic + * @dataProvider validationTopicFailsDataProvider + */ + public function testValidationTopicFails($topic) + { + $body = '{ status: "DISMISSED", orderId: "19418" }'; + $hash = 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q='; + + $this->config->expects($this->never()) + ->method('getApiKey'); + + $this->decoder->expects($this->never()) + ->method('decode'); + + $webhookRequest = $this->createWebhookRequest($body, $topic, $hash); + + $this->assertFalse( + $this->model->validate($webhookRequest), + 'Negative webhook event topic value validation fails' + ); + } + + /** + * @return array + */ + public function validationTopicFailsDataProvider() + { + return [ + ['wrong topic' => 'bla-bla-topic'], + ['empty topic' => ''] + ]; + } + + /** + * Case with wrong webhook request body + * + * @param string $body + * @dataProvider validationBodyFailsDataProvider + */ + public function testValidationBodyFails($body) + { + $topic = 'cases/creation'; + $hash = 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q='; + $webhookRequest = $this->createWebhookRequest($body, $topic, $hash); + + $this->config->expects($this->never()) + ->method('getApiKey'); + + if (empty($body)) { + $this->decoder->expects($this->once()) + ->method('decode') + ->with($body) + ->willReturn(''); + } else { + $this->decoder->expects($this->once()) + ->method('decode') + ->with($body) + ->willThrowException(new \Exception('Error')); + } + + $this->assertFalse( + $this->model->validate($webhookRequest), + 'Negative webhook request body validation fails' + ); + } + + /** + * @return array + */ + public function validationBodyFailsDataProvider() + { + return [ + ['Empty request body' => ''], + ['Bad request body' => '{ bad data}'] + ]; + } + + /** + * Case with wrong hash + */ + public function testValidationHashFails() + { + $topic = 'cases/creation'; + $body = '{ status: "DISMISSED", orderId: "19418" }'; + $hash = 'wrong hash'; + $webhookRequest = $this->createWebhookRequest($body, $topic, $hash); + + $this->config->expects($this->once()) + ->method('getApiKey') + ->willReturn('GpFZZnxGgIxuI8BazSm3v6eGK'); + + $this->decoder->expects($this->once()) + ->method('decode') + ->with($body) + ->willReturn(['status' => "DISMISSED", 'orderId' => '19418']); + + $this->assertFalse( + $this->model->validate($webhookRequest), + 'Negative webhook hash validation fails' + ); + } + + /** + * Returns mocked WebhookRequest + * + * @param string $body + * @param string $topic + * @param string $hash + * @return WebhookRequest|\PHPUnit_Framework_MockObject_MockObject + */ + private function createWebhookRequest($body, $topic, $hash) + { + $webhookRequest = $this->getMockBuilder(WebhookRequest::class) + ->disableOriginalConstructor() + ->getMock(); + $webhookRequest->expects($this->once()) + ->method('getBody') + ->willReturn($body); + $webhookRequest->expects($this->once()) + ->method('getEventTopic') + ->willReturn($topic); + $webhookRequest->expects($this->once()) + ->method('getHash') + ->willReturn($hash); + + return $webhookRequest; + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php new file mode 100644 index 0000000000000..9d3061f240c21 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php @@ -0,0 +1,60 @@ +identityGenerator = $this->getMockBuilder(IdentityGeneratorInterface::class) + ->getMockForAbstractClass(); + + $this->signifydOrderSessionId = new SignifydOrderSessionId($this->identityGenerator); + } + + /** + * Tests method by passing quoteId parameter + * + * @covers \Magento\Signifyd\Model\SignifydOrderSessionId::get + */ + public function testGetByQuoteId() + { + $quoteId = 1; + $signifydOrderSessionId = 'asdfzxcv'; + + $this->identityGenerator->expects(self::once()) + ->method('generateIdForData') + ->with($quoteId) + ->willReturn($signifydOrderSessionId); + + $this->assertEquals( + $signifydOrderSessionId, + $this->signifydOrderSessionId->get($quoteId) + ); + } +} diff --git a/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php new file mode 100644 index 0000000000000..e2870953ec280 --- /dev/null +++ b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php @@ -0,0 +1,255 @@ +config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->setMethods(['isActive']) + ->getMock(); + + $this->logger = $this->getMockBuilder(LoggerInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->creationService = $this->getMockBuilder(CaseCreationServiceInterface::class) + ->disableOriginalConstructor() + ->setMethods(['createForOrder']) + ->getMock(); + + $this->observer = $this->getMockBuilder(Observer::class) + ->disableOriginalConstructor() + ->setMethods(['getEvent']) + ->getMock(); + + $this->event = $this->getMockBuilder(Event::class) + ->disableOriginalConstructor() + ->setMethods(['getData']) + ->getMock(); + + $this->placeOrder = new PlaceOrder( + $this->config, + $this->creationService, + $this->logger + ); + } + + /** + * Checks a test case when Signifyd module is disabled. + * + * @covers \Magento\Signifyd\Observer\PlaceOrder::execute + */ + public function testExecuteWithDisabledModule() + { + $this->withActiveSignifydIntegration(false); + + $this->creationService->expects(self::never()) + ->method('createForOrder'); + + $this->placeOrder->execute($this->observer); + } + + /** + * Checks a test case when the observer event returns empty an order entity. + * + * @covers \Magento\Signifyd\Observer\PlaceOrder::execute + */ + public function testExecuteWithoutOrder() + { + $this->withActiveSignifydIntegration(true); + $this->withOrderEntity(null); + + $this->creationService->expects(self::never()) + ->method('createForOrder'); + + $this->placeOrder->execute($this->observer); + } + + /** + * Checks a test case when the order placed with offline payment method. + * + * @covers \Magento\Signifyd\Observer\PlaceOrder::execute + */ + public function testExecuteWithOfflinePayment() + { + $orderId = 1; + $this->withActiveSignifydIntegration(true); + $this->withOrderEntity($orderId); + $this->withAvailablePaymentMethod(false); + + $this->creationService->expects(self::never()) + ->method('createForOrder'); + + $this->placeOrder->execute($this->observer); + } + + /** + * Checks a test case when case creation service fails. + * + * @covers \Magento\Signifyd\Observer\PlaceOrder::execute + */ + public function testExecuteWithFailedCaseCreation() + { + $orderId = 1; + $exceptionMessage = __('Case with the same order id already exists.'); + + $this->withActiveSignifydIntegration(true); + $this->withOrderEntity($orderId); + $this->withAvailablePaymentMethod(true); + + $this->creationService->method('createForOrder') + ->with(self::equalTo($orderId)) + ->willThrowException(new AlreadyExistsException($exceptionMessage)); + + $this->logger->method('error') + ->with(self::equalTo($exceptionMessage)); + + $result = $this->placeOrder->execute($this->observer); + $this->assertNull($result); + } + + /** + * Checks a test case when observer successfully calls case creation service. + * + * @covers \Magento\Signifyd\Observer\PlaceOrder::execute + */ + public function testExecute() + { + $orderId = 1; + + $this->withActiveSignifydIntegration(true); + $this->withOrderEntity($orderId); + $this->withAvailablePaymentMethod(true); + + $this->creationService + ->method('createForOrder') + ->with(self::equalTo($orderId)); + + $this->logger->expects(self::never()) + ->method('error'); + + $this->placeOrder->execute($this->observer); + } + + /** + * Specifies order entity mock execution. + * + * @param int $orderId + * @return void + */ + private function withOrderEntity($orderId) + { + $this->orderEntity = $this->getMockBuilder(OrderInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->orderEntity->method('getEntityId') + ->willReturn($orderId); + + $this->observer->method('getEvent') + ->willReturn($this->event); + + $this->event->method('getData') + ->with('order') + ->willReturn($this->orderEntity); + } + + /** + * Specifies config mock execution. + * + * @param bool $isActive + * @return void + */ + private function withActiveSignifydIntegration($isActive) + { + $this->config->method('isActive') + ->willReturn($isActive); + } + + /** + * Specifies payment method mock execution. + * + * @param bool $isAvailable + * @return void + */ + private function withAvailablePaymentMethod($isAvailable) + { + /** @var MethodInterface|MockObject $paymentMethod */ + $paymentMethod = $this->getMockBuilder(MethodInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + /** + * The code depends on implementation but not interface + * because order payment implements two interfaces + */ + /** @var Payment|MockObject $orderPayment */ + $orderPayment = $this->getMockBuilder(Payment::class) + ->disableOriginalConstructor() + ->getMock(); + $this->orderEntity->method('getPayment') + ->willReturn($orderPayment); + + $orderPayment->method('getMethodInstance') + ->willReturn($paymentMethod); + + $paymentMethod->method('isOffline') + ->willReturn(!$isAvailable); + } +} diff --git a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php new file mode 100644 index 0000000000000..1e6234a8e27a9 --- /dev/null +++ b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php @@ -0,0 +1,56 @@ +escaper = $escaper; + } + + /** + * {@inheritdoc} + */ + public function toOptionArray() + { + return [ + [ + 'value' => CaseInterface::GUARANTEE_DECLINED, + 'label' => $this->escaper->escapeHtml(__('Declined')) + ], + [ + 'value' => CaseInterface::GUARANTEE_APPROVED, + 'label' => $this->escaper->escapeHtml(__('Approved')) + ], + [ + 'value' => CaseInterface::GUARANTEE_CANCELED, + 'label' => $this->escaper->escapeHtml(__('Canceled')) + ], + [ + 'value' => CaseInterface::GUARANTEE_PENDING, + 'label' => $this->escaper->escapeHtml(__('Pending')) + ] + ]; + } +} diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json new file mode 100644 index 0000000000000..59326a48f3e85 --- /dev/null +++ b/app/code/Magento/Signifyd/composer.json @@ -0,0 +1,35 @@ +{ + "name": "magento/module-signifyd", + "description": "Submitting Case Entry to Signifyd on Order Creation", + "config": { + "sort-packages": true + }, + "require": { + "magento/framework": "100.3.*", + "magento/module-backend": "100.3.*", + "magento/module-checkout": "100.3.*", + "magento/module-config": "100.3.*", + "magento/module-customer": "100.3.*", + "magento/module-directory": "100.3.*", + "magento/module-payment": "100.3.*", + "magento/module-sales": "100.3.*", + "magento/module-store": "100.3.*", + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + }, + "suggest": { + "magento/module-config": "100.3.*" + }, + "type": "magento2-module", + "version": "100.3.0-dev", + "license": [ + "proprietary" + ], + "autoload": { + "files": [ + "registration.php" + ], + "psr-4": { + "Magento\\Signifyd\\": "" + } + } +} diff --git a/app/code/Magento/Signifyd/etc/acl.xml b/app/code/Magento/Signifyd/etc/acl.xml new file mode 100644 index 0000000000000..32f0493fbcad9 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/acl.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/adminhtml/di.xml b/app/code/Magento/Signifyd/etc/adminhtml/di.xml new file mode 100644 index 0000000000000..c771d67216d43 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/adminhtml/di.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/code/Magento/Signifyd/etc/adminhtml/routes.xml b/app/code/Magento/Signifyd/etc/adminhtml/routes.xml new file mode 100644 index 0000000000000..c078ab3c8c4c1 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/adminhtml/routes.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml new file mode 100644 index 0000000000000..d9ba2f7ffdff2 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml @@ -0,0 +1,65 @@ + + + + +
    + + sales + Magento_Sales::fraud_protection + + signifyd-logo-header + + Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info + signifyd-about-header + + Benefits:
      +
    • Grow your business without fear of fraud
      • +
    • Accept more orders and maximize your revenue
      • +
    • Automate order review and shift fraud off your plate

    ]]> +     + https://www.signifyd.com/magento-guaranteed-fraud-protection +     + + signifyd-about-header + + View our setup guide for step-by-step instructions on how to integrate Signifyd with Magento.
    For support contact support@signifyd.com.]]> +     + + + Magento\Config\Model\Config\Source\Yesno + fraud_protection/signifyd/active + + + + settings page in the Signifyd console]]> + fraud_protection/signifyd/api_key + Magento\Config\Model\Config\Backend\Encrypted + + + + fraud_protection/signifyd/api_url + Don’t change unless asked to do so. + + + + Magento\Config\Model\Config\Source\Yesno + fraud_protection/signifyd/debug + + + + configure a guarantee completed webhook in Signifyd. Webhooks are used to sync Signifyd`s guarantee decisions back to Magento.]]> + signifyd/webhooks/handler + Magento\Signifyd\Block\Adminhtml\System\Config\Field\WebhookUrl + +     +     +
    +     +     diff --git a/app/code/Magento/Signifyd/etc/config.xml b/app/code/Magento/Signifyd/etc/config.xml new file mode 100644 index 0000000000000..804342a14bb08 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/config.xml @@ -0,0 +1,19 @@ + + + + + + + 0 + https://api.signifyd.com/v2/ + + 0 + + + + diff --git a/app/code/Magento/Signifyd/etc/db_schema.xml b/app/code/Magento/Signifyd/etc/db_schema.xml new file mode 100644 index 0000000000000..731ae1e94b2bb --- /dev/null +++ b/app/code/Magento/Signifyd/etc/db_schema.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + +
    +     diff --git a/app/code/Magento/Signifyd/etc/db_schema_whitelist.json b/app/code/Magento/Signifyd/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..31f753dbb3b39 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/db_schema_whitelist.json @@ -0,0 +1,28 @@ +{ + "signifyd_case": { + "column": { + "entity_id": true, + "order_id": true, + "case_id": true, + "guarantee_eligible": true, + "guarantee_disposition": true, + "status": true, + "score": true, + "associated_team": true, + "review_disposition": true, + "created_at": true, + "updated_at": true + }, + "constraint": { + "PRIMARY": true, + "SIGNIFYD_CASE_ORDER_ID_SALES_ORDER_ENTITY_ID": true, + "SIGNIFYD_CASE_ORDER_ID": true, + "SIGNIFYD_CASE_CASE_ID": true + } + }, + "sales_order_grid": { + "column": { + "signifyd_guarantee_status": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Signifyd/etc/di.xml b/app/code/Magento/Signifyd/etc/di.xml new file mode 100644 index 0000000000000..92ad8a0bfd87a --- /dev/null +++ b/app/code/Magento/Signifyd/etc/di.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + U + + + + + + + Magento\Payment\Gateway\Config\Config + SignifydAvsDefaultMapper + SignifydCvvDefaultMapper + + + + + Magento\Sales\Model\ResourceModel\Order\Grid + + + + + + Magento\Signifyd\Model\SalesOrderGrid\NotSyncedOrderIdListProvider + + + + + + SignifydIdListProvider + + + signifyd_case + entity_id + order_id + + + + signifyd_case.guarantee_disposition + + + + + + sales + + + + + Magento_Signifyd + signifyd_payment_mapping.xsd + + + + + Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter + PaymentMapperSchemaLocator + signifyd_payment_mapping.xml + + + + + PaymentMapperConfigReader + signifyd_payment_list_cache + + + + + PaymentMethodConfigData + + + + + + 1 + 1 + + + 1 + 1 + + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/events.xml b/app/code/Magento/Signifyd/etc/events.xml new file mode 100644 index 0000000000000..a89b56ddf13c6 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/events.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/frontend/di.xml b/app/code/Magento/Signifyd/etc/frontend/di.xml new file mode 100644 index 0000000000000..08a690d1a9930 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/frontend/di.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/code/Magento/Signifyd/etc/frontend/routes.xml b/app/code/Magento/Signifyd/etc/frontend/routes.xml new file mode 100644 index 0000000000000..5803f59d8624b --- /dev/null +++ b/app/code/Magento/Signifyd/etc/frontend/routes.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/module.xml b/app/code/Magento/Signifyd/etc/module.xml new file mode 100644 index 0000000000000..d5adcba88ad9a --- /dev/null +++ b/app/code/Magento/Signifyd/etc/module.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml new file mode 100644 index 0000000000000..096a968167173 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml @@ -0,0 +1,82 @@ + + + + + + braintree + PAYMENT_CARD + + + braintree_paypal + PAYPAL_ACCOUNT + + + paypal_express + PAYPAL_ACCOUNT + + + paypal_express_bml + PAYPAL_ACCOUNT + + + payflow_express + PAYPAL_ACCOUNT + + + payflow_express_bml + PAYPAL_ACCOUNT + + + payflowpro + PAYMENT_CARD + + + payflow_link + PAYMENT_CARD + + + payflow_advanced + PAYMENT_CARD + + + hosted_pro + PAYMENT_CARD + + + authorizenet_directpost + PAYMENT_CARD + + + worldpay + PAYMENT_CARD + + + eway + PAYMENT_CARD + + + cybersource + PAYMENT_CARD + + + free + FREE + + + diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd new file mode 100644 index 0000000000000..f48805c328e09 --- /dev/null +++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Signifyd/i18n/en_US.csv b/app/code/Magento/Signifyd/i18n/en_US.csv new file mode 100644 index 0000000000000..40772188dac9e --- /dev/null +++ b/app/code/Magento/Signifyd/i18n/en_US.csv @@ -0,0 +1,46 @@ +OPEN,Open +PROCESSING,Processing +FLAGGED,Flagged +DISMISSED,Dismissed +HELD,Held +GOOD,Good +FRAUDULENT,Fraudulent +UNSET,Unset +NULL,Unset +APPROVED,Approved +DECLINED,Declined +PENDING,Pending +CANCELED,Canceled +IN_REVIEW,"In review" +Approved,Approved +Declined,Declined +Pending,Pending +Canceled,Canceled +"In Review","In Review" +Unrequested,Unrequested +"Learn more","Learn more" +"This order already has associated case entity","This order already has associated case entity" +"The case entity should not be empty.","The case entity should not be empty." +"Cannot update Case entity.","Cannot update Case entity." +"The ""%1"" should not be empty.","The ""%1"" should not be empty." +"Case entity not found.","Case entity not found." +"Case Update: New score for the order is %1. Previous score was %2.","Case Update: New score for the order is %1. Previous score was %2." +"Awaiting the Signifyd guarantee disposition.","Awaiting the Signifyd guarantee disposition." +"Only single entrance of ""%1"" node is required.","Only single entrance of ""%1"" node is required." +"Not empty value for ""%1"" node is required.","Not empty value for ""%1"" node is required." +"%1 must implement %2","%1 must implement %2" +Error,Error +"Cannot generate message.","Cannot generate message." +"Message is generated.","Message is generated." +"Case with the same order id already exists.","Case with the same order id already exists." +"Fraud Protection Information","Fraud Protection Information" +"Signifyd Guarantee Decision","Signifyd Guarantee Decision" +"Fraud Protection Section","Fraud Protection Section" +"Fraud Protection","Fraud Protection" +"Protect your store from fraud with Guaranteed Fraud Protection by Signifyd.","Protect your store from fraud with Guaranteed Fraud Protection by Signifyd." +Configuration,Configuration +"Enable this Solution","Enable this Solution" +"API Key","API Key" +"API URL","API URL" +Debug,Debug +"Webhook URL","Webhook URL" diff --git a/app/code/Magento/Signifyd/registration.php b/app/code/Magento/Signifyd/registration.php new file mode 100644 index 0000000000000..72b11f7eac214 --- /dev/null +++ b/app/code/Magento/Signifyd/registration.php @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml new file mode 100644 index 0000000000000..a42b7f93b5b92 --- /dev/null +++ b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml @@ -0,0 +1,34 @@ + + +isEmptyCase()) { + return ''; + } +?> +
    +
    + escapeHtml(__('Fraud Protection Information')) ?> +
    +
    +
    +
    + + + + + + + +
    escapeHtml(__('Signifyd Guarantee Decision')) ?>escapeHtml($block->getCaseGuaranteeDisposition()) ?>
    +
    +
    +
    +
    diff --git a/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml new file mode 100644 index 0000000000000..91053d617f31f --- /dev/null +++ b/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml @@ -0,0 +1,20 @@ + + ++ + + + select + + true + select + + + + + diff --git a/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png b/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png new file mode 100644 index 0000000000000..7c6645e7c6c93 Binary files /dev/null and b/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png differ diff --git a/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js b/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js new file mode 100644 index 0000000000000..f55170336ca03 --- /dev/null +++ b/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js @@ -0,0 +1,24 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'mageUtils', + 'Magento_Ui/js/form/components/button' +], function (utils, Button) { + 'use strict'; + + return Button.extend({ + + /** + * Creates and submits form for Guarantee create/cancel + */ + sendRequest: function () { + utils.submit({ + url: this.requestURL, + data: this.data + }); + } + }); +}); diff --git a/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml new file mode 100644 index 0000000000000..30472ae5e9ae9 --- /dev/null +++ b/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml new file mode 100644 index 0000000000000..30472ae5e9ae9 --- /dev/null +++ b/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml new file mode 100644 index 0000000000000..356bab9c62ded --- /dev/null +++ b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml @@ -0,0 +1,18 @@ + +isModuleActive()): ?> + + diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php index 3ae3061310a0b..840a6a1858fae 100644 --- a/app/code/Magento/Sitemap/Model/Observer.php +++ b/app/code/Magento/Sitemap/Model/Observer.php @@ -113,7 +113,6 @@ public function scheduledGenerateSitemaps() $sitemap->generateXml(); } catch (\Exception $e) { $errors[] = $e->getMessage(); - throw $e; } } @@ -122,8 +121,7 @@ public function scheduledGenerateSitemaps() \Magento\Store\Model\ScopeInterface::SCOPE_STORE ) ) { - $translate = $this->_translateModel->getTranslateInline(); - $this->_translateModel->setTranslateInline(false); + $this->inlineTranslation->suspend(); $this->_transportBuilder->setTemplateIdentifier( $this->_scopeConfig->getValue( diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php index d050ea84ecccb..01addd0c19666 100644 --- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php +++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php @@ -6,12 +6,15 @@ namespace Magento\Sitemap\Model\ResourceModel\Cms; use Magento\Cms\Api\Data\PageInterface; -use Magento\Framework\EntityManager\MetadataPool; -use Magento\Framework\Model\ResourceModel\Db\Context; -use Magento\Framework\Model\AbstractModel; +use Magento\Cms\Api\GetUtilityPageIdentifiersInterface; use Magento\Cms\Model\Page as CmsPage; +use Magento\Framework\App\ObjectManager; use Magento\Framework\DB\Select; use Magento\Framework\EntityManager\EntityManager; +use Magento\Framework\EntityManager\MetadataPool; +use Magento\Framework\Model\AbstractModel; +use Magento\Framework\Model\ResourceModel\Db\AbstractDb; +use Magento\Framework\Model\ResourceModel\Db\Context; /** * Sitemap cms page collection model @@ -19,7 +22,7 @@ * @api * @since 100.0.2 */ -class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb +class Page extends AbstractDb { /** * @var MetadataPool @@ -34,19 +37,29 @@ class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb protected $entityManager; /** - * @param Context $context - * @param MetadataPool $metadataPool - * @param EntityManager $entityManager - * @param string $connectionName + * @var GetUtilityPageIdentifiersInterface + * @since 100.2.0 + */ + private $getUtilityPageIdentifiers; + + /** + * @param Context $context + * @param MetadataPool $metadataPool + * @param EntityManager $entityManager + * @param string $connectionName + * @param GetUtilityPageIdentifiersInterface $getUtilityPageIdentifiers */ public function __construct( Context $context, MetadataPool $metadataPool, EntityManager $entityManager, - $connectionName = null + $connectionName = null, + GetUtilityPageIdentifiersInterface $getUtilityPageIdentifiers = null ) { - $this->metadataPool = $metadataPool; - $this->entityManager = $entityManager; + $this->metadataPool = $metadataPool; + $this->entityManager = $entityManager; + $this->getUtilityPageIdentifiers = $getUtilityPageIdentifiers ?: + ObjectManager::getInstance()->get(GetUtilityPageIdentifiersInterface::class); parent::__construct($context, $connectionName); } @@ -90,8 +103,8 @@ public function getCollection($storeId) )->where( 'main_table.is_active = 1' )->where( - 'main_table.identifier != ?', - \Magento\Cms\Model\Page::NOROUTE_PAGE_ID + 'main_table.identifier NOT IN (?)', + $this->getUtilityPageIdentifiers->execute() )->where( 'store_table.store_id IN(?)', [0, $storeId] diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php index 0136890afcd61..f78c3d656ed58 100644 --- a/app/code/Magento/Sitemap/Model/Sitemap.php +++ b/app/code/Magento/Sitemap/Model/Sitemap.php @@ -42,6 +42,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento const TYPE_URL = 'url'; + /** + * Last mode date min value + */ + const LAST_MOD_MIN_VAL = '0000-01-01 00:00:00'; + /** * Real file path * @@ -177,6 +182,13 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento */ private $sitemapItemFactory; + /** + * Last mode min timestamp value + * + * @var int + */ + private $lastModMinTsVal; + /** * Initialize dependencies. * @@ -694,7 +706,11 @@ protected function _getMediaUrl($url) */ protected function _getFormattedLastmodDate($date) { - return date('c', strtotime($date)); + if ($this->lastModMinTsVal === null) { + $this->lastModMinTsVal = strtotime(self::LAST_MOD_MIN_VAL); + } + $timestamp = max(strtotime($date), $this->lastModMinTsVal); + return date('c', $timestamp); } /** diff --git a/app/code/Magento/Sitemap/Setup/InstallSchema.php b/app/code/Magento/Sitemap/Setup/InstallSchema.php deleted file mode 100644 index eaf4effeb3684..0000000000000 --- a/app/code/Magento/Sitemap/Setup/InstallSchema.php +++ /dev/null @@ -1,85 +0,0 @@ -startSetup(); - - /** - * Create table 'sitemap' - */ - $table = $installer->getConnection()->newTable( - $installer->getTable('sitemap') - )->addColumn( - 'sitemap_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Sitemap Id' - )->addColumn( - 'sitemap_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Sitemap Type' - )->addColumn( - 'sitemap_filename', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - [], - 'Sitemap Filename' - )->addColumn( - 'sitemap_path', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Sitemap Path' - )->addColumn( - 'sitemap_time', - \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, - null, - ['nullable' => true], - 'Sitemap Time' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store id' - )->addIndex( - $installer->getIdxName('sitemap', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('sitemap', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'XML Sitemap' - ); - - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php index 92e6f4e2e2293..ac88f23ff9d69 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php @@ -7,6 +7,10 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +/** + * Class ObserverTest + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class ObserverTest extends \PHPUnit\Framework\TestCase { /** @@ -96,11 +100,11 @@ protected function setUp() ); } - /** - * @expectedException \Exception - */ - public function testScheduledGenerateSitemapsThrowsException() + public function testScheduledGenerateSitemapsSendsExceptionEmail() { + $exception = 'Sitemap Exception'; + $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class); + $this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true); $this->collectionFactoryMock->expects($this->once()) @@ -111,7 +115,55 @@ public function testScheduledGenerateSitemapsThrowsException() ->method('getIterator') ->willReturn(new \ArrayIterator([$this->sitemapMock])); - $this->sitemapMock->expects($this->once())->method('generateXml')->willThrowException(new \Exception()); + $this->sitemapMock->expects($this->once()) + ->method('generateXml') + ->willThrowException(new \Exception($exception)); + + $this->scopeConfigMock->expects($this->at(1)) + ->method('getValue') + ->with( + \Magento\Sitemap\Model\Observer::XML_PATH_ERROR_RECIPIENT, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ) + ->willReturn('error-recipient@example.com'); + + $this->inlineTranslationMock->expects($this->once()) + ->method('suspend'); + + $this->transportBuilderMock->expects($this->once()) + ->method('setTemplateIdentifier') + ->will($this->returnSelf()); + + $this->transportBuilderMock->expects($this->once()) + ->method('setTemplateOptions') + ->with([ + 'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE, + 'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID, + ]) + ->will($this->returnSelf()); + + $this->transportBuilderMock->expects($this->once()) + ->method('setTemplateVars') + ->with(['warnings' => $exception]) + ->will($this->returnSelf()); + + $this->transportBuilderMock->expects($this->once()) + ->method('setFrom') + ->will($this->returnSelf()); + + $this->transportBuilderMock->expects($this->once()) + ->method('addTo') + ->will($this->returnSelf()); + + $this->transportBuilderMock->expects($this->once()) + ->method('getTransport') + ->willReturn($transport); + + $transport->expects($this->once()) + ->method('sendMessage'); + + $this->inlineTranslationMock->expects($this->once()) + ->method('resume'); $this->observer->scheduledGenerateSitemaps(); } diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php new file mode 100644 index 0000000000000..d6e19ce7277b7 --- /dev/null +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php @@ -0,0 +1,198 @@ +resource = $this->getMockBuilder(ResourceConnection::class) + ->disableOriginalConstructor() + ->getMock(); + $this->context = $objectManager->getObject( + Context::class, + ['resource' => $this->resource] + ); + $this->metadataPool = $this->getMockBuilder(MetadataPool::class) + ->disableOriginalConstructor() + ->getMock(); + $this->entityManager = $this->getMockBuilder(EntityManager::class) + ->disableOriginalConstructor() + ->getMock(); + $this->getUtilityPageIdentifiers = $this->getMockBuilder(GetUtilityPageIdentifiers::class) + ->disableOriginalConstructor() + ->getMock(); + $this->model = $objectManager->getObject( + Page::class, + [ + 'context' => $this->context, + 'metadataPool' => $this->metadataPool, + 'entityManager' => $this->entityManager, + 'connectionName' => 'default', + 'getUtilityPageIdentifiers' => $this->getUtilityPageIdentifiers, + ] + ); + } + + /** + * Test Page::getCollection() build correct query to get cms page collection array. + * + * @return void + */ + public function testGetCollection() + { + $pageId = 'testPageId'; + $url = 'testUrl'; + $updatedAt = 'testUpdatedAt'; + $pageIdentifiers = ['testCmsHomePage', 'testCmsNoRoute', 'testCmsNoCookies']; + $storeId = 1; + $linkField = 'testLinkField'; + $expectedPage = new DataObject(); + $expectedPage->setId($pageId); + $expectedPage->setUrl($url); + $expectedPage->setUpdatedAt($updatedAt); + + $query = $this->getMockBuilder(\Zend_Db_Statement_Interface::class) + ->disableOriginalConstructor() + ->setMethods(['fetch']) + ->getMockForAbstractClass(); + $query->expects($this->exactly(2)) + ->method('fetch') + ->willReturnOnConsecutiveCalls( + [ + 'page_id' => $pageId, + 'url' => $url, + 'updated_at' => $updatedAt + ], + false + ); + + $select = $this->getMockBuilder(Select::class) + ->disableOriginalConstructor() + ->getMock(); + $select->expects($this->once()) + ->method('from') + ->with( + $this->identicalTo(['main_table' => 'cms_page']), + $this->identicalTo(['page_id', 'url' => 'identifier', 'updated_at' => 'update_time']) + )->willReturnSelf(); + $select->expects($this->once()) + ->method('join') + ->with( + $this->identicalTo(['store_table' => 'cms_page_store']), + $this->identicalTo("main_table.{$linkField} = store_table.$linkField"), + $this->identicalTo([]) + )->willReturnSelf(); + $select->expects($this->exactly(3)) + ->method('where') + ->withConsecutive( + [$this->identicalTo('main_table.is_active = 1')], + [$this->identicalTo('main_table.identifier NOT IN (?)'), $this->identicalTo($pageIdentifiers)], + [$this->identicalTo('store_table.store_id IN(?)'), $this->identicalTo([0, $storeId])] + )->willReturnSelf(); + + $connection = $this->getMockBuilder(AdapterInterface::class) + ->setMethods(['select']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $connection->expects($this->once()) + ->method('select') + ->willReturn($select); + $connection->expects($this->once()) + ->method('query') + ->with($this->identicalTo($select)) + ->willReturn($query); + + $entityMetadata = $this->getMockBuilder(EntityMetadataInterface::class) + ->setMethods(['getLinkField', 'getEntityConnection']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $entityMetadata->expects($this->once()) + ->method('getLinkField') + ->willReturn($linkField); + $entityMetadata->expects($this->exactly(2)) + ->method('getEntityConnection') + ->willReturn($connection); + + $this->getUtilityPageIdentifiers->expects($this->once()) + ->method('execute') + ->willReturn($pageIdentifiers); + + $this->resource->expects($this->exactly(2)) + ->method('getTableName') + ->withConsecutive( + [$this->identicalTo('cms_page'), $this->identicalTo('default')], + [$this->identicalTo('cms_page_store'), $this->identicalTo('default')] + )->willReturnOnConsecutiveCalls( + 'cms_page', + 'cms_page_store' + ); + + $this->metadataPool->expects($this->exactly(3)) + ->method('getMetadata') + ->with($this->identicalTo(PageInterface::class)) + ->willReturn($entityMetadata); + + $result = $this->model->getCollection($storeId); + $resultPage = array_shift($result); + $this->assertEquals($expectedPage, $resultPage); + } +} diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php index 29d188445cffb..f805d4471553b 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php @@ -527,7 +527,7 @@ protected function getModelMock($mockBeforeSave = false) ->willReturn([ new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'), new SitemapItem('/category/sub-category.html', '1.0', 'daily', '2012-12-21 00:00:00'), - new SitemapItem('product.html', '0.5', 'monthly', '2012-12-21 00:00:00'), + new SitemapItem('product.html', '0.5', 'monthly', '0000-00-00 00:00:00'), new SitemapItem( 'product2.html', '0.5', diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml index 3a0357cf30c51..519464cf76cf1 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml +++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml @@ -10,7 +10,7 @@ xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"> http://store.com/product.html - 2012-12-21T00:00:00-08:00 + 0000-01-01T00:00:00-08:00 monthly 0.5 diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml index e79e022c98995..cc2ff96dd28f2 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml +++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml @@ -22,7 +22,7 @@ http://store.com/product.html - 2012-12-21T00:00:00-08:00 + 0000-01-01T00:00:00-08:00 monthly 0.5 diff --git a/app/code/Magento/Sitemap/etc/db_schema.xml b/app/code/Magento/Sitemap/etc/db_schema.xml new file mode 100644 index 0000000000000..4abc9a2fbe035 --- /dev/null +++ b/app/code/Magento/Sitemap/etc/db_schema.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Sitemap/etc/db_schema_whitelist.json b/app/code/Magento/Sitemap/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..b7067f773b93f --- /dev/null +++ b/app/code/Magento/Sitemap/etc/db_schema_whitelist.json @@ -0,0 +1,19 @@ +{ + "sitemap": { + "column": { + "sitemap_id": true, + "sitemap_type": true, + "sitemap_filename": true, + "sitemap_path": true, + "sitemap_time": true, + "store_id": true + }, + "index": { + "SITEMAP_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "SITEMAP_STORE_ID_STORE_STORE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Sitemap/etc/module.xml b/app/code/Magento/Sitemap/etc/module.xml index 0edfcf84f644f..0cfe3d551d162 100644 --- a/app/code/Magento/Sitemap/etc/module.xml +++ b/app/code/Magento/Sitemap/etc/module.xml @@ -9,6 +9,7 @@ + diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 613a6d1998858..3fa78dc94aa35 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -6,6 +6,7 @@ namespace Magento\Store\App\Request; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Store\Model\Store; class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface { @@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI } if ($store->isUseStoreInUrl()) { - if (!$request->isDirectAccessFrontendName($storeCode)) { + if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) { $this->storeManager->setCurrentStore($store->getCode()); $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); return $pathInfo; diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php index 1f44b9dcec3e3..1d0fdd7284848 100644 --- a/app/code/Magento/Store/Model/Address/Renderer.php +++ b/app/code/Magento/Store/Model/Address/Renderer.php @@ -15,6 +15,12 @@ */ class Renderer { + const DEFAULT_TEMPLATE = "{{var name}}\n" . + "{{var street_line1}}\n" . + "{{depend street_line2}}{{var street_line2}}\n{{/depend}}" . + "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" . + "{{var country}}"; + /** * @var EventManager */ @@ -25,18 +31,26 @@ class Renderer */ protected $filterManager; + /** + * @var string + */ + private $template; + /** * Constructor * * @param EventManager $eventManager * @param FilterManager $filterManager + * @param string $template */ public function __construct( EventManager $eventManager, - FilterManager $filterManager + FilterManager $filterManager, + $template = self::DEFAULT_TEMPLATE ) { $this->eventManager = $eventManager; $this->filterManager = $filterManager; + $this->template = $template; } /** @@ -50,9 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html') { $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]); $address = $this->filterManager->template( - "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" . - "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" . - "{{var country}}", + $this->template, ['variables' => $storeInfo->getData()] ); diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php index 3dff61b9e7a57..f86788a9a5bcf 100644 --- a/app/code/Magento/Store/Model/Store.php +++ b/app/code/Magento/Store/Model/Store.php @@ -1182,18 +1182,29 @@ public function getCurrentUrl($fromStore = true) if (!$this->isUseStoreInUrl()) { $storeParsedQuery['___store'] = $this->getCode(); } + if ($fromStore !== false) { $storeParsedQuery['___from_store'] = $fromStore === true ? $this->_storeManager->getStore()->getCode() : $fromStore; } + $requestStringParts = explode('?', $requestString, 2); + $requestStringPath = $requestStringParts[0]; + if (isset($requestStringParts[1])) { + parse_str($requestStringParts[1], $requestString); + } else { + $requestString = []; + } + + $currentUrlQueryParams = array_merge($requestString, $storeParsedQuery); + $currentUrl = $storeParsedUrl['scheme'] . '://' . $storeParsedUrl['host'] . (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '') . $storeParsedUrl['path'] - . $requestString - . ($storeParsedQuery ? '?' . http_build_query($storeParsedQuery, '', '&') : ''); + . $requestStringPath + . ($currentUrlQueryParams ? '?' . http_build_query($currentUrlQueryParams, '', '&') : ''); return $currentUrl; } diff --git a/app/code/Magento/Store/Setup/InstallSchema.php b/app/code/Magento/Store/Setup/InstallSchema.php deleted file mode 100644 index f6cdfb6fcba71..0000000000000 --- a/app/code/Magento/Store/Setup/InstallSchema.php +++ /dev/null @@ -1,316 +0,0 @@ -defaultCategory === null) { - $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance() - ->get(DefaultCategory::class); - } - return $this->defaultCategory; - } - - /** - * {@inheritdoc} - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - */ - public function install(SchemaSetupInterface $setup, ModuleContextInterface $context) - { - $installer = $setup; - - $installer->startSetup(); - $connection = $installer->getConnection(); - - /** - * Create table 'store_website' - */ - $table = $connection->newTable( - $installer->getTable('store_website') - )->addColumn( - 'website_id', - Table::TYPE_SMALLINT, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Website Id' - )->addColumn( - 'code', - Table::TYPE_TEXT, - 32, - [], - 'Code' - )->addColumn( - 'name', - Table::TYPE_TEXT, - 64, - [], - 'Website Name' - )->addColumn( - 'sort_order', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Sort Order' - )->addColumn( - 'default_group_id', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Default Group Id' - )->addColumn( - 'is_default', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'default' => '0'], - 'Defines Is Website Default' - )->addIndex( - $installer->getIdxName( - 'store_website', - ['code'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['code'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('store_website', ['sort_order']), - ['sort_order'] - )->addIndex( - $installer->getIdxName('store_website', ['default_group_id']), - ['default_group_id'] - )->setComment( - 'Websites' - ); - $connection->createTable($table); - - /** - * Create table 'store_group' - */ - $table = $connection->newTable( - $installer->getTable('store_group') - )->addColumn( - 'group_id', - Table::TYPE_SMALLINT, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Group Id' - )->addColumn( - 'website_id', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Website Id' - )->addColumn( - 'name', - Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Store Group Name' - )->addColumn( - 'root_category_id', - Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Root Category Id' - )->addColumn( - 'default_store_id', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Default Store Id' - )->addIndex( - $installer->getIdxName('store_group', ['website_id']), - ['website_id'] - )->addIndex( - $installer->getIdxName('store_group', ['default_store_id']), - ['default_store_id'] - )->addForeignKey( - $installer->getFkName('store_group', 'website_id', 'store_website', 'website_id'), - 'website_id', - $installer->getTable('store_website'), - 'website_id', - Table::ACTION_CASCADE - )->setComment( - 'Store Groups' - ); - $connection->createTable($table); - - /** - * Create table 'store' - */ - $table = $connection->newTable( - $installer->getTable('store') - )->addColumn( - 'store_id', - Table::TYPE_SMALLINT, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Store Id' - )->addColumn( - 'code', - Table::TYPE_TEXT, - 32, - [], - 'Code' - )->addColumn( - 'website_id', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Website Id' - )->addColumn( - 'group_id', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Group Id' - )->addColumn( - 'name', - Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Store Name' - )->addColumn( - 'sort_order', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store Sort Order' - )->addColumn( - 'is_active', - Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store Activity' - )->addIndex( - $installer->getIdxName( - 'store', - ['code'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['code'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addIndex( - $installer->getIdxName('store', ['website_id']), - ['website_id'] - )->addIndex( - $installer->getIdxName('store', ['is_active', 'sort_order']), - ['is_active', 'sort_order'] - )->addIndex( - $installer->getIdxName('store', ['group_id']), - ['group_id'] - )->addForeignKey( - $installer->getFkName('store', 'group_id', 'store_group', 'group_id'), - 'group_id', - $installer->getTable('store_group'), - 'group_id', - Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName('store', 'website_id', 'store_website', 'website_id'), - 'website_id', - $installer->getTable('store_website'), - 'website_id', - Table::ACTION_CASCADE - )->setComment( - 'Stores' - ); - $connection->createTable($table); - - /** - * Insert websites - */ - $connection->insertForce( - $installer->getTable('store_website'), - [ - 'website_id' => 0, - 'code' => 'admin', - 'name' => 'Admin', - 'sort_order' => 0, - 'default_group_id' => 0, - 'is_default' => 0 - ] - ); - $connection->insertForce( - $installer->getTable('store_website'), - [ - 'website_id' => 1, - 'code' => 'base', - 'name' => 'Main Website', - 'sort_order' => 0, - 'default_group_id' => 1, - 'is_default' => 1 - ] - ); - - /** - * Insert store groups - */ - $connection->insertForce( - $installer->getTable('store_group'), - ['group_id' => 0, 'website_id' => 0, 'name' => 'Default', 'root_category_id' => 0, 'default_store_id' => 0] - ); - $connection->insertForce( - $installer->getTable('store_group'), - [ - 'group_id' => 1, - 'website_id' => 1, - 'name' => 'Main Website Store', - 'root_category_id' => $this->getDefaultCategory()->getId(), - 'default_store_id' => 1 - ] - ); - - /** - * Insert stores - */ - $connection->insertForce( - $installer->getTable('store'), - [ - 'store_id' => 0, - 'code' => 'admin', - 'website_id' => 0, - 'group_id' => 0, - 'name' => 'Admin', - 'sort_order' => 0, - 'is_active' => 1 - ] - ); - $connection->insertForce( - $installer->getTable('store'), - [ - 'store_id' => 1, - 'code' => 'default', - 'website_id' => 1, - 'group_id' => 1, - 'name' => 'Default Store View', - 'sort_order' => 0, - 'is_active' => 1 - ] - ); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Store/Setup/Recurring.php b/app/code/Magento/Store/Setup/Recurring.php new file mode 100644 index 0000000000000..c4ab9196d9f46 --- /dev/null +++ b/app/code/Magento/Store/Setup/Recurring.php @@ -0,0 +1,136 @@ +defaultCategory === null) { + $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance() + ->get(DefaultCategory::class); + } + return $this->defaultCategory; + } + + /** + * {@inheritdoc} + * @throws \Exception + */ + public function install(SchemaSetupInterface $setup, ModuleContextInterface $context) + { + $installer = $setup; + + $installer->startSetup(); + $connection = $installer->getConnection(); + $select = $connection->select() + ->from($installer->getTable('store_website')) + ->where('website_id = ?', 0); + + if ($connection->fetchOne($select) === false) { + /** + * Insert websites + */ + $connection->insertForce( + $installer->getTable('store_website'), + [ + 'website_id' => 0, + 'code' => 'admin', + 'name' => 'Admin', + 'sort_order' => 0, + 'default_group_id' => 0, + 'is_default' => 0 + ] + ); + $connection->insertForce( + $installer->getTable('store_website'), + [ + 'website_id' => 1, + 'code' => 'base', + 'name' => 'Main Website', + 'sort_order' => 0, + 'default_group_id' => 1, + 'is_default' => 1 + ] + ); + + /** + * Insert store groups + */ + $connection->insertForce( + $installer->getTable('store_group'), + [ + 'group_id' => 0, + 'website_id' => 0, + 'name' => 'Default', + 'root_category_id' => 0, + 'default_store_id' => 0 + ] + ); + $connection->insertForce( + $installer->getTable('store_group'), + [ + 'group_id' => 1, + 'website_id' => 1, + 'name' => 'Main Website Store', + 'root_category_id' => $this->getDefaultCategory()->getId(), + 'default_store_id' => 1 + ] + ); + + /** + * Insert stores + */ + $connection->insertForce( + $installer->getTable('store'), + [ + 'store_id' => 0, + 'code' => 'admin', + 'website_id' => 0, + 'group_id' => 0, + 'name' => 'Admin', + 'sort_order' => 0, + 'is_active' => 1 + ] + ); + $connection->insertForce( + $installer->getTable('store'), + [ + 'store_id' => 1, + 'code' => 'default', + 'website_id' => 1, + 'group_id' => 1, + 'name' => 'Default Store View', + 'sort_order' => 0, + 'is_active' => 1 + ] + ); + $setup->endSetup(); + } + } +} diff --git a/app/code/Magento/Store/Setup/UpgradeSchema.php b/app/code/Magento/Store/Setup/UpgradeSchema.php deleted file mode 100644 index ad0d48effeca1..0000000000000 --- a/app/code/Magento/Store/Setup/UpgradeSchema.php +++ /dev/null @@ -1,63 +0,0 @@ -startSetup(); - - if (version_compare($context->getVersion(), '2.1.0', '<')) { - $this->addCodeColumnToStoreGroupTable($setup); - } - - $setup->endSetup(); - } - - /** - * Add new column 'code' to store_group table, and unique index for it. - * - * @param SchemaSetupInterface $setup - * @return void - */ - private function addCodeColumnToStoreGroupTable(SchemaSetupInterface $setup) - { - $setup->getConnection()->addColumn( - $setup->getTable('store_group'), - 'code', - [ - 'type' => Table::TYPE_TEXT, - 'length' => 32, - 'comment' => 'Store group unique code', - 'after' => 'website_id' - ] - ); - $setup->getConnection()->addIndex( - $setup->getTable('store_group'), - $setup->getIdxName( - 'store_group', - ['code'], - AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['code'], - AdapterInterface::INDEX_TYPE_UNIQUE - ); - } -} diff --git a/app/code/Magento/Store/etc/db_schema.xml b/app/code/Magento/Store/etc/db_schema.xml new file mode 100644 index 0000000000000..e3cd8c8e816b6 --- /dev/null +++ b/app/code/Magento/Store/etc/db_schema.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Store/etc/db_schema_whitelist.json b/app/code/Magento/Store/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..5fa120333ff12 --- /dev/null +++ b/app/code/Magento/Store/etc/db_schema_whitelist.json @@ -0,0 +1,61 @@ +{ + "store_website": { + "column": { + "website_id": true, + "code": true, + "name": true, + "sort_order": true, + "default_group_id": true, + "is_default": true + }, + "index": { + "STORE_WEBSITE_SORT_ORDER": true, + "STORE_WEBSITE_DEFAULT_GROUP_ID": true + }, + "constraint": { + "PRIMARY": true, + "STORE_WEBSITE_CODE": true + } + }, + "store_group": { + "column": { + "group_id": true, + "website_id": true, + "name": true, + "root_category_id": true, + "default_store_id": true, + "code": true + }, + "index": { + "STORE_GROUP_WEBSITE_ID": true, + "STORE_GROUP_DEFAULT_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "STORE_GROUP_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true, + "STORE_GROUP_CODE": true + } + }, + "store": { + "column": { + "store_id": true, + "code": true, + "website_id": true, + "group_id": true, + "name": true, + "sort_order": true, + "is_active": true + }, + "index": { + "STORE_WEBSITE_ID": true, + "STORE_IS_ACTIVE_SORT_ORDER": true, + "STORE_GROUP_ID": true + }, + "constraint": { + "PRIMARY": true, + "STORE_GROUP_ID_STORE_GROUP_GROUP_ID": true, + "STORE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true, + "STORE_CODE": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php index 306f01af17e71..66ecd06c646e7 100644 --- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php +++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php @@ -84,15 +84,15 @@ public function getJsonConfig() * Parse swatch labels for template * * @codeCoverageIgnore - * @param null $swatchStoreValue - * @return string + * @param null|array $swatchStoreValue + * @return null|array */ protected function reformatSwatchLabels($swatchStoreValue = null) { if ($swatchStoreValue === null) { return; } - $newSwatch = ''; + $newSwatch = []; foreach ($swatchStoreValue as $key => $value) { if ($value[0] == '#') { $newSwatch[$key] = 'background: '.$value; diff --git a/app/code/Magento/Swatches/Setup/InstallSchema.php b/app/code/Magento/Swatches/Setup/InstallSchema.php deleted file mode 100644 index 2ba29c8ba46f3..0000000000000 --- a/app/code/Magento/Swatches/Setup/InstallSchema.php +++ /dev/null @@ -1,113 +0,0 @@ -startSetup(); - - $swatchTable = $setup->getTable('eav_attribute_option_swatch'); - - /** Creating the main_table 'eav_attribute_option_swatch' */ - $table = $setup->getConnection() - ->newTable($swatchTable) - ->addColumn( - 'swatch_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Swatch ID' - ) - ->addColumn( - 'option_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false], - 'Option ID' - ) - ->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false], - 'Store ID' - ) - ->addColumn( - 'type', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false], - 'Swatch type: 0 - text, 1 - visual color, 2 - visual image' - ) - ->addColumn( - 'value', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['identity' => false, 'unsigned' => false, 'nullable' => true, 'primary' => false], - 'Swatch Value' - ) - ->addIndex( - $setup->getIdxName($swatchTable, ['swatch_id']), - ['swatch_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX] - ) - ->addIndex( - $setup->getIdxName( - $swatchTable, - ['store_id', 'option_id'], - true - ), - ['store_id', 'option_id'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - ) - ->addForeignKey( - $setup->getFkName($swatchTable, 'store_id', 'store', 'store_id'), - 'store_id', - $setup->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->addForeignKey( - $setup->getFkName($swatchTable, 'option_id', 'eav_attribute_option', 'option_id'), - 'option_id', - $setup->getTable('eav_attribute_option'), - 'option_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - ) - ->setComment('Magento Swatches table'); - - if (!$setup->getConnection()->tableColumnExists($setup->getTable('catalog_eav_attribute'), 'additional_data')) { - $setup->getConnection() - ->addColumn( - $setup->getTable('catalog_eav_attribute'), - 'additional_data', - [ - 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 'default' => null, - 'nullable' => true, - 'comment' => 'Additional swatch attributes data', - ] - ); - } - - $setup->getConnection()->createTable($table); - - $setup->endSetup(); - } -} diff --git a/app/code/Magento/Swatches/etc/db_schema.xml b/app/code/Magento/Swatches/etc/db_schema.xml new file mode 100644 index 0000000000000..6613c412744e9 --- /dev/null +++ b/app/code/Magento/Swatches/etc/db_schema.xml @@ -0,0 +1,40 @@ + + + + + +
    + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Swatches/etc/db_schema_whitelist.json b/app/code/Magento/Swatches/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..8f335442def21 --- /dev/null +++ b/app/code/Magento/Swatches/etc/db_schema_whitelist.json @@ -0,0 +1,25 @@ +{ + "catalog_eav_attribute": { + "column": { + "additional_data": true + } + }, + "eav_attribute_option_swatch": { + "column": { + "swatch_id": true, + "option_id": true, + "store_id": true, + "type": true, + "value": true + }, + "index": { + "EAV_ATTRIBUTE_OPTION_SWATCH_SWATCH_ID": true + }, + "constraint": { + "PRIMARY": true, + "EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_STORE_STORE_ID": true, + "EAV_ATTR_OPT_SWATCH_OPT_ID_EAV_ATTR_OPT_OPT_ID": true, + "EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_OPTION_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js index 14cf1ebfe538f..1187e6bc4fdaa 100644 --- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js +++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js @@ -182,6 +182,7 @@ define([ useProductImageForSwatch = false, defaultValueUpdateImage = false, optionDefaultInputType = '', + isFrontTabHidden = false, thing = this; if (!this.frontendInput.length) { @@ -247,6 +248,7 @@ define([ switch (option) { case '_front_fieldset': thing.tabsFront.hide(); + isFrontTabHidden = true; break; case '_default_value': @@ -263,6 +265,11 @@ define([ thing.setRowVisibility($('#' + option), false); } }); + + if (!isFrontTabHidden) { + thing.tabsFront.show(); + } + } else { this.tabsFront.show(); this.showDefaultRows(); diff --git a/app/code/Magento/SwatchesGraphQl/etc/graphql.xml b/app/code/Magento/SwatchesGraphQl/etc/graphql.xml index 589cc45007a24..1e5e9ac1fb7be 100644 --- a/app/code/Magento/SwatchesGraphQl/etc/graphql.xml +++ b/app/code/Magento/SwatchesGraphQl/etc/graphql.xml @@ -5,12 +5,12 @@ --> - + - + - + diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php index 847f1312e8caf..b623b6c6868e7 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php @@ -51,8 +51,8 @@ public function execute() } // clear the block html cache - $this->_cacheTypeList->cleanType('block_html'); - $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'block_html']); + $this->_cacheTypeList->cleanType('config'); + $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'config']); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php index 19731403ae74b..9707f3ae6e353 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php @@ -13,12 +13,11 @@ class Country extends \Magento\Directory\Model\Config\Source\Country protected $_options; /** - * @param bool $noEmpty - * @return array + * @inheritdoc */ - public function toOptionArray($noEmpty = false) + public function toOptionArray($noEmpty = false, $foregroundCountries = '') { - $options = parent::toOptionArray($noEmpty); + $options = parent::toOptionArray($noEmpty, $foregroundCountries); if (!$noEmpty) { if ($options) { diff --git a/app/code/Magento/Tax/Setup/InstallSchema.php b/app/code/Magento/Tax/Setup/InstallSchema.php deleted file mode 100644 index 4282b67b17773..0000000000000 --- a/app/code/Magento/Tax/Setup/InstallSchema.php +++ /dev/null @@ -1,409 +0,0 @@ -startSetup(); - - /** - * Create table 'tax_class' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_class') - )->addColumn( - 'class_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Class Id' - )->addColumn( - 'class_name', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Class Name' - )->addColumn( - 'class_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 8, - ['nullable' => false, 'default' => 'CUSTOMER'], - 'Class Type' - )->setComment( - 'Tax Class' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_calculation_rule' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_calculation_rule') - )->addColumn( - 'tax_calculation_rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Tax Calculation Rule Id' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Code' - )->addColumn( - 'priority', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Priority' - )->addColumn( - 'position', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Position' - )->addColumn( - 'calculate_subtotal', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Calculate off subtotal option' - )->addIndex( - $setup->getIdxName('tax_calculation_rule', ['priority', 'position']), - ['priority', 'position'] - )->addIndex( - $setup->getIdxName('tax_calculation_rule', ['code']), - ['code'] - )->setComment( - 'Tax Calculation Rule' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_calculation_rate' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_calculation_rate') - )->addColumn( - 'tax_calculation_rate_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Tax Calculation Rate Id' - )->addColumn( - 'tax_country_id', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 2, - ['nullable' => false], - 'Tax Country Id' - )->addColumn( - 'tax_region_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Tax Region Id' - )->addColumn( - 'tax_postcode', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 21, - [], - 'Tax Postcode' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Code' - )->addColumn( - 'rate', - \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, - '12,4', - ['nullable' => false], - 'Rate' - )->addColumn( - 'zip_is_range', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [], - 'Zip Is Range' - )->addColumn( - 'zip_from', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Zip From' - )->addColumn( - 'zip_to', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true], - 'Zip To' - )->addIndex( - $setup->getIdxName('tax_calculation_rate', ['tax_country_id', 'tax_region_id', 'tax_postcode']), - ['tax_country_id', 'tax_region_id', 'tax_postcode'] - )->addIndex( - $setup->getIdxName('tax_calculation_rate', ['code']), - ['code'] - )->addIndex( - $setup->getIdxName( - 'tax_calculation_rate', - ['tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode'] - ), - ['tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode'] - )->setComment( - 'Tax Calculation Rate' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_calculation' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_calculation') - )->addColumn( - 'tax_calculation_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Tax Calculation Id' - )->addColumn( - 'tax_calculation_rate_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Tax Calculation Rate Id' - )->addColumn( - 'tax_calculation_rule_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Tax Calculation Rule Id' - )->addColumn( - 'customer_tax_class_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false], - 'Customer Tax Class Id' - )->addColumn( - 'product_tax_class_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false], - 'Product Tax Class Id' - )->addIndex( - $setup->getIdxName('tax_calculation', ['tax_calculation_rule_id']), - ['tax_calculation_rule_id'] - )->addIndex( - $setup->getIdxName('tax_calculation', ['customer_tax_class_id']), - ['customer_tax_class_id'] - )->addIndex( - $setup->getIdxName('tax_calculation', ['product_tax_class_id']), - ['product_tax_class_id'] - )->addIndex( - $setup->getIdxName( - 'tax_calculation', - ['tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id'] - ), - ['tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id'] - )->addForeignKey( - $setup->getFkName('tax_calculation', 'product_tax_class_id', 'tax_class', 'class_id'), - 'product_tax_class_id', - $setup->getTable('tax_class'), - 'class_id', - \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 - )->addForeignKey( - $setup->getFkName( - 'tax_calculation', - 'tax_calculation_rate_id', - 'tax_calculation_rate', - 'tax_calculation_rate_id' - ), - 'tax_calculation_rate_id', - $setup->getTable('tax_calculation_rate'), - 'tax_calculation_rate_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $setup->getFkName( - 'tax_calculation', - 'tax_calculation_rule_id', - 'tax_calculation_rule', - 'tax_calculation_rule_id' - ), - 'tax_calculation_rule_id', - $setup->getTable('tax_calculation_rule'), - 'tax_calculation_rule_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Tax Calculation' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_calculation_rate_title' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_calculation_rate_title') - )->addColumn( - 'tax_calculation_rate_title_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Tax Calculation Rate Title Id' - )->addColumn( - 'tax_calculation_rate_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false], - 'Tax Calculation Rate Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false], - 'Store Id' - )->addColumn( - 'value', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Value' - )->addIndex( - $setup->getIdxName('tax_calculation_rate_title', ['tax_calculation_rate_id', 'store_id']), - ['tax_calculation_rate_id', 'store_id'] - )->addIndex( - $setup->getIdxName('tax_calculation_rate_title', ['store_id']), - ['store_id'] - )->addForeignKey( - $setup->getFkName('tax_calculation_rate_title', 'store_id', 'store', 'store_id'), - 'store_id', - $setup->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $setup->getFkName( - 'tax_calculation_rate_title', - 'tax_calculation_rate_id', - 'tax_calculation_rate', - 'tax_calculation_rate_id' - ), - 'tax_calculation_rate_id', - $setup->getTable('tax_calculation_rate'), - 'tax_calculation_rate_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Tax Calculation Rate Title' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_order_aggregated_created' - */ - $table = $setup->getConnection()->newTable( - $setup->getTable('tax_order_aggregated_created') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'period', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - ['nullable' => true], - 'Period' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true], - 'Store Id' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Code' - )->addColumn( - 'order_status', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 50, - ['nullable' => false], - 'Order Status' - )->addColumn( - 'percent', - \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT, - null, - [], - 'Percent' - )->addColumn( - 'orders_count', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Orders Count' - )->addColumn( - 'tax_base_amount_sum', - \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT, - null, - [], - 'Tax Base Amount Sum' - )->addIndex( - $setup->getIdxName( - 'tax_order_aggregated_created', - ['period', 'store_id', 'code', 'percent', 'order_status'], - true - ), - ['period', 'store_id', 'code', 'percent', 'order_status'], - ['type' => 'unique'] - )->addIndex( - $setup->getIdxName('tax_order_aggregated_created', ['store_id']), - ['store_id'] - )->addForeignKey( - $setup->getFkName('tax_order_aggregated_created', 'store_id', 'store', 'store_id'), - 'store_id', - $setup->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Tax Order Aggregation' - ); - $setup->getConnection()->createTable($table); - - /** - * Create table 'tax_order_aggregated_updated' - */ - $setup->getConnection()->createTable( - $setup->getConnection()->createTableByDdl( - $setup->getTable('tax_order_aggregated_created'), - $setup->getTable('tax_order_aggregated_updated') - ) - ); - - $setup->endSetup(); - } -} diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php index 0f879a6e162f5..2035885f05e8f 100644 --- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php +++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php @@ -19,7 +19,7 @@ public function testExecute() ->getMock(); $cacheTypeList->expects($this->once()) ->method('cleanType') - ->with('block_html') + ->with('config') ->willReturn(null); $request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class) diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php index 833520cc2855d..cbd7ed46e38d7 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php +++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php @@ -7,7 +7,7 @@ namespace Magento\Tax\Test\Unit\Model\Calculation; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Tax\Model\Calculation\RowbaseCalculator; +use Magento\Tax\Model\Calculation\RowBaseCalculator; use Magento\Tax\Model\Calculation\TotalBaseCalculator; /** diff --git a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php index effc54b84ac04..88dce330b1535 100644 --- a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php +++ b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php @@ -5,61 +5,63 @@ */ namespace Magento\Tax\Test\Unit\Plugin\Checkout\CustomerData; -class CartTest extends \PHPUnit\Framework\TestCase +use Magento\Checkout\CustomerData\Cart as CheckoutCart; +use Magento\Checkout\Helper\Data; +use Magento\Checkout\Model\Session; +use Magento\Quote\Model\Quote; +use Magento\Quote\Model\Quote\Item; +use Magento\Tax\Block\Item\Price\Renderer; +use Magento\Tax\Plugin\Checkout\CustomerData\Cart; +use PHPUnit\Framework\TestCase; +use PHPUnit_Framework_MockObject_MockObject as MockObject; + +class CartTest extends TestCase { - /** - * @var \Magento\Checkout\Model\Session + * @var Session|MockObject */ - protected $checkoutSession; + private $checkoutSession; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Data|MockObject */ - protected $checkoutHelper; + private $checkoutHelper; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Renderer|MockObject */ - protected $itemPriceRenderer; + private $itemPriceRenderer; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var CheckoutCart|MockObject */ - protected $checkoutCart; + private $checkoutCart; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Quote|MockObject */ - protected $quote; + private $quote; /** - * @var \Magento\Tax\Plugin\Checkout\CustomerData\Cart + * @var Cart */ - protected $cart; + private $cart; protected function setUp() { - $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $this->checkoutSession = $this->createMock(\Magento\Checkout\Model\Session::class); - $this->checkoutHelper = $this->createMock(\Magento\Checkout\Helper\Data::class); - $this->itemPriceRenderer = $this->createMock(\Magento\Tax\Block\Item\Price\Renderer::class); - $this->checkoutCart = $this->createMock(\Magento\Checkout\CustomerData\Cart::class); - $this->quote = $this->createMock(\Magento\Quote\Model\Quote::class); - - $this->checkoutSession->expects( - $this->any() - )->method( - 'getQuote' - )->willReturn($this->quote); - - $this->cart = $helper->getObject( - \Magento\Tax\Plugin\Checkout\CustomerData\Cart::class, - [ - 'checkoutSession' => $this->checkoutSession, - 'checkoutHelper' => $this->checkoutHelper, - 'itemPriceRenderer' => $this->itemPriceRenderer, - ] + $this->checkoutSession = $this->createMock(Session::class); + $this->checkoutHelper = $this->createMock(Data::class); + $this->itemPriceRenderer = $this->createMock(Renderer::class); + $this->checkoutCart = $this->createMock(CheckoutCart::class); + $this->quote = $this->createMock(Quote::class); + + $this->checkoutSession->method('getQuote') + ->willReturn($this->quote); + + $this->cart = new Cart( + $this->checkoutSession, + $this->checkoutHelper, + $this->itemPriceRenderer ); } @@ -77,49 +79,34 @@ public function testAfterGetSectionData() ] ]; - $this->checkoutHelper->expects( - $this->atLeastOnce() - )->method( - 'formatPrice' - )->willReturn('formatted'); - - $item1 = $this->createMock(\Magento\Quote\Model\Quote\Item::class); - $item2 = $this->createMock(\Magento\Quote\Model\Quote\Item::class); - - $item1->expects( - $this->atLeastOnce() - )->method( - 'getItemId' - )->willReturn(1); - $item2->expects( - $this->atLeastOnce() - )->method( - 'getItemId' - )->willReturn(2); - - $this->quote->expects( - $this->any() - )->method( - 'getAllVisibleItems' - )->willReturn([ - $item1, - $item2, - ]); - - $this->itemPriceRenderer->expects( - $this->atLeastOnce(1) - )->method( - 'toHtml' - )->willReturn(1); + $this->checkoutHelper->method('formatPrice') + ->willReturn('formatted'); + + $item1 = $this->createMock(Item::class); + $item2 = $this->createMock(Item::class); + + $item1->method('getItemId') + ->willReturn(1); + $item2->method('getItemId') + ->willReturn(2); + + $this->quote->method('getAllVisibleItems') + ->willReturn([ + $item1, + $item2, + ]); + + $this->itemPriceRenderer->method('toHtml') + ->willReturn(1); $result = $this->cart->afterGetSectionData($this->checkoutCart, $input); - $this->assertArrayHasKey('subtotal_incl_tax', $result); - $this->assertArrayHasKey('subtotal_excl_tax', $result); - $this->assertArrayHasKey('items', $result); - $this->assertTrue(is_array($result['items'])); - $this->assertEquals(2, count($result['items'])); - $this->assertEquals(1, count($result['items'][0]['product_price'])); - $this->assertEquals(1, count($result['items'][1]['product_price'])); + self::assertArrayHasKey('subtotal_incl_tax', $result); + self::assertArrayHasKey('subtotal_excl_tax', $result); + self::assertArrayHasKey('items', $result); + self::assertTrue(is_array($result['items'])); + self::assertEquals(2, count($result['items'])); + self::assertEquals(1, $result['items'][0]['product_price']); + self::assertEquals(1, $result['items'][1]['product_price']); } } diff --git a/app/code/Magento/Tax/etc/db_schema.xml b/app/code/Magento/Tax/etc/db_schema.xml new file mode 100644 index 0000000000000..bde6879c073d6 --- /dev/null +++ b/app/code/Magento/Tax/etc/db_schema.xml @@ -0,0 +1,201 @@ + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Tax/etc/db_schema_whitelist.json b/app/code/Magento/Tax/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..4e9731abce738 --- /dev/null +++ b/app/code/Magento/Tax/etc/db_schema_whitelist.json @@ -0,0 +1,128 @@ +{ + "tax_class": { + "column": { + "class_id": true, + "class_name": true, + "class_type": true + }, + "constraint": { + "PRIMARY": true + } + }, + "tax_calculation_rule": { + "column": { + "tax_calculation_rule_id": true, + "code": true, + "priority": true, + "position": true, + "calculate_subtotal": true + }, + "index": { + "TAX_CALCULATION_RULE_PRIORITY_POSITION": true, + "TAX_CALCULATION_RULE_CODE": true + }, + "constraint": { + "PRIMARY": true + } + }, + "tax_calculation_rate": { + "column": { + "tax_calculation_rate_id": true, + "tax_country_id": true, + "tax_region_id": true, + "tax_postcode": true, + "code": true, + "rate": true, + "zip_is_range": true, + "zip_from": true, + "zip_to": true + }, + "index": { + "TAX_CALCULATION_RATE_TAX_COUNTRY_ID_TAX_REGION_ID_TAX_POSTCODE": true, + "TAX_CALCULATION_RATE_CODE": true, + "IDX_CA799F1E2CB843495F601E56C84A626D": true + }, + "constraint": { + "PRIMARY": true + } + }, + "tax_calculation": { + "column": { + "tax_calculation_id": true, + "tax_calculation_rate_id": true, + "tax_calculation_rule_id": true, + "customer_tax_class_id": true, + "product_tax_class_id": true + }, + "index": { + "TAX_CALCULATION_TAX_CALCULATION_RULE_ID": true, + "TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID": true, + "TAX_CALCULATION_PRODUCT_TAX_CLASS_ID": true, + "TAX_CALC_TAX_CALC_RATE_ID_CSTR_TAX_CLASS_ID_PRD_TAX_CLASS_ID": true + }, + "constraint": { + "PRIMARY": true, + "TAX_CALCULATION_PRODUCT_TAX_CLASS_ID_TAX_CLASS_CLASS_ID": true, + "TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID_TAX_CLASS_CLASS_ID": true, + "TAX_CALC_TAX_CALC_RATE_ID_TAX_CALC_RATE_TAX_CALC_RATE_ID": true, + "TAX_CALC_TAX_CALC_RULE_ID_TAX_CALC_RULE_TAX_CALC_RULE_ID": true + } + }, + "tax_calculation_rate_title": { + "column": { + "tax_calculation_rate_title_id": true, + "tax_calculation_rate_id": true, + "store_id": true, + "value": true + }, + "index": { + "TAX_CALCULATION_RATE_TITLE_TAX_CALCULATION_RATE_ID_STORE_ID": true, + "TAX_CALCULATION_RATE_TITLE_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "TAX_CALCULATION_RATE_TITLE_STORE_ID_STORE_STORE_ID": true, + "FK_37FB965F786AD5897BB3AE90470C42AB": true + } + }, + "tax_order_aggregated_created": { + "column": { + "id": true, + "period": true, + "store_id": true, + "code": true, + "order_status": true, + "percent": true, + "orders_count": true, + "tax_base_amount_sum": true + }, + "index": { + "TAX_ORDER_AGGREGATED_CREATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "TAX_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID": true, + "TAX_ORDER_AGGRED_CREATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS": true + } + }, + "tax_order_aggregated_updated": { + "column": { + "id": true, + "period": true, + "store_id": true, + "code": true, + "order_status": true, + "percent": true, + "orders_count": true, + "tax_base_amount_sum": true + }, + "index": { + "TAX_ORDER_AGGREGATED_UPDATED_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "TAX_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true, + "TAX_ORDER_AGGRED_UPDATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/TaxGraphQl/etc/graphql.xml b/app/code/Magento/TaxGraphQl/etc/graphql.xml index 39c39f46fb581..4f8dc3aba3fd9 100644 --- a/app/code/Magento/TaxGraphQl/etc/graphql.xml +++ b/app/code/Magento/TaxGraphQl/etc/graphql.xml @@ -5,13 +5,13 @@ --> - + - + - + TAX diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php index b1b22e06d7172..ed3445e117331 100644 --- a/app/code/Magento/Theme/Block/Html/Topmenu.php +++ b/app/code/Magento/Theme/Block/Html/Topmenu.php @@ -235,7 +235,13 @@ protected function _getHtml( if ($childLevel == 0 && $outermostClass) { $outermostClassCode = ' class="' . $outermostClass . '" '; - $child->setClass($outermostClass); + $currentClass = $child->getClass(); + + if (empty($currentClass)) { + $child->setClass($outermostClass); + } else { + $child->setClass($currentClass . ' ' . $outermostClass); + } } if (count($colBrakes) && $colBrakes[$counter]['colbrake']) { @@ -331,7 +337,7 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item) /** * Add identity * - * @param array $identity + * @param string|array $identity * @return void */ public function addIdentity($identity) diff --git a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php index 4c8d6bca52edc..404e2f3c49c4f 100644 --- a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php +++ b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php @@ -6,8 +6,9 @@ namespace Magento\Theme\Console\Command; -use Magento\Framework\App\Area; use Magento\Framework\App\Cache; +use Magento\Framework\App\Console\MaintenanceModeEnabler; +use Magento\Framework\App\ObjectManager; use Magento\Framework\App\MaintenanceMode; use Magento\Framework\App\State\CleanupFiles; use Magento\Framework\Composer\ComposerInformation; @@ -39,13 +40,6 @@ class ThemeUninstallCommand extends Command const INPUT_KEY_THEMES = 'theme'; const INPUT_KEY_CLEAR_STATIC_CONTENT = 'clear-static-content'; - /** - * Maintenance Mode - * - * @var MaintenanceMode - */ - private $maintenanceMode; - /** * Composer general dependency checker * @@ -116,13 +110,18 @@ class ThemeUninstallCommand extends Command */ private $themeDependencyChecker; + /** + * @var MaintenanceModeEnabler + */ + private $maintenanceModeEnabler; + /** * Constructor * * @param Cache $cache * @param CleanupFiles $cleanupFiles * @param ComposerInformation $composer - * @param MaintenanceMode $maintenanceMode + * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead * @param DependencyChecker $dependencyChecker * @param Collection $themeCollection * @param BackupRollbackFactory $backupRollbackFactory @@ -130,6 +129,9 @@ class ThemeUninstallCommand extends Command * @param ThemePackageInfo $themePackageInfo * @param ThemeUninstaller $themeUninstaller * @param ThemeDependencyChecker $themeDependencyChecker + * @param MaintenanceModeEnabler $maintenanceModeEnabler + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Cache $cache, @@ -142,12 +144,12 @@ public function __construct( ThemeValidator $themeValidator, ThemePackageInfo $themePackageInfo, ThemeUninstaller $themeUninstaller, - ThemeDependencyChecker $themeDependencyChecker + ThemeDependencyChecker $themeDependencyChecker, + MaintenanceModeEnabler $maintenanceModeEnabler = null ) { $this->cache = $cache; $this->cleanupFiles = $cleanupFiles; $this->composer = $composer; - $this->maintenanceMode = $maintenanceMode; $this->dependencyChecker = $dependencyChecker; $this->themeCollection = $themeCollection; $this->backupRollbackFactory = $backupRollbackFactory; @@ -155,6 +157,8 @@ public function __construct( $this->themePackageInfo = $themePackageInfo; $this->themeUninstaller = $themeUninstaller; $this->themeDependencyChecker = $themeDependencyChecker; + $this->maintenanceModeEnabler = + $maintenanceModeEnabler ?: ObjectManager::getInstance()->get(MaintenanceModeEnabler::class); parent::__construct(); } @@ -214,27 +218,32 @@ protected function execute(InputInterface $input, OutputInterface $output) return \Magento\Framework\Console\Cli::RETURN_FAILURE; } - try { - $output->writeln('Enabling maintenance mode'); - $this->maintenanceMode->set(true); - if ($input->getOption(self::INPUT_KEY_BACKUP_CODE)) { - $time = time(); - $codeBackup = $this->backupRollbackFactory->create($output); - $codeBackup->codeBackup($time); - } - - $this->themeUninstaller->uninstallRegistry($output, $themePaths); - $this->themeUninstaller->uninstallCode($output, $themePaths); + $result = $this->maintenanceModeEnabler->executeInMaintenanceMode( + function () use ($input, $output, $themePaths) { + try { + if ($input->getOption(self::INPUT_KEY_BACKUP_CODE)) { + $time = time(); + $codeBackup = $this->backupRollbackFactory->create($output); + $codeBackup->codeBackup($time); + } + + $this->themeUninstaller->uninstallRegistry($output, $themePaths); + $this->themeUninstaller->uninstallCode($output, $themePaths); + + $this->cleanup($input, $output); + return \Magento\Framework\Console\Cli::RETURN_SUCCESS; + } catch (\Exception $e) { + $output->writeln('' . $e->getMessage() . ''); + $output->writeln('Please disable maintenance mode after you resolved above issues'); + // we must have an exit code higher than zero to indicate something was wrong + return \Magento\Framework\Console\Cli::RETURN_FAILURE; + } + }, + $output, + true + ); - $this->cleanup($input, $output); - $output->writeln('Disabling maintenance mode'); - $this->maintenanceMode->set(false); - } catch (\Exception $e) { - $output->writeln('' . $e->getMessage() . ''); - $output->writeln('Please disable maintenance mode after you resolved above issues'); - // we must have an exit code higher than zero to indicate something was wrong - return \Magento\Framework\Console\Cli::RETURN_FAILURE; - } + return $result; } /** diff --git a/app/code/Magento/Theme/Model/Design/Config/Storage.php b/app/code/Magento/Theme/Model/Design/Config/Storage.php index a73f70efa0adf..c97114f963a09 100644 --- a/app/code/Magento/Theme/Model/Design/Config/Storage.php +++ b/app/code/Magento/Theme/Model/Design/Config/Storage.php @@ -87,10 +87,13 @@ public function load($scope, $scopeId) $scopeId, $fieldData->getFieldConfig() ); - if ($value !== null) { - $fieldData->setValue($value); + + if ($value === null) { + $value = ''; } + $fieldData->setValue($value); } + return $designConfig; } diff --git a/app/code/Magento/Theme/Setup/InstallSchema.php b/app/code/Magento/Theme/Setup/InstallSchema.php deleted file mode 100644 index b1bc59596f2a7..0000000000000 --- a/app/code/Magento/Theme/Setup/InstallSchema.php +++ /dev/null @@ -1,204 +0,0 @@ -getConnection(); - - $installer->startSetup(); - - /** - * Create table 'theme' - */ - $table = $connection->newTable( - $installer->getTable('theme') - )->addColumn( - 'theme_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Theme identifier' - )->addColumn( - 'parent_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => true], - 'Parent Id' - )->addColumn( - 'theme_path', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Theme Path' - )->addColumn( - 'theme_title', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Theme Title' - )->addColumn( - 'preview_image', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Preview Image' - )->addColumn( - 'is_featured', - \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN, - null, - ['nullable' => false, 'default' => 0], - 'Is Theme Featured' - )->addColumn( - 'area', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Theme Area' - )->addColumn( - 'type', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false], - 'Theme type: 0:physical, 1:virtual, 2:staging' - )->addColumn( - 'code', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - null, - [], - 'Full theme code, including package' - )->setComment( - 'Core theme' - ); - $connection->createTable($table); - - /** - * Create table 'theme_file' - */ - $table = $connection->newTable( - $installer->getTable('theme_file') - )->addColumn( - 'theme_files_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Theme files identifier' - )->addColumn( - 'theme_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['nullable' => false, 'unsigned' => true], - 'Theme Id' - )->addColumn( - 'file_path', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - ['nullable' => true], - 'Relative path to file' - )->addColumn( - 'file_type', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 32, - ['nullable' => false], - 'File Type' - )->addColumn( - 'content', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE, - ['nullable' => false], - 'File Content' - )->addColumn( - 'sort_order', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['nullable' => false, 'default' => 0], - 'Sort Order' - )->addColumn( - 'is_temporary', - \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN, - null, - ['nullable' => false, 'default' => 0], - 'Is Temporary File' - )->addForeignKey( - $installer->getFkName('theme_file', 'theme_id', 'theme', 'theme_id'), - 'theme_id', - $installer->getTable('theme'), - 'theme_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Core theme files' - ); - $connection->createTable($table); - - /** - * Create table 'design_change' - */ - $table = $connection->newTable( - $installer->getTable('design_change') - )->addColumn( - 'design_change_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'nullable' => false, 'primary' => true], - 'Design Change Id' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Store Id' - )->addColumn( - 'design', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Design' - )->addColumn( - 'date_from', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'First Date of Design Activity' - )->addColumn( - 'date_to', - \Magento\Framework\DB\Ddl\Table::TYPE_DATE, - null, - [], - 'Last Date of Design Activity' - )->addIndex( - $installer->getIdxName('design_change', ['store_id']), - ['store_id'] - )->addForeignKey( - $installer->getFkName('design_change', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment( - 'Design Changes' - ); - $connection->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Theme/Setup/RecurringData.php b/app/code/Magento/Theme/Setup/RecurringData.php index 9b2a9ab931304..972b60dc67f89 100644 --- a/app/code/Magento/Theme/Setup/RecurringData.php +++ b/app/code/Magento/Theme/Setup/RecurringData.php @@ -6,10 +6,12 @@ namespace Magento\Theme\Setup; +use Magento\Framework\Indexer\IndexerRegistry; use Magento\Framework\Setup\InstallDataInterface; use Magento\Framework\Setup\ModuleContextInterface; use Magento\Framework\Setup\ModuleDataSetupInterface; use Magento\Theme\Model\Theme\Registration; +use Magento\Theme\Model\Data\Design\Config; /** * Upgrade registered themes @@ -23,14 +25,21 @@ class RecurringData implements InstallDataInterface */ private $themeRegistration; + /** + * @var IndexerRegistry + */ + private $indexerRegistry; + /** * Init * * @param Registration $themeRegistration + * @param IndexerRegistry $indexerRegistry */ - public function __construct(Registration $themeRegistration) + public function __construct(Registration $themeRegistration, IndexerRegistry $indexerRegistry) { $this->themeRegistration = $themeRegistration; + $this->indexerRegistry = $indexerRegistry; } /** @@ -38,6 +47,8 @@ public function __construct(Registration $themeRegistration) */ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context) { + $indexer = $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID); + $indexer->reindexAll(); $this->themeRegistration->register(); } } diff --git a/app/code/Magento/Theme/Setup/UpgradeData.php b/app/code/Magento/Theme/Setup/UpgradeData.php index 366e5387b46e5..ade0e9d3f6c39 100644 --- a/app/code/Magento/Theme/Setup/UpgradeData.php +++ b/app/code/Magento/Theme/Setup/UpgradeData.php @@ -9,11 +9,9 @@ use Magento\Framework\DB\DataConverter\SerializedToJson; use Magento\Framework\DB\FieldDataConverterFactory; use Magento\Framework\DB\Select\QueryModifierFactory; -use Magento\Framework\Indexer\IndexerRegistry; use Magento\Framework\Setup\UpgradeDataInterface; use Magento\Framework\Setup\ModuleContextInterface; use Magento\Framework\Setup\ModuleDataSetupInterface; -use Magento\Theme\Model\Data\Design\Config; /** * @codeCoverageIgnore @@ -30,26 +28,18 @@ class UpgradeData implements UpgradeDataInterface */ private $queryModifierFactory; - /** - * @var IndexerRegistry - */ - protected $indexerRegistry; - /** * UpgradeData constructor * - * @param IndexerRegistry $indexerRegistry * @param FieldDataConverterFactory $fieldDataConverterFactory * @param QueryModifierFactory $queryModifierFactory */ public function __construct( - IndexerRegistry $indexerRegistry, FieldDataConverterFactory $fieldDataConverterFactory, QueryModifierFactory $queryModifierFactory ) { $this->fieldDataConverterFactory = $fieldDataConverterFactory; $this->queryModifierFactory = $queryModifierFactory; - $this->indexerRegistry = $indexerRegistry; } /** @@ -58,8 +48,6 @@ public function __construct( public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context) { $setup->startSetup(); - $indexer = $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID); - $indexer->reindexAll(); if (version_compare($context->getVersion(), '2.0.2', '<')) { $this->upgradeToVersionTwoZeroTwo($setup); } diff --git a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php index abd4c91a7e1b7..a90df675ec258 100644 --- a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php +++ b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php @@ -6,8 +6,9 @@ namespace Magento\Theme\Test\Unit\Console\Command; +use Magento\Framework\App\Console\MaintenanceModeEnabler; use Magento\Theme\Console\Command\ThemeUninstallCommand; -use Magento\Theme\Model\Theme\themePackageInfo; +use Magento\Theme\Model\Theme\ThemePackageInfo; use Magento\Theme\Model\Theme\ThemeUninstaller; use Magento\Theme\Model\Theme\ThemeDependencyChecker; use Symfony\Component\Console\Tester\CommandTester; @@ -56,7 +57,7 @@ class ThemeUninstallCommandTest extends \PHPUnit\Framework\TestCase /** * Theme Validator * - * @var ThemeValidator|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Theme\Model\ThemeValidator|\PHPUnit_Framework_MockObject_MockObject */ private $themeValidator; @@ -107,7 +108,8 @@ protected function setUp() $this->themeValidator, $this->themePackageInfo, $this->themeUninstaller, - $this->themeDependencyChecker + $this->themeDependencyChecker, + new MaintenanceModeEnabler($this->maintenanceMode) ); $this->tester = new CommandTester($this->command); } diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml index 925b906af9523..8b740bc8d09ae 100644 --- a/app/code/Magento/Theme/etc/config.xml +++ b/app/code/Magento/Theme/etc/config.xml @@ -45,7 +45,7 @@ Disallow: /*SID= Default welcome msg!
    - Copyright © 2013-2017 Magento, Inc. All rights reserved. + Copyright © 2013-2018 Magento, Inc. All rights reserved.
    diff --git a/app/code/Magento/Theme/etc/db_schema.xml b/app/code/Magento/Theme/etc/db_schema.xml new file mode 100644 index 0000000000000..62f7135d7b94d --- /dev/null +++ b/app/code/Magento/Theme/etc/db_schema.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Theme/etc/db_schema_whitelist.json b/app/code/Magento/Theme/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..2d1c3f8b6554a --- /dev/null +++ b/app/code/Magento/Theme/etc/db_schema_whitelist.json @@ -0,0 +1,49 @@ +{ + "theme": { + "column": { + "theme_id": true, + "parent_id": true, + "theme_path": true, + "theme_title": true, + "preview_image": true, + "is_featured": true, + "area": true, + "type": true, + "code": true + }, + "constraint": { + "PRIMARY": true + } + }, + "theme_file": { + "column": { + "theme_files_id": true, + "theme_id": true, + "file_path": true, + "file_type": true, + "content": true, + "sort_order": true, + "is_temporary": true + }, + "constraint": { + "PRIMARY": true, + "THEME_FILE_THEME_ID_THEME_THEME_ID": true + } + }, + "design_change": { + "column": { + "design_change_id": true, + "store_id": true, + "design": true, + "date_from": true, + "date_to": true + }, + "index": { + "DESIGN_CHANGE_STORE_ID": true + }, + "constraint": { + "PRIMARY": true, + "DESIGN_CHANGE_STORE_ID_STORE_STORE_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv index 16cc5596b3a93..daa5c27e75fcc 100644 --- a/app/code/Magento/Theme/i18n/en_US.csv +++ b/app/code/Magento/Theme/i18n/en_US.csv @@ -142,7 +142,7 @@ Empty,Empty "1 column","1 column" Configuration,Configuration "Default welcome msg!","Default welcome msg!" -"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved." +"Copyright © 2013-2018 Magento, Inc. All rights reserved.","Copyright © 2013-2018 Magento, Inc. All rights reserved." "Design Config Grid","Design Config Grid" "Rebuild design config grid index","Rebuild design config grid index" "Admin empty","Admin empty" diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml index cc3ea276e2230..58548a0ba268a 100644 --- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml @@ -15,7 +15,7 @@ $welcomeMessage = $block->getWelcome(); case 'welcome': ?>
  • - + diff --git a/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml b/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml index 7e8854b914261..2b75bd2222e26 100644 --- a/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml @@ -126,7 +126,7 @@ }; window.localStorage.__proto__ = window.localStorage = new Storage('local'); - window.sessionStorage.__proto__ = window.sessionStorag = new Storage('session'); + window.sessionStorage.__proto__ = window.sessionStorage = new Storage('session'); })(); } diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js index 08bbb95888d8d..fd5e9628fecdb 100644 --- a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js +++ b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js @@ -132,6 +132,10 @@ define([ ed.onInit.add(self.onEditorInit.bind(self)); + ed.onInit.add(function (editor) { + varienGlobalEvents.fireEvent('wysiwygEditorInitialized', editor); + }); + ed.onSubmit.add(function (edi, e) { varienGlobalEvents.fireEvent('tinymceSubmit', e); }); @@ -244,6 +248,13 @@ define([ return tinyMCE3.get(id); }, + /** + * @return {String|null} + */ + getId: function () { + return this.id || (this.activeEditor() ? this.activeEditor().id : null) || tinyMceEditors.values()[0].id; + }, + /** * @return {Object} */ @@ -261,6 +272,35 @@ define([ this.activeEditor().execCommand('mceInsertContent', typeof ui !== 'undefined' ? ui : false, content); }, + /** + * Set the status of the toolbar to disabled or enabled (true for enabled, false for disabled) + * @param {Boolean} enabled + */ + setToolbarStatus: function (enabled) { + _.each(this.activeEditor().controlManager.controls, function (property, index, controls) { + controls[property.id].setDisabled(!enabled); + }); + }, + + /** + * Set the status of the editor and toolbar + * + * @param {Boolean} enabled + */ + setEnabledStatus: function (enabled) { + if (this.activeEditor()) { + this.activeEditor().getBody().setAttribute('contenteditable', enabled); + this.activeEditor().readonly = !enabled; + this.setToolbarStatus(enabled); + } + + if (enabled) { + this.getTextArea().removeProp('disabled'); + } else { + this.getTextArea().prop('disabled', 'disabled'); + } + }, + /** * Set caret location in WYSIWYG editor. * @@ -279,7 +319,7 @@ define([ storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0, frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]'), wUrl = this.config['files_browser_window_url'] + - 'target_element_id/' + this.id + '/' + + 'target_element_id/' + this.getId() + '/' + 'store/' + storeId + '/'; this.mediaBrowserOpener = o.win; @@ -331,14 +371,14 @@ define([ * @return {jQuery|*|HTMLElement} */ getToggleButton: function () { - return $('toggle' + this.id); + return $('toggle' + this.getId()); }, /** * Get plugins button. */ getPluginButtons: function () { - return $$('#buttons' + this.id + ' > button.plugin'); + return jQuery('#buttons' + this.getId() + ' > button.plugin'); }, /** @@ -350,11 +390,9 @@ define([ this.setup(mode); - tinyMCE3.execCommand('mceAddControl', false, this.id); + tinyMCE3.execCommand('mceAddControl', false, this.getId()); - this.getPluginButtons().each(function (e) { - e.hide(); - }); + this.getPluginButtons().hide(); return this; }, @@ -365,11 +403,9 @@ define([ turnOff: function () { this.closePopups(); - tinyMCE3.execCommand('mceRemoveControl', false, this.id); + tinyMCE3.execCommand('mceRemoveControl', false, this.getId()); - this.getPluginButtons().each(function (e) { - e.show(); - }); + this.getPluginButtons().show(); return this; }, @@ -380,8 +416,8 @@ define([ closePopups: function () { if (typeof closeEditorPopup == 'function') { // close all popups to avoid problems with updating parent content area - closeEditorPopup('widget_window' + this.id); - closeEditorPopup('browser_window' + this.id); + closeEditorPopup('widget_window' + this.getId()); + closeEditorPopup('browser_window' + this.getId()); } }, @@ -389,7 +425,7 @@ define([ * @return {Boolean} */ toggle: function () { - if (!tinyMCE3.get(this.id)) { + if (!tinyMCE3.get(this.getId())) { this.turnOn(); return true; @@ -415,8 +451,8 @@ define([ * On form validation. */ onFormValidation: function () { - if (tinyMCE3.get(this.id)) { - $(this.id).value = tinyMCE3.get(this.id).getContent(); + if (tinyMCE3.get(this.getId())) { + $(this.getId()).value = tinyMCE3.get(this.getId()).getContent(); } }, @@ -444,25 +480,28 @@ define([ * @param {String} directive */ makeDirectiveUrl: function (directive) { - return this.config['directives_url'].replace('directive', 'directive/___directive/' + directive); + return this.config['directives_url'].replace(/directive.*/, 'directive/___directive/' + directive); }, /** + * Convert {{directive}} style attributes syntax to absolute URLs * @param {Object} content * @return {*} */ encodeDirectives: function (content) { // collect all HTML tags with attributes that contain directives - return content.gsub(/<([a-z0-9\-\_]+.+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function (match) { - var attributesString = match[2]; + return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function (match) { + var attributesString = match[2], + decodedDirectiveString; // process tag attributes string attributesString = attributesString.gsub(/([a-z0-9\-\_]+)="(.*?)(\{\{.+?\}\})(.*?)"/i, function (m) { - return m[1] + '="' + m[2] + this.makeDirectiveUrl(Base64.mageEncode(m[3])) + m[4] + '"'; + decodedDirectiveString = encodeURIComponent(Base64.mageEncode(m[3].replace(/"/g, '"'))); + + return m[1] + '="' + m[2] + this.makeDirectiveUrl(decodedDirectiveString) + m[4] + '"'; }.bind(this)); return '<' + match[1] + attributesString + '>'; - }.bind(this)); }, @@ -493,16 +532,17 @@ define([ }, /** + * Convert absolute URLs to {{directive}} style attributes syntax * @param {Object} content * @return {*} */ decodeDirectives: function (content) { // escape special chars in directives url to use it in regular expression var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'), - reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)')); + reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9%,_-]+)\/?')); return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind - return Base64.mageDecode(match[1]); + return Base64.mageDecode(decodeURIComponent(match[1])).replace(/"/g, '"'); }); }, @@ -548,7 +588,7 @@ define([ * Update text area. */ updateTextArea: function () { - var editor = tinyMCE3.get(this.id), + var editor = tinyMCE3.get(this.getId()), content; if (!editor) { @@ -558,7 +598,14 @@ define([ content = editor.getContent(); content = this.decodeContent(content); - jQuery('#' + this.id).val(content).trigger('change'); + this.getTextArea().val(content).trigger('change'); + }, + + /** + * @return {Object} jQuery textarea element + */ + getTextArea: function () { + return jQuery('#' + this.getId()); }, /** diff --git a/app/code/Magento/Translation/Setup/InstallSchema.php b/app/code/Magento/Translation/Setup/InstallSchema.php deleted file mode 100644 index 5dd180ecd3cbf..0000000000000 --- a/app/code/Magento/Translation/Setup/InstallSchema.php +++ /dev/null @@ -1,105 +0,0 @@ -startSetup(); - - /** - * Create table 'translation' - */ - $table = $installer->getConnection() - ->newTable($installer->getTable('translation')) - ->addColumn( - 'key_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - [ - 'identity' => true, - 'unsigned' => true, - 'nullable' => false, - 'primary' => true, - ], - 'Key Id of Translation' - )->addColumn( - 'string', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [ - 'nullable' => false, - 'default' => 'Translate String', - ], - 'Translation String' - )->addColumn( - 'store_id', - \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, - null, - [ - 'unsigned' => true, - 'nullable' => false, - 'default' => '0', - ], - 'Store Id' - )->addColumn( - 'translate', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 255, - [], - 'Translate' - )->addColumn( - 'locale', - \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, - 20, - [ - 'nullable' => false, - 'default' => 'en_US', - ], - 'Locale' - )->addColumn( - 'crc_string', - \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT, - null, - [ - 'nullable' => false, - 'default' => crc32('Translate String') - ], - 'Translation String CRC32 Hash' - )->addIndex( - $installer->getIdxName( - 'translation', - ['store_id', 'locale', 'crc_string', 'string'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['store_id', 'locale', 'crc_string', 'string'], - ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE] - )->addForeignKey( - $installer->getFkName('translation', 'store_id', 'store', 'store_id'), - 'store_id', - $installer->getTable('store'), - 'store_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment('Translations'); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} diff --git a/app/code/Magento/Translation/etc/db_schema.xml b/app/code/Magento/Translation/etc/db_schema.xml new file mode 100644 index 0000000000000..633a7a6d3dd8c --- /dev/null +++ b/app/code/Magento/Translation/etc/db_schema.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Translation/etc/db_schema_whitelist.json b/app/code/Magento/Translation/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..deee0d900e3ee --- /dev/null +++ b/app/code/Magento/Translation/etc/db_schema_whitelist.json @@ -0,0 +1,17 @@ +{ + "translation": { + "column": { + "key_id": true, + "string": true, + "store_id": true, + "translate": true, + "locale": true, + "crc_string": true + }, + "constraint": { + "PRIMARY": true, + "TRANSLATION_STORE_ID_STORE_STORE_ID": true, + "TRANSLATION_STORE_ID_LOCALE_CRC_STRING_STRING": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Ui/Component/ExportButton.php b/app/code/Magento/Ui/Component/ExportButton.php index 9d5f125839003..284362a119bad 100644 --- a/app/code/Magento/Ui/Component/ExportButton.php +++ b/app/code/Magento/Ui/Component/ExportButton.php @@ -54,11 +54,13 @@ public function getComponentName() */ public function prepare() { + $context = $this->getContext(); $config = $this->getData('config'); if (isset($config['options'])) { $options = []; foreach ($config['options'] as $option) { - $option['url'] = $this->urlBuilder->getUrl($option['url']); + $additionalParams = $this->getAdditionalParams($config, $context); + $option['url'] = $this->urlBuilder->getUrl($option['url'], $additionalParams); $options[] = $option; } $config['options'] = $options; @@ -66,4 +68,25 @@ public function prepare() } parent::prepare(); } + + /** + * Get export button additional parameters + * + * @param array $config + * @param ContextInterface $context + * @return array + */ + protected function getAdditionalParams($config, $context) + { + $additionalParams = []; + if (isset($config['additionalParams'])) { + foreach ($config['additionalParams'] as $paramName => $paramValue) { + if ('*' == $paramValue) { + $paramValue = $context->getRequestParam($paramName); + } + $additionalParams[$paramName] = $paramValue; + } + } + return $additionalParams; + } } diff --git a/app/code/Magento/Ui/Config/Converter/HtmlContent.php b/app/code/Magento/Ui/Config/Converter/HtmlContent.php index f77b4a5285d5a..db874a302bd50 100644 --- a/app/code/Magento/Ui/Config/Converter/HtmlContent.php +++ b/app/code/Magento/Ui/Config/Converter/HtmlContent.php @@ -23,7 +23,7 @@ public function convert(\DOMNode $node, array $data) if ($node->nodeType == XML_ELEMENT_NODE) { $xml = '' . "\n" . '' . "\n" - . $node->ownerDocument->saveXml($node) . "\n" + . $node->ownerDocument->saveXML($node) . "\n" . ''; $items['layout']['xsi:type'] = 'string'; $items['layout']['name'] = 'layout'; diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php index 18fd5eea2f5f2..4df9198c0b95d 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php @@ -79,7 +79,10 @@ private function validateAclResource($dataProviderConfigData) { if (isset($dataProviderConfigData['aclResource'])) { if (!$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])) { - $this->_redirect('admin/denied'); + if (!$this->_request->isAjax()) { + $this->_redirect('admin/denied'); + } + return false; } } diff --git a/app/code/Magento/Ui/Setup/InstallSchema.php b/app/code/Magento/Ui/Setup/InstallSchema.php deleted file mode 100644 index 6190c870ebd12..0000000000000 --- a/app/code/Magento/Ui/Setup/InstallSchema.php +++ /dev/null @@ -1,91 +0,0 @@ -getConnection(); - $setup->startSetup(); - $table = $connection->newTable($setup->getTable('ui_bookmark')) - ->addColumn( - 'bookmark_id', - Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Bookmark identifier' - ) - ->addColumn( - 'user_id', - Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false], - 'User Id' - ) - ->addColumn( - 'namespace', - Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Bookmark namespace' - ) - ->addColumn( - 'identifier', - Table::TYPE_TEXT, - 255, - ['nullable' => false], - 'Bookmark Identifier' - ) - ->addColumn( - 'current', - Table::TYPE_SMALLINT, - 1, - ['nullable' => false], - 'Mark current bookmark per user and identifier' - ) - ->addColumn('title', Table::TYPE_TEXT, 255, ['nullable' => true], 'Bookmark title') - ->addColumn('config', Table::TYPE_TEXT, Table::MAX_TEXT_SIZE, ['nullable' => true], 'Bookmark config') - ->addColumn('created_at', Table::TYPE_DATETIME, null, ['nullable' => false], 'Bookmark created at') - ->addColumn('updated_at', Table::TYPE_DATETIME, null, ['nullable' => false], 'Bookmark updated at') - ->addIndex( - $setup->getIdxName( - 'ui_bookmark', - ['user_id', 'namespace', 'identifier'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ), - ['user_id', 'namespace', 'identifier'], - \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE - ) - ->addForeignKey( - $setup->getFkName('ui_bookmark', 'user_id', 'admin_user', 'user_id'), - 'user_id', - $setup->getTable('admin_user'), - 'user_id', - Table::ACTION_CASCADE - ) - ->setComment('Bookmark'); - $connection->createTable($table); - $setup->endSetup(); - } -} diff --git a/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php b/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php index 53e148fb8aaf2..76749e165e245 100644 --- a/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php +++ b/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php @@ -62,14 +62,37 @@ public function testPrepare() ->disableOriginalConstructor() ->getMock(); $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor); + $this->context->expects($this->any()) + ->method('getRequestParam') + ->with('test_asterisk') + ->willReturn('test_asterisk_value'); $option = ['label' => 'test label', 'value' => 'test value', 'url' => 'test_url']; - $data = ['config' => ['options' => [$option]]]; + $data = [ + 'config' => [ + 'options' => [ + $option + ], + 'additionalParams' => [ + 'test_key' => 'test_value', + 'test_asterisk' => '*' + ] + ], + ]; + $expected = $data; + $expected['config']['options'][0]['url'] = [ + 'test_key' => 'test_value', + 'test_asterisk' => 'test_asterisk_value', + ]; $this->model->setData($data); - $this->urlBuilderMock->expects($this->once()) ->method('getUrl') ->with('test_url') - ->willReturnArgument(0); - $this->assertNull($this->model->prepare()); + ->willReturnArgument(1); + + self::assertNull($this->model->prepare()); + self::assertEquals( + $expected, + $this->model->getData() + ); } } diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php index b1ef1dd9b5249..d41c90bfa760a 100644 --- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php +++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php @@ -208,6 +208,13 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf $this->requestMock->expects($this->any()) ->method('getParams') ->willReturn([]); + if ($isAllowed === false) { + $this->requestMock->expects($this->once()) + ->method('isAjax') + ->willReturn(true); + } + $this->responseMock->expects($this->never()) + ->method('setRedirect'); $this->responseMock->expects($this->any()) ->method('appendBody') ->with($renderedData); diff --git a/app/code/Magento/Ui/etc/db_schema.xml b/app/code/Magento/Ui/etc/db_schema.xml new file mode 100644 index 0000000000000..c5e5392277490 --- /dev/null +++ b/app/code/Magento/Ui/etc/db_schema.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + +
    +     diff --git a/app/code/Magento/Ui/etc/db_schema_whitelist.json b/app/code/Magento/Ui/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..662d6234ab96d --- /dev/null +++ b/app/code/Magento/Ui/etc/db_schema_whitelist.json @@ -0,0 +1,22 @@ +{ + "ui_bookmark": { + "column": { + "bookmark_id": true, + "user_id": true, + "namespace": true, + "identifier": true, + "current": true, + "title": true, + "config": true, + "created_at": true, + "updated_at": true + }, + "index": { + "UI_BOOKMARK_USER_ID_NAMESPACE_IDENTIFIER": true + }, + "constraint": { + "PRIMARY": true, + "UI_BOOKMARK_USER_ID_ADMIN_USER_USER_ID": true + } + } +} \ No newline at end of file diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml index dd4a2038a53c4..5bbf252c8a787 100644 --- a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml +++ b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> -
    +
    diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml index 6dc91cf6b3d5b..977ea8374dfa8 100644 --- a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml +++ b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> -
    +
    diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml index baab52111aebe..aedf18961a719 100644 --- a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml +++ b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> -
    +