From 26ab505d60ed565e66a3bf2144ad1f8996fc46e9 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Fri, 23 Sep 2016 12:44:38 +0000
Subject: - Umstrukturierung Passwortabfrage über Kundenverwaltungsmodul
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5779 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../checkout_customer_inner.phtml                  | 44 +++++++++++++---------
 views/warenkorb/checkout.phtml                     | 27 ++-----------
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
index 093024b..5963a8d 100644
--- a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
+++ b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
@@ -1,23 +1,33 @@
 <?php
 
-	/**
-	 * Template für die Registrierung während des Checkouts
-	 * wird von checkout.phtml eingebunden
-	 */
+ /**
+  * Template für die Registrierung während des Checkouts
+  * wird von checkout.phtml eingebunden
+  */
 
 ?>
-<div class="wpsg_checkoutblock">
-	<label for="wpsg_mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
-	<?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-	</label>
-	<input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="mod_kundenverwaltung_pwd1" name="wpsg[mod_kundenverwaltung][pwd1]" value="" />			
-</div>
+<label for="checkout_login" style="line-height:35px; margin-top:25px; cursor:pointer;">    
+	<?php /* display:none, bis Option aktiv */ ?>   
+  	<input <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'checked="checked"':''); ?> type="checkbox" id="checkout_login" value="" onclick="jQuery('#checkout_login_fields').toggle();">&nbsp;
+ <span class="wpsg-checkbox-label">Ich möchte ein Kundenkonto anlegen.</span>
+</label>         
 
-<div class="wpsg_checkoutblock">		
-	<label for="wpsg_mod_kundenverwaltung_pwd2"><?php echo __("Passwort wiederholen", "wpsg"); ?>
-	<?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-	</label>
-	<input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][pwd2]" value="" />
-</div>
+<?php /* aktiv bei Registrierungszwang - aktiv bei Fehlermeldung */ ?>
+<div id="checkout_login_fields" style="display:<?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'block':'none'); ?>;">    
+ <div class="wpsg_checkoutblock">
+  <label for="wpsg_mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
+  <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+  </label>
+  <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="mod_kundenverwaltung_pwd1" name="wpsg[mod_kundenverwaltung][pwd1]" value="" />   
+ </div>
 
-<div class="wpsg_clear"></div>
\ No newline at end of file
+ <div class="wpsg_checkoutblock">  
+  <label for="wpsg_mod_kundenverwaltung_pwd2"><?php echo __("Passwort wiederholen", "wpsg"); ?>
+  <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+  </label>
+  <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][pwd2]" value="" />
+ </div>
+
+ <div class="wpsg_clear"></div>
+ 
+</div>
\ No newline at end of file
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
index 7c2c5b1..1df66d3 100644
--- a/views/warenkorb/checkout.phtml
+++ b/views/warenkorb/checkout.phtml
@@ -59,21 +59,6 @@
 		} );
 		
 	} );
-
-	/* Checkout aktiv, wird Passwortabfrage für Kundenkonto angezeigt */
-	function setVisibility2(id) {
-		
-		if(document.getElementById('bt2').value=='Hide Layer'){
-
-			document.getElementById('bt2').value = 'Show Layer';
-			document.getElementById(id).style.display = 'none';
-
-		}else{
-			
-			document.getElementById('bt2').value = 'Hide Layer';
-			document.getElementById(id).style.display = 'inline';
-		}
-	} 
 		
 /* ]]> */</script>
 
@@ -238,15 +223,9 @@
 				
 				<?php /* $this->callMods('checkout_customer_inner'); START */ ?>
 				
-				<?php /* Passwortabfrage für Neuregistrierung */ ?>
-
-				<label for="checkout_login"><br />
-		       		<input type=checkbox name=type id='bt2' value='Show Layer' onclick="setVisibility2('sub4')">
-            		<span class="wpsg-checkbox-label">Ich möchte ein Kundenkonto anlegen.</span>
-       			</label>         
-				<div id="sub4" class="wpsg_checkout_login_aktiv">    
-    				<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); ?>
-       			</div>
+				<?php /* Passwortabfrage für Neuregistrierung */ ?> 
+    			<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); ?>
+       
 				<?php /*echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); */ ?>
 				
 				<?php /* Abfrage Satollo-Newsletter */ ?>
-- 
cgit v1.2.3