git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5717 0d5edaf7-2b12-4e95-93f4-047927463d4b

2 files changed, 33 insertions, 22 deletions

diff --git a/views/mods/mod_newsletter/checkout_customer_inner.phtml b/views/mods/mod_newsletter/checkout_customer_inner.phtml
index 8d8ac82..a00fc36 100644
--- a/views/mods/mod_newsletter/checkout_customer_inner.phtml
+++ b/views/mods/mod_newsletter/checkout_customer_inner.phtml
@@ -8,6 +8,6 @@
 ?>

 <div class="wpsg_checkoutblock">

 	<label for="wpsg_mod_newsletter">

-		<input class="wpsg_checkout" type="checkbox" id="wpsg_mod_newsletter" name="wpsg[checkout][wpsg_mod_newsletter]" value="1" <?php echo (($this->view['basket']['checkout']['wpsg_mod_newsletter'] == '1')?'checked="checked"':''); ?> /><?php echo __("Für Newsletter anmelden.", "wpsg"); ?>						

+		<input class="wpsg_checkout" type="checkbox" id="wpsg_mod_newsletter" name="wpsg[checkout][wpsg_mod_newsletter]" value="1" <?php echo (($this->view['basket']['checkout']['wpsg_mod_newsletter'] == '1')?'checked="checked"':''); ?> /><?php echo __("Melden Sie sich hier für unseren Newsletter an.", "wpsg"); ?>						

 	</label>

 </div>
\ No newline at end of file
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
index f13bed1..8935b5c 100644
--- a/views/warenkorb/checkout.phtml
+++ b/views/warenkorb/checkout.phtml
@@ -86,14 +86,7 @@
 			<div class="wpsg_spacer"></div>

 		

 			<div class="wpsg_inner">

-		

-				<div class="wpsg_checkoutblock" id="wpsg_firma">

-					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>

-					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

-					</label>

-					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />

-				</div>

-			

+					

 				<div class="wpsg_checkoutblock" id="wpsg_anrede">

 					<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>

 					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>

@@ -135,27 +128,27 @@
 				</div>

 				<?php } ?>

 				

+				<div class="wpsg_checkoutblock" id="wpsg_telefon">

+					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>

+					<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+					</label>

+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />

+				</div>

+				

 				<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">

 					<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>

 					<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

 					</label>

 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[checkout][geb]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['geb']); ?>" />

 				</div>

-						

-				<div class="wpsg_checkoutblock" id="wpsg_fax">

-					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>

-					<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

-					</label>

-					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />

-				</div>

 				

-				<div class="wpsg_checkoutblock" id="wpsg_telefon">

-					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>

-					<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+				<div class="wpsg_checkoutblock" id="wpsg_firma">

+					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>

+					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

 					</label>

-					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />

+					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />

 				</div>

-			

+								

 				<div class="wpsg_checkoutblock" id="wpsg_strasse">

 					<label for="strasse" class="wpsg_checkout"><?php echo __("Strasse Nr.", "wpsg"); ?> 

 					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

@@ -188,6 +181,13 @@
 						<?php } ?>

 					</select>

 				</div>

+						

+				<div class="wpsg_checkoutblock" id="wpsg_fax">

+					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>

+					<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:

+					</label>

+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />

+				</div>		

 				

 				<div class="wpsg_checkoutblock" id="wpsg_ustidnr">

 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 

@@ -222,7 +222,18 @@
 				<?php /* Automatische Einbindung der benutzerdefinierten Kundenfelder ENDE */ ?>

 				<div class="wpsg_clear"></div>

 				

-				<?php $this->callMods('checkout_customer_inner'); ?>

+				<?php /* $this->callMods('checkout_customer_inner'); START */ ?>

+				

+				<?php /* Passwortabfrage für Neuregistrierung */ ?>

+				<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); ?>

+				

+				<?php /* Abfrage Satollo-Newsletter */ ?>

+				<?php echo $this->callMod('wpsg_mod_nlsatolo', 'checkout_customer_inner'); ?>

+				

+				<?php /* Einverständnisabfrage Trusted Shops */ ?>

+				<?php echo $this->callMod('wpsg_mod_trustedshops', 'checkout_customer_inner'); ?>

+				

+				<?php /* $this->callMods('checkout_customer_inner'); ENDE */ ?>

 				

 			</div>