Skip to content

Commit dd436cd

Browse files
magento-engcom-teammagento-engcom-team
authored
[EngCom] Public Pull Requests - 2.3-develop
 - merged latest code from mainline branch
2 parents 9b71d80 + 9c27244 commit dd436cd

File tree

65 files changed

+203
-88
lines changed

Some content is hidden

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

65 files changed

+203
-88
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">notificationGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
1515
<argument name="default_dir" xsi:type="string">DESC</argument>
1616
<argument name="default_sort" xsi:type="string">date_added</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">catalog_search_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">name</argument>
1616
<argument name="default_dir" xsi:type="string">ASC</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">cache_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
1515
<argument name="pager_visibility" xsi:type="string">0</argument>
1616
</arguments>
1717
<block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.cache.massaction" as="grid.massaction">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">designGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
1515
<argument name="use_ajax" xsi:type="string">1</argument>
1616
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
1717
<argument name="grid_url" xsi:type="url" path="*/*/grid">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="id" xsi:type="string">storeGrid</argument>
1414
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
15-
<argument name="dataSource" xsi:type="object">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
15+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
1616
</arguments>
1717
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.store.grid.columnSet" as="grid.columnSet">
1818
<arguments>

‎app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">backupsGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Backup\Model\Fs\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backup\Model\Fs\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">time</argument>
1616
<argument name="default_dir" xsi:type="string">desc</argument>
1717
</arguments>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.product.set.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">setGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">set_name</argument>
1616
<argument name="default_dir" xsi:type="string">ASC</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="promo.catalog.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">promo_catalog_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">name</argument>
1616
<argument name="default_dir" xsi:type="string">ASC</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/Cms/Block/Block.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,14 @@ public function getIdentities()
8484
{
8585
return [\Magento\Cms\Model\Block::CACHE_TAG . '_' . $this->getBlockId()];
8686
}
87+
88+
/**
89+
* @inheritdoc
90+
*/
91+
public function getCacheKeyInfo()
92+
{
93+
$cacheKeyInfo = parent::getCacheKeyInfo();
94+
$cacheKeyInfo[] = $this->_storeManager->getStore()->getId();
95+
return $cacheKeyInfo;
96+
}
8797
}

‎app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ define([
373373
allowedProducts,
374374
i,
375375
j,
376-
basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount),
376+
finalPrice = parseFloat(this.options.spConfig.prices.finalPrice.amount),
377377
optionFinalPrice,
378378
optionPriceDiff,
379379
optionPrices = this.options.spConfig.optionPrices,
@@ -410,7 +410,7 @@ define([
410410
typeof optionPrices[allowedProducts[0]] !== 'undefined') {
411411
allowedProductMinPrice = this._getAllowedProductWithMinPrice(allowedProducts);
412412
optionFinalPrice = parseFloat(optionPrices[allowedProductMinPrice].finalPrice.amount);
413-
optionPriceDiff = optionFinalPrice - basePrice;
413+
optionPriceDiff = optionFinalPrice - finalPrice;
414414

415415
if (optionPriceDiff !== 0) {
416416
options[i].label = options[i].label + ' ' + priceUtils.formatPrice(

0 commit comments

Comments
 (0)