109. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:00 +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.

109.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Newsletter/templatessubscribe_popup.phtml2021-02-22 01:14:38 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Newsletter/templatessubscribe_popup.phtml2021-07-08 08:11:14 +0000

109.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2300
Changed12
Inserted00
Removed00

109.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

109.4 Active regular expressions

No regular expressions were active.

109.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  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 ?> 9 ?>
10 <?php 10 <?php
11     $_helper = $this->helper('Smartwave\Porto\Helper\Data'); 11     $_helper = $this->helper('Smartwave\Porto\Helper\Data');
12  12 
13     $popup = $_helper->getConfig('porto_settings/newsletter'); 13     $popup = $_helper->getConfig('porto_settings/newsletter');
14     if($popup['enable']) { 14     if($popup['enable']) {
15         $delay = $popup["delay"]; 15         $delay = $popup["delay"];
16 ?> 16 ?>
17 <script type="text/javascript"> 17 <script type="text/javascript">
18 require([ 18 require([
19         'jquery', 19         'jquery',
20         'jquery/jquery.cookie', 20         'jquery/jquery.cookie',
21 »       »       'fancybox/js/jquery.fancybox' 21 »       »       'fancybox/js/jquery.fancybox'
22     ], function ($) { 22     ], function ($) {
23         $(document).ready(function(){ 23         $(document).ready(function(){
24         <?php if($popup['enable'] == 1): ?> 24         <?php if($popup['enable'] == 1): ?>
25             if($("body").hasClass("cms-index-index")) { 25             if($("body").hasClass("cms-index-index")) {
26         <?php endif; ?> 26         <?php endif; ?>
27                 var check_cookie = $.cookie('newsletter_popup'); 27                 var check_cookie = $.cookie('newsletter_popup');
28                 if(window.location!=window.parent.location){ 28                 if(window.location!=window.parent.location){
29                     $('#newsletter_popup').remove(); 29                     $('#newsletter_popup').remove();
30                 } else { 30                 } else {
31                     if(check_cookie == null || check_cookie == 'shown') { 31                     if(check_cookie == null || check_cookie == 'shown') {
32                         setTimeout(function(){ 32                         setTimeout(function(){
33                             beginNewsletterForm(); 33                             beginNewsletterForm();
34                         }, <?php echo $delay; ?>); 34                         }, <?php echo $delay; ?>);
35                     } 35                     }
36                     $('#newsletter_popup_dont_show_again').on('change', function(){ 36                     $('#newsletter_popup_dont_show_again').on('change', function(){
37                         if($(this).length){ 37                         if($(this).length){
38                             var check_cookie = $.cookie('newsletter_popup'); 38                             var check_cookie = $.cookie('newsletter_popup');
39                             if(check_cookie == null || check_cookie == 'shown') { 39                             if(check_cookie == null || check_cookie == 'shown') {
40                                 $.cookie('newsletter_popup','dontshowitagain'); 40                                 $.cookie('newsletter_popup','dontshowitagain');
41                             } 41                             }
42                             else 42                             else
43                             { 43                             {
44                                 $.cookie('newsletter_popup','shown'); 44                                 $.cookie('newsletter_popup','shown');
45                                 beginNewsletterForm(); 45                                 beginNewsletterForm();
46                             } 46                             }
47                         } else { 47                         } else {
48                             $.cookie('newsletter_popup','shown'); 48                             $.cookie('newsletter_popup','shown');
49                         } 49                         }
50                     }); 50                     });
51                 } 51                 }
52         <?php if($popup['enable'] == 1): ?> 52         <?php if($popup['enable'] == 1): ?>
53             } 53             }
54         <?php endif; ?> 54         <?php endif; ?>
55         }); 55         });
56  56 
57         function beginNewsletterForm() { 57         function beginNewsletterForm() {
58             $.fancybox({ 58             $.fancybox({
59                 'padding': '0px', 59                 'padding': '0px',
60                 'autoScale': true, 60                 'autoScale': true,
61                 'transitionIn': 'fade', 61                 'transitionIn': 'fade',
62                 'transitionOut': 'fade', 62                 'transitionOut': 'fade',
63                 'type': 'inline', 63                 'type': 'inline',
64                 'href': '#newsletter_popup', 64                 'href': '#newsletter_popup',
65                 'onComplete': function() { 65                 'onComplete': function() {
66                     $.cookie('newsletter_popup', 'shown'); 66                     $.cookie('newsletter_popup', 'shown');
67                 }, 67                 },
68                 'tpl': { 68                 'tpl': {
69                     closeBtn: '<a title="Close" class="fancybox-item fancybox-close fancybox-newsletter-close" href="javascript:;"></a>' 69                     closeBtn: '<a title="Close" class="fancybox-item fancybox-close fancybox-newsletter-close" href="javascript:;"></a>'
70                 }, 70                 },
71                 'helpers': { 71                 'helpers': {
72                     overlay: { 72                     overlay: {
73                         locked: false 73                         locked: false
74                     } 74                     }
75                 } 75                 }
76             }); 76             });
77             $('#newsletter_popup').trigger('click'); 77             $('#newsletter_popup').trigger('click');
78         } 78         }
79 }); 79 });
80 </script> 80 </script>
81 <style type="text/css"> 81 <style type="text/css">
82 <?php 82 <?php
83     if($popup["custom_style"]){ 83     if($popup["custom_style"]){
84         echo $popup["custom_style"]; 84         echo $popup["custom_style"];
85     } 85     }
86 ?> 86 ?>
87 #newsletter_popup{ 87 #newsletter_popup{
88 <?php 88 <?php
89     if($popup["width"]){ 89     if($popup["width"]){
90         echo "width:".$popup["width"].";"; 90         echo "width:".$popup["width"].";";
91     } 91     }
92     if($popup["height"]){ 92     if($popup["height"]){
93         echo "min-height:".$popup["height"].";"; 93         echo "min-height:".$popup["height"].";";
94     } 94     }
95     if($popup["bg_color"]){ 95     if($popup["bg_color"]){
96         echo "background-color:".$popup["bg_color"].";"; 96         echo "background-color:".$popup["bg_color"].";";
97     } 97     }
98     if(isset($popup["bg_image"]) && $popup["bg_image"]){ 98     if(isset($popup["bg_image"]) && $popup["bg_image"]){
99         $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Newsletterbg::UPLOAD_DIR; 99         $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Newsletterbg::UPLOAD_DIR;
100         $path = $folderName . '/' . $popup["bg_image"]; 100         $path = $folderName . '/' . $popup["bg_image"];
101         $imageUrl = $_helper->getBaseUrl() . $path; 101         $imageUrl = $_helper->getBaseUrl() . $path;
102 ?> 102 ?>
103     background-image:url(<?php echo $imageUrl;?>); 103     background-image:url(<?php echo $imageUrl;?>);
104 <?php 104 <?php
105     } 105     }
106 ?> 106 ?>
107 } 107 }
108 </style> 108 </style>
109 <div class="newsletter row no-padding" id="newsletter_popup" style="display: none;"> 109 <div class="newsletter row
" id="newsletter_popup" style="display: none;">
110     <div class="col-sm-8 pr-lg-4 vc_column_container col-md-7 col-10"> 110     <div class="col-sm-8 pr-lg-4 vc_column_container col-md-7 col-10">
111         <?php 111         <?php
112             if(isset($popup["logo_src"]) && $popup["logo_src"]){ 112             if(isset($popup["logo_src"]) && $popup["logo_src"]){
113                 $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Newsletterlogo::UPLOAD_DIR; 113                 $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Newsletterlogo::UPLOAD_DIR;
114                 $path = $folderName . '/' . $popup["logo_src"]; 114                 $path = $folderName . '/' . $popup["logo_src"];
115                 $logoUrl = $_helper->getBaseUrl() . $path; 115                 $logoUrl = $_helper->getBaseUrl() . $path;
116         ?> 116         ?>
117         <div class="text_left mb-4 pb-1"> 117         <div class="text_left mb-4 pb-1">
118           <img src="<?php echo $logoUrl; ?>" alt="" /> 118           <img src="<?php echo $logoUrl; ?>" alt="" />
119         </div> 119         </div>
120         <?php 120         <?php
121             } 121             }
122         ?> 122         ?>
123         <?php echo $popup["content"]; ?> 123         <?php echo $popup["content"]; ?>
124         <form class="form subscribe mb-1" 124         <form class="form subscribe mb-1"
125             novalidate 125             novalidate
126             action="<?php echo $block->getFormActionUrl() ?>" 126             action="<?php echo $block->getFormActionUrl() ?>"
127             method="post" 127             method="post"
128             data-mage-init='{"validation": {"errorClass": "mage-error"}}' 128             data-mage-init='{"validation": {"errorClass": "mage-error"}}'
129             id="newsletter-validate-detail"> 129             id="newsletter-validate-detail">
130             <div class="field newsletter"> 130             <div class="field newsletter">
131                 <div class="control"> 131                 <div class="control">
132                     <input name="email" type="email" id="footer_newsletter" placeholder="<?php echo __("Your email address");?>" 132                     <input name="email" type="email" id="footer_newsletter" placeholder="<?php echo __("Your email address");?>"
133                                 data-validate="{required:true, 'validate-email':true}"/> 133                                 data-validate="{required:true, 'validate-email':true}"/>
134                 </div> 134                 </div>
135             </div> 135             </div>
136             <div class="actions"> 136             <div class="actions">
137                 <button class="action subscribe primary" title="<?php echo __('Submit') ?>" type="submit"> 137                 <button class="action subscribe primary" title="<?php echo __('Submit') ?>" type="submit">
138                     <span><?php echo __('Submit') ?></span> 138                     <span><?php echo __('Submit') ?></span>
139                 </button> 139                 </button>
140             </div> 140             </div>
141         </form> 141         </form>
142         <p class="mb-0"> 142         <p class="mb-0">
143           <label class="checkbox checkbox-inline"> 143           <label class="checkbox checkbox-inline">
144             <input type="checkbox" id="newsletter_popup_dont_show_again"/><?php echo __("Don't show this popup again"); ?> 144             <input type="checkbox" id="newsletter_popup_dont_show_again"/><?php echo __("Don't show this popup again"); ?>
145           </label 145           </label
146         </div> 146         </div>
147     </div> 147     </div>
148 </div> 148 </div>
149 <?php 149 <?php
150     } 150     }
151 ?> 151 ?>