Skip to content

Commit 6d60a51

Browse files
oshmyheliukoshmyheliuk
committed
Merge branch 'develop' of github.com:magento-falcons/magento2ce into develop
2 parents a4dd3ba + 6ee307f commit 6d60a51

File tree

126 files changed

+1667
-537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1667
-537
lines changed

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
4141
{
4242
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
4343
'Read Details'
44-
) . '</a> | ' : '';
44+
) . '</a>' : '';
4545

4646
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
4747
'*/*/markAsRead/',
4848
['_current' => true, 'id' => $row->getId()]
4949
) . '">' . __(
5050
'Mark as Read'
51-
) . '</a> | ' : '';
51+
) . '</a>' : '';
5252

5353
$encodedUrl = $this->_urlHelper->getEncodedUrl();
5454
return sprintf(

‎app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Magento\Framework\Registry;
1616
use Magento\Payment\Model\IframeConfigProvider;
1717
use Magento\Quote\Api\CartManagementInterface;
18+
use Magento\Framework\Exception\LocalizedException;
1819

1920
/**
2021
* Class Place
@@ -125,6 +126,9 @@ protected function placeCheckoutOrder()
125126
'action' => $this
126127
]
127128
);
129+
} catch (LocalizedException $exception) {
130+
$result->setData('error', true);
131+
$result->setData('error_messages', $exception->getMessage());
128132
} catch (\Exception $exception) {
129133
$result->setData('error', true);
130134
$result->setData('error_messages', __('Unable to place order. Please try again later.'));

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<head>
1010
<title>Magento Admin</title>
1111
<meta name="viewport" content="width=1024"/>
12+
<meta name="format-detection" content="telephone=no"/>
1213
<link src="requirejs/require.js"/>
1314
<css src="extjs/resources/css/ext-all.css"/>
1415
<css src="extjs/resources/css/ytheme-magento.css"/>

‎app/code/Magento/Bundle/Setup/UpgradeData.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
4040
/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
4141
$eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
4242

43-
$eavSetup->addAttributeGroup(ProductAttributeInterface::ENTITY_TYPE_CODE, 'Default', 'Bundle Items', 16);
43+
$attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
44+
$eavSetup->addAttributeGroup(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeSetId, 'Bundle Items', 16);
4445

4546
$this->upgradePriceType($eavSetup);
4647
$this->upgradeSkuType($eavSetup);
@@ -133,9 +134,10 @@ private function upgradeWeightType(EavSetup $eavSetup)
133134
*/
134135
private function upgradeShipmentType(EavSetup $eavSetup)
135136
{
137+
$attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
136138
$eavSetup->addAttributeToGroup(
137139
ProductAttributeInterface::ENTITY_TYPE_CODE,
138-
'Default',
140+
$attributeSetId,
139141
'Bundle Items',
140142
'shipment_type',
141143
1

‎app/code/Magento/Bundle/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<type name="Magento\Quote\Model\Quote\Item\Repository">
119119
<arguments>
120120
<argument name="cartItemProcessors" xsi:type="array">
121-
<item name="bundle" xsi:type="object">\Magento\Bundle\Model\CartItemProcessor</item>
121+
<item name="bundle" xsi:type="object">\Magento\Bundle\Model\CartItemProcessor\Proxy</item>
122122
</argument>
123123
</arguments>
124124
</type>

‎app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ protected function updateOptionsValues(array &$options)
120120
$option->setOptionId($optionId);
121121
if (is_array($optionValue)) {
122122
$optionValue = $this->processFileOptionValue($optionValue);
123+
$optionValue = $this->processDateOptionValue($optionValue);
123124
$optionValue = implode(',', $optionValue);
124125
}
125126
$option->setOptionValue($optionValue);
@@ -147,6 +148,24 @@ private function processFileOptionValue(array $optionValue)
147148
return $optionValue;
148149
}
149150

151+
/**
152+
* Returns date option value only with 'date_internal data
153+
*
154+
* @param array $optionValue
155+
* @return array
156+
*/
157+
private function processDateOptionValue(array $optionValue)
158+
{
159+
if (array_key_exists('date_internal', $optionValue)
160+
) {
161+
$closure = function ($key) {
162+
return $key === 'date_internal';
163+
};
164+
$optionValue = array_filter($optionValue, $closure, ARRAY_FILTER_USE_KEY);
165+
}
166+
return $optionValue;
167+
}
168+
150169
/**
151170
* @return \Magento\Catalog\Model\Product\Option\UrlBuilder
152171
*

‎app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
502502
$staticTable,
503503
$staticAttributes
504504
)->join(
505-
['e' => $this->getTable('catalog_product_entity')],
505+
['e' => $this->getTable($this->getEntityTable())],
506506
'e.' . $this->getLinkField() . ' = ' . $staticTable . '.' . $this->getLinkField()
507507
)->where(
508508
'e.entity_id = :entity_id'
@@ -523,7 +523,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
523523
$select = $connection->select()
524524
->from(['default_value' => $table], ['attribute_id'])
525525
->join(
526-
['e' => $this->getTable('catalog_product_entity')],
526+
['e' => $this->getTable($this->getEntityTable())],
527527
'e.' . $this->getLinkField() . ' = ' . 'default_value.' . $this->getLinkField(),
528528
''
529529
)->where('default_value.attribute_id IN (?)', array_keys($_attributes))

‎app/code/Magento/Catalog/Setup/UpgradeData.php

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,30 +167,31 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
167167
'frontend_label',
168168
'Product Name'
169169
);
170+
$attributeSetId = $categorySetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
170171
$categorySetup->addAttributeToGroup(
171172
ProductAttributeInterface::ENTITY_TYPE_CODE,
172-
'Default',
173+
$attributeSetId,
173174
'Product Details',
174175
'visibility',
175176
80
176177
);
177178
$categorySetup->addAttributeToGroup(
178179
ProductAttributeInterface::ENTITY_TYPE_CODE,
179-
'Default',
180+
$attributeSetId,
180181
'Product Details',
181182
'news_from_date',
182183
90
183184
);
184185
$categorySetup->addAttributeToGroup(
185186
ProductAttributeInterface::ENTITY_TYPE_CODE,
186-
'Default',
187+
$attributeSetId,
187188
'Product Details',
188189
'news_to_date',
189190
100
190191
);
191192
$categorySetup->addAttributeToGroup(
192193
ProductAttributeInterface::ENTITY_TYPE_CODE,
193-
'Default',
194+
$attributeSetId,
194195
'Product Details',
195196
'country_of_manufacture',
196197
110
@@ -199,26 +200,26 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
199200
//Content tab
200201
$categorySetup->addAttributeGroup(
201202
ProductAttributeInterface::ENTITY_TYPE_CODE,
202-
'Default',
203+
$attributeSetId,
203204
'Content',
204205
15
205206
);
206207
$categorySetup->updateAttributeGroup(
207208
ProductAttributeInterface::ENTITY_TYPE_CODE,
208-
'Default',
209+
$attributeSetId,
209210
'Content',
210211
'tab_group_code',
211212
'basic'
212213
);
213214
$categorySetup->addAttributeToGroup(
214215
ProductAttributeInterface::ENTITY_TYPE_CODE,
215-
'Default',
216+
$attributeSetId,
216217
'Content',
217218
'description'
218219
);
219220
$categorySetup->addAttributeToGroup(
220221
ProductAttributeInterface::ENTITY_TYPE_CODE,
221-
'Default',
222+
$attributeSetId,
222223
'Content',
223224
'short_description',
224225
100
@@ -227,20 +228,20 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
227228
//Images tab
228229
$groupId = (int)$categorySetup->getAttributeGroupByCode(
229230
ProductAttributeInterface::ENTITY_TYPE_CODE,
230-
'Default',
231+
$attributeSetId,
231232
'image-management',
232233
'attribute_group_id'
233234
);
234235
$categorySetup->addAttributeToGroup(
235236
ProductAttributeInterface::ENTITY_TYPE_CODE,
236-
'Default',
237+
$attributeSetId,
237238
$groupId,
238239
'image',
239240
1
240241
);
241242
$categorySetup->updateAttributeGroup(
242243
ProductAttributeInterface::ENTITY_TYPE_CODE,
243-
'Default',
244+
$attributeSetId,
244245
$groupId,
245246
'attribute_group_name',
246247
'Images'
@@ -282,27 +283,27 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
282283
//Schedule Design Update tab
283284
$categorySetup->addAttributeGroup(
284285
ProductAttributeInterface::ENTITY_TYPE_CODE,
285-
'Default',
286+
$attributeSetId,
286287
'Schedule Design Update',
287288
55
288289
);
289290
$categorySetup->updateAttributeGroup(
290291
ProductAttributeInterface::ENTITY_TYPE_CODE,
291-
'Default',
292+
$attributeSetId,
292293
'Schedule Design Update',
293294
'tab_group_code',
294295
'advanced'
295296
);
296297
$categorySetup->addAttributeToGroup(
297298
ProductAttributeInterface::ENTITY_TYPE_CODE,
298-
'Default',
299+
$attributeSetId,
299300
'Schedule Design Update',
300301
'custom_design_from',
301302
20
302303
);
303304
$categorySetup->addAttributeToGroup(
304305
ProductAttributeInterface::ENTITY_TYPE_CODE,
305-
'Default',
306+
$attributeSetId,
306307
'Schedule Design Update',
307308
'custom_design_to',
308309
30
@@ -316,7 +317,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
316317
);
317318
$categorySetup->addAttributeToGroup(
318319
ProductAttributeInterface::ENTITY_TYPE_CODE,
319-
'Default',
320+
$attributeSetId,
320321
'Schedule Design Update',
321322
'custom_design'
322323
);

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,7 @@ public function addContainerChildren(
314314
ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),
315315
$attributeContainer,
316316
[
317-
'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
318-
// TODO: Eliminate this in scope of MAGETWO-51364
319-
'scopeLabel' => $this->getScopeLabel($attribute),
317+
'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER
320318
]
321319
);
322320

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
<type name="Magento\Quote\Model\Quote\Item\Repository">
538538
<arguments>
539539
<argument name="cartItemProcessors" xsi:type="array">
540-
<item name="custom_options" xsi:type="object">Magento\Catalog\Model\CustomOptions\CustomOptionProcessor</item>
540+
<item name="custom_options" xsi:type="object">Magento\Catalog\Model\CustomOptions\CustomOptionProcessor\Proxy</item>
541541
</argument>
542542
</arguments>
543543
</type>

0 commit comments

Comments
 (0)