79. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-11-18 03:12:08 +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.

79.1 Files compared

#LocationFileLast Modified
1Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailcreditmemo_update_guest.html2016-06-21 09:41:00 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailcreditmemo_update_guest.html2022-11-02 03:40:17 +0000

79.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged492
Changed39
Inserted00
Removed00

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

79.4 Active regular expressions

No regular expressions were active.

79.5 Comparison detail

1 <!-- 1 <!--
2 /** 2 /**
3  * Copyright © 2016 Magento. All rights reserved. 3  * Copyright © 2016 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 --> 6 -->
7 <!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @--> 7 <!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
8 <!--@vars { 8 <!--@vars {
9 "var comment":"Credit Memo Comment", 9 "var comment":"Credit Memo Comment",
10 "var creditmemo.increment_id":"Credit Memo Id", 10 "var creditmemo.increment_id":"Credit Memo Id",
11 "var billing.getName()":"Guest Customer Name", 11 "var billing.getName()":"Guest Customer Name",
12 "var order.increment_id":"Order Id", 12 "var order.increment_id":"Order Id",
13 "var order.getStatusLabel()":"Order Status" 13 "var order.getStatusLabel()":"Order Status"
14 } @--> 14 } @-->
15 {{template config_path="design/email/header_template"}} 15 {{template config_path="design/email/header_template"}}
16  16 
17 <table> 17 <table>
18     <tr class="email-intro"> 18     <tr class="email-intro">
19         <td> 19       <td>
20             <p class="greeting">{{trans "%name," name=$billing.getName()}}</p> 20           <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
21             <p> 21           <p>
22                 {{trans 22               {{trans
23                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>." 23                   "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
24  24 
25                     increment_id=$order.increment_id 25                   increment_id=$order.increment_id
26                     order_status=$order.getStatusLabel() 26                   order_status=$order_data.frontend_status_label
27                 |raw}} 27               |raw}}
28             </p> 28           </p>
29             <p> 29           <p>
30                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
 30               {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>
' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
    31               {{depend store_hours}}
    32                   {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
    33               {{/depend}}
31             </p> 34           </p>
32         </td> 35       </td>
33     </tr> 36     </tr>
34     <tr class="email-information"> 37     <tr class="email-information">
35         <td> 38         <td>
36             {{depend comment}} 39             {{depend comment}}
37             <table class="message-info"> 40             <table class="message-info">
38                 <tr> 41                 <tr>
39                     <td> 42                     <td>
40                         {{var comment|escape|nl2br}} 43                         {{var comment|escape|nl2br}}
41                     </td> 44                     </td>
42                 </tr> 45                 </tr>
43             </table> 46             </table>
44             {{/depend}} 47             {{/depend}}
45         </td> 48         </td>
46     </tr> 49     </tr>
47 </table> 50 </table>
48  51 
49 {{template config_path="design/email/footer_template"}} 52 {{template config_path="design/email/footer_template"}}