// update mail templates

mails/en/src/account.php

@@ -17,8 +17,8 @@
 		</p>
 		<span>
 			<?php echo t('Here are your login details:'); ?><br /> 
-			<?php echo t('<span><strong>E-mail address: <a href="mailto:{email}">{email}</a></strong>'); ?><br />
-			<?php echo t('<strong>Password:</strong></span> {passwd}'); ?>
+			<?php echo t('<span><strong>E-mail address: <a href="mailto:{email}">{email}</a></strong></span>'); ?><br />
+			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?>
 		</span>
 	</td>
 </tr>

mails/en/src/bankwire.php

@@ -16,7 +16,7 @@
 			<?php echo t('Your order with the reference {order_name} - Awaiting wire payment'); ?>
 		</p>
 		<span>
-			<?php echo t('Your order with the reference {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
 		</span>
 	</td>
 </tr>

mails/en/src/cheque.php

@@ -16,7 +16,7 @@
 			<?php echo t('Your order with the reference {order_name} - Awaiting check payment'); ?>
 		</p>
 		<span>
-			<?php echo t('Your order with the reference {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
 		</span>
 	</td>
 </tr>
@@ -32,7 +32,7 @@
 			<?php echo t('Here are the bank details for your wire or transfer:'); ?><br /> 
 			<?php echo t('<span><strong>Amount:</strong></span> {total_paid}'); ?><br />
 			<?php echo t('<span><strong>Payable to the order of:</strong></span> {cheque_name}'); ?><br />
-			<?php echo t('Please mail your check to:</strong></span> {cheque_address_html}'); ?>
+			<?php echo t('<span><strong>Please mail your check to:</strong></span> {cheque_address_html}'); ?>
 
 		</span>
 	</td>

mails/en/src/contact.php

@@ -15,7 +15,7 @@
 			<?php echo t('Message from a {shop_name} customer'); ?>
 		</p>
 		<span>
-			<?php echo t('<span><strong>Customer e-mail address: <a href="mailto:{email}">{email}</a></strong>'); ?><br /><br />
+			<?php echo t('<span><strong>Customer e-mail address: <a href="mailto:{email}">{email}</a></strong></span>'); ?><br /><br />
 			<?php echo t('<span><strong>Customer message:</strong></span> {message}'); ?><br /><br />
 			<?php echo t('<span><strong>Order ID:</strong></span> {order_name}'); ?><br />
 			<?php echo t('<span><strong>Attached file:</strong></span> {attached_file}'); ?>

mails/en/src/credit_slip.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your order with the reference {order_name} - Credit slip created'); ?>
 		</p>
 		<span>
-			<?php echo t('We have generated a credit slip in your name for order with the reference {order_name}'); ?>
+			<?php echo t('We have generated a credit slip in your name for order with the reference <span><strong>{order_name}</strong></span>.'); ?>
 		</span>
 	</td>
 </tr>

mails/en/src/employee_password.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your {shop_name} login information'); ?>
 		</p>
 		<span>
-			<?php echo t('Here is your personal login information for {shop_name}:'); ?><br/>
+			<?php echo t('Here is your personal login information for <span><strong>{shop_name}</strong></span>:'); ?><br/>
 			<?php echo t('<span><strong>First name:</strong></span> {firstname}'); ?><br />
 			<?php echo t('<span><strong>Last name:</strong></span> {lastname}'); ?><br />
 			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?><br />

mails/en/src/forward_msg.php

@@ -15,7 +15,7 @@
 			<?php echo t('Customer service - Forwarded discussion'); ?>
 		</p>
 		<span>
-			<?php echo t('{employee} wanted to forward this discussion to you.'); ?> <br /><br />
+			<?php echo t('<span><strong>{employee}</strong></span> wanted to forward this discussion to you.'); ?> <br /><br />
 			<?php echo t('<span><strong>Discussion history:</strong></span> {messages}'); ?><br /><br />
 			<?php echo t('<span><strong>{employee}</strong></span> added <span><strong>"{comment}"</strong></span>'); ?>
 		</span>

mails/en/src/guest_to_customer.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your customer account creation'); ?>
 		</p>
 		<span>
-			<?php echo t('Your guest account for {shop_name} has been transformed into a customer account.'); ?> <br /><br />
+			<?php echo t('Your guest account for <span><strong>{shop_name}</strong></span> has been transformed into a customer account.'); ?> <br /><br />
 			<?php echo t('<span><strong>E-mail address:</strong></span> {email}'); ?><br /><br />
 			<?php echo t('<span><strong>Password:</strong></span> {passwd}'); ?>
 		</span>

mails/en/src/header.php

@@ -11,8 +11,8 @@ function t($str)
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<title><?php echo t('Message from {shop_name}'); ?></title>
-		<link rel="stylesheet" type="text/css" href="../../admin-dev/themes/default/css/admin-mail.css" />
-		<link rel="stylesheet" type="text/css" href="../../admin-dev/themes/default/css/admin-theme/email.css" />
+		<link rel="stylesheet" type="text/css" href="../../../admin-dev/themes/default/css/admin-mail.css" />
+		<link rel="stylesheet" type="text/css" href="../../../admin-dev/themes/default/css/admin-theme/email.css" />
 	</head>
 	<body>
 		<table class="table table-mail">

mails/en/src/in_transit.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your order with the reference {order_name} - In transit'); ?>
 		</p>
 		<span>
-			<?php echo t('Your order with the reference {order_name} is currently in transit.'); ?> <br /><br />
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> is currently in transit.'); ?> <br /><br />
 			<?php echo t('You can track your package using the following link: <a href="{followup}">{followup}</a>'); ?>
 		</span>
 	</td>

mails/en/src/order_canceled.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your order with the reference {order_name} - Order cancelled'); ?>
 		</p>
 		<span>
-			<?php echo t('Your order with the reference {order_name} from {shop_name} has been cancelled.'); ?><br />
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been cancelled.'); ?><br />
 			<?php echo t('You can check for it in the <span><strong>"Tools" &gt; "Logs"</strong></span> section of your Back Office.'); ?>
 		</span>
 	</td>

mails/en/src/order_changed.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your order with the reference {order_name} - Order changed'); ?>
 		</p>
 		<span>
-			<?php echo t('Your order with the reference {order_name} from {shop_name} has been changed by the merchant.'); ?><br />
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been changed by the merchant.'); ?><br />
 			<?php echo t('You can check for it in the <span><strong>"Tools" &gt; "Logs"</strong></span> section of your Back Office.'); ?>
 		</span>
 	</td>

mails/en/src/order_customer_comment.php

@@ -15,7 +15,7 @@
 			<?php echo t('Message from a customer'); ?>
 		</p>
 		<span>
-			<?php echo t('You have received a new message regarding order with the reference {order_name}.'); ?><br /><br />
+			<?php echo t('You have received a new message regarding order with the reference <span><strong>{order_name}</strong></span>.'); ?><br /><br />
 			<?php echo t('<span><strong>Customer:</strong></span> {firstname} {lastname} ({email})'); ?><br /><br />
 			<?php echo t('{message}'); ?>
 		</span>

mails/en/src/order_merchant_comment.php

@@ -15,7 +15,7 @@
 			<?php echo t('New message from {shop_name}'); ?>
 		</p>
 		<span>
-			<?php echo t('You have received a new message from {shop_name} regarding order with the reference {order_name}.'); ?><br /><br />
+			<?php echo t('You have received a new message from <span><strong>{shop_name}</strong></span> regarding order with the reference <span><strong>{order_name}</strong></span>.'); ?><br /><br />
 			<?php echo t('<span><strong>Message:</strong></span> {message}'); ?>
 		</span>
 	</td>

mails/en/src/password_query.php

@@ -15,7 +15,7 @@
 			<?php echo t('Password reset request for {shop_name}'); ?>
 		</p>
 		<span>
-			<?php echo t('You have requested to reset your {shop_name} login details.'); ?><br/><br/>
+			<?php echo t('You have requested to reset your <span><strong>{shop_name}</strong></span> login details.'); ?><br/><br/>
 			<?php echo t('Please note that this will change your current password.'); ?><br/><br/>
 			<?php echo t('To confirm this action, please use the following link:<br /> <a href="{url}">{url}</a>'); ?>
 		</span>

mails/en/src/payment_error.php

@@ -15,7 +15,7 @@
 			<?php echo t('Your order with the reference {order_name} - Payment processing error'); ?>
 		</p>
 		<span>
-			<?php echo t('There is a problem with your payment for <strong><span>{shop_name}</span></strong> order with the reference  <strong><span>{order_name}</span></strong>. Please contact us at your earliest convenience.'); ?><br/>
+			<?php echo t('There is a problem with your payment for <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>. Please contact us at your earliest convenience.'); ?><br/>
 			<?php echo t('<strong>We cannot ship your order until we receive your payment. </strong>'); ?>
 		</span>
 	</td>

mails/en/src/refund.php

@@ -0,0 +1,34 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td class="box">
+		<p>
+			<?php echo t('Refund processed for order with the reference {order_name}'); ?>
+		</p>
+		<span>
+			<?php echo t('We have processed your <strong><span>{shop_name}</strong></span> refund for order with the reference <strong><span>{order_name}</strong></span>.'); ?>
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>You can review your order and download your invoice from the <a href="{history_url}">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}">"My account"</a> on our shop.</span>'); ?>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</span>'); ?>
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>
+

mails/en/src/reply_msg.php

@@ -0,0 +1,28 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>{reply}</span>'); ?>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span><strong>Please do not reply to this message</strong>, we will not receive it.</span>'); ?>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>In order to reply, please use the following link: <a href="{link}">{link}</a>.</span>'); ?>
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>

mails/en/src/shipped.php

@@ -0,0 +1,30 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hi {firstname} {lastname},</span><br/>
+			<span class="subtitle">Thank you for shopping with {shop_name}!</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td class="box">
+		<p>
+			<?php echo t('Your order with the reference {order_name} - Shipped'); ?>
+		</p>
+		<span>
+			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been shipped.'); ?><br /> 
+			<?php echo t('You will soon receive a URL to track the delivery progress of your package.'); ?>
+		</span>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>You can now place orders on our shop: <a href="{shop_url}">{shop_name}</a></span>'); ?>.
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>

mails/en/src/test.php

@@ -0,0 +1,18 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hello,</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td>
+		<?php echo t('<span>This is a <strong>test e-mail</strong> from your shop.<br /><br /> If you can read this, the test was successful!</span>'); ?>.
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>

mails/en/src/voucher.php

@@ -0,0 +1,25 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td class="box">
+		<p>
+			<?php echo t('Your order with the reference {order_name} - Voucher created'); ?>
+		</p>
+		<span>
+			<?php echo t('A voucher has been created in your name as a result of your order with the reference <span><strong>{order_name}</strong></span>.'); ?><br/><br/>
+			<?php echo t('<span><strong>Voucher code: {voucher_num}</strong></span> in the amount of <span><strong>{voucher_amount}</strong></span></strong>'); ?><br /><br />
+			<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
+		</span>
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>

mails/en/src/voucher_new.php

@@ -0,0 +1,23 @@
+<?php include ('header.php'); ?>
+
+<tr>
+	<td align="center">
+		<?php echo t('<span class="title">Hi {firstname} {lastname},</span>'); 
+		?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td class="box">
+		<p>
+			<?php echo t('This is to inform you about the creation of a voucher.'); ?>
+		</p>
+		<span>
+			<?php echo t('Here is the code of your voucher: <span><strong>{voucher_num}</strong></span>'); ?><br/><br/>
+			<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
+	</td>
+</tr>
+
+<?php include ('footer.php'); ?>