Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7246)
+++ /controller/wpsg_ShopController.class.php	(revision 7247)
@@ -4058,4 +4058,5 @@
 				$arPflicht['fax'] = '1';
 				$arPflicht['strasse'] = '1';
+				$arPflicht['wpsg_showNr'] = '0';
 				$arPflicht['plz'] = '1';
 				$arPflicht['ort'] = '1';
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7246)
+++ /lib/wpsg_basket.class.php	(revision 7247)
@@ -386,4 +386,5 @@
 				'tel' => $kunde['tel'],
 				'strasse' => $kunde['strasse'],
+				'nr' => $kunde['nr'],
 				'fax' => $kunde['fax'],
 				'plz' => $kunde['plz'],
@@ -789,4 +790,5 @@
 					$adata['name'] 		= $this->arCheckout['shipping_name'];
 					$adata['strasse'] 	= $this->arCheckout['shipping_strasse'];
+					$adata['nr'] 	= $this->arCheckout['shipping_nr'];
 					$adata['plz'] 		= $this->arCheckout['shipping_plz'];
 					$adata['ort'] 		= $this->arCheckout['shipping_ort'];
@@ -1014,4 +1016,13 @@
 					$this->shop->addFrontendError(__('Bitte die Eingaben im Feld "Straße" ÃŒberprÃŒfen!', 'wpsg'));
 					$_SESSION['wpsg']['errorFields'][] = 'strasse';
+					$bError = true;
+					
+				}
+				
+				// Hausnummer
+				if (($custom_config['wpsg_showNr']??'') === '1' && $custom_config['strasse'] != '2' && $custom_config['strasse'] != '1' && wpsg_getStr($this->arCheckout['nr']) == '') {
+					
+					$this->shop->addFrontendError(__('Bitte die Eingaben im Feld "Straße" ÃŒberprÃŒfen!', 'wpsg'));
+					$_SESSION['wpsg']['errorFields'][] = 'nr';
 					$bError = true;
 					
Index: /model/wpsg_customer.class.php
===================================================================
--- /model/wpsg_customer.class.php	(revision 7246)
+++ /model/wpsg_customer.class.php	(revision 7247)
@@ -264,5 +264,5 @@
 			{
 				
-				//return $this->nr
+				return $this->nr;
 				
 			}
Index: /mods/mod_converter/M1_Converter_update.php
===================================================================
--- /mods/mod_converter/M1_Converter_update.php	(revision 7246)
+++ /mods/mod_converter/M1_Converter_update.php	(revision 7247)
@@ -70,5 +70,5 @@
 	    		$data['fax'] = $k['fax'];
 	    		$data['strasse'] = $k['strasse'];
-	    		//$data['nr'] = $k['nr'];
+	    		$data['nr'] = ($k['nr']??'');
 	    		$data['plz'] = $k['plz'];
 	    		$data['ort'] = $k['ort'];
@@ -171,5 +171,5 @@
 				$data['firma'] = $o['shipping_firma'];
 				$data['strasse'] = $o['shipping_strasse'];
-				$data['nr'] = $o['shipping_hausnr'];
+				$data['nr'] = $o['shipping_nr'];
 				$data['plz'] = $o['shipping_plz'];
 				$data['ort'] = $o['shipping_ort'];
Index: /mods/mod_statistics/wpsg_customerMap.class.php
===================================================================
--- /mods/mod_statistics/wpsg_customerMap.class.php	(revision 7246)
+++ /mods/mod_statistics/wpsg_customerMap.class.php	(revision 7247)
@@ -57,5 +57,5 @@
 				{
 					 
-					$arLongLat = $this->geocode($c['plz'].' '.$c['ort'].','.$c['strasse']);
+					$arLongLat = $this->geocode($c['plz'].' '.$c['ort'].','.$c['strasse'].rtrim(' '.($c['nr']??'')));
 
 					if ($arLongLat !== null)
Index: /mods/wpsg_mod_addressvalidation.class.php
===================================================================
--- /mods/wpsg_mod_addressvalidation.class.php	(revision 7246)
+++ /mods/wpsg_mod_addressvalidation.class.php	(revision 7247)
@@ -95,6 +95,7 @@
 				$plz = $arCheckout['plz'];
 				$nr = '';
-				if (isset($arCheckout['nr']))
-					$nr = $arCheckout['nr'];
+				
+				if (isset($arCheckout['nr'])) $nr = $arCheckout['nr'];
+				
 				$land = $arCheckout['land'];
 				
@@ -111,9 +112,6 @@
 				$key = $this->shop->get_option('wpsg_mod_addressvalidation_apikey');
 					
-				if (wpsg_isSizedInt($this->shop->get_option('wpsg_showNr'))) {
-						
-					$strasse = $strasse.' '.$nr;
-				
-				}
+				$strasse = $strasse.rtrim(' '.$nr);
+				
 					
 				if ($astr != wpsg_getStr($_SESSION['wpsg']['Adressstring1']))
@@ -232,6 +230,16 @@
 							{
 						
-								if ($pflicht['strasse'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_strasse';
-								//$_SESSION['wpsg']['errorFields'][] = 'shipping_nr';
+								if ($pflicht['strasse'] != '1') {
+									
+									$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse';
+									
+									if (($pflicht['wpsg_showNr']??'') === '1') {
+									
+										$_SESSION['wpsg']['errorFields'][] = 'shipping_nr';
+										
+									}
+									
+								}
+								
 								if ($pflicht['ort'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_ort';
 								if ($pflicht['plz'] != '1') $_SESSION['wpsg']['errorFields'][] = 'shipping_plz';
Index: /mods/wpsg_mod_auftragsbestaetigung.class.php
===================================================================
--- /mods/wpsg_mod_auftragsbestaetigung.class.php	(revision 7246)
+++ /mods/wpsg_mod_auftragsbestaetigung.class.php	(revision 7247)
@@ -125,5 +125,5 @@
 			$arrShippingData['shipping_name'] = $arrAdress['name'];
 			$arrShippingData['shipping_strasse'] = $arrAdress['strasse'];
-			$arrShippingData['shipping_hausnr'] = $arrAdress['nr'];
+			$arrShippingData['shipping_nr'] = $arrAdress['nr'];
 			$arrShippingData['shipping_plz'] = $arrAdress['plz'];
 			$arrShippingData['shipping_ort'] = $arrAdress['ort'];
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7246)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7247)
@@ -1938,5 +1938,5 @@
 					'fax' 		=> wpsg_q($_REQUEST['fax']),
 					'strasse' 	=> wpsg_q($_REQUEST['strasse']),
-					'nr' 		=> wpsg_q(wpsg_getStr($_REQUEST['hnr'])),
+					'nr' 		=> wpsg_q(wpsg_getStr($_REQUEST['nr'])),
 					'plz' 		=> wpsg_q($_REQUEST['plz']),
 					'ort' 		=> wpsg_q($_REQUEST['ort']),
Index: /mods/wpsg_mod_shippingadress.class.php
===================================================================
--- /mods/wpsg_mod_shippingadress.class.php	(revision 7246)
+++ /mods/wpsg_mod_shippingadress.class.php	(revision 7247)
@@ -77,4 +77,5 @@
 					'name' => wpsg_q($form_data['dialog_shipping_name']),
 					'strasse' => wpsg_q($form_data['dialog_shipping_strasse']),
+					'nr' => wpsg_q($form_data['dialog_shipping_nr']),
 					'plz' => wpsg_q($form_data['dialog_shipping_plz']),
 					'ort' => wpsg_q($form_data['dialog_shipping_ort']),
@@ -129,4 +130,11 @@
 						$_SESSION['wpsg']['errorFields'][] = 'shipping_land';
 					
+					if ($pflicht['wpsg_showNr'] === '1') {
+						
+						if (($pflicht['strasse'] != '2') && ($pflicht['strasse'] != '1') && ($arCheckout['shipping_nr'] == ''))
+							$_SESSION['wpsg']['errorFields'][] = 'shipping_nr';
+						
+					}
+					
 					if (count($_SESSION['wpsg']['errorFields']) > 0)
 					{
@@ -147,4 +155,5 @@
 					unset($_SESSION['wpsg']['checkout']['shipping_name']); unset($arCheckout['shipping_name']);				
 					unset($_SESSION['wpsg']['checkout']['shipping_strasse']); unset($arCheckout['shipping_strasse']);
+					unset($_SESSION['wpsg']['checkout']['shipping_nr']); unset($arCheckout['shipping_nr']);
 					unset($_SESSION['wpsg']['checkout']['shipping_ort']); unset($arCheckout['shipping_ort']);
 					unset($_SESSION['wpsg']['checkout']['shipping_land']); unset($arCheckout['shipping_land']);
@@ -198,4 +207,5 @@
 							`firma` AS shipping_firma,
 							`strasse` AS shipping_strasse,
+							`nr` AS shipping_nr,
 							`plz` AS shipping_plz,
 							`ort` AS shipping_ort,
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css	(revision 7246)
+++ /views/css/frontend.css	(revision 7247)
@@ -95,6 +95,9 @@
 .wpsg_checkout .wpsg_commentblock textarea { box-sizing:border-box; padding:2px; width:100%; height:150px; }
 .wpsg_checkout .wpsg_logout_box a { float:right; border-bottom:0px; padding:15px; font-weight:bold; color:#FF0000; font-weight:bold; color:#fff; background-color:#333; }
-
-/* Checkout2 */ 
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock { display:flex; flex-direction:row; width:100%; }
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .street { flex-grow:1; padding-right:15px; }
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .nr input { width:75px; }  
+	
+	/* Checkout2 */ 
 .shippay_wrap { margin-top:40px; width:100%; font-family:Arial; padding-right:10px; }
 .wpsg_payment .wpsg_payment_textwrap { margin-top:40px; }
@@ -358,4 +361,7 @@
 .wpsg_mod_request_requestpage select { width:100%; height:30px; margin-top:5px; margin-bottom:5px;}
 .wpsg_mod_request_requestpage h2 { margin-top:2rem; margin-bottom:1rem; }
+.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock { display:flex; flex-direction:row; width:100%; }
+.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock .street { flex-grow:1; padding-right:15px; }
+.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock .nr input { width:75px; }
 .requestlist_ajax_wrap { padding-bottom:2rem; }
 
Index: /views/mailtemplates/adminmail.phtml
===================================================================
--- /views/mailtemplates/adminmail.phtml	(revision 7246)
+++ /views/mailtemplates/adminmail.phtml	(revision 7247)
@@ -19,5 +19,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>    
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
@@ -45,5 +45,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>    
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
Index: /views/mailtemplates/html/customer.phtml
===================================================================
--- /views/mailtemplates/html/customer.phtml	(revision 7246)
+++ /views/mailtemplates/html/customer.phtml	(revision 7247)
@@ -13,5 +13,5 @@
 	<tr>
 		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
-		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?></td>	
+		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(_($this->view['basket']['checkout']['nr']??''))); ?></td>	
 	</tr>
 	<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
@@ -82,5 +82,5 @@
 	<tr>
 		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
-		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?></td>
+		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(($this->view['basket']['checkout']['nr']))); ?></td>
 	</tr>
 	<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
Index: /views/mailtemplates/kundenmail.phtml
===================================================================
--- /views/mailtemplates/kundenmail.phtml	(revision 7246)
+++ /views/mailtemplates/kundenmail.phtml	(revision 7247)
@@ -22,5 +22,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>    
 <?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
@@ -48,5 +48,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>    
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
Index: /views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
===================================================================
--- /views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml	(revision 7246)
+++ /views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml	(revision 7247)
@@ -10,5 +10,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')); ?>
 <?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
@@ -35,5 +35,5 @@
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')); ?>    
 <?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
Index: /views/mods/mod_deliverynote/deliverynote_pdf.phtml
===================================================================
--- /views/mods/mod_deliverynote/deliverynote_pdf.phtml	(revision 7246)
+++ /views/mods/mod_deliverynote/deliverynote_pdf.phtml	(revision 7247)
@@ -83,5 +83,5 @@
 			$pdf->Text($adress_left, $adress_top, $shop->view['data']['firma']);
 			$pdf->Text($adress_left, $adress_top + 5, $shop->view['data']['vname'].' '.$shop->view['data']['name']);
-			$pdf->Text($adress_left, $adress_top + 10, $shop->view['data']['strasse'].' '.$shop->view['data']['hausnr']);
+			$pdf->Text($adress_left, $adress_top + 10, $shop->view['data']['strasse'].' '.$shop->view['data']['nr']);
 			$pdf->Text($adress_left, $adress_top + 15, $shop->view['data']['plz'].' '.$shop->view['data']['ort']);
 			//if ($shop->get_option('wpsg_mod_deliverynote_hideCountry') != '1') $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getShippingCountryName()));
Index: /views/mods/mod_kundenverwaltung/edit.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/edit.phtml	(revision 7246)
+++ /views/mods/mod_kundenverwaltung/edit.phtml	(revision 7247)
@@ -70,5 +70,11 @@
 	                   	<?php }?>
 	                    <?php if ($this->view['pflicht']['strasse'] != '2') { ?>
+                    
                         	<?php echo wpsg_drawForm_Input('strasse', __('Straße', 'wpsg'), @$this->view['data']['strasse']); ?>
+										
+							<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>	
+								<?php echo wpsg_drawForm_Input('nr', __('Hausnummer', 'wpsg'), @$this->view['data']['nr']); ?>
+							<?php } ?>
+						
                         <?php } ?>
                         <?php if ($this->view['pflicht']['plz'] != '2') { ?>	
Index: /views/mods/mod_kundenverwaltung/mail_register.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_register.phtml	(revision 7246)
+++ /views/mods/mod_kundenverwaltung/mail_register.phtml	(revision 7247)
@@ -19,5 +19,5 @@
 <?php echo wpsg_translate(__('Telefon: #1#', 'wpsg'), $this->view['kunde']['tel']); ?> 
 <?php echo wpsg_translate(__('Fax: #1#', 'wpsg'), $this->view['kunde']['fax']); ?>  
-<?php echo wpsg_translate(__('Straße: #1#', 'wpsg'), $this->view['kunde']['strasse']); ?> 
+<?php echo wpsg_translate(__('Straße: #1#', 'wpsg'), $this->view['kunde']['strasse'].rtrim(' '.$this->view['kunde']['nr'])); ?> 
 <?php echo wpsg_translate(__('PLZ: #1#', 'wpsg'), $this->view['kunde']['plz']); ?> 
 <?php echo wpsg_translate(__('Ort: #1#', 'wpsg'), $this->view['kunde']['ort']); ?>  
Index: /views/mods/mod_kundenverwaltung/mail_register_html.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_register_html.phtml	(revision 7246)
+++ /views/mods/mod_kundenverwaltung/mail_register_html.phtml	(revision 7247)
@@ -37,5 +37,5 @@
 	<tr>
 		<td style="padding-right:15px;"><?php echo __('Straße', 'wpsg'); ?>:</td>
-		<td><?php echo wpsg_hspc($this->view['kunde']['strasse']); ?></td>	
+		<td><?php echo wpsg_hspc($this->view['kunde']['strasse'].rtrim(' '.$this->view['kunde']['nr'])); ?></td>	
 	</tr>
 	<tr>
Index: /views/mods/mod_kundenverwaltung/profil.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/profil.phtml	(revision 7246)
+++ /views/mods/mod_kundenverwaltung/profil.phtml	(revision 7247)
@@ -117,5 +117,5 @@
 	window.onload = function() {
 		
-		const email2 = document.getElementById('email2');
+		var email2 = document.getElementById('email2');
 
 		email2.onpaste = function(e) {
@@ -226,10 +226,29 @@
 				
 		<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-		<div class="wpsg_checkoutblock">			
-			<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?> 
-			<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-			</label>
-			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[profil][strasse]" value="<?php echo htmlspecialchars($this->view['data']['strasse']); ?>" />		
-		</div>
+			
+			<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+				<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+					<label for="strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wspg'); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+						<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[profil][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />
+					</label>
+					<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr:', 'wpsg'); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+						<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[profil][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['nr'])); ?>" />
+					</label>
+				</div>
+			
+			<?php } else { ?>
+
+				<div class="wpsg_checkoutblock">
+					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[profil][strasse]" value="<?php echo htmlspecialchars($this->view['data']['strasse']); ?>" />
+				</div>
+			
+			<?php } ?>
+						
 		<?php } ?>
 		
Index: /views/mods/mod_kundenverwaltung/register.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/register.phtml	(revision 7246)
+++ /views/mods/mod_kundenverwaltung/register.phtml	(revision 7247)
@@ -132,5 +132,5 @@
 	window.onload = function() {
 		
-		const email2 = document.getElementById('email2');
+		var email2 = document.getElementById('email2');
 
 		email2.onpaste = function(e) {
@@ -260,10 +260,29 @@
 	
 		<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-		<div class="wpsg_checkoutblock">
-			<label for="strasse" class="wpsg_register"><?php echo __("Straße Nr.", "wpsg"); ?>
-			<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-			</label>
-			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />		
-		</div>
+			
+			<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+				<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+					<label for="strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wspg'); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+						<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />
+					</label>
+					<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr:', 'wpsg'); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+						<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[register][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['nr'])); ?>" />
+					</label>
+				</div>
+			
+			<?php } else { ?>
+
+				<div class="wpsg_checkoutblock">
+					<label for="strasse" class="wpsg_register"><?php echo __("Straße Nr.", "wpsg"); ?>
+						<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />
+				</div>
+			
+			<?php } ?>
+			
 		<?php } ?>
 	
Index: /views/mods/mod_onepagecheckout/onepage.phtml
===================================================================
--- /views/mods/mod_onepagecheckout/onepage.phtml	(revision 7246)
+++ /views/mods/mod_onepagecheckout/onepage.phtml	(revision 7247)
@@ -267,10 +267,29 @@
 					
 						<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-						<div class="wpsg_checkoutblock">
-							<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?> 
-							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-							</label>
-							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['strasse']); ?>" />		
-						</div>
+							
+							<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+								<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+									<label for="strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wspg'); ?>
+										<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+										<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />
+									</label>
+									<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr:', 'wpsg'); ?>
+										<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+										<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[checkout][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['nr'])); ?>" />
+									</label>
+								</div>
+							
+							<?php } else { ?>
+
+								<div class="wpsg_checkoutblock">
+									<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
+										<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+									</label>
+									<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['strasse']); ?>" />
+								</div>
+							
+							<?php } ?>
+						
 						<?php } ?>
 					
Index: /views/mods/mod_rechnungen/accounting_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 7246)
+++ /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 7247)
@@ -86,5 +86,5 @@
 			$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);
 			$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);
-			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));
+			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['nr']));
 			$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);
 			if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0')
Index: /views/mods/mod_request/requestmail.phtml
===================================================================
--- /views/mods/mod_request/requestmail.phtml	(revision 7246)
+++ /views/mods/mod_request/requestmail.phtml	(revision 7247)
@@ -100,5 +100,5 @@
 <?php echo wpsg_pad_right(__('Fax', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['fax']), 46); ?> 
 <?php echo wpsg_pad_right(__('Tel.', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['tel']), 46); ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['strasse']), 46); ?>  
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['strasse']).rtrim(' '.$this->view['requestlist']['customer']['nr']), 46); ?>  
 <?php echo wpsg_pad_right(__('PLZ', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['plz']), 46); ?> 
 <?php echo wpsg_pad_right(__('Ort', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['ort']), 46); ?> 
Index: /views/mods/mod_request/requestmail_html.phtml
===================================================================
--- /views/mods/mod_request/requestmail_html.phtml	(revision 7246)
+++ /views/mods/mod_request/requestmail_html.phtml	(revision 7247)
@@ -155,4 +155,5 @@
 			'tel' => __('Tel.', 'wpsg'),
 			'strasse' => __('Straße', 'wpsg'),	
+			'nr' => __('Hausnummer', 'wpsg'),
 			'plz' => __('PLZ', 'wpsg'),
 			'ort' => __('Ort', 'wpsg'),
Index: /views/mods/mod_request/requestpage.phtml
===================================================================
--- /views/mods/mod_request/requestpage.phtml	(revision 7246)
+++ /views/mods/mod_request/requestpage.phtml	(revision 7247)
@@ -65,5 +65,5 @@
 	window.onload = function() {
 		
-		const email2 = document.getElementById('email2');
+		var email2 = document.getElementById('email2');
 
 		email2.onpaste = function(e) {
@@ -350,8 +350,29 @@
 		
 			<div class="wpsg_checkoutblock" id="wpsg_strasse">
-				<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-				</label>
-				<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />		
+				
+				<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+					<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+
+						<label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?>
+							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:				
+							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />
+						</label>
+						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?>
+							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[request][customer][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['requestlist']['customer']['nr'])); ?>" />
+						</label>
+						
+					</div>
+					
+				<?php } else { ?>
+				
+					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />		
+				
+				<?php } ?>
+				
 			</div>
 		
Index: /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 7246)
+++ /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 7247)
@@ -60,12 +60,31 @@
 				
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-			<div class="wpsg_checkoutblock">
-				<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
-				</label>
-				<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />		
-			</div>
+				
+				<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+					<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+						<label for="strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wspg'); ?>
+							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />
+						</label>
+						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr:', 'wpsg'); ?>
+							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_nr" name="wpsg[checkout][shipping_nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['shipping_nr'])); ?>" />
+						</label>
+					</div>
+				
+				<?php } else { ?>
+
+					<div class="wpsg_checkoutblock">
+						<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
+							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+						</label>
+						<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />
+					</div>
+				
+				<?php } ?> 
+				
 			<?php } ?>
-			
+						
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
Index: /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
===================================================================
--- /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml	(revision 7246)
+++ /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml	(revision 7247)
@@ -47,4 +47,11 @@
                     <?php echo wpsg_drawForm_Input('dialog_shipping_name', __('Name', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_name']); ?>
                     <?php echo wpsg_drawForm_Input('dialog_shipping_strasse', __('Straße', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
+						
+					<?php if (($this->view['pflicht']['wpsg_showNr']??'') === '1') { ?>
+	
+						<?php echo wpsg_drawForm_Input('dialog_shipping_nr', __('Hausnummer', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_nr']); ?>
+						
+					<?php } ?>
+						
                     <?php echo wpsg_drawForm_Input('dialog_shipping_plz', __('Postleitzahl', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_plz']); ?>
                     <?php echo wpsg_drawForm_Input('dialog_shipping_ort', __('Ort', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_ort']); ?>
@@ -73,5 +80,5 @@
 
     ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
-    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse'].rtrim(' '.($this->view['wpsg_mod_shippingadress']['shipping_nr']??''))); ?><br />
 	<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
     <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($lk); ?><br />
Index: /views/mods/mod_si/cannotorder.phtml
===================================================================
--- /views/mods/mod_si/cannotorder.phtml	(revision 7246)
+++ /views/mods/mod_si/cannotorder.phtml	(revision 7247)
@@ -12,5 +12,5 @@
 		'firstname' => $this->view['basket']['checkout']['vname'], // Vorname des Kunden, z.B. "Max"
 		'lastname' => $this->view['basket']['checkout']['name'], // Nachname des Kunden, z.B. "Mustermann"
-		'street' => $this->view['basket']['checkout']['strasse'], // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
+		'street' => $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')), // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
 		'city' => $this->view['basket']['checkout']['ort'], // Wohnort des Kunden, z.B. "Berlin"
 		'zipcode' => $this->view['basket']['checkout']['plz'], // PLZ des Kunden, z.B. "10117"
Index: /views/mods/mod_skrill/order_done.phtml
===================================================================
--- /views/mods/mod_skrill/order_done.phtml	(revision 7246)
+++ /views/mods/mod_skrill/order_done.phtml	(revision 7247)
@@ -27,5 +27,5 @@
 	<input type="hidden" name="lastname" value="<?php echo wpsg_hspc($this->view['kunde']['name']); ?>" />
 	<input type="hidden" name="date_of_birth" value="<?php echo wpsg_hspc(date('dmY', strtotime($this->view['kunde']['geb']))); ?>" />
-	<input type="hidden" name="address" value="<?php echo wpsg_hspc($this->view['kunde']['strasse']); ?>" />
+	<input type="hidden" name="address" value="<?php echo wpsg_hspc(rtrim($this->view['kunde']['strasse'].' '.($this->view['kunde']['nr']??''))); ?>" />
 	<input type="hidden" name="phone_number" value="<?php echo wpsg_hspc($this->view['kunde']['tel']); ?>" />
 	<input type="hidden" name="postal_code" value="<?php echo wpsg_hspc($this->view['kunde']['plz']); ?>" />
Index: /views/order/view_customerdata.phtml
===================================================================
--- /views/order/view_customerdata.phtml	(revision 7246)
+++ /views/order/view_customerdata.phtml	(revision 7247)
@@ -51,5 +51,13 @@
                 <br />
                 <?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-                	<?php echo wpsg_drawForm_Input('dialog_strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
+                	
+					<?php echo wpsg_drawForm_Input('dialog_strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
+	
+					<?php if (($this->view['pflicht']['wpsg_showNr']??'') === '1') { ?>
+		
+						<?php echo wpsg_drawForm_Input('dialog_nr', __('Hausnummer', 'wpsg'), $this->view['data']['nr']); ?>
+						
+					<?php } ?>
+					
                 <?php } ?>
                 <?php if ($this->view['pflicht']['plz'] != '2') { ?>     
@@ -106,5 +114,7 @@
     <?php } ?>                    
     <?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-    	<?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc($this->view['data']['nr']); ?><br />
+	
+		<?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc(($this->view['data']['nr']??'')); ?><br />
+		 
     <?php } ?>                    
    	<?php if ($this->view['pflicht']['plz'] != '2') { ?>
Index: /views/warenkorb/checkout.phtml
===================================================================
--- /views/warenkorb/checkout.phtml	(revision 7246)
+++ /views/warenkorb/checkout.phtml	(revision 7247)
@@ -64,5 +64,5 @@
 	window.onload = function() {
 		
-		const email2 = document.getElementById('email2');
+		var email2 = document.getElementById('email2');
 
 		email2.onpaste = function(e) {
@@ -187,10 +187,29 @@
 			
 				<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<div class="wpsg_checkoutblock" id="wpsg_strasse">
-					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?> 
-					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
-					</label>
-					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />		
-				</div>
+									
+					<?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+					
+						<div class="wpsg_checkoutblock" id="wpsg_streetnr">
+							<label for="strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wspg'); ?>
+								<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+								<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />
+							</label>
+							<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr:', 'wpsg'); ?>
+								<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+								<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[checkout][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['nr'])); ?>" />							
+							</label>
+						</div>
+						
+					<?php } else { ?>
+
+						<div class="wpsg_checkoutblock" id="wpsg_strasse">
+							<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
+								<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
+							</label>
+							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />
+						</div>
+						
+					<?php } ?>
+					
 				<?php } ?>
 			
Index: /views/warenkorb/overview.phtml
===================================================================
--- /views/warenkorb/overview.phtml	(revision 7246)
+++ /views/warenkorb/overview.phtml	(revision 7247)
@@ -70,5 +70,5 @@
 			<?php } ?>
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
@@ -105,5 +105,5 @@
 			<?php } ?>
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse'].rtrim(' '.($this->view['basket']['checkout']['shipping_nr']))); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
@@ -146,5 +146,5 @@
 			<?php } ?>	
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>