Skip to content

Commit 08671ba

Browse files
committed
Add back extension point for adding some html to the category page #29286
1 parent f3a160c commit 08671ba

File tree

2 files changed

+34
-35
lines changed
  • app/code/Magento

2 files changed

+34
-35
lines changed

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
7474
</strong>
7575
<?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
7676
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
77-
<?php if ($_product->isAvailable()) :?>
78-
<?= $block->getProductDetailsHtml($_product) ?>
79-
<?php endif; ?>
77+
<?= $block->getProductDetailsHtml($_product) ?>
8078

8179
<div class="product-item-inner">
8280
<div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $escaper->escapeHtmlAttr($position) : '' ?>>

app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,43 @@
44
* See COPYING.txt for license details.
55
*/
66
?>
7-
<?php
8-
/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
9-
$productId = $block->getProduct()->getId();
10-
/** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */
11-
$configurableViewModel = $block->getConfigurableViewModel()
12-
?>
13-
<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
14-
data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
7+
<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
8+
<?php $product = $block->getProduct() ?>
9+
<?php if ($product && $product->isAvailable()) : ?>
10+
<?php $productId = $product->getId() ?>
11+
<?php /** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */ ?>
12+
<?php $configurableViewModel = $block->getConfigurableViewModel() ?>
13+
<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
14+
data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
1515

16-
<script type="text/x-magento-init">
17-
{
18-
"[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
19-
"Magento_Swatches/js/swatch-renderer": {
20-
"selectorProduct": ".product-item-details",
21-
"onlySwatches": true,
22-
"enableControlLabel": false,
23-
"numberToShow": <?= $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
24-
"jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
25-
"jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
26-
"mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
27-
"jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
28-
"showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
16+
<script type="text/x-magento-init">
17+
{
18+
"[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
19+
"Magento_Swatches/js/swatch-renderer": {
20+
"selectorProduct": ".product-item-details",
21+
"onlySwatches": true,
22+
"enableControlLabel": false,
23+
"numberToShow": <?= $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
24+
"jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
25+
"jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
26+
"mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
27+
"jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
28+
"showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
29+
}
2930
}
3031
}
31-
}
32-
</script>
32+
</script>
3333

34-
<script type="text/x-magento-init">
35-
{
36-
"[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
37-
"priceBox": {
38-
"priceConfig": {
39-
"priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson(); ?>,
40-
"prices": <?= /* @noEscape */ $block->getPricesJson(); ?>
34+
<script type="text/x-magento-init">
35+
{
36+
"[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
37+
"priceBox": {
38+
"priceConfig": {
39+
"priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson() ?>,
40+
"prices": <?= /* @noEscape */ $block->getPricesJson() ?>
41+
}
4142
}
4243
}
4344
}
44-
}
45-
</script>
45+
</script>
46+
<?php endif; ?>

0 commit comments

Comments
 (0)