From 1d6924261105510ad7d68d75a0861f01277f18f0 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Mon, 25 Nov 2019 16:36:38 +0530
Subject: [PATCH 01/22] Preview email facility in tjnotification #65

---
 .../admin/views/notification/tmpl/edit.php    | 37 +++++++++++++++
 .../admin/views/notification/view.html.php    |  4 ++
 src/com_tjnotifications/media/js/template.js  | 47 +++++++++++++++++++
 .../media/js/template.min.js                  |  9 ++++
 src/com_tjnotifications/tjnotifications.xml   |  4 ++
 5 files changed, 101 insertions(+)
 create mode 100644 src/com_tjnotifications/media/js/template.js
 create mode 100644 src/com_tjnotifications/media/js/template.min.js

diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index e7b822f6..bf7421a9 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -4,7 +4,13 @@
 defined('_JEXEC') or die;
 JHtml::_('formbehavior.chosen','select');
 JHtml::_('behavior.formvalidator');
+use Joomla\CMS\Language\Text;
+
 $today= gmdate('Y-m-d');
+
+$options['relative'] = true;
+
+JHtml::_('script', 'com_tjnotifications/template.js', $options);
 ?>
 <script>
 	jQuery(document).ready(function()
@@ -128,4 +134,35 @@
 		</div>
 		<input type="hidden" name="task" value="notification.edit" />
 		<?php echo JHtml::_('form.token'); ?>
+
+<!-- Modal -->
+<style>
+	.modal-body {
+	    overflow-y: auto;
+	}
+</style>
+<div id="templatePreview" class="modal fade" role="dialog">
+	<div class="modal-dialog">
+	<button type="button" class="close" data-dismiss="modal" style="width: 40px;opacity: 0.7;">&times;</button>
+	<!-- Modal content-->
+	<div class="modal-content">
+		<div class="modal-header">
+			<h4 class="modal-title"><?php echo Text::_('COM_TJNOTIFICATIONS_TEMPLATE_MODAL_PREVIEW_TITLE'); ?></h4>
+			<p class="alert alert-info hide" id="show-info"><?php echo Text::_('COM_TJNOTIFICATIONS_CERTIFICATE_TEMPLATE_MODAL_HEADER_INFO'); ?></p>
+		</div>
+		<div class="modal-body" id="previewTempl">
+		</div>
+		<div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+		</div>
+	</div>
+
+	</div>
+</div>
 </form>
+<script type="text/javascript">
+	jQuery(document).ready(function () {
+
+		template.previewTemplate();
+	});
+</script>
diff --git a/src/com_tjnotifications/admin/views/notification/view.html.php b/src/com_tjnotifications/admin/views/notification/view.html.php
index dff5fa7e..8b008b68 100644
--- a/src/com_tjnotifications/admin/views/notification/view.html.php
+++ b/src/com_tjnotifications/admin/views/notification/view.html.php
@@ -83,6 +83,10 @@ protected function addToolBar()
 		JToolBarHelper::apply('notification.editSave', 'JTOOLBAR_APPLY');
 		JToolBarHelper::save('notification.saveClose', 'JTOOLBAR_SAVE');
 		JToolBarHelper::custom('notification.saveNew', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+
+		// Add preview toolbar
+		JToolbarHelper::modal('templatePreview', 'icon-eye', 'COM_TJNOTIFICATIONS_TEMPLATE_PREVIEW');
+
 		JToolBarHelper::cancel('notification.cancel', 'JTOOLBAR_CANCEL');
 	}
 
diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
new file mode 100644
index 00000000..ffb289a8
--- /dev/null
+++ b/src/com_tjnotifications/media/js/template.js
@@ -0,0 +1,47 @@
+/**
+ * @package     TJNotifications
+ * @subpackage  com_tjnotifications
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+
+var template = {
+
+	previewTemplate: function () {
+
+		jQuery(document).on('click', 'button[data-target="#templatePreview"]', function () {
+
+			jQuery('#show-info').hide();
+
+			if (typeof tinyMCE != "undefined")
+			{
+			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_email_body');
+			}
+			else if (typeof CodeMirror != "undefined")
+			{
+				var editor = document.querySelector('.CodeMirror').CodeMirror;
+				jQuery('#jform_email_body').html(editor.getValue());
+			}
+			else
+			{
+				jQuery('#show-info').show();
+			}
+
+			jQuery('#previewTempl').empty();
+			jQuery('<style>').html(jQuery('#jform_template_css').val()).appendTo('#previewTempl');
+			jQuery('<div>').html(jQuery('#jform_email_body').val()).appendTo('#previewTempl');
+		});
+
+		jQuery('#templatePreview').on('hidden.bs.modal', function () {
+
+			if (typeof tinyMCE != "undefined")
+			{
+			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_email_body');
+			}
+
+			jQuery('#previewTempl').empty();
+		});
+	}
+}
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
new file mode 100644
index 00000000..1004edf5
--- /dev/null
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -0,0 +1,9 @@
+/**
+ * @package     TJNotifications
+ * @subpackage  com_tjnotifications
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+var template={previewTemplate:function(){jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){if(jQuery("#show-info").hide(),"undefined"!=typeof tinyMCE)tinyMCE.execCommand("mceToggleEditor",!1,"jform_email_body");else if("undefined"!=typeof CodeMirror){var e=document.querySelector(".CodeMirror").CodeMirror;jQuery("#jform_email_body").html(e.getValue())}else jQuery("#show-info").show();jQuery("#previewTempl").empty(),jQuery("<style>").html(jQuery("#jform_template_css").val()).appendTo("#previewTempl"),jQuery("<div>").html(jQuery("#jform_email_body").val()).appendTo("#previewTempl")}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_email_body"),jQuery("#previewTempl").empty()})}};
diff --git a/src/com_tjnotifications/tjnotifications.xml b/src/com_tjnotifications/tjnotifications.xml
index b8cdeab9..5eaeb7a8 100644
--- a/src/com_tjnotifications/tjnotifications.xml
+++ b/src/com_tjnotifications/tjnotifications.xml
@@ -18,6 +18,10 @@
 			<schemapath type="mysql">sql/updates/mysql</schemapath>
 		</schemas>
 	</update>
+	<!-- Media files -->
+	<media destination="com_tjnotifications" folder="media">
+		<folder>js</folder>
+	</media>
 	<uninstall>
 		<sql>
 			<file driver="mysql" charset="utf8">sql/uninstall.mysql.utf8.sql</file>

From 66c4db32c894e31313070d607d35cb5b18d01069 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Mon, 25 Nov 2019 16:49:46 +0530
Subject: [PATCH 02/22] Preview email facility in tjnotification #65

---
 .../admin/language/en-GB.com_tjnotifications.ini            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
index 141f6b92..7985669f 100644
--- a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
+++ b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
@@ -93,3 +93,9 @@ COM_TJNOTIFICATIONS_CORE_TEMPLATE_VALUE="No"
 COM_TJNOTIFICATIONS_TAGS_DESC="Enter the tag given on left in to the editor these tag names will be replaced by description given in notification template"
 COM_TJNOTIFICATIONS_REPLACEMENT_TAGS="Replacement Tag"
 COM_TJNOTIFICATIONS_REPLACEMENT_TAGS_DESC="Description"
+
+;preview email
+COM_TJNOTIFICATIONS_TEMPLATE_PREVIEW="Preview"
+COM_TJNOTIFICATIONS_TEMPLATE_MODAL_PREVIEW_TITLE="Preview"
+COM_TJNOTIFICATIONS_CERTIFICATE_TEMPLATE_MODAL_HEADER_INFO="If latest changes are not visible then try after saving the template."
+

From f96c7190c8a207bebd4875fd616aeb544d13438c Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 3 Dec 2019 15:45:44 +0530
Subject: [PATCH 03/22] Preview email facility in tjnotification #65 #67

---
 .../admin/language/en-GB.com_tjnotifications.ini             | 2 +-
 .../admin/views/notification/tmpl/edit.php                   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
index 7985669f..9dc7f52f 100644
--- a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
+++ b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
@@ -97,5 +97,5 @@ COM_TJNOTIFICATIONS_REPLACEMENT_TAGS_DESC="Description"
 ;preview email
 COM_TJNOTIFICATIONS_TEMPLATE_PREVIEW="Preview"
 COM_TJNOTIFICATIONS_TEMPLATE_MODAL_PREVIEW_TITLE="Preview"
-COM_TJNOTIFICATIONS_CERTIFICATE_TEMPLATE_MODAL_HEADER_INFO="If latest changes are not visible then try after saving the template."
+COM_TJNOTIFICATIONS_TEMPLATE_MODAL_HEADER_INFO="If latest changes are not visible then try after saving the template."
 
diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index bf7421a9..909e53a0 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -5,12 +5,13 @@
 JHtml::_('formbehavior.chosen','select');
 JHtml::_('behavior.formvalidator');
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
 
 $today= gmdate('Y-m-d');
 
 $options['relative'] = true;
 
-JHtml::_('script', 'com_tjnotifications/template.js', $options);
+HTMLHelper::_('script', 'com_tjnotifications/template.min.js', $options);
 ?>
 <script>
 	jQuery(document).ready(function()
@@ -148,7 +149,7 @@
 	<div class="modal-content">
 		<div class="modal-header">
 			<h4 class="modal-title"><?php echo Text::_('COM_TJNOTIFICATIONS_TEMPLATE_MODAL_PREVIEW_TITLE'); ?></h4>
-			<p class="alert alert-info hide" id="show-info"><?php echo Text::_('COM_TJNOTIFICATIONS_CERTIFICATE_TEMPLATE_MODAL_HEADER_INFO'); ?></p>
+			<p class="alert alert-info hide" id="show-info"><?php echo Text::_('COM_TJNOTIFICATIONS_TEMPLATE_MODAL_HEADER_INFO'); ?></p>
 		</div>
 		<div class="modal-body" id="previewTempl">
 		</div>

From 591f8844202ce1aa6e345d888f12e791dd749f56 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Wed, 11 Dec 2019 19:09:02 +0530
Subject: [PATCH 04/22] Preview email facility in tjnotification #65 #67

---
 .../admin/controllers/notification.php        | 13 +++++
 .../admin/views/notification/tmpl/edit.php    |  9 ++--
 src/com_tjnotifications/media/js/template.js  | 52 +++++++------------
 .../media/js/template.min.js                  |  2 +-
 .../tjnotifications/tjnotifications.php       | 52 +++++++++++++++++++
 5 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index edbe6bac..8a12a80b 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -220,4 +220,17 @@ public function add($key = null, $urlVar = null)
 
 		$this->setRedirect($link);
 	}
+
+	/**
+	 * Function to print sample data for email template
+	 *
+	 * @return  void
+	 */
+	public function getSampleData()
+	{
+		$data = Tjnotifications::getSampleBodyData();
+
+		echo $data;
+		jexit();
+	}
 }
diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index 909e53a0..f7a1e674 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -2,11 +2,12 @@
 
 // No direct access
 defined('_JEXEC') or die;
-JHtml::_('formbehavior.chosen','select');
-JHtml::_('behavior.formvalidator');
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
 
+HTMLHelper::_('formbehavior.chosen','select');
+HTMLHelper::_('behavior.formvalidator');
+
 $today= gmdate('Y-m-d');
 
 $options['relative'] = true;
@@ -100,6 +101,7 @@
 								<div class="control-group">
 									<div class="control-label"><?php echo $field->label; ?></div>
 									<div class="controls"><?php echo $field->input ; ?></div>
+
 								</div>
 							<?php endforeach; ?>
 							</div>
@@ -116,7 +118,7 @@
 										<tbody>
 											<?php foreach ($this->tags as $tags): ?>
 											<tr>
-												<td scope="row"><?php echo('{' . $tags->name . '}'); ?></td>
+												<td scope="row"><?php echo $tags->name; ?></td>
 												<td><?php echo($tags->description); ?></td>
 											</tr>
 											<?php endforeach; ?>
@@ -165,5 +167,6 @@
 	jQuery(document).ready(function () {
 
 		template.previewTemplate();
+
 	});
 </script>
diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index ffb289a8..d469c3ea 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -11,37 +11,25 @@ var template = {
 
 	previewTemplate: function () {
 
-		jQuery(document).on('click', 'button[data-target="#templatePreview"]', function () {
-
-			jQuery('#show-info').hide();
-
-			if (typeof tinyMCE != "undefined")
-			{
-			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_email_body');
-			}
-			else if (typeof CodeMirror != "undefined")
-			{
-				var editor = document.querySelector('.CodeMirror').CodeMirror;
-				jQuery('#jform_email_body').html(editor.getValue());
-			}
-			else
-			{
-				jQuery('#show-info').show();
-			}
-
-			jQuery('#previewTempl').empty();
-			jQuery('<style>').html(jQuery('#jform_template_css').val()).appendTo('#previewTempl');
-			jQuery('<div>').html(jQuery('#jform_email_body').val()).appendTo('#previewTempl');
-		});
-
-		jQuery('#templatePreview').on('hidden.bs.modal', function () {
-
-			if (typeof tinyMCE != "undefined")
-			{
-			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_email_body');
-			}
-
-			jQuery('#previewTempl').empty();
-		});
+	var url = new URL(window.location.href);
+	var id= url.searchParams.get('id');
+
+	jQuery(document).on('click', 'button[data-target="#templatePreview"]', function () {
+
+			jQuery.ajax({
+				url: Joomla.getOptions('system.paths').base + "/index.php?option=com_tjnotifications&task=notification.getSampleData&id=" + id,
+				type: 'GET',
+				 data: {
+					data: jQuery("#jform_email_body").serialize()
+				},
+				success: function(data) {
+
+						jQuery("#previewTempl").append(data);
+				},
+				error: function(xhr, ajaxOptions, thrownError) {}
+			})
+
+	});
+
 	}
 }
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index 1004edf5..09fec0ae 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){if(jQuery("#show-info").hide(),"undefined"!=typeof tinyMCE)tinyMCE.execCommand("mceToggleEditor",!1,"jform_email_body");else if("undefined"!=typeof CodeMirror){var e=document.querySelector(".CodeMirror").CodeMirror;jQuery("#jform_email_body").html(e.getValue())}else jQuery("#show-info").show();jQuery("#previewTempl").empty(),jQuery("<style>").html(jQuery("#jform_template_css").val()).appendTo("#previewTempl"),jQuery("<div>").html(jQuery("#jform_email_body").val()).appendTo("#previewTempl")}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_email_body"),jQuery("#previewTempl").empty()})}};
+var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})})}};
diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index 00a6d485..25f712a2 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -9,6 +9,9 @@
 JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models', 'NotificationsModel');
 JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjnotifications/models', 'NotificationsModel');
 
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
+
 /**
  * Tjnotifications
  *
@@ -240,4 +243,53 @@ public static function getTags($data_template)
 		//  $matches[0]= stores tag like {doner.name} and $matches[1] stores doner.name. Explode it and make it doner->name
 			return $matches;
 	}
+
+	/**
+	 * Method to get Sample data for email template.
+	 *
+	 * @return  string  $body
+	 *
+	 * @since 1.0
+	 */
+	public static function getSampleBodyData()
+	{
+		$input = JFactory::getApplication()->input;
+		$id = $input->get('id');
+
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
+		$storeTable = Table::getInstance('Notification', 'TjnotificationTable');
+		$storeTable->load($id);
+
+		$bodyTemplate = $storeTable->email_body;
+
+		$matches = self::getTags($bodyTemplate);
+		$replacamentTags = $matches[0];
+
+		$index = 0;
+		$replacementsdata = $storeTable->replacement_tags;
+		$replacements = json_decode($replacementsdata);
+
+		$tags = $matches[1];
+
+		foreach ($replacamentTags as $ind => $replacamentTag)
+		{
+			$replaceWith = '';
+
+			foreach ($replacements as $value)
+			{
+				if ($replacamentTag == $value->name)
+				{
+					$replaceWith = !empty($value->sampledata) ? $value->sampledata : " ";
+				}
+
+				if (!empty($replaceWith))
+				{
+					$bodyTemplate = str_replace($replacamentTag, $replaceWith, $bodyTemplate);
+					break;
+				}
+			}
+		}
+
+		return $bodyTemplate;
+	}
 }

From 524466cdc53beafc6a8d4636602cdacf72e1d535 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Wed, 11 Dec 2019 19:10:45 +0530
Subject: [PATCH 05/22] Preview email facility in tjnotification #65 #67

---
 src/techjoomla/tjnotifications/tjnotifications.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index 25f712a2..da037c4d 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -253,7 +253,7 @@ public static function getTags($data_template)
 	 */
 	public static function getSampleBodyData()
 	{
-		$input = JFactory::getApplication()->input;
+		$input = Factory::getApplication()->input;
 		$id = $input->get('id');
 
 		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');

From dfd12dd24f09bda2797cf5e4b0500e5eb2bf5434 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Thu, 12 Dec 2019 15:14:44 +0530
Subject: [PATCH 06/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/media/js/template.js     | 8 ++++++++
 src/com_tjnotifications/media/js/template.min.js | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index d469c3ea..b1a783d6 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -30,6 +30,14 @@ var template = {
 			})
 
 	});
+		jQuery('#templatePreview').on('hidden.bs.modal', function () {
 
+			if (typeof tinyMCE != "undefined")
+			{
+			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_body');
+			}
+
+			jQuery('#previewTempl').empty();
+		});
 	}
 }
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index 09fec0ae..9fb938c3 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})})}};
+var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_body"),jQuery("#previewTempl").empty()})}};

From ea3ef4e57c65789ea7f4a90c30b6ed0f67efe832 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Thu, 12 Dec 2019 15:17:09 +0530
Subject: [PATCH 07/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/media/js/template.js     | 3 ---
 src/com_tjnotifications/media/js/template.min.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index b1a783d6..46ed82c5 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -19,9 +19,6 @@ var template = {
 			jQuery.ajax({
 				url: Joomla.getOptions('system.paths').base + "/index.php?option=com_tjnotifications&task=notification.getSampleData&id=" + id,
 				type: 'GET',
-				 data: {
-					data: jQuery("#jform_email_body").serialize()
-				},
 				success: function(data) {
 
 						jQuery("#previewTempl").append(data);
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index 9fb938c3..73708c63 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_body"),jQuery("#previewTempl").empty()})}};
+var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,n){}})}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_body"),jQuery("#previewTempl").empty()})}};

From 70444ad3cfde9acb91d705d120852ca53ed7a0bd Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Thu, 12 Dec 2019 16:38:41 +0530
Subject: [PATCH 08/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/admin/views/notification/tmpl/edit.php | 2 +-
 src/techjoomla/tjnotifications/tjnotifications.php             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index f7a1e674..e1cd17f1 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -118,7 +118,7 @@
 										<tbody>
 											<?php foreach ($this->tags as $tags): ?>
 											<tr>
-												<td scope="row"><?php echo $tags->name; ?></td>
+												<td scope="row"><?php echo ('{' . $tags->name . '}'); ?></td>
 												<td><?php echo($tags->description); ?></td>
 											</tr>
 											<?php endforeach; ?>
diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index da037c4d..bafe2658 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -269,8 +269,6 @@ public static function getSampleBodyData()
 		$replacementsdata = $storeTable->replacement_tags;
 		$replacements = json_decode($replacementsdata);
 
-		$tags = $matches[1];
-
 		foreach ($replacamentTags as $ind => $replacamentTag)
 		{
 			$replaceWith = '';

From 3948c8931ab246eddc27dfdec96cafb95f426378 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Mon, 23 Dec 2019 16:09:21 +0530
Subject: [PATCH 09/22] Preview email facility in tjnotification

---
 src/techjoomla/tjnotifications/tjnotifications.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index bafe2658..eee2bb17 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -272,17 +272,18 @@ public static function getSampleBodyData()
 		foreach ($replacamentTags as $ind => $replacamentTag)
 		{
 			$replaceWith = '';
+			$replacamentTagName = '{' . $replacamentTag . '}';
 
 			foreach ($replacements as $value)
 			{
-				if ($replacamentTag == $value->name)
+				if ($replacamentTagName == $value->name)
 				{
 					$replaceWith = !empty($value->sampledata) ? $value->sampledata : " ";
 				}
 
 				if (!empty($replaceWith))
 				{
-					$bodyTemplate = str_replace($replacamentTag, $replaceWith, $bodyTemplate);
+					$bodyTemplate = str_replace($replacamentTagName, $replaceWith, $bodyTemplate);
 					break;
 				}
 			}

From 639dd383905ced555de7822ce4be4830d099bd25 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Mon, 23 Dec 2019 16:35:22 +0530
Subject: [PATCH 10/22] Preview email facility in tjnotification

---
 src/techjoomla/tjnotifications/tjnotifications.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index eee2bb17..c07d7e74 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -263,7 +263,7 @@ public static function getSampleBodyData()
 		$bodyTemplate = $storeTable->email_body;
 
 		$matches = self::getTags($bodyTemplate);
-		$replacamentTags = $matches[0];
+		$replacamentTags = $matches[1];
 
 		$index = 0;
 		$replacementsdata = $storeTable->replacement_tags;

From 665d9a592d8882d4ee7edbf651bc4007c490bb1b Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 16:00:15 +0530
Subject: [PATCH 11/22] Preview email facility in tjnotification

---
 .../admin/controllers/notification.php                   | 6 +++++-
 .../admin/language/en-GB.com_tjnotifications.ini         | 2 +-
 src/com_tjnotifications/media/js/template.js             | 9 ---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 8a12a80b..9ae04ebf 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -8,6 +8,7 @@
 
 // No direct access to this file
 defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
 
 /**
  * Notification controller class.
@@ -228,7 +229,10 @@ public function add($key = null, $urlVar = null)
 	 */
 	public function getSampleData()
 	{
-		$data = Tjnotifications::getSampleBodyData();
+		$input = Factory::getApplication()->input;
+		$id = $input->get('id');
+
+		$data = Tjnotifications::getSampleBodyData($id);
 
 		echo $data;
 		jexit();
diff --git a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
index 9dc7f52f..a4c99d99 100644
--- a/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
+++ b/src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini
@@ -98,4 +98,4 @@ COM_TJNOTIFICATIONS_REPLACEMENT_TAGS_DESC="Description"
 COM_TJNOTIFICATIONS_TEMPLATE_PREVIEW="Preview"
 COM_TJNOTIFICATIONS_TEMPLATE_MODAL_PREVIEW_TITLE="Preview"
 COM_TJNOTIFICATIONS_TEMPLATE_MODAL_HEADER_INFO="If latest changes are not visible then try after saving the template."
-
+COM_TJNOTIFICATIONS_TEMPLATE_MODAL_CLOSE="Close"
diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index 46ed82c5..b88109b9 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -27,14 +27,5 @@ var template = {
 			})
 
 	});
-		jQuery('#templatePreview').on('hidden.bs.modal', function () {
-
-			if (typeof tinyMCE != "undefined")
-			{
-			   tinyMCE.execCommand('mceToggleEditor', false, 'jform_body');
-			}
-
-			jQuery('#previewTempl').empty();
-		});
 	}
 }

From 82ae957a90a869425a807cc11b227464395d9d47 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 16:34:22 +0530
Subject: [PATCH 12/22] Preview email facility in tjnotification

---
 .../admin/controllers/notification.php        |  6 +++-
 .../admin/models/notification.php             | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 9ae04ebf..0a35189f 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -9,6 +9,7 @@
 // No direct access to this file
 defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
 /**
  * Notification controller class.
@@ -232,7 +233,10 @@ public function getSampleData()
 		$input = Factory::getApplication()->input;
 		$id = $input->get('id');
 
-		$data = Tjnotifications::getSampleBodyData($id);
+		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
+		$notificationsModel = BaseDatabaseModel::getInstance('Notification', 'TJNotificationsModel');
+
+		$data = $notificationsModel->getSampleBodyData($id);
 
 		echo $data;
 		jexit();
diff --git a/src/com_tjnotifications/admin/models/notification.php b/src/com_tjnotifications/admin/models/notification.php
index 785cbae0..866e87a7 100644
--- a/src/com_tjnotifications/admin/models/notification.php
+++ b/src/com_tjnotifications/admin/models/notification.php
@@ -296,4 +296,32 @@ public function updateReplacementTags($data)
 
 		$result = $db->execute();
 	}
+
+	/**
+	 * Method to get Sample data for email template.
+	 *
+	 * @return  string  $body
+	 *
+	 * @since _DEPLOY_VERSION_
+	 */
+	public static function getSampleBodyData($id)
+	{
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
+		$storeTable = Table::getInstance('Notification', 'TjnotificationTable');
+		$storeTable->load($id);
+
+		$bodyTemplate = $storeTable->email_body;
+
+		$replacementsdata = $storeTable->replacement_tags;
+		$replacements = json_decode($replacementsdata);
+
+		foreach ($replacements as $value)
+		{
+			$replaceWith = !empty($value->sampledata) ? $value->sampledata : $value->name;
+
+			$bodyTemplate = str_replace($value->name, $replaceWith, $bodyTemplate);
+		}
+
+		return $bodyTemplate;
+	}
 }

From b94af382c8cf89d46ecaf09b1320c8229353ad0a Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 17:25:16 +0530
Subject: [PATCH 13/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/admin/controllers/notification.php  | 6 +++---
 src/com_tjnotifications/admin/models/notification.php       | 2 ++
 .../admin/views/notification/tmpl/edit.php                  | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 0a35189f..1d481e68 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -230,12 +230,12 @@ public function add($key = null, $urlVar = null)
 	 */
 	public function getSampleData()
 	{
-		$input = Factory::getApplication()->input;
-		$id = $input->get('id');
-
 		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
 		$notificationsModel = BaseDatabaseModel::getInstance('Notification', 'TJNotificationsModel');
 
+		$input = Factory::getApplication()->input;
+		$id = $input->get('id');
+
 		$data = $notificationsModel->getSampleBodyData($id);
 
 		echo $data;
diff --git a/src/com_tjnotifications/admin/models/notification.php b/src/com_tjnotifications/admin/models/notification.php
index 866e87a7..9cdd8453 100644
--- a/src/com_tjnotifications/admin/models/notification.php
+++ b/src/com_tjnotifications/admin/models/notification.php
@@ -9,6 +9,8 @@
 defined('_JEXEC') or die;
 jimport('joomla.application.component.model');
 JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
 
 /**
  * notification model.
diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index e1cd17f1..b227010e 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -10,9 +10,9 @@
 
 $today= gmdate('Y-m-d');
 
-$options['relative'] = true;
+$options = array("relative" => true);
 
-HTMLHelper::_('script', 'com_tjnotifications/template.min.js', $options);
+HTMLHelper::_('script', 'com_tjnotifications/template.js', $options);
 ?>
 <script>
 	jQuery(document).ready(function()
@@ -156,7 +156,7 @@
 		<div class="modal-body" id="previewTempl">
 		</div>
 		<div class="modal-footer">
-			<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+			<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo Text::_('COM_TJNOTIFICATIONS_TEMPLATE_MODAL_CLOSE'); ?></button>
 		</div>
 	</div>
 

From e6f88cfb81570eaa283a1fd4ab434c2e9336f6a2 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 17:40:26 +0530
Subject: [PATCH 14/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/media/js/template.js  | 39 ++++++++-----------
 .../media/js/template.min.js                  |  2 +-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index b88109b9..b2835151 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -6,26 +6,21 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-
 var template = {
-
-	previewTemplate: function () {
-
-	var url = new URL(window.location.href);
-	var id= url.searchParams.get('id');
-
-	jQuery(document).on('click', 'button[data-target="#templatePreview"]', function () {
-
-			jQuery.ajax({
-				url: Joomla.getOptions('system.paths').base + "/index.php?option=com_tjnotifications&task=notification.getSampleData&id=" + id,
-				type: 'GET',
-				success: function(data) {
-
-						jQuery("#previewTempl").append(data);
-				},
-				error: function(xhr, ajaxOptions, thrownError) {}
-			})
-
-	});
-	}
-}
+    previewTemplate: function() {
+        var e = new URL(window.location.href).searchParams.get("id");
+        jQuery(document).on("click", 'button[data-target="#templatePreview"]', function() {
+            jQuery.ajax({
+                url: Joomla.getOptions("system.paths").base + "/index.php?option=com_tjnotifications&task=notification.getSampleData&id=" + e,
+                type: "GET",
+                data: {
+                    data: jQuery("#jform_email_body").serialize()
+                },
+                success: function(e) {
+                    jQuery("#previewTempl").append(e)
+                },
+                error: function(e, t, a) {}
+            })
+        })
+    }
+};
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index 73708c63..09fec0ae 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,n){}})}),jQuery("#templatePreview").on("hidden.bs.modal",function(){"undefined"!=typeof tinyMCE&&tinyMCE.execCommand("mceToggleEditor",!1,"jform_body"),jQuery("#previewTempl").empty()})}};
+var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})})}};

From a8aeb2f939bb5a482625cf440deb548270fd26d0 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 17:42:19 +0530
Subject: [PATCH 15/22] Preview email facility in tjnotification

---
 .../tjnotifications/tjnotifications.php       | 48 -------------------
 1 file changed, 48 deletions(-)

diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index c07d7e74..9b1f9a67 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -243,52 +243,4 @@ public static function getTags($data_template)
 		//  $matches[0]= stores tag like {doner.name} and $matches[1] stores doner.name. Explode it and make it doner->name
 			return $matches;
 	}
-
-	/**
-	 * Method to get Sample data for email template.
-	 *
-	 * @return  string  $body
-	 *
-	 * @since 1.0
-	 */
-	public static function getSampleBodyData()
-	{
-		$input = Factory::getApplication()->input;
-		$id = $input->get('id');
-
-		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/tables');
-		$storeTable = Table::getInstance('Notification', 'TjnotificationTable');
-		$storeTable->load($id);
-
-		$bodyTemplate = $storeTable->email_body;
-
-		$matches = self::getTags($bodyTemplate);
-		$replacamentTags = $matches[1];
-
-		$index = 0;
-		$replacementsdata = $storeTable->replacement_tags;
-		$replacements = json_decode($replacementsdata);
-
-		foreach ($replacamentTags as $ind => $replacamentTag)
-		{
-			$replaceWith = '';
-			$replacamentTagName = '{' . $replacamentTag . '}';
-
-			foreach ($replacements as $value)
-			{
-				if ($replacamentTagName == $value->name)
-				{
-					$replaceWith = !empty($value->sampledata) ? $value->sampledata : " ";
-				}
-
-				if (!empty($replaceWith))
-				{
-					$bodyTemplate = str_replace($replacamentTagName, $replaceWith, $bodyTemplate);
-					break;
-				}
-			}
-		}
-
-		return $bodyTemplate;
-	}
 }

From e0707e6532357773fcad074563d3bbabdbd595d4 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 17:45:13 +0530
Subject: [PATCH 16/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/admin/controllers/notification.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 1d481e68..901efe46 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -49,8 +49,7 @@ public function editSave()
 		}
 		else
 		{
-			$link = JRoute::_(
-			'index.php?option=com_tjnotifications&view=notification&layout=edit&id=' . $recordId , false);
+			$link = JRoute::_('index.php?option=com_tjnotifications&view=notification&layout=edit&id=' . $recordId, false);
 		}
 
 		$this->setRedirect($link, $msg);
@@ -227,6 +226,8 @@ public function add($key = null, $urlVar = null)
 	 * Function to print sample data for email template
 	 *
 	 * @return  void
+	 *
+	 * @since _DEPLOY_VERSION_
 	 */
 	public function getSampleData()
 	{

From ba9017e17739e5f87d0d35fd8f750dbc23655fd5 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 17:47:33 +0530
Subject: [PATCH 17/22] Preview email facility in tjnotification

---
 src/techjoomla/tjnotifications/tjnotifications.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/techjoomla/tjnotifications/tjnotifications.php b/src/techjoomla/tjnotifications/tjnotifications.php
index 9b1f9a67..00a6d485 100644
--- a/src/techjoomla/tjnotifications/tjnotifications.php
+++ b/src/techjoomla/tjnotifications/tjnotifications.php
@@ -9,9 +9,6 @@
 JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models', 'NotificationsModel');
 JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tjnotifications/models', 'NotificationsModel');
 
-use Joomla\CMS\Table\Table;
-use Joomla\CMS\Factory;
-
 /**
  * Tjnotifications
  *

From 255dc339927bf6f7092e40252cffeacc4da5863b Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 19:49:44 +0530
Subject: [PATCH 18/22] Task #154509 chore: Adding sample data for
 TJ-Notification template

---
 .../admin/views/notification/tmpl/edit.php    | 33 +------------------
 src/com_tjnotifications/media/js/template.js  | 28 ++++++++++++++++
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
index b227010e..dce0484e 100644
--- a/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
+++ b/src/com_tjnotifications/admin/views/notification/tmpl/edit.php
@@ -14,37 +14,6 @@
 
 HTMLHelper::_('script', 'com_tjnotifications/template.js', $options);
 ?>
-<script>
-	jQuery(document).ready(function()
-	{
-		jQuery("fieldset").click(function()
-		{
-			status=this.id+'0';
-			statusChange=this.id+'1';
-			var check=(jQuery("#"+status).attr("checked"));
-
-			if(check=="checked")
-			{
-				var body=(this.id).replace("status", "body_ifr");
-				var bodyData=(jQuery("#"+body).contents().find("body").find("p").html());
-				if(bodyData=='<br data-mce-bogus="1">')
-				{
-					alert('Please fill the data');
-					jQuery('#'+this.id).find('label[for='+statusChange+']').attr('class','btn active btn-danger');
-					jQuery('#'+this.id).find('label[for='+status+']').attr('class','btn');
-					return false;
-				}
-				else
-				{
-					jQuery('#'+this.id).find('label[for='+status+']').attr('class','btn active btn-success');
-					jQuery('#'+this.id).find('label[for='+statusChange+']').attr('class','btn');
-				}
-			}
-		});
-	});
-</script>
-
-
 <form action="<?php echo JRoute::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id . '&extension='.$this->component); ?>"
     method="post" name="adminForm" id="adminForm">
      <input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" />
@@ -167,6 +136,6 @@
 	jQuery(document).ready(function () {
 
 		template.previewTemplate();
-
+		template.init();
 	});
 </script>
diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index b2835151..d7cc0dde 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -6,6 +6,7 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 var template = {
     previewTemplate: function() {
         var e = new URL(window.location.href).searchParams.get("id");
@@ -22,5 +23,32 @@ var template = {
                 error: function(e, t, a) {}
             })
         })
+    }
+
+		init: function() {
+		jQuery("fieldset").click(function()
+		{
+			status=this.id+'0';
+			statusChange=this.id+'1';
+			var check=(jQuery("#"+status).attr("checked"));
+
+			if(check=="checked")
+			{
+				var body=(this.id).replace("status", "body_ifr");
+				var bodyData=(jQuery("#"+body).contents().find("body").find("p").html());
+				if(bodyData=='<br data-mce-bogus="1">')
+				{
+					alert('Please fill the data');
+					jQuery('#'+this.id).find('label[for='+statusChange+']').attr('class','btn active btn-danger');
+					jQuery('#'+this.id).find('label[for='+status+']').attr('class','btn');
+					return false;
+				}
+				else
+				{
+					jQuery('#'+this.id).find('label[for='+status+']').attr('class','btn active btn-success');
+					jQuery('#'+this.id).find('label[for='+statusChange+']').attr('class','btn');
+				}
+			}
+		});
     }
 };

From 06bc4f03f92ca5e1524f4f824ae54d3eeb5b9bb5 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Tue, 24 Dec 2019 19:52:15 +0530
Subject: [PATCH 19/22] Task #154509 chore: Adding sample data for
 TJ-Notification template

---
 src/com_tjnotifications/media/js/template.js     | 4 ++--
 src/com_tjnotifications/media/js/template.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index d7cc0dde..4d5bcbb7 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -23,7 +23,7 @@ var template = {
                 error: function(e, t, a) {}
             })
         })
-    }
+    },
 
 		init: function() {
 		jQuery("fieldset").click(function()
@@ -49,6 +49,6 @@ var template = {
 					jQuery('#'+this.id).find('label[for='+statusChange+']').attr('class','btn');
 				}
 			}
-		});
+		})
     }
 };
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index 09fec0ae..cfe8b065 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){var e=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+e,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(e){jQuery("#previewTempl").append(e)},error:function(e,t,a){}})})}};
+var template={previewTemplate:function(){var t=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+t,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(t){jQuery("#previewTempl").append(t)},error:function(t,e,a){}})})},init:function(){jQuery("fieldset").click(function(){if(status=this.id+"0",statusChange=this.id+"1","checked"==jQuery("#"+status).attr("checked")){var t=this.id.replace("status","body_ifr");if('<br data-mce-bogus="1">'==jQuery("#"+t).contents().find("body").find("p").html())return alert("Please fill the data"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn active btn-danger"),jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn"),!1;jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn active btn-success"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn")}})}};

From 248dec6d0ed38b5cd14f6c0502a18e29566d3070 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Wed, 25 Dec 2019 11:05:44 +0530
Subject: [PATCH 20/22] Task #154509 chore: Adding sample data for
 TJ-Notification template

---
 src/com_tjnotifications/admin/controllers/notification.php | 2 +-
 src/com_tjnotifications/admin/models/notification.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 901efe46..46610ceb 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -227,7 +227,7 @@ public function add($key = null, $urlVar = null)
 	 *
 	 * @return  void
 	 *
-	 * @since _DEPLOY_VERSION_
+	 * @since __DEPLOY_VERSION__
 	 */
 	public function getSampleData()
 	{
diff --git a/src/com_tjnotifications/admin/models/notification.php b/src/com_tjnotifications/admin/models/notification.php
index 9cdd8453..c31468d7 100644
--- a/src/com_tjnotifications/admin/models/notification.php
+++ b/src/com_tjnotifications/admin/models/notification.php
@@ -304,7 +304,7 @@ public function updateReplacementTags($data)
 	 *
 	 * @return  string  $body
 	 *
-	 * @since _DEPLOY_VERSION_
+	 * @since __DEPLOY_VERSION__
 	 */
 	public static function getSampleBodyData($id)
 	{

From 171a111d7dce8f46ef9174091247c4deaba0cbcc Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Wed, 25 Dec 2019 11:45:30 +0530
Subject: [PATCH 21/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/admin/controllers/notification.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com_tjnotifications/admin/controllers/notification.php b/src/com_tjnotifications/admin/controllers/notification.php
index 46610ceb..3fc085e1 100644
--- a/src/com_tjnotifications/admin/controllers/notification.php
+++ b/src/com_tjnotifications/admin/controllers/notification.php
@@ -231,12 +231,10 @@ public function add($key = null, $urlVar = null)
 	 */
 	public function getSampleData()
 	{
-		BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjnotifications/models');
-		$notificationsModel = BaseDatabaseModel::getInstance('Notification', 'TJNotificationsModel');
-
 		$input = Factory::getApplication()->input;
 		$id = $input->get('id');
 
+		$notificationsModel  = $this->getModel('notification');
 		$data = $notificationsModel->getSampleBodyData($id);
 
 		echo $data;

From 13b9bece8a072de124c160d7efb847324655ba02 Mon Sep 17 00:00:00 2001
From: poonam_b <poonam_b@techjoomla.com>
Date: Fri, 27 Dec 2019 14:09:10 +0530
Subject: [PATCH 22/22] Preview email facility in tjnotification

---
 src/com_tjnotifications/media/js/template.js     | 3 ++-
 src/com_tjnotifications/media/js/template.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com_tjnotifications/media/js/template.js b/src/com_tjnotifications/media/js/template.js
index 4d5bcbb7..ee8a51ab 100644
--- a/src/com_tjnotifications/media/js/template.js
+++ b/src/com_tjnotifications/media/js/template.js
@@ -18,7 +18,8 @@ var template = {
                     data: jQuery("#jform_email_body").serialize()
                 },
                 success: function(e) {
-                    jQuery("#previewTempl").append(e)
+                    jQuery("#previewTempl").empty();
+                    jQuery("#previewTempl").append(e);
                 },
                 error: function(e, t, a) {}
             })
diff --git a/src/com_tjnotifications/media/js/template.min.js b/src/com_tjnotifications/media/js/template.min.js
index cfe8b065..2e733879 100644
--- a/src/com_tjnotifications/media/js/template.min.js
+++ b/src/com_tjnotifications/media/js/template.min.js
@@ -6,4 +6,4 @@
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-var template={previewTemplate:function(){var t=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+t,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(t){jQuery("#previewTempl").append(t)},error:function(t,e,a){}})})},init:function(){jQuery("fieldset").click(function(){if(status=this.id+"0",statusChange=this.id+"1","checked"==jQuery("#"+status).attr("checked")){var t=this.id.replace("status","body_ifr");if('<br data-mce-bogus="1">'==jQuery("#"+t).contents().find("body").find("p").html())return alert("Please fill the data"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn active btn-danger"),jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn"),!1;jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn active btn-success"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn")}})}};
+var template={previewTemplate:function(){var t=new URL(window.location.href).searchParams.get("id");jQuery(document).on("click",'button[data-target="#templatePreview"]',function(){jQuery.ajax({url:Joomla.getOptions("system.paths").base+"/index.php?option=com_tjnotifications&task=notification.getSampleData&id="+t,type:"GET",data:{data:jQuery("#jform_email_body").serialize()},success:function(t){jQuery("#previewTempl").empty(),jQuery("#previewTempl").append(t)},error:function(t,e,a){}})})},init:function(){jQuery("fieldset").click(function(){if(status=this.id+"0",statusChange=this.id+"1","checked"==jQuery("#"+status).attr("checked")){var t=this.id.replace("status","body_ifr");if('<br data-mce-bogus="1">'==jQuery("#"+t).contents().find("body").find("p").html())return alert("Please fill the data"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn active btn-danger"),jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn"),!1;jQuery("#"+this.id).find("label[for="+status+"]").attr("class","btn active btn-success"),jQuery("#"+this.id).find("label[for="+statusChange+"]").attr("class","btn")}})}};