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

86.1 Files compared

#LocationFileLast Modified
1Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailorder_new.html2016-10-11 14:40:38 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailorder_new.html2022-11-02 03:45:42 +0000

86.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged15142
Changed1443
Inserted00
Removed00

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

86.4 Active regular expressions

No regular expressions were active.

86.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.increment_id":"Order Id", 11 "var order.increment_id":"Order Id",
12 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid", 12 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
13 "var payment_html|raw":"Payment Details", 13 "var payment_html|raw":"Payment Details",
14 "var formattedShippingAddress|raw":"Shipping Address", 14 "var formattedShippingAddress|raw":"Shipping Address",
15 "var order.getShippingDescription()":"Shipping Description", 15 "var order.shipping_description":"Shipping Description",
16 "var shipping_msg":"Shipping message"
 16 "var shipping_msg":"Shipping message",
    17 "var created_at_formatted":"Order Created At (datetime)",
    18 "var store.frontend_name":"Store Frontend Name",
    19 "var store_phone":"Store Phone",
    20 "var store_email":"Store Email",
    21 "var store_hours":"Store Hours",
    22 "var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
    23 "var order_data.is_not_virtual":"Order Type",
    24 "var order":"Order",
    25 "var order_id": "Order DB Id",
    26 "var order_data.customer_name":"Customer Name"
17 } @--> 27 } @-->
18  28 
19 {{template config_path="design/email/header_template"}} 29 {{template config_path="design/email/header_template"}}
20  30 
21 <table> 31 <table>
22     <tr class="email-intro"> 32     <tr class="email-intro">
23         <td> 33         <td>
24             <p class="greeting">{{trans "%customer_name," customer_name=$order.getCustomerName()}}</p> 34             <p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
25             <p> 35             <p>
26                 {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} 36                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
27                 {{trans "Once your package ships we will send you a tracking number."}} 37                 {{trans "Once your package ships we will send you a tracking number."}}
28                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} 38                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
29             </p> 39             </p>
30             <p> 40             <p>
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}}
 41                 {{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}}.
    42                 {{depend store_hours}}
    43                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
    44                 {{/depend}}
32             </p> 45             </p>
33         </td> 46         </td>
34     </tr> 47     </tr>
35     <tr class="email-summary"> 48     <tr class="email-summary">
36         <td> 49         <td>
37             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1> 50             <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> 51             <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
39         </td> 52         </td>
40     </tr> 53     </tr>
41     <tr class="email-information"> 54     <tr class="email-information">
42         <td> 55         <td>
43             {{depend order.getEmailCustomerNote()}} 56             {{depend order_data.email_customer_note}}
44             <table class="message-info"> 57             <table class="message-info">
45                 <tr> 58                 <tr>
46                     <td> 59                     <td>
47                         {{var order.getEmailCustomerNote()|escape|nl2br}} 60                         {{var order_data.email_customer_note|escape|nl2br}}
48                     </td> 61                     </td>
49                 </tr> 62                 </tr>
50             </table> 63             </table>
51             {{/depend}} 64             {{/depend}}
52             <table class="order-details"> 65             <table class="order-details">
53                 <tr> 66                 <tr>
54                     <td class="address-details"> 67                     <td class="address-details">
55                         <h3>{{trans "Billing Info"}}</h3> 68                         <h3>{{trans "Billing Info"}}</h3>
56                         <p>{{var formattedBillingAddress|raw}}</p> 69                         <p>{{var formattedBillingAddress|raw}}</p>
57                     </td> 70                     </td>
58                     {{depend order.getIsNotVirtual()}} 71                     {{depend order_data.is_not_virtual}}
59                     <td class="address-details"> 72                     <td class="address-details">
60                         <h3>{{trans "Shipping Info"}}</h3> 73                         <h3>{{trans "Shipping Info"}}</h3>
61                         <p>{{var formattedShippingAddress|raw}}</p> 74                         <p>{{var formattedShippingAddress|raw}}</p>
62                     </td> 75                     </td>
63                     {{/depend}} 76                     {{/depend}}
64                 </tr> 77                 </tr>
65                 <tr> 78                 <tr>
66                     <td class="method-info"> 79                     <td class="method-info">
67                         <h3>{{trans "Payment Method"}}</h3> 80                         <h3>{{trans "Payment Method"}}</h3>
68                         {{var payment_html|raw}} 81                         {{var payment_html|raw}}
69                     </td> 82                     </td>
70                     {{depend order.getIsNotVirtual()}} 83                     {{depend order_data.is_not_virtual}}
71                     <td class="method-info"> 84                     <td class="method-info">
72                         <h3>{{trans "Shipping Method"}}</h3> 85                         <h3>{{trans "Shipping Method"}}</h3>
73                         <p>{{var order.getShippingDescription()}}</p> 86                         <p>{{var order.shipping_description}}</p>
74                         {{if shipping_msg}} 87                         {{if shipping_msg}}
75                         <p>{{var shipping_msg}}</p> 88                         <p>{{var shipping_msg}}</p>
76                         {{/if}} 89                         {{/if}}
77                     </td> 90                     </td>
78                     {{/depend}} 91                     {{/depend}}
79                 </tr> 92                 </tr>
80             </table> 93             </table>
81             {{layout handle="sales_email_order_items" order=$order area="frontend"}} 94             {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
82         </td> 95         </td>
83     </tr> 96     </tr>
84 </table> 97 </table>
85  98 
86 {{template config_path="design/email/footer_template"}} 99 {{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.