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

85.1 Files compared

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

85.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged14132
Changed1348
Inserted00
Removed00

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

85.4 Active regular expressions

No regular expressions were active.

85.5 Comparison detail

1 <!-- 1 <!--
2 /** 2 /**
3  * Copyright © 2016 Magento
. All rights reserved.		 3  * Copyright © 
Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 --> 6 -->
7 <!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @--> 7 <!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
8 <!--@vars { 8 <!--@vars {
9 "var formattedBillingAddress|raw":"Billing Address", 9 "var formattedBillingAddress|raw":"Billing Address",
10 "var order.getEmailCustomerNote()":"Email Order Note", 10 "var order_data.email_customer_note|escape|nl2br":"Email Order Note",
11 "var order.getBillingAddress().getName()":"Guest Customer Name", 11 "var order_data.customer_name":"Guest Customer Name",
12 "var order.getCreatedAtFormatted(1)":"Order Created At (datetime)", 12 "var created_at_formatted":"Order Created At (datetime)",
13 "var order.increment_id":"Order Id", 13 "var order.increment_id":"Order Id",
14 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid", 14 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
15 "var payment_html|raw":"Payment Details", 15 "var payment_html|raw":"Payment Details",
16 "var formattedShippingAddress|raw":"Shipping Address", 16 "var formattedShippingAddress|raw":"Shipping Address",
17 "var order.getShippingDescription()":"Shipping Description"
 17 "var order.shipping_description":"Shipping Description",
18 "var shipping_msg":"Shipping message"
 18 "var shipping_msg":"Shipping message",
    19 "var store.frontend_name":"Store Frontend Name",
    20 "var store_phone":"Store Phone",
    21 "var store_email":"Store Email",
    22 "var store_hours":"Store Hours",
    23 "var order_data.is_not_virtual":"Order Type",
    24 "var order_id": "Order DB Id",
    25 "var order":"Order"
19 } @--> 26 } @-->
20 {{template config_path="design/email/header_template"}} 27 {{template config_path="design/email/header_template"}}
21  28 
22 <table> 29 <table>
23     <tr class="email-intro"> 30     <tr class="email-intro">
24         <td> 31         <td>
25             <p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p> 32             <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
26             <p> 33             <p>
27                 {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} 34                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
28                 {{trans "Once your package ships we will send you a tracking number."}} 35                 {{trans "Once your package ships we will send an email with a link to track your order."}}
29             </p> 36                 {{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}}.
30             <p> 37                 {{depend store_hours}}
31                 {{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}} 38                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
    39                 {{/depend}}
32             </p> 40             </p>
33         </td> 41         </td>
34     </tr> 42     </tr>
35     <tr class="email-summary"> 43     <tr class="email-summary">
36         <td> 44         <td>
37             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1> 45             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
38             <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(1) |raw}}</p> 46             <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
39         </td> 47         </td>
40     </tr> 48     </tr>
41     <tr class="email-information"> 49     <tr class="email-information">
42         <td> 50         <td>
43             {{depend order.getEmailCustomerNote()}} 51             {{depend order_data.email_customer_note}}
44             <table class="message-info"> 52             <table class="message-info">
45                 <tr> 53                 <tr>
46                     <td> 54                     <td>
47                         {{var order.getEmailCustomerNote()|escape|nl2br}} 55                         {{var order_data.email_customer_note|escape|nl2br}}
48                     </td> 56                     </td>
49                 </tr> 57                 </tr>
50             </table> 58             </table>
51             {{/depend}} 59             {{/depend}}
52             <table class="order-details"> 60             <table class="order-details">
53                 <tr> 61                 <tr>
54                     <td class="address-details"> 62                     <td class="address-details">
55                         <h3>{{trans "Billing Info"}}</h3> 63                         <h3>{{trans "Billing Info"}}</h3>
56                         <p>{{var formattedBillingAddress|raw}}</p> 64                         <p>{{var formattedBillingAddress|raw}}</p>
57                     </td> 65                     </td>
58                     {{depend order.getIsNotVirtual()}} 66                     {{depend order_data.is_not_virtual}}
59                     <td class="address-details"> 67                     <td class="address-details">
60                         <h3>{{trans "Shipping Info"}}</h3> 68                         <h3>{{trans "Shipping Info"}}</h3>
61                         <p>{{var formattedShippingAddress|raw}}</p> 69                         <p>{{var formattedShippingAddress|raw}}</p>
62                     </td> 70                     </td>
63                     {{/depend}} 71                     {{/depend}}
64                 </tr> 72                 </tr>
65                 <tr> 73                 <tr>
66                     <td class="method-info"> 74                     <td class="method-info">
67                         <h3>{{trans "Payment Method"}}</h3> 75                         <h3>{{trans "Payment Method"}}</h3>
68                         {{var payment_html|raw}} 76                         {{var payment_html|raw}}
69                     </td> 77                     </td>
70                     {{depend order.getIsNotVirtual()}} 78                     {{depend order_data.is_not_virtual}}
71                     <td class="method-info"> 79                     <td class="method-info">
72                         <h3>{{trans "Shipping Method"}}</h3> 80                         <h3>{{trans "Shipping Method"}}</h3>
73                         <p>{{var order.getShippingDescription()}}</p> 81                         <p>{{var order.shipping_description}}</p>
74                         {{if shipping_msg}} 82                         {{if shipping_msg}}
75                         <p>{{var shipping_msg}}</p> 83                         <p>{{var shipping_msg}}</p>
76                         {{/if}} 84                         {{/if}}
77                     </td> 85                     </td>
78                     {{/depend}} 86                     {{/depend}}
79                 </tr> 87                 </tr>
80             </table> 88             </table>
81             {{layout handle="sales_email_order_items" order=$order}} 89             {{layout handle="sales_email_order_items" order_id=$order_id }}
82         </td> 90         </td>
83     </tr> 91     </tr>
84 </table> 92 </table>
85  93 
86 {{template config_path="design/email/footer_template"}} 94 {{template config_path="design/email/footer_template"}}

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.