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

83.1 Files compared

#	Location	File	Last Modified
1	Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email	invoice_update_guest.html	2016-06-21 09:41:00 +0000
2	Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email	invoice_update_guest.html	2016-06-21 09:41:00 +0000

83.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	98
Changed	0	0
Inserted	0	0
Removed	0	0

83.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

83.4 Active regular expressions

No regular expressions were active.

83.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 invoice" store_name=$store.getFrontendName()}} @-->	7	<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
8	<!--@vars {	8	<!--@vars {
9	"var billing.getName()":"Guest Customer Name",	9	"var billing.getName()":"Guest Customer Name",
10	"var comment":"Invoice Comment",	10	"var comment":"Invoice Comment",
11	"var invoice.increment_id":"Invoice Id",	11	"var invoice.increment_id":"Invoice Id",
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=$billing.getName()}}</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.getStatusLabel()
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}}
31	</p>	31	</p>
32	</td>	32	</td>
33	</tr>	33	</tr>
34	<tr class="email-information">	34	<tr class="email-information">
35	<td>	35	<td>
36	{{depend comment}}	36	{{depend comment}}
37	<table class="message-info">	37	<table class="message-info">
38	<tr>	38	<tr>
39	<td>	39	<td>
40	{{var comment\|escape\|nl2br}}	40	{{var comment\|escape\|nl2br}}
41	</td>	41	</td>
42	</tr>	42	</tr>
43	</table>	43	</table>
44	{{/depend}}	44	{{/depend}}
45	</td>	45	</td>
46	</tr>	46	</tr>
47	</table>	47	</table>
48		48
49	{{template config_path="design/email/footer_template"}}	49	{{template config_path="design/email/footer_template"}}