Index: /changelog
===================================================================
--- /changelog	(revision 5707)
+++ /changelog	(revision 5717)
@@ -812,4 +812,5 @@
  - Feature - optionale Preisanzeige nur fÃŒr eingeloggte Benutzer
  - Feature - PostID wird beim wechsel der Variante mit ÃŒbergeben
+ - Feature - frei positionierbare Newsletterabfragen im Warenkorb
  - Feature - Lieferzeit 0 Tag(e) wird als sofort lieferbar im Produkt angezeigt
  - Feature - Alle Mails aus dem Shop senden den Return-Path (From) mit
@@ -836,5 +837,4 @@
 
 
-
 #4.0.0 / 5259
  - Feature - Produktbilder - Mehrfacher Upload möglich
Index: /views/mods/mod_newsletter/checkout_customer_inner.phtml
===================================================================
--- /views/mods/mod_newsletter/checkout_customer_inner.phtml	(revision 5707)
+++ /views/mods/mod_newsletter/checkout_customer_inner.phtml	(revision 5717)
@@ -9,5 +9,5 @@
 <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>
Index: /views/warenkorb/checkout.phtml
===================================================================
--- /views/warenkorb/checkout.phtml	(revision 5707)
+++ /views/warenkorb/checkout.phtml	(revision 5717)
@@ -87,12 +87,5 @@
 		
 			<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'); ?>
@@ -136,4 +129,11 @@
 				<?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"); ?>
@@ -142,19 +142,12 @@
 					<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 } ?>:
-					</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_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_strasse">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Strasse Nr.", "wpsg"); ?> 
@@ -189,4 +182,11 @@
 					</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">
@@ -223,5 +223,16 @@
 				<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>