Index: /mods/wpsg_mod_deliverytime.class.php
===================================================================
--- /mods/wpsg_mod_deliverytime.class.php	(revision 6574)
+++ /mods/wpsg_mod_deliverytime.class.php	(revision 6575)
@@ -39,5 +39,10 @@
 			$sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS." (
 		   		wpsg_mod_deliverytime_deliverytime VARCHAR(255) NOT NULL,
-				wpsg_mod_deliverytime_storeproduct VARCHAR (255) NOT NULL
+				wpsg_mod_deliverytime_storeproduct VARCHAR (255) NOT NULL,
+				wpsg_mod_deliverytime_storetext VARCHAR (255) NOT NULL COMMENT 'Hinweistext',
+				wpsg_mod_deliverytime_storelink VARCHAR (255) NOT NULL COMMENT 'Link zur Adresse',
+				wpsg_mod_deliverytime_delay INT(1) DEFAULT 0 NOT NULL COMMENT '1=Verzögerung',
+				wpsg_mod_deliverytime_delaytext VARCHAR (255) NOT NULL COMMENT 'Grund',
+				wpsg_mod_deliverytime_delaytime VARCHAR (255) NOT NULL COMMENT 'Zeitangabe'
 		   	) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
 
@@ -67,9 +72,31 @@
 
 			}
-
+			
+			$this->shop->view['wpsg_mod_deliverytime']['arSelection'] = $this->getPossibleSelection();
+			
+			$pages = get_pages();
+			
+			$arPages = array(
+					'-1' => __('Neu anlegen und zuordnen', 'wpsg')
+			);
+			
+			foreach ($pages as $k => $v)
+			{
+				$arPages[$v->ID] = $v->post_title.' (ID:'.$v->ID.')';
+			}
+			
+			$this->shop->view['pages'] = $arPages;
+			
 			//if (isset($this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']))
 				$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'] = $product_data['wpsg_mod_deliverytime_deliverytime'];
 			//if (isset($this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']))
 				$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'] = $product_data['wpsg_mod_deliverytime_storeproduct'];
+
+			// Neue Felder im Produkt ÃŒbergeben
+			$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'] = $product_data['wpsg_mod_deliverytime_storetext'];
+			$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'] = $product_data['wpsg_mod_deliverytime_storelink'];
+			$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'] = $product_data['wpsg_mod_deliverytime_delay'];
+			$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'] = $product_data['wpsg_mod_deliverytime_delaytext'];
+			$this->shop->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'] = $product_data['wpsg_mod_deliverytime_delaytime'];
 
 			$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/produkt_addedit_allgemein.phtml', false);
@@ -130,4 +157,11 @@
 			$produkt_data['wpsg_mod_deliverytime_storeproduct'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']));
 
+			// Neue Felder im Produkt
+			$produkt_data['wpsg_mod_deliverytime_storetext'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext']));
+			$produkt_data['wpsg_mod_deliverytime_storelink'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink']));
+			$produkt_data['wpsg_mod_deliverytime_delay'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay']));
+			$produkt_data['wpsg_mod_deliverytime_delaytext'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext']));
+			$produkt_data['wpsg_mod_deliverytime_delaytime'] = wpsg_q(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime']));
+			
 		} // public function produkt_save_before(&$produkt_data)
 
@@ -139,6 +173,6 @@
 			$this->shop->view['wpsg_mod_deliverytime']['i'] = $index;
 			$this->shop->view['wpsg_mod_deliverytime']['p'] = $produkt;
-			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($produkt['id']));
-
+			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->displayDeliveryTime($this->shop->getProduktID($produkt['id']));
+			
 			if ($this->shop->htmlMail === true)
 			{
@@ -163,6 +197,8 @@
 			$this->shop->view['wpsg_mod_deliverytime']['i'] = $i;
 			$this->shop->view['wpsg_mod_deliverytime']['p'] = $p;
-			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($p['id']));
-
+			
+			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->displayDeliveryTime($this->shop->getProduktID($p['id']));
+			$this->shop->view['wpsg_mod_deliverytime']['delaytime'] = $this->displayDelayTime($this->shop->getProduktID($p['id']));
+			
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/basket_row.phtml');
 
@@ -176,6 +212,8 @@
 			$this->shop->view['wpsg_mod_deliverytime']['i'] = $i;
 			$this->shop->view['wpsg_mod_deliverytime']['p'] = $p;
-			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->getProductDeliveryTime($this->shop->getProduktID($p['id']));
-
+			
+			$this->shop->view['wpsg_mod_deliverytime']['deliverytime'] = $this->displayDeliveryTime($this->shop->getProduktID($p['id']));
+			$this->shop->view['wpsg_mod_deliverytime']['delaytime'] = $this->displayDelayTime($this->shop->getProduktID($p['id']));
+			
 			return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/overview_row.phtml');
 
@@ -204,5 +242,5 @@
 
 		/**
-		 * Zeigt einen Text an, der bei Lieferverzögerungen angezeigt wird
+		 * Liefert einen Text, der bei Lieferverzögerungen angezeigt wird
 		 * @param $product_key
 		 */
@@ -210,4 +248,12 @@
 		{
 
+			// 'Hinweistext bei Verzögerungen anzeigen', 'wpsg'),
+			// array(0 => 'Standardeinstellung', 1 => 'Anzeigen', 2 => 'Nicht anzeigen')
+			
+			$oProduct = wpsg_product::getInstance($this->shop->getProduktID($product_key));
+			
+			if ($oProduct->wpsg_mod_deliverytime_delay == 1) return wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage(n) in der Zustellung kommen.', 'wpsg'), $oProduct->wpsg_mod_deliverytime_delaytext, $oProduct->wpsg_mod_deliverytime_delaytime);
+			else if ($oProduct->wpsg_mod_deliverytime_delay == 2) return false;
+			
 			if ($this->shop->get_option('wpsg_mod_deliverytime_delay') != '1') return false;
 
@@ -223,4 +269,32 @@
 		}
 
+		/**
+		 * Liefert einen Text, der bei Offline-Produkten angezeigt wird
+		 * @param $product_key
+		 */
+		public function displayStoreText($product_key)
+		{
+			
+			$oProduct = wpsg_product::getInstance($this->shop->getProduktID($product_key));
+			
+			if ($oProduct->wpsg_mod_deliverytime_storeproduct == 1) return __($oProduct->wpsg_mod_deliverytime_storetext, 'wpsg');
+			else return __($this->shop->get_option('wpsg_mod_deliverytime_storetext'), 'wpsg');
+			
+		} // public function displayStoreText($product_key)
+		
+		/**
+		 * Liefert einen Link, der bei Offline-Produkten angezeigt wird
+		 * @param $product_key
+		 */
+		public function displayStoreLink($product_key)
+		{
+			
+			$oProduct = wpsg_product::getInstance($this->shop->getProduktID($product_key));
+			
+			if ($oProduct->wpsg_mod_deliverytime_storeproduct == 1) return __($oProduct->wpsg_mod_deliverytime_storelink, 'wpsg');
+			else return __($this->shop->get_option('wpsg_page_mod_deliverytime_storelink'), 'wpsg');
+			
+		} // public function displayStoreLink($product_key)
+		
 		/**
 		 * Zeigt die Lieferzeit formatiert an.
@@ -304,14 +378,17 @@
 		{
 
-			// Wenn die Option fÃŒr "Offline Produkte" nicht aktiviert ist, so kann es auch kein Offline Produkt sein
-			if ($this->shop->get_option('wpsg_mod_deliverytime_store') != '1') return false;
-
+			// Die Produkteinstellung Als Offlineprodukt anzeigen
+			// 'Als Offlineprodukt anzeigen', 'wpsg'), 
+			// array(0 => 'Standardeinstellung', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt')
 			$oProduct = wpsg_product::getInstance($this->shop->getProduktID($product_key));
-
-			if ($oProduct->wpsg_mod_deliverytime_storeproduct > 0) return true;
-			else return false;
-
+			
+			if ($oProduct->wpsg_mod_deliverytime_storeproduct == 2) return false;
+			else if ($oProduct->wpsg_mod_deliverytime_storeproduct == 1) return true;
+			else if ($this->shop->get_option('wpsg_mod_deliverytime_store') != '1') return false;
+			else return true;
+			
 		} // public function isStoreProduct($product_key)
-
+		
+	
 		/**
 		 * Gibt die Lieferzeit eines Produktes anhand seiner ID zurÃŒck
Index: /views/mods/mod_deliverytime/basket_row.phtml
===================================================================
--- /views/mods/mod_deliverytime/basket_row.phtml	(revision 6574)
+++ /views/mods/mod_deliverytime/basket_row.phtml	(revision 6575)
@@ -12,11 +12,6 @@
 	</div>
 	<div class="valuel">
-		<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
-			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
-		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
-				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
-		<?php } else { /* Sonst sofort lieferbar */ ?>
-		 	<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
-		<?php } ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
+	
 	</div>
 	<div class="dummyr">
@@ -26,10 +21,8 @@
 </div>
 <?php /* Hinweistext fÌr Verzögerung in der Lieferzeit */ ?>
-<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 <div class="product_info">
 	<div class="fulll">
-		<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
 
 	</div>
 </div>
-<?php } ?>
Index: /views/mods/mod_deliverytime/overview_row.phtml
===================================================================
--- /views/mods/mod_deliverytime/overview_row.phtml	(revision 6574)
+++ /views/mods/mod_deliverytime/overview_row.phtml	(revision 6575)
@@ -12,11 +12,6 @@
 	</div>
 	<div class="valuel">
-		<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
-			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
-		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
-				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
-		<?php } else { /* Sonst sofort lieferbar */ ?>
-		 	<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
-		<?php } ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
+
 	</div>
 	<div class="dummyr">
@@ -26,10 +21,8 @@
 </div>
 <?php /* Hinweistext fÌr Verzögerung in der Lieferzeit */ ?>
-<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 <div class="product_info">
 	<div class="fulll">
-		<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
 
 	</div>
 </div>
-<?php } ?>
Index: /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
===================================================================
--- /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 6574)
+++ /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 6575)
@@ -16,10 +16,55 @@
 	<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
 		<?php if (isset($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']))
-				echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
+				//echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct1]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
+				<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Standardeinstellung', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?>
+
+	<div class="wpsg_mod_deliverytime_store wpsg_mod_deliverytime_store_1">
+	    <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storetext]', __('Hinweistext', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'], array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
+	    <?php ?>
+	    <?php $arPageWithoutCreate = $this->view['pages']; unset($arPageWithoutCreate['-1']); ?>
+	    <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storelink]', __('Seite mit Adressdaten', 'wpsg'), wpsg_array_merge(array(
+	        '0' => __('Keine Verlinkung auf eine Seite anzeigen', 'wpsg')
+	    ), $arPageWithoutCreate), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'], array('help' => 'wpsg_page_mod_deliverytime_storelink')); ?>
+	</div>
+	
+	<br />
+
 	<?php } ?>
 	
+	<?php //echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('help' => 'wpsg_mod_deliverytime_delay')); ?>
+	<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Standardeinstellung', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_delay')); ?>
+	<div class="wpsg_mod_deliverytime_delay_activ" style="display:none;">
+	<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytext]', __('Grund fÌr verzögerte Lieferung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'], array('help' => 'wpsg_mod_deliverytime_delayText')); ?>
+	<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytime]', __('Zeitangabe der Verzögerung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'], array('help' => 'wpsg_mod_deliverytime_delayTime')); ?>
+	</div>
+	
 	<br />
+
 
 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverytime"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Lieferzeit', 'wpsg'); ?></a>
 	
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+        jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_storeproduct').bind('change', function() {
+			//alert('TEST:' + jQuery(this).val());
+            jQuery('.wpsg_mod_deliverytime_store').hide();
+            //if (jQuery(this).prop('checked')) jQuery('.wpsg_mod_deliverytime_store_1').show();
+            if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_store_1').show();
+
+        } ).change();
+
+		jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_delay').bind('change', function() {
+
+			//if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_deliverytime_delay_activ').show();
+			if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_delay_activ').show();
+			else jQuery('.wpsg_mod_deliverytime_delay_activ').hide();
+			
+		} ).change();
+		
+	} );
+
+/* ]]> */</script>
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 6574)
+++ /views/produkttemplates/standard.phtml	(revision 6575)
@@ -155,11 +155,12 @@
 			<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?>
 
-				<div class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></div>
-
-				<?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>
-				&nbsp;<a href="<?php echo get_permalink($this->get_option('wpsg_page_mod_deliverytime_storelink')); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
-				<?php } ?>
-
-			<?php } else {?>
+				<div class="wpsg_product_only_store"><?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?></div>
+
+				<?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
+				<?php if (wpsg_isSizedInt($stl)) { ?>
+				&nbsp;<a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+				<?php } ?>
+
+			<?php } else { ?>
 
 				<div class="wpsg_mod_deliverytime">