From 9834f96548ba7f0c132354d4680f846a16f42ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CShivani=E2=80=9D?=
 <“shivani_p@tekditechjoomla.com”>
Date: Fri, 10 Jan 2020 10:32:25 +0530
Subject: [PATCH 1/2] Bug #82808 fix: On payment :- Uncaught TypeError. After
 conferming payment.

---
 code/plugins/authorizenet/authorizenet/tmpl/default.php     | 2 +-
 code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php | 3 ++-
 code/plugins/bycheck/bycheck/tmpl/default.php               | 3 +--
 code/plugins/bycheck/bycheck/tmpl/default_bs3.php           | 2 +-
 code/plugins/byorder/byorder/tmpl/default.php               | 3 ++-
 code/plugins/byorder/byorder/tmpl/default_bs3.php           | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/plugins/authorizenet/authorizenet/tmpl/default.php b/code/plugins/authorizenet/authorizenet/tmpl/default.php
index 58d643f..ccd550b 100755
--- a/code/plugins/authorizenet/authorizenet/tmpl/default.php
+++ b/code/plugins/authorizenet/authorizenet/tmpl/default.php
@@ -26,7 +26,6 @@ function myValidate(f)
 	{
 		if (document.formvalidator.isValid(f))
 		{
-			f.check.value='<?php echo JSession::getFormToken(); ?>';
 			return true;
 		}
 		else
@@ -251,6 +250,7 @@ function plg_auth_showHide()
 				<input type="hidden" name="order_id" size="10" value="<?php echo $vars->order_id; ?>" />
 				<input type="hidden" name="plugin_payment_method" value="onsite" />
 				<input type="submit" name="submit" class="btn btn-success btn-large" value="<?php echo JText::_('SUBMIT');?>" />
+				<?php echo JHtml::_('form.token'); ?>
 			</div>
 		</div>
 	</form>
diff --git a/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php b/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
index 5f505d2..17cf9d2 100755
--- a/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
+++ b/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
@@ -24,7 +24,7 @@
    function myValidate(f)
    {
 	if (document.formvalidator.isValid(f)) {
-		f.check.value='<?php echo JSession::getFormToken(); ?>';
+
 		return true;
 	}
 	else {
@@ -173,6 +173,7 @@ function plg_auth_showHide()
 			<input type="hidden" name="order_id" size="10" value="<?php echo $vars->order_id;?>" />
 			<input type="hidden" name="plugin_payment_method" value="onsite" />
 			<input type="submit" name="submit" class="btn btn-success btn-large" value="<?php echo JText::_('SUBMIT');?>" />
+			<?php echo JHtml::_('form.token'); ?>
 		 </div>
 	  </div>
    </form>
diff --git a/code/plugins/bycheck/bycheck/tmpl/default.php b/code/plugins/bycheck/bycheck/tmpl/default.php
index 267fcb8..ee2d3ff 100755
--- a/code/plugins/bycheck/bycheck/tmpl/default.php
+++ b/code/plugins/bycheck/bycheck/tmpl/default.php
@@ -23,8 +23,6 @@ function myValidate(f)
 	{
 		if (document.formvalidator.isValid(f))
 		{
-			f.check.value = '<?php echo JSession::getFormToken(); ?>';
-
 			return true;
 		}
 		else
@@ -82,6 +80,7 @@ function myValidate(f)
 				<input type="hidden" name="plugin_payment_method" value="onsite" />
 				<input type='submit' name='btn_check' id='btn_check' class="btn btn-success btn-large"
 				value="<?php echo JText::_('SUBMIT'); ?>">
+				<?php echo JHtml::_('form.token'); ?>
 			</div>
 	</form>
 </div>
diff --git a/code/plugins/bycheck/bycheck/tmpl/default_bs3.php b/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
index 9d10fb3..afa3848 100755
--- a/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
+++ b/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
@@ -23,7 +23,6 @@ function myValidate(f)
 	{
 		if (document.formvalidator.isValid(f))
 		{
-			f.check.value = '<?php echo JSession::getFormToken(); ?>';
 			return true;
 		}
 		else
@@ -80,6 +79,7 @@ function myValidate(f)
 				<input type='hidden' name='return' value="<?php echo $vars->return;?>" >
 				<input type="hidden" name="plugin_payment_method" value="onsite" />
 				<input type='submit' name='btn_check' id='btn_check' class="btn btn-success"  value="<?php echo JText::_('SUBMIT'); ?>">
+				<?php echo JHtml::_('form.token'); ?>
 			</div>
 		</div>
 	</form>
diff --git a/code/plugins/byorder/byorder/tmpl/default.php b/code/plugins/byorder/byorder/tmpl/default.php
index 4825c6d..1fcfa9b 100755
--- a/code/plugins/byorder/byorder/tmpl/default.php
+++ b/code/plugins/byorder/byorder/tmpl/default.php
@@ -25,7 +25,7 @@
 function myValidate(f)
 {
 if (document.formvalidator.isValid(f)) {
-		f.check.value='<?php echo JSession::getFormToken(); ?>';
+
 		return true;
 	}
 	else {
@@ -64,6 +64,7 @@ function myValidate(f)
 					<input type='hidden' name='return' value="<?php echo $vars->return;?>" >
 					<input type="hidden" name="plugin_payment_method" value="onsite" />
 					<input type='submit' name='btn_check' id='btn_check' class="btn btn-success btn-large"  value="<?php echo JText::_('SUBMIT'); ?>">
+					<?php echo JHtml::_('form.token'); ?>
 				</div>
 
 	</div>
diff --git a/code/plugins/byorder/byorder/tmpl/default_bs3.php b/code/plugins/byorder/byorder/tmpl/default_bs3.php
index be8da12..b34e33c 100755
--- a/code/plugins/byorder/byorder/tmpl/default_bs3.php
+++ b/code/plugins/byorder/byorder/tmpl/default_bs3.php
@@ -25,7 +25,7 @@
 function myValidate(f)
 {
 if (document.formvalidator.isValid(f)) {
-		f.check.value='<?php echo JSession::getFormToken(); ?>';
+
 		return true;
 	}
 	else {
@@ -64,6 +64,7 @@ function myValidate(f)
 					<input type='hidden' name='return' value="<?php echo $vars->return;?>" >
 					<input type="hidden" name="plugin_payment_method" value="onsite" />
 					<input type='submit' name='btn_check' id='btn_check' class="btn btn-success btn-large"  value="<?php echo JText::_('SUBMIT'); ?>">
+					<?php echo JHtml::_('form.token'); ?>
 				</div>
 
 	</div>

From ec5762c923b8e9336492da382e92cc3438a8ca3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CShivani=E2=80=9D?=
 <“shivani_p@tekditechjoomla.com”>
Date: Thu, 16 Jan 2020 17:16:15 +0530
Subject: [PATCH 2/2] Bug #114703 fix: Backend : (for comment)alert tag added
 in attribute title field and on product page alert is display.

---
 .../authorizenet/tmpl/default.php             | 20 +++++++++----------
 .../authorizenet/tmpl/default_bs3.php         | 13 ++++++------
 code/plugins/bycheck/bycheck/tmpl/default.php | 12 +++++------
 .../bycheck/bycheck/tmpl/default_bs3.php      | 14 ++++++-------
 code/plugins/byorder/byorder/tmpl/default.php | 13 ++++--------
 .../byorder/byorder/tmpl/default_bs3.php      | 13 ++++--------
 6 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/code/plugins/authorizenet/authorizenet/tmpl/default.php b/code/plugins/authorizenet/authorizenet/tmpl/default.php
index ccd550b..c5b7ad5 100755
--- a/code/plugins/authorizenet/authorizenet/tmpl/default.php
+++ b/code/plugins/authorizenet/authorizenet/tmpl/default.php
@@ -23,20 +23,18 @@
 
 <script type="text/javascript">
 	function myValidate(f)
-	{
-		if (document.formvalidator.isValid(f))
-		{
-			return true;
-		}
-		else
-		{
-			var msg = 'Some values are not acceptable.  Please retry.';
-			alert(msg);
-			plg_auth_showHide();
-		}
+   {
+	if (!document.formvalidator.isValid(f)) {
+		var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
+		alert(msg);
+		plg_auth_showHide();
+
 		return false;
 	}
 
+	return true;
+   }
+
 	function plg_auth_showHide()
 	{
 		// Get the DOM reference
diff --git a/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php b/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
index 17cf9d2..ad3904e 100755
--- a/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
+++ b/code/plugins/authorizenet/authorizenet/tmpl/default_bs3.php
@@ -23,16 +23,15 @@
 <script type="text/javascript">
    function myValidate(f)
    {
-	if (document.formvalidator.isValid(f)) {
-
-		return true;
-	}
-	else {
-		var msg = 'Some values are not acceptable.  Please retry.';
+	if (!document.formvalidator.isValid(f)) {
+		var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
 		alert(msg);
 		plg_auth_showHide();
+
+		return false;
 	}
-	return false;
+
+	return true;
    }
 
    function plg_auth_showHide()
diff --git a/code/plugins/bycheck/bycheck/tmpl/default.php b/code/plugins/bycheck/bycheck/tmpl/default.php
index ee2d3ff..97b069b 100755
--- a/code/plugins/bycheck/bycheck/tmpl/default.php
+++ b/code/plugins/bycheck/bycheck/tmpl/default.php
@@ -21,16 +21,14 @@
 <script type="text/javascript">
 	function myValidate(f)
 	{
-		if (document.formvalidator.isValid(f))
+		if (!document.formvalidator.isValid(f))
 		{
-			return true;
-		}
-		else
-		{
-			alert("<?php echo JText::_('PLG_PAYMENT_BYCHECK_ALERT_MSG'); ?>");
+			var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
+			alert(msg);
+			return false;
 		}
 
-		return false;
+		return true;
 	}
 </script>
 <div class="tjcpg-wrapper">
diff --git a/code/plugins/bycheck/bycheck/tmpl/default_bs3.php b/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
index afa3848..93edac7 100755
--- a/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
+++ b/code/plugins/bycheck/bycheck/tmpl/default_bs3.php
@@ -21,17 +21,15 @@
 <script type="text/javascript">
 	function myValidate(f)
 	{
-		if (document.formvalidator.isValid(f))
+		if (!document.formvalidator.isValid(f))
 		{
-			return true;
-		}
-		else
-		{
-			alert("<?php echo JText::_('PLG_PAYMENT_BYCHECK_ALERT_MSG'); ?>");
+			var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
+			alert(msg);
+			return false;
 		}
 
-		return false;
-}
+		return true;
+	}
 </script>
 <div class="tjcpg-wrapper">
 <form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal"  method="post">
diff --git a/code/plugins/byorder/byorder/tmpl/default.php b/code/plugins/byorder/byorder/tmpl/default.php
index 1fcfa9b..6cf54b7 100755
--- a/code/plugins/byorder/byorder/tmpl/default.php
+++ b/code/plugins/byorder/byorder/tmpl/default.php
@@ -24,19 +24,14 @@
 <script type="text/javascript">
 function myValidate(f)
 {
-if (document.formvalidator.isValid(f)) {
-
-		return true;
-	}
-	else {
+if (!document.formvalidator.isValid(f)) {
 		var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
 		alert(msg);
+
+		return false;
 	}
-	return false;
+	return true;
 }
-
-
-
 </script>
 <div class="tjcpg-wrapper">
 <form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal"  method="post">
diff --git a/code/plugins/byorder/byorder/tmpl/default_bs3.php b/code/plugins/byorder/byorder/tmpl/default_bs3.php
index b34e33c..abef63e 100755
--- a/code/plugins/byorder/byorder/tmpl/default_bs3.php
+++ b/code/plugins/byorder/byorder/tmpl/default_bs3.php
@@ -24,19 +24,14 @@
 <script type="text/javascript">
 function myValidate(f)
 {
-if (document.formvalidator.isValid(f)) {
-
-		return true;
-	}
-	else {
+if (!document.formvalidator.isValid(f)) {
 		var msg = "<?php echo JText::_('PLG_BYORDER_VALIDATION_MSG'); ?>";
 		alert(msg);
+
+		return false;
 	}
-	return false;
+	return true;
 }
-
-
-
 </script>
 <div class="tjcpg-wrapper">
 <form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal"  method="post">