RadicalMart Message: Email v1.1.1 (#9)

RadicalMart · Apr 19, 2022 · f6d6a87 · f6d6a87
1 parent 25aa2e8
commit f6d6a87
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 21 deletions.
diff --git a/email.php b/email.php
@@ -2,7 +2,7 @@
 /*
  * @package     RadicalMart Package
  * @subpackage  plg_radicalmart_message_email
- * @version     1.1.0
+ * @version     1.1.1
  * @author      Delo Design - delo-design.ru
  * @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
  * @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -185,10 +185,7 @@ protected function sendEmail($subject, $recipient, $body)
 		$mailer->isHtml(true);
 		$mailer->Encoding = 'base64';
 		$mailer->addRecipient($recipient);
-		$mailer->addReplyTo(array(
-			$config->get('replyto'),
-			$config->get('replytoname')
-		));
+		$mailer->addReplyTo($config->get('replyto'), $config->get('replytoname'));
 		$mailer->setBody($body);
 
 		return $mailer->Send();

diff --git a/email.xml b/email.xml
@@ -2,12 +2,12 @@
 <extension version="3.9" type="plugin" group="radicalmart_message" method="upgrade">
 	<name>PLG_RADICALMART_MESSAGE_EMAIL</name>
 	<author>Delo Design</author>
-	<creationDate>March 2022</creationDate>
+	<creationDate>April 2022</creationDate>
 	<copyright>Copyright © 2021 Delo Design. All rights reserved.</copyright>
 	<license>https://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
 	<authorEmail>boss@delo-design.ru</authorEmail>
 	<authorUrl>https://delo-design.ru</authorUrl>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<description>PLG_RADICALMART_MESSAGE_EMAIL_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 	<languages folder="language">

diff --git a/language/en-GB/en-GB.plg_radicalmart_message_email.ini b/language/en-GB/en-GB.plg_radicalmart_message_email.ini
@@ -1,6 +1,6 @@
 ; @package     RadicalMart Package
 ; @subpackage  plg_radicalmart_message_email
-; @version     1.1.0
+; @version     1.1.1
 ; @author      Delo Design - delo-design.ru
 ; @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
 ; @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

diff --git a/language/en-GB/en-GB.plg_radicalmart_message_email.sys.ini b/language/en-GB/en-GB.plg_radicalmart_message_email.sys.ini
@@ -1,6 +1,6 @@
 ; @package     RadicalMart Package
 ; @subpackage  plg_radicalmart_message_email
-; @version     1.1.0
+; @version     1.1.1
 ; @author      Delo Design - delo-design.ru
 ; @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
 ; @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

diff --git a/language/ru-RU/ru-RU.plg_radicalmart_message_email.ini b/language/ru-RU/ru-RU.plg_radicalmart_message_email.ini
@@ -1,6 +1,6 @@
 ; @package     RadicalMart Package
 ; @subpackage  plg_radicalmart_message_email
-; @version     1.1.0
+; @version     1.1.1
 ; @author      Delo Design - delo-design.ru
 ; @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
 ; @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

diff --git a/language/ru-RU/ru-RU.plg_radicalmart_message_email.sys.ini b/language/ru-RU/ru-RU.plg_radicalmart_message_email.sys.ini
@@ -1,6 +1,6 @@
 ; @package     RadicalMart Package
 ; @subpackage  plg_radicalmart_message_email
-; @version     1.1.0
+; @version     1.1.1
 ; @author      Delo Design - delo-design.ru
 ; @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
 ; @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

diff --git a/layouts/order/create.php b/layouts/order/create.php
@@ -2,7 +2,7 @@
 /*
  * @package     RadicalMart Package
  * @subpackage  plg_radicalmart_message_email
- * @version     1.1.0
+ * @version     1.1.1
  * @author      Delo Design - delo-design.ru
  * @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
  * @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -33,8 +33,9 @@
  */
 
 
-$link   = Uri::getInstance()->toString(array('scheme', 'host', 'port'));
-$link   .= ($recipient === 'admin') ? '/administrator/index.php?option=' . $component . '&task=order.edit&id='
+$root = Uri::getInstance()->toString(array('scheme', 'host', 'port'));
+$link = $root;
+$link .= ($recipient === 'admin') ? '/administrator/index.php?option=' . $component . '&task=order.edit&id='
 	. $order->id : $order->link;
 ?>
 	<h1>
@@ -111,7 +112,7 @@
 			<tr>
 				<td style="<?php echo $style; ?>">
 					<?php if ($product->link && $links) : ?>
-						<a href="<?php echo $product->link; ?>" style="word-wrap:break-word;"
+						<a href="<?php echo $root . $product->link; ?>" style="word-wrap:break-word;"
 						   class="uk-link-reset"><?php echo $product->title; ?></a>
 					<?php else: ?>
 						<?php echo $product->title; ?>
@@ -146,6 +147,41 @@ class="uk-link-reset"><?php echo $product->title; ?></a>
 				</td>
 			</tr>
 		<?php endforeach; ?>
+		<?php if (!empty($order->shipping) && !empty($order->shipping->order) && !empty($order->shipping->order->price)):
+			$style = 'padding: 8px; line-height: 18px; text-align: left; vertical-align: top;border-top: 1px solid #ddd;';
+			if ($i % 2) $style .= 'background-color: #f9f9f9;';
+			$i++;
+			?>
+			<tr>
+				<td style="<?php echo $style; ?>">
+					<?php echo (!empty($order->shipping->order->title)) ?
+						$order->shipping->order->title : $order->shipping->title; ?>
+				</td>
+				<td style="<?php echo $style; ?> text-align: right;border-left: 1px solid #ddd;">
+					<?php if (!empty($order->shipping->order->price['discount_enable'])): ?>
+						<div style="font-size: 12px; color: #ccc">
+							<s><?php echo $order->shipping->order->price['base_seo']; ?></s>
+							<?php echo ' ( - ' . $order->shipping->order->price['discount_seo'] . ')'; ?>
+						</div>
+					<?php endif; ?>
+					<div>
+						<?php echo str_replace(' ', '&nbsp;', $order->shipping->order->price['final_seo']); ?>
+					</div>
+				</td>
+				<td style="<?php echo $style; ?> text-align: center;border-left: 1px solid #ddd;">1</td>
+				<td style="<?php echo $style; ?> text-align: right;border-left: 1px solid #ddd;">
+					<?php if (!empty($order->shipping->order->price['discount_enable'])): ?>
+						<div style="font-size: 12px; color: #ccc">
+							<s><?php echo $order->shipping->order->price['base_seo']; ?></s>
+							<?php echo ' ( - ' . $order->shipping->order->price['discount_seo'] . ')'; ?>
+						</div>
+					<?php endif; ?>
+					<div>
+						<?php echo str_replace(' ', '&nbsp;', $order->shipping->order->price['final_seo']); ?>
+					</div>
+				</td>
+			</tr>
+		<?php endif; ?>
 		</tbody>
 		<tfoot>
 		<tr>

diff --git a/layouts/order/status.php b/layouts/order/status.php
@@ -2,7 +2,7 @@
 /*
  * @package     RadicalMart Package
  * @subpackage  plg_radicalmart_message_email
- * @version     1.1.0
+ * @version     1.1.1
  * @author      Delo Design - delo-design.ru
  * @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
  * @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -32,8 +32,9 @@
  *
  */
 
-$link      = Uri::getInstance()->toString(array('scheme', 'host', 'port'));
-$link      .= ($recipient === 'admin') ? '/administrator/index.php?option=' . $component . '&task=order.edit&id='
+$root = Uri::getInstance()->toString(array('scheme', 'host', 'port'));
+$link = $root;
+$link .= ($recipient === 'admin') ? '/administrator/index.php?option=' . $component . '&task=order.edit&id='
 	. $order->id : $order->link;
 ?>
 	<h1>
@@ -110,7 +111,7 @@
 			<tr>
 				<td style="<?php echo $style; ?>">
 					<?php if ($product->link && $links) : ?>
-						<a href="<?php echo $product->link; ?>" style="word-wrap:break-word;"
+						<a href="<?php echo $root . $product->link; ?>" style="word-wrap:break-word;"
 						   class="uk-link-reset"><?php echo $product->title; ?></a>
 					<?php else: ?>
 						<?php echo $product->title; ?>
@@ -145,6 +146,41 @@ class="uk-link-reset"><?php echo $product->title; ?></a>
 				</td>
 			</tr>
 		<?php endforeach; ?>
+		<?php if (!empty($order->shipping) && !empty($order->shipping->order) && !empty($order->shipping->order->price)):
+			$style = 'padding: 8px; line-height: 18px; text-align: left; vertical-align: top;border-top: 1px solid #ddd;';
+			if ($i % 2) $style .= 'background-color: #f9f9f9;';
+			$i++;
+			?>
+			<tr>
+				<td style="<?php echo $style; ?>">
+					<?php echo (!empty($order->shipping->order->title)) ?
+						$order->shipping->order->title : $order->shipping->title; ?>
+				</td>
+				<td style="<?php echo $style; ?> text-align: right;border-left: 1px solid #ddd;">
+					<?php if (!empty($order->shipping->order->price['discount_enable'])): ?>
+						<div style="font-size: 12px; color: #ccc">
+							<s><?php echo $order->shipping->order->price['base_seo']; ?></s>
+							<?php echo ' ( - ' . $order->shipping->order->price['discount_seo'] . ')'; ?>
+						</div>
+					<?php endif; ?>
+					<div>
+						<?php echo str_replace(' ', '&nbsp;', $order->shipping->order->price['final_seo']); ?>
+					</div>
+				</td>
+				<td style="<?php echo $style; ?> text-align: center;border-left: 1px solid #ddd;">1</td>
+				<td style="<?php echo $style; ?> text-align: right;border-left: 1px solid #ddd;">
+					<?php if (!empty($order->shipping->order->price['discount_enable'])): ?>
+						<div style="font-size: 12px; color: #ccc">
+							<s><?php echo $order->shipping->order->price['base_seo']; ?></s>
+							<?php echo ' ( - ' . $order->shipping->order->price['discount_seo'] . ')'; ?>
+						</div>
+					<?php endif; ?>
+					<div>
+						<?php echo str_replace(' ', '&nbsp;', $order->shipping->order->price['final_seo']); ?>
+					</div>
+				</td>
+			</tr>
+		<?php endif; ?>
 		</tbody>
 		<tfoot>
 		<tr>

diff --git a/layouts/user/create.php b/layouts/user/create.php
@@ -2,7 +2,7 @@
 /*
  * @package     RadicalMart Package
  * @subpackage  plg_radicalmart_message_email
- * @version     1.1.0
+ * @version     1.1.1
  * @author      Delo Design - delo-design.ru
  * @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
  * @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

diff --git a/script.php b/script.php
@@ -2,7 +2,7 @@
 /*
  * @package     RadicalMart Package
  * @subpackage  plg_radicalmart_message_email
- * @version     1.1.0
+ * @version     1.1.1
  * @author      Delo Design - delo-design.ru
  * @copyright   Copyright (c) 2021 Delo Design. All rights reserved.
  * @license     GNU/GPL license: https://www.gnu.org/copyleft/gpl.html