Skip to content

Commit fd48b47

Browse files
slavvkaslavvka
authored
ENGCOM-7911: Add back extension point for adding some html to the category page #29291 
2 parents d95b3e0 + f410b23 commit fd48b47

File tree

2 files changed

+49
-45
lines changed
  • app/code/Magento

2 files changed

+49
-45
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ $_productCollection = $block->getLoadedProductCollection();
2020
/** @var \Magento\Catalog\Helper\Output $_helper */
2121
$_helper = $block->getData('outputHelper');
2222
?>
23-
<?php if (!$_productCollection->count()):?>
23+
<?php if (!$_productCollection->count()): ?>
2424
<div class="message info empty">
2525
<div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div>
2626
</div>
27-
<?php else:?>
27+
<?php else: ?>
2828
<?= $block->getToolbarHtml() ?>
2929
<?= $block->getAdditionalHtml() ?>
3030
<?php
31-
if ($block->getMode() == 'grid') {
31+
if ($block->getMode() === 'grid') {
3232
$viewMode = 'grid';
3333
$imageDisplayArea = 'category_page_grid';
3434
$showDescription = false;
@@ -47,7 +47,7 @@ $_helper = $block->getData('outputHelper');
4747
<div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
4848
<ol class="products list items product-items">
4949
<?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
50-
<?php foreach ($_productCollection as $_product):?>
50+
<?php foreach ($_productCollection as $_product): ?>
5151
<li class="item product product-item">
5252
<div class="product-item-info"
5353
id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
@@ -66,9 +66,7 @@ $_helper = $block->getData('outputHelper');
6666
<?= $productImage->toHtml() ?>
6767
</a>
6868
<div class="product details product-item-details">
69-
<?php
70-
$_productNameStripped = $block->stripTags($_product->getName(), null, true);
71-
?>
69+
<?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
7270
<strong class="product name product-item-name">
7371
<a class="product-item-link"
7472
href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
@@ -77,9 +75,8 @@ $_helper = $block->getData('outputHelper');
7775
</strong>
7876
<?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
7977
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
80-
<?php if ($_product->isAvailable()):?>
81-
<?= $block->getProductDetailsHtml($_product) ?>
82-
<?php endif; ?>
78+
79+
<?= $block->getProductDetailsHtml($_product) ?>
8380

8481
<div class="product-item-inner">
8582
<div class="product actions product-item-actions">
@@ -121,7 +118,7 @@ $_helper = $block->getData('outputHelper');
121118
'product-item-info_' . $_product->getId() . ' div.actions-primary'
122119
) : '' ?>
123120
<div data-role="add-to-links" class="actions-secondary">
124-
<?php if ($addToBlock = $block->getChildBlock('addto')):?>
121+
<?php if ($addToBlock = $block->getChildBlock('addto')): ?>
125122
<?= $addToBlock->setProduct($_product)->getChildHtml() ?>
126123
<?php endif; ?>
127124
</div>
@@ -131,7 +128,7 @@ $_helper = $block->getData('outputHelper');
131128
'product-item-info_' . $_product->getId() . ' div.actions-secondary'
132129
) : '' ?>
133130
</div>
134-
<?php if ($showDescription):?>
131+
<?php if ($showDescription): ?>
135132
<div class="product description product-item-description">
136133
<?= /* @noEscape */ $_helper->productAttribute(
137134
$_product,
@@ -156,7 +153,7 @@ $_helper = $block->getData('outputHelper');
156153
</ol>
157154
</div>
158155
<?= $block->getToolbarHtml() ?>
159-
<?php if (!$block->isRedirectToCartEnabled()):?>
156+
<?php if (!$block->isRedirectToCartEnabled()): ?>
160157
<script type="text/x-magento-init">
161158
{
162159
"[data-role=tocart-form], .form.map.checkout": {

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

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,50 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
use Magento\Catalog\Model\Product;
8+
use Magento\Swatches\Block\Product\Renderer\Listing\Configurable;
9+
use Magento\Swatches\ViewModel\Product\Renderer\Configurable as ConfigurableViewModel;
10+
11+
/** @var Configurable $block */
12+
/** @var Product $product */
13+
$product = $block->getProduct()
614
?>
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>
15+
<?php if ($product && $product->isAvailable()): ?>
16+
<?php $productId = $product->getId() ?>
17+
<?php /** @var ConfigurableViewModel $configurableViewModel */ ?>
18+
<?php $configurableViewModel = $block->getConfigurableViewModel() ?>
19+
<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
20+
data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
1521

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()) ?>
22+
<script type="text/x-magento-init">
23+
{
24+
"[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
25+
"Magento_Swatches/js/swatch-renderer": {
26+
"selectorProduct": ".product-item-details",
27+
"onlySwatches": true,
28+
"enableControlLabel": false,
29+
"numberToShow": <?= $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
30+
"jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
31+
"jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
32+
"mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
33+
"jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
34+
"showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
35+
}
2936
}
3037
}
31-
}
32-
</script>
38+
</script>
3339

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(); ?>
40+
<script type="text/x-magento-init">
41+
{
42+
"[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
43+
"priceBox": {
44+
"priceConfig": {
45+
"priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson() ?>,
46+
"prices": <?= /* @noEscape */ $block->getPricesJson() ?>
47+
}
4148
}
4249
}
4350
}
44-
}
45-
</script>
51+
</script>
52+
<?php endif; ?>

0 commit comments

Comments
 (0)