Skip to content

Commit 93b676a

Browse files
YevSentYevSent
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into MAGETWO-83340
2 parents ffc1580 + 910ca33 commit 93b676a

File tree

289 files changed

+3413
-1007
lines changed

Some content is hidden

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

289 files changed

+3413
-1007
lines changed

‎app/code/Magento/Analytics/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
1818
"Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
1919
terms and conditions</a>.]]></comment>
20-
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
20+
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
2121
<label>Advanced Reporting Service</label>
2222
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
2323
<backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
2424
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
2525
<config_path>analytics/subscription/enabled</config_path>
2626
</field>
27-
<field id="collection_time" translate="label comment" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
27+
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
2828
<label>Time of day to send data</label>
2929
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
3030
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>

‎app/code/Magento/Bundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"suggest": {
2727
"magento/module-webapi": "*",
28-
"magento/module-bundle-sample-data": "Sample Data version:100.3.*"
28+
"magento/module-bundle-sample-data": "*"
2929
},
3030
"type": "magento2-module",
3131
"license": [

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -184,33 +184,19 @@ protected function _prepareForm()
184184
'form_after',
185185
$this->getLayout()->createBlock(
186186
\Magento\Backend\Block\Widget\Form\Element\Dependence::class
187-
)->addFieldMap(
188-
"is_wysiwyg_enabled",
189-
'wysiwyg_enabled'
190187
)->addFieldMap(
191188
"is_html_allowed_on_front",
192189
'html_allowed_on_front'
193190
)->addFieldMap(
194191
"frontend_input",
195192
'frontend_input_type'
196-
)->addFieldDependence(
197-
'wysiwyg_enabled',
198-
'frontend_input_type',
199-
'textarea'
200-
)->addFieldDependence(
201-
'html_allowed_on_front',
202-
'wysiwyg_enabled',
203-
'0'
204-
)
205-
->addFieldMap(
193+
)->addFieldMap(
206194
"is_searchable",
207195
'searchable'
208-
)
209-
->addFieldMap(
196+
)->addFieldMap(
210197
"is_visible_in_advanced_search",
211198
'advanced_search'
212-
)
213-
->addFieldDependence(
199+
)->addFieldDependence(
214200
'advanced_search',
215201
'searchable',
216202
'1'

‎app/code/Magento/Catalog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"suggest": {
3535
"magento/module-cookie": "*",
3636
"magento/module-sales": "*",
37-
"magento/module-catalog-sample-data": "Sample Data version:100.3.*"
37+
"magento/module-catalog-sample-data": "*"
3838
},
3939
"type": "magento2-module",
4040
"license": [

‎app/code/Magento/Catalog/etc/adminhtml/system.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
</group>
3737
<group id="recently_products" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
3838
<label>Recently Viewed/Compared Products</label>
39-
<field id="recently_viewed_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
39+
<field id="recently_viewed_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4040
<label>Lifetime of products in Recently Viewed Widget</label>
4141
</field>
42-
<field id="recently_compared_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
42+
<field id="recently_compared_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4343
<label>Lifetime of products in Recently Compared Widget</label>
4444
</field>
4545
<field id="synchronize_with_backend" translate="label" type="select" showInDefault="1" canRestore="1">
@@ -83,7 +83,7 @@
8383
<backend_model>Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode</backend_model>
8484
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8585
</field>
86-
<field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
86+
<field id="default_sort_by" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
8787
<label>Product Listing Sort by</label>
8888
<source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
8989
</field>

‎app/code/Magento/CatalogRule/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"suggest": {
1919
"magento/module-import-export": "*",
20-
"magento/module-catalog-rule-sample-data": "Sample Data version:100.3.*"
20+
"magento/module-catalog-rule-sample-data": "*"
2121
},
2222
"type": "magento2-module",
2323
"license": [

‎app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,42 @@
55
*/
66
namespace Magento\CheckoutAgreements\Block\Adminhtml\Agreement;
77

8+
use Magento\Framework\App\ObjectManager;
9+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid\CollectionFactory as GridCollectionFactory;
10+
811
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
912
{
1013
/**
1114
* @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
15+
* @deprecated
1216
*/
1317
protected $_collectionFactory;
1418

19+
/**
20+
* @param GridCollectionFactory
21+
*/
22+
private $gridCollectionFactory;
23+
1524
/**
1625
* @param \Magento\Backend\Block\Template\Context $context
1726
* @param \Magento\Backend\Helper\Data $backendHelper
1827
* @param \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory
1928
* @param array $data
29+
* @param GridCollectionFactory $gridColFactory
2030
* @codeCoverageIgnore
2131
*/
2232
public function __construct(
2333
\Magento\Backend\Block\Template\Context $context,
2434
\Magento\Backend\Helper\Data $backendHelper,
2535
\Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory,
26-
array $data = []
36+
array $data = [],
37+
GridCollectionFactory $gridColFactory = null
2738
) {
39+
2840
$this->_collectionFactory = $collectionFactory;
41+
$this->gridCollectionFactory = $gridColFactory
42+
? : ObjectManager::getInstance()->get(GridCollectionFactory::class);
43+
2944
parent::__construct($context, $backendHelper, $data);
3045
}
3146

@@ -47,7 +62,7 @@ protected function _construct()
4762
*/
4863
protected function _prepareCollection()
4964
{
50-
$this->setCollection($this->_collectionFactory->create());
65+
$this->setCollection($this->gridCollectionFactory->create());
5166
return parent::_prepareCollection();
5267
}
5368

‎app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid;
9+
10+
/**
11+
* CheckoutAgreement Grid Collection
12+
*/
13+
class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection
14+
{
15+
16+
/**
17+
* {@inheritdoc}
18+
*/
19+
public function load($printQuery = false, $logQuery = false)
20+
{
21+
if ($this->isLoaded()) {
22+
return $this;
23+
}
24+
25+
parent::load($printQuery, $logQuery);
26+
27+
$this->addStoresToResult();
28+
29+
return $this;
30+
}
31+
32+
/**
33+
* @return void
34+
*/
35+
private function addStoresToResult()
36+
{
37+
$stores = $this->getStoresForAgreements();
38+
39+
if (!empty($stores)) {
40+
$storesByAgreementId = [];
41+
42+
foreach ($stores as $storeData) {
43+
$storesByAgreementId[$storeData['agreement_id']][] = $storeData['store_id'];
44+
}
45+
46+
foreach ($this as $item) {
47+
$agreementId = $item->getData('agreement_id');
48+
49+
if (!isset($storesByAgreementId[$agreementId])) {
50+
continue;
51+
}
52+
53+
$item->setData('stores', $storesByAgreementId[$agreementId]);
54+
}
55+
}
56+
}
57+
58+
/**
59+
* @return array
60+
*/
61+
private function getStoresForAgreements()
62+
{
63+
$agreementId = $this->getColumnValues('agreement_id');
64+
65+
if (!empty($agreementId)) {
66+
$select = $this->getConnection()->select()->from(
67+
['agreement_store' => 'checkout_agreement_store']
68+
)->where(
69+
'agreement_store.agreement_id IN (?)',
70+
$agreementId
71+
);
72+
73+
return $this->getConnection()->fetchAll($select);
74+
}
75+
76+
return [];
77+
}
78+
}

‎app/code/Magento/Cms/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"magento/module-widget": "*"
1919
},
2020
"suggest": {
21-
"magento/module-cms-sample-data": "Sample Data version:100.3.*"
21+
"magento/module-cms-sample-data": "*"
2222
},
2323
"type": "magento2-module",
2424
"license": [

‎app/code/Magento/ConfigurableProduct/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"magento/module-webapi": "*",
2424
"magento/module-sales": "*",
2525
"magento/module-product-video": "*",
26-
"magento/module-configurable-sample-data": "Sample Data version:100.3.*",
27-
"magento/module-product-links-sample-data": "Sample Data version:100.3.*"
26+
"magento/module-configurable-sample-data": "*",
27+
"magento/module-product-links-sample-data": "*"
2828
},
2929
"type": "magento2-module",
3030
"license": [

0 commit comments

Comments
 (0)