285. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:06 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

285.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/templatessmall_list.phtml2019-10-28 04:58:32 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/templatessmall_list.phtml2021-02-22 00:45:20 +0000

285.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7252
Changed413
Inserted00
Removed22

285.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

285.4 Active regular expressions

No regular expressions were active.

285.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 use Magento\Framework\App\Action\Action; 6 use Magento\Framework\App\Action\Action;
7  7 
8 // @codingStandardsIgnoreFile 8 // @codingStandardsIgnoreFile
9 ?> 9 ?>
10 <?php 10 <?php
11 /** 11 /**
12  * Product list template 12  * Product list template
13  * 13  *
14  * @var $block \Smartwave\Filterproducts\Block\ 14  * @var $block \Smartwave\Filterproducts\Block\
15  */ 15  */
16 ?> 16 ?>
17 <?php 17 <?php
18 $_productCollection = $block->getLoadedProductCollection(); 18 $_productCollection = $block->getLoadedProductCollection();
19 $_helper = $this->helper('Magento\Catalog\Helper\Output'); 19 $_helper = $this->helper('Magento\Catalog\Helper\Output');
20 $_imagehelper = $this->helper('Magento\Catalog\Helper\Image'); 20 $_imagehelper = $this->helper('Magento\Catalog\Helper\Image');
21  21 
22 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data'); 22 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data');
23 $review_model = $_portohelper->getModel('\Magento\Review\Model\Review');    
24  23 
25 $_category_config = $_portohelper->getConfig('porto_settings/category'); 24 $_category_config = $_portohelper->getConfig('porto_settings/category');
26 $_category_grid_config = $_portohelper->getConfig('porto_settings/category_grid'); 25 $_category_grid_config = $_portohelper->getConfig('porto_settings/category_grid');
27 $_lazyload = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/optimization/lazyload'); 26 $_lazyload = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/optimization/lazyload');
28  27 
29 $aspect_ratio = $this->getData("aspect_ratio"); 28 $aspect_ratio = $this->getData("aspect_ratio");
30 if($aspect_ratio == null) { 29 if($aspect_ratio == null) {
31     $aspect_ratio = $_category_config['aspect_ratio']; 30     $aspect_ratio = $_category_config['aspect_ratio'];
32 } 31 }
33 $image_width = $this->getData("image_width"); 32 $image_width = $this->getData("image_width");
34 if(!$image_width) { 33 if(!$image_width) {
35     $image_width = ($_category_config['ratio_width'])?$_category_config['ratio_width']:300; 34     $image_width = ($_category_config['ratio_width'])?$_category_config['ratio_width']:300;
36 } 35 }
37 $image_height = $this->getData("image_height"); 36 $image_height = $this->getData("image_height");
38 if($aspect_ratio) 37 if($aspect_ratio)
39     $image_height = $image_width; 38     $image_height = $image_width;
40 if(!$image_height) { 39 if(!$image_height) {
41     $image_height = ($_category_config['ratio_height'])?$_category_config['ratio_height']:300;   40     $image_height = ($_category_config['ratio_height'])?$_category_config['ratio_height']:300;
42 } 41 }
43 ?> 42 ?>
44 <?php if (!$_productCollection->count()): ?> 43 <?php if (!$_productCollection->count()): ?>
45     <div class="message info empty"><div><?php echo __('We can\'t find products matching the selection.') ?></div></div> 44     <div class="message info empty"><div><?php echo __('We can\'t find products matching the selection.') ?></div></div>
46 <?php else: ?> 45 <?php else: ?>
47     <?php 46     <?php
48     $viewMode = 'grid'; 47     $viewMode = 'grid';
49     $image = 'category_page_grid'; 48     $image = 'category_page_grid';
50     $hover_image = 'category_page_grid-hover'; 49     $hover_image = 'category_page_grid-hover';
51     $showDescription = false; 50     $showDescription = false;
52     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW; 51     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
53     ?> 52     ?>
54     <div class="products wrapper <?php echo $viewMode; ?> small-list products-<?php echo $viewMode; ?>"> 53     <div class="products wrapper <?php echo $viewMode; ?> small-list products-<?php echo $viewMode; ?>">
55         <div class="filterproducts products list items product-items"> 54         <div class="filterproducts products list items product-items">
56             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?> 55             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
57             <?php foreach ($_productCollection as $_product): ?> 56             <?php foreach ($_productCollection as $_product): ?>
58                 <div class="product product-item"> 57                 <div class="product product-item">
59                 <div class="product-item-info" data-container="product-grid"> 58                 <div class="product-item-info" data-container="product-grid">
60                     <?php // Product Image ?> 59                     <?php // Product Image ?>
61                     <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1"> 60                     <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
62                         <?php 61                         <?php
63                             if($aspect_ratio) 62                             if($aspect_ratio)
64                                 $productImage = $_imagehelper->init($_product, $image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width); 63                                 $productImage = $_imagehelper->init($_product, $image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width);
65                             else 64                             else
66                                 $productImage = $_imagehelper->init($_product, $image)->resize($image_width, $image_height); 65                                 $productImage = $_imagehelper->init($_product, $image)->resize($image_width, $image_height);
67                             $productImageUrl = $productImage->getUrl(); 66                             $productImageUrl = $productImage->getUrl();
68                         ?> 67                         ?>
69                             <img class="product-image-photo default_image <?php if(!$_lazyload): ?>porto-lazyload<?php endif;?>" <?php if(!$_lazyload): ?>data-<?php endif; ?>src="<?php echo $productImageUrl; ?>" width="<?php echo $image_width; ?>" height="<?php echo $image_height; ?>" alt="
"/>
 68                             <img class="product-image-photo default_image <?php if(!$_lazyload): ?>porto-lazyload<?php endif;?>" <?php if(!$_lazyload): ?>data-<?php endif; ?>src="<?php echo $productImageUrl; ?>" width="<?php echo $image_width; ?>" height="<?php echo $image_height; ?>" alt="<?php //echo $productImage->getLabel(); ?>"/>
70                         <?php if($_category_config['alternative_image']): ?> 69                         <?php if($_category_config['alternative_image']): ?>
71                         <?php 70                         <?php
72                             if($aspect_ratio) 71                             if($aspect_ratio)
73                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width); 72                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width);
74                             else 73                             else
75                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->resize($image_width, $image_height); 74                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->resize($image_width, $image_height);
76                             $productHoverImageUrl = $productHoverImage->getUrl(); 75                             $productHoverImageUrl = $productHoverImage->getUrl();
77                         ?> 76                         ?>
78                             <?php if($productImageUrl != str_replace("/thumbnail/","/small_image/",$productHoverImageUrl)): ?> 77                             <?php if($productImageUrl != str_replace("/thumbnail/","/small_image/",$productHoverImageUrl)): ?>
79                             <img class="product-image-photo hover_image" src="<?php echo $productHoverImageUrl; ?>" alt="
"/>
 78                             <img class="product-image-photo hover_image" src="<?php echo $productHoverImageUrl; ?>" alt="<?php //echo $productHoverImage->getLabel(); ?>"/>
80                             <?php endif; ?> 79                             <?php endif; ?>
81                         <?php endif; ?> 80                         <?php endif; ?>
82                     </a> 81                     </a>
83                     <div class="product details product-item-details"> 82                     <div class="product details product-item-details">
84                         <?php 83                         <?php
85                             $_productNameStripped = $block->stripTags($_product->getName(), null, true); 84                             $_productNameStripped = $block->stripTags($_product->getName(), null, true);
86                         ?> 85                         ?>
87                         <strong class="product name product-item-name"> 86                         <a class="product-item-link" href="<?php echo $_product->getProductUrl() ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?></a>
88                             <a class="product-item-link"    
89                                href="<?php echo $_product->getProductUrl() ?>">    
90                                 <
?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
    
91                             </a>    
92                         </strong>    
93                         <?php if($_category_config['rating_star']): ?> 87                         <?php if($_category_config['rating_star']): ?>
94                         <?php 88                         <?php
95                             $review_model->getEntitySummary($_product);    
96                             $review_html = $block->getReviewsSummaryHtml($_product, $templateType); 89                             $review_html = $block->getReviewsSummaryHtml($_product, $templateType);
97                         ?> 90                         ?>
98                         <?php if($review_html): ?> 91                         <?php if($review_html): ?>
99                             <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?> 92                             <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?>
100                         <?php else: ?> 93                         <?php else: ?>
101                         <div class="product-reviews-summary short"> 94                         <div class="product-reviews-summary short">
102                             <div class="rating-summary"> 95                             <div class="rating-summary">
103                                 <span class="label"><span>Rating:</span></span> 96                                 <span class="label"><span>Rating:</span></span>
104                                 <div class="rating-result" title="0%"> 97                                 <div class="rating-result" title="0%">
105                                     <span style="width:0"><span>0%</span></span> 98                                     <span style="width:0"><span>0%</span></span>
106                                 </div> 99                                 </div>
107                             </div> 100                             </div>
108                         </div> 101                         </div>
109                         <?php endif; ?> 102                         <?php endif; ?>
110                         <?php endif; ?> 103                         <?php endif; ?>
111                         <?php if ($showDescription):?> 104                         <?php if ($showDescription):?>
112                             <div class="product description product-item-description"> 105                             <div class="product description product-item-description">
113                                 <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?> 106                                 <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
114                                 <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>" 107                                 <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
115                                    class="action more"><?php echo __('Learn More') ?></a> 108                                    class="action more"><?php echo __('Learn More') ?></a>
116                             </div> 109                             </div>
117                         <?php endif; ?> 110                         <?php endif; ?>
118                         <?php if($_category_config['product_price']): ?> 111                         <?php if($_category_config['product_price']): ?>
119                         <?php echo $block->getProductPrice($_product) ?> 112                         <?php echo $block->getProductPrice($_product) ?>
120                         <?php endif; ?> 113                         <?php endif; ?>
121                         <?php echo $block->getProductDetailsHtml($_product); ?> 114                         <?php echo $block->getProductDetailsHtml($_product); ?>
122                     </div> 115                     </div>
123                 </div> 116                 </div>
124                 </div> 117                 </div>
125             <?php endforeach; ?> 118             <?php endforeach; ?>
126         </div> 119         </div>
127     </div> 120     </div>
128     <?php if (!$block->isRedirectToCartEnabled()) : ?> 121     <?php if (!$block->isRedirectToCartEnabled()) : ?>
129         <script type="text/x-magento-init"> 122         <script type="text/x-magento-init">
130         { 123         {
131             "[data-role=tocart-form], .form.map.checkout": { 124             "[data-role=tocart-form], .form.map.checkout": {
132                 "catalogAddToCart": {} 125                 "catalogAddToCart": {}
133             } 126             }
134         } 127         }
135         </script> 128         </script>
136     <?php endif; ?> 129     <?php endif; ?>
137 <?php endif; ?> 130 <?php endif; ?>