Skip to content

Commit 14a9c29

Browse files
magicbunnehmagicbunneh
committed
Merge remote-tracking branch 'main-ce/develop' into MAGETWO-47870
2 parents a9901da + 0da0b13 commit 14a9c29

File tree

30 files changed

+1279
-79
lines changed

30 files changed

+1279
-79
lines changed

‎app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ public function isIndexable()
417417
if ($this->getAttributeCode() == 'price') {
418418
return false;
419419
}
420+
if ($this->getAttributeCode() == 'visibility') {
421+
return true;
422+
}
420423

421424
if (!$this->getIsFilterableInSearch() && !$this->getIsVisibleInAdvancedSearch() && !$this->getIsFilterable()) {
422425
return false;

‎app/code/Magento/CatalogInventory/Setup/InstallSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
254254
->addIndex(
255255
$installer->getIdxName(
256256
'cataloginventory_stock_item',
257-
['product_id', 'website_id'],
257+
['product_id', 'stock_id'],
258258
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
259259
),
260-
['product_id', 'website_id'],
260+
['product_id', 'stock_id'],
261261
['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
262262
)
263263
->addIndex(

‎app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\CatalogInventory\Setup;
8+
9+
use Magento\Framework\Setup\UpgradeSchemaInterface;
10+
use Magento\Framework\Setup\ModuleContextInterface;
11+
use Magento\Framework\Setup\SchemaSetupInterface;
12+
use Magento\CatalogInventory\Model\Stock\Item as StockItem;
13+
14+
class UpgradeSchema implements UpgradeSchemaInterface
15+
{
16+
/**
17+
* @var string
18+
*/
19+
private $productCompositeKeyVersion = '2.2.0';
20+
21+
/**
22+
* {@inheritdoc}
23+
*/
24+
public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
25+
{
26+
$setup->startSetup();
27+
28+
if (version_compare($context->getVersion(), $this->productCompositeKeyVersion, '<')) {
29+
$this->upgradeProductCompositeKey($setup);
30+
}
31+
32+
$setup->endSetup();
33+
}
34+
35+
/**
36+
* @param SchemaSetupInterface $setup
37+
* @return void
38+
*/
39+
private function upgradeProductCompositeKey(SchemaSetupInterface $setup)
40+
{
41+
$oldCompositeKeyColumns = ['product_id', 'website_id'];
42+
$newCompositeKeyColumns = ['product_id', 'stock_id'];
43+
44+
$foreignKeys = $this->getForeignKeys($setup, $oldCompositeKeyColumns);
45+
// drop foreign keys
46+
$this->dropForeignKeys($setup, $foreignKeys);
47+
48+
$oldIndexName = $setup->getIdxName(
49+
$setup->getTable(StockItem::ENTITY),
50+
$oldCompositeKeyColumns,
51+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
52+
);
53+
54+
$newIndexName = $setup->getIdxName(
55+
$setup->getTable(StockItem::ENTITY),
56+
$newCompositeKeyColumns,
57+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
58+
);
59+
60+
// Drop a key based on the following columns: "product_id","website_id"
61+
$setup->getConnection()->dropIndex($setup->getTable(StockItem::ENTITY), $oldIndexName);
62+
63+
// Create a key based on the following columns: "product_id","stock_id"
64+
$setup->getConnection()
65+
->addIndex(
66+
$setup->getTable(StockItem::ENTITY),
67+
$newIndexName,
68+
$newCompositeKeyColumns,
69+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
70+
);
71+
// restore deleted foreign keys
72+
$this->createForeignKeys($setup, $foreignKeys);
73+
}
74+
75+
/**
76+
* @param SchemaSetupInterface $setup
77+
* @param array $keys
78+
* @return void
79+
*/
80+
private function dropForeignKeys(SchemaSetupInterface $setup, array $keys)
81+
{
82+
foreach ($keys as $key) {
83+
$setup->getConnection()->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
84+
}
85+
}
86+
87+
/**
88+
* @param SchemaSetupInterface $setup
89+
* @param array $keys
90+
* @return void
91+
*/
92+
private function createForeignKeys(SchemaSetupInterface $setup, array $keys)
93+
{
94+
foreach ($keys as $key) {
95+
$setup->getConnection()->addForeignKey(
96+
$key['FK_NAME'],
97+
$key['TABLE_NAME'],
98+
$key['COLUMN_NAME'],
99+
$key['REF_TABLE_NAME'],
100+
$key['REF_COLUMN_NAME'],
101+
$key['ON_DELETE']
102+
);
103+
}
104+
}
105+
106+
/**
107+
* @param SchemaSetupInterface $setup
108+
* @param array $compositeKeys
109+
* @return array
110+
*/
111+
private function getForeignKeys(SchemaSetupInterface $setup, array $compositeKeys)
112+
{
113+
$foreignKeys = [];
114+
$allForeignKeys = $setup->getConnection()->getForeignKeys($setup->getTable(StockItem::ENTITY));
115+
foreach ($allForeignKeys as $key) {
116+
if (in_array($key['COLUMN_NAME'], $compositeKeys)) {
117+
$foreignKeys[] = $key;
118+
}
119+
}
120+
121+
return $foreignKeys;
122+
}
123+
}

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<!-- /ko --><br/>
1616
<!-- ko foreach: { data: currentBillingAddress().customAttributes, as: 'element' } -->
1717
<!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
18-
<!-- ko text: element[attribute].value --><!-- /ko -->
18+
<!-- ko if: (typeof element[attribute] === "object") -->
19+
<!-- ko text: element[attribute].value --><!-- /ko -->
20+
<!-- /ko -->
21+
<!-- ko if: (typeof element[attribute] === "string") -->
22+
<!-- ko text: element[attribute] --><!-- /ko -->
23+
<!-- /ko --><br/>
1924
<!-- /ko -->
2025
<!-- /ko -->
2126
<button type="button"

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<!-- /ko --><br/>
1616
<!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
1717
<!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
18-
<!-- ko text: element[attribute].value --><!-- /ko -->
18+
<!-- ko if: (typeof element[attribute] === "object") -->
19+
<!-- ko text: element[attribute].value --><!-- /ko -->
20+
<!-- /ko -->
21+
<!-- ko if: (typeof element[attribute] === "string") -->
22+
<!-- ko text: element[attribute] --><!-- /ko -->
23+
<!-- /ko --><br/>
1924
<!-- /ko -->
2025
<!-- /ko -->
2126
<!-- ko if: (address().isEditable()) -->

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<!-- /ko --><br/>
1616
<!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
1717
<!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
18-
<!-- ko text: element[attribute].value --><!-- /ko -->
18+
<!-- ko if: (typeof element[attribute] === "object") -->
19+
<!-- ko text: element[attribute].value --><!-- /ko -->
20+
<!-- /ko -->
21+
<!-- ko if: (typeof element[attribute] === "string") -->
22+
<!-- ko text: element[attribute] --><!-- /ko -->
23+
<!-- /ko --><br/>
1924
<!-- /ko -->
2025
<!-- /ko -->
2126
<!-- /ko -->

‎app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function getAssociatedProducts($product)
202202
$collection = $this->getAssociatedProductCollection(
203203
$product
204204
)->addAttributeToSelect(
205-
['name', 'price', 'special_price', 'special_from_date', 'special_to_date']
205+
['name', 'price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id']
206206
)->addFilterByRequiredOptions()->setPositionOrder()->addStoreFilter(
207207
$this->getStoreFilter($product)
208208
)->addAttributeToFilter(

‎app/code/Magento/Store/Model/StoreManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function isSingleStoreMode()
152152
public function getStore($storeId = null)
153153
{
154154
if (!isset($storeId) || '' === $storeId || $storeId === true) {
155-
if (!$this->currentStoreId) {
155+
if (null === $this->currentStoreId) {
156156
\Magento\Framework\Profiler::start('store.resolve');
157157
$this->currentStoreId = $this->storeResolver->getCurrentStoreId();
158158
\Magento\Framework\Profiler::stop('store.resolve');

‎app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,15 @@ public function __construct(
6060
public function prepare()
6161
{
6262
$config = $this->getData('config');
63+
6364
if (!isset($config['storeTimeZone'])) {
6465
$storeTimeZone = $this->localeDate->getConfigTimezone();
6566
$config['storeTimeZone'] = $storeTimeZone;
6667
}
6768
// Set date format pattern by current locale
6869
$localeDateFormat = $this->localeDate->getDateFormat();
6970
$config['options']['dateFormat'] = $localeDateFormat;
70-
$config['outputDateFormat'] = $localeDateFormat;
71+
$config['options']['storeLocale'] = $this->locale;
7172
$this->setData('config', $config);
7273
parent::prepare();
7374
}

‎app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ public function testPrepareWithTimeOffset()
7070
$this->assertArrayHasKey('options', $config);
7171
$this->assertArrayHasKey('dateFormat', $config['options']);
7272
$this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
73-
74-
$this->assertArrayHasKey('outputDateFormat', $config);
75-
$this->assertEquals($localeDateFormat, $config['outputDateFormat']);
7673
}
7774

7875
public function testPrepareWithoutTimeOffset()
@@ -112,15 +109,14 @@ public function testPrepareWithoutTimeOffset()
112109
$this->assertArrayHasKey('dateFormat', $config['options']);
113110
$this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
114111

115-
$this->assertArrayHasKey('outputDateFormat', $config);
116-
$this->assertEquals($localeDateFormat, $config['outputDateFormat']);
117112
}
118113

119114
/**
120115
* This tests ensures that userTimeZone is properly saved in the configuration
121116
*/
122117
public function testPrepare()
123118
{
119+
$this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn('de-DE');
124120
$this->date = $this->objectManagerHelper->getObject(
125121
Date::class,
126122
[
@@ -133,5 +129,6 @@ public function testPrepare()
133129
$this->date->prepare();
134130
$configArray = $this->date->getData('config');
135131
$this->assertEquals('America/Chicago', $configArray['storeTimeZone']);
132+
$this->assertEquals('de-DE', $configArray['options']['storeLocale']);
136133
}
137134
}

0 commit comments

Comments
 (0)