Skip to content
Snippets Groups Projects
Unverified Commit b09ab2aa authored by Magento 2 Team's avatar Magento 2 Team Committed by GitHub
Browse files

:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento/magento2#13015: [Backport to 2.2-develop] The quote address fields length expanded in the database (by @dverkade)
 - magento/magento2#13027: Change of copyright year from 2017 to 2018. (by @bhargavmehta)


Fixed GitHub Issues:
 - magento/magento2#10869: field lengths differ across many tables (reported by @steros) has been fixed in magento/magento2#13015 by @dverkade in 2.2-develop branch
   Related commits:
     1. 6c16fcbc
parents 49dcdeeb 160b0501
Branches
No related merge requests found
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
......
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define(function () {
......
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
......
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
......
......@@ -5,6 +5,7 @@
*/
namespace Magento\Quote\Setup;
use Magento\Framework\DB\Ddl\Table;
use Magento\Framework\Setup\UpgradeSchemaInterface;
use Magento\Framework\Setup\ModuleContextInterface;
use Magento\Framework\Setup\SchemaSetupInterface;
......@@ -40,7 +41,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
'street',
'street',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'type' => Table::TYPE_TEXT,
'length' => 255,
'comment' => 'Street'
]
......@@ -61,7 +62,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
$setup->getTable('quote_address', self::$connectionName),
'shipping_method',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'type' => Table::TYPE_TEXT,
'length' => 120
]
);
......@@ -72,33 +73,53 @@ class UpgradeSchema implements UpgradeSchemaInterface
$setup->getTable('quote_address', self::$connectionName),
'firstname',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'type' => Table::TYPE_TEXT,
'length' => 255,
]
)->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'middlename',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'type' => Table::TYPE_TEXT,
'length' => 40,
]
)->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'lastname',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
'type' => Table::TYPE_TEXT,
'length' => 255,
]
)->modifyColumn(
$setup->getTable('quote', self::$connectionName),
'updated_at',
[
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
'type' => Table::TYPE_TIMESTAMP,
'nullable' => false,
'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE,
'default' => Table::TIMESTAMP_INIT_UPDATE,
]
);
}
if (version_compare($context->getVersion(), '2.0.7', '<')) {
$connection = $setup->getConnection(self::$connectionName);
$connection->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'telephone',
['type' => Table::TYPE_TEXT, 'length' => 255]
)->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'fax',
['type' => Table::TYPE_TEXT, 'length' => 255]
)->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'region',
['type' => Table::TYPE_TEXT, 'length' => 255]
)->modifyColumn(
$setup->getTable('quote_address', self::$connectionName),
'city',
['type' => Table::TYPE_TEXT, 'length' => 255]
);
}
$setup->endSetup();
}
}
......@@ -6,6 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Magento_Quote" setup_version="2.0.6">
<module name="Magento_Quote" setup_version="2.0.7">
</module>
</config>
......@@ -45,7 +45,7 @@ Disallow: /*SID=
<welcome>Default welcome msg!</welcome>
</header>
<footer translate="copyright">
<copyright>Copyright &#169; 2013-2017 Magento, Inc. All rights reserved.</copyright>
<copyright>Copyright &#169; 2013-2018 Magento, Inc. All rights reserved.</copyright>
</footer>
</design>
<theme>
......
......@@ -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"
......
......@@ -67,7 +67,7 @@ class SaveTest extends AbstractBackendController
'header_logo_height' => '',
'header_logo_alt' => '',
'header_welcome' => 'Default welcome msg!',
'footer_copyright' => 'Copyright © 2013-2017 Magento, Inc. All rights reserved.',
'footer_copyright' => 'Copyright © 2013-2018 Magento, Inc. All rights reserved.',
'footer_absolute_footer' => '',
'default_robots' => 'INDEX,FOLLOW',
'custom_instructions' => '',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment