Skip to content

Commit 36b6695

Browse files
committed
Merge remote-tracking branch 'mainline/develop' into BUGS
2 parents aabd23a + 6a55821 commit 36b6695

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-4
lines changed

app/code/Magento/Checkout/Model/ConfigProviderInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Checkout\Model;
77

8+
/**
9+
* Interface ConfigProviderInterface
10+
* @api
11+
*/
812
interface ConfigProviderInterface
913
{
1014

app/code/Magento/Checkout/view/frontend/web/js/view/payment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ define(
5353
stepNavigator.registerStep(
5454
'payment',
5555
null,
56-
$t('Review & Payments'),
56+
'Review & Payments',
5757
this.isVisible,
5858
_.bind(this.navigate, this),
5959
20

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ define(
8383
stepNavigator.registerStep(
8484
'shipping',
8585
'',
86-
$t('Shipping'),
86+
'Shipping',
8787
this.visible, _.bind(this.navigate, this),
8888
10
8989
);

app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ul class="opc-progress-bar">
88
<!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
99
<li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
10-
<span data-bind="text: item.title, click: $parent.navigateTo"></span>
10+
<span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
1111
</li>
1212
<!-- /ko -->
1313
</ul>

app/code/Magento/Quote/Setup/UpgradeSchema.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
2929
);
3030
}
3131

32+
if (version_compare($context->getVersion(), '2.0.2', '<')) {
33+
$setup->getConnection()->changeColumn(
34+
$setup->getTable('quote_address'),
35+
'street',
36+
'street',
37+
[
38+
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
39+
'length' => 255,
40+
'comment' => 'Street'
41+
]
42+
);
43+
}
44+
3245
$setup->endSetup();
3346
}
3447
}

app/code/Magento/Quote/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Magento_Quote" setup_version="2.0.1">
9+
<module name="Magento_Quote" setup_version="2.0.2">
1010
</module>
1111
</config>

0 commit comments

Comments
 (0)