From 6713af92c1ff09f17c46e45db3a88bcad1a51490 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 16 Jul 2019 04:34:05 +0000
Subject: - Enter auf Input Felder im Checkout(1) sendet Klick auf den
 richtigen Button wenn Login Formular mit eingebunden ist.

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7481 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/checkout.phtml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
index 4a4db46..5c87af4 100644
--- a/views/warenkorb/checkout.phtml
+++ b/views/warenkorb/checkout.phtml
@@ -8,9 +8,9 @@
 	//wpsg_debug($this->view);
 ?>	
 <script type="text/javascript">/* <![CDATA[ */
-
+	
 	jQuery(document).ready(function() {
-
+		
 		<?php if ($this->get_option('wpsg_form_validation') == '1') { ?>
 		
 		if (typeof jQuery.validationEngine == "object")
@@ -49,11 +49,27 @@
 		
 		<?php } ?>
 
-		jQuery('.wpsg_checkout input').bind('keyup', function(e) {
+		jQuery('.wpsg_checkout input').bind('keyup keypress', function(e) {
+
+			var jqThis = jQuery(this);
+			
+			// Enter lass ich direkt durch
+			if (jqThis.attr("type") === 'submit') return true;
+			
+			var keyCode = e.keyCode || e.which;
+			
+			if (keyCode == 13) {
+ 		    	
+				if (jqThis.parents('.wpsg_loginform').length > 0) {
 
-			if(e.keyCode == 13)
-		    {
-		        jQuery('#wpsg_checkout2button').click();
+					jQuery('input[name="wpsg_mod_kundenverwaltung_login"]').click();
+					
+				} else {
+		        
+					jQuery('#wpsg_checkout2button').click();
+					
+				}
+				
 		    }
 		    
 		} );
@@ -83,7 +99,9 @@
 	<form id="form-step2" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">
 
 		<?php /* Einbindung des Logins im Checkout */ ?>	
-		<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>
+		<div class="wpsg_loginform">
+			<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>
+		</div>
 	
 		<div class="wpsg_box" id="wpsg_box_kundendaten">
 			
-- 
cgit v1.2.3