Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 7150)
+++ /controller/wpsg_AdminController.class.php	(revision 7151)
@@ -304,4 +304,15 @@
 				$this->shop->update_option('dataprotectioncommissioner_texts', $_REQUEST['dataprotectioncommissioner_texts'], false, true);
 
+				$this->shop->update_option('wpsg_customerdatadelete_complete', $_REQUEST['wpsg_customerdatadelete_complete'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_completeeinheit', $_REQUEST['wpsg_customerdatadelete_completeeinheit'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_storno', $_REQUEST['wpsg_customerdatadelete_storno'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_stornoeinheit', $_REQUEST['wpsg_customerdatadelete_stornoeinheit'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_uncomplete', $_REQUEST['wpsg_customerdatadelete_uncomplete'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_uncompleteeinheit', $_REQUEST['wpsg_customerdatadelete_uncompleteeinheit'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_abos', $_REQUEST['wpsg_customerdatadelete_abos'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_aboseinheit', $_REQUEST['wpsg_customerdatadelete_aboseinheit'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_rechnung', $_REQUEST['wpsg_customerdatadelete_rechnung'], false, true);
+				$this->shop->update_option('wpsg_customerdatadelete_rechnungeinheit', $_REQUEST['wpsg_customerdatadelete_rechnungeinheit'], false, true);
+				
 				$this->shop->update_option('wpsg_shopdata_bank_name', $_REQUEST['wpsg_shopdata_bank_name'], false, true);
 				$this->shop->update_option('wpsg_shopdata_bank_owner', $_REQUEST['wpsg_shopdata_bank_owner'], false, true);
@@ -2022,4 +2033,16 @@
 				$this->update_option('dataprotectioncommissioner_cookietext', $_REQUEST['dataprotectioncommissioner_cookietext']);
 
+				$this->update_option('wpsg_customerdatadelete_complete', $_REQUEST['wpsg_customerdatadelete_complete']);
+				$this->update_option('wpsg_customerdatadelete_completeeinheit', $_REQUEST['wpsg_customerdatadelete_completeeinheit']);
+				$this->update_option('wpsg_customerdatadelete_storno', $_REQUEST['wpsg_customerdatadelete_storno']);
+				$this->update_option('wpsg_customerdatadelete_stornoeinheit', $_REQUEST['wpsg_customerdatadelete_stornoeinheit']);
+				$this->update_option('wpsg_customerdatadelete_uncomplete', $_REQUEST['wpsg_customerdatadelete_uncomplete']);
+				$this->update_option('wpsg_customerdatadelete_uncompleteeinheit', $_REQUEST['wpsg_customerdatadelete_uncompleteeinheit']);
+				$this->update_option('wpsg_customerdatadelete_abos', $_REQUEST['wpsg_customerdatadelete_abos']);
+				$this->update_option('wpsg_customerdatadelete_aboseinheit', $_REQUEST['wpsg_customerdatadelete_aboseinheit']);
+				$this->update_option('wpsg_customerdatadelete_rechnung', $_REQUEST['wpsg_customerdatadelete_rechnung']);
+				$this->update_option('wpsg_customerdatadelete_rechnungeinheit', $_REQUEST['wpsg_customerdatadelete_rechnungeinheit']);
+				
+				
 				$this->addBackendMessage(__('Einstellungen gespeichert.', 'wpsg'));
 
Index: /views/admin/dataprotection.phtml
===================================================================
--- /views/admin/dataprotection.phtml	(revision 7150)
+++ /views/admin/dataprotection.phtml	(revision 7151)
@@ -39,36 +39,85 @@
   			 			
   			</div>
+  		</div>	
+  		
+  		<div class="panel panel-default">
+  			<div class="panel-heading clearfix">
+          		<h3 class="panel-title"><?php echo __('Technisch-Organisatorische Maßnahmen', 'wpsg'); ?></h3>
+        	</div>
+  			<div class="panel-body">
   			
-  			<hr>
-  			
-  			<?php /* Datenschutzhinweis an alle bestehenden Kunden versenden - Upload und Versendebutton */ ?>
-			<?php echo wpsg_drawForm_Upload('wpsg_tom', __('Technisch-Organisatorische Maßnahmen (TOM)', 'wpsg')); ?>
+	  			<?php /* Datenschutzhinweis an alle bestehenden Kunden versenden - Upload und Versendebutton */ ?>
+				<?php echo wpsg_drawForm_Upload('wpsg_tom', __('Technisch-Organisatorische Maßnahmen (TOM)', 'wpsg')); ?>
+				
+				<br />
+				
+				<?php /* Datenschutzhinweis an neue Kunden mittels BestellbestÀtigung versenden (Checkbox) */ ?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_tom_kundenmail', __('Anhang an BestellbestÀtigung', 'wpsg'), $this->get_option('wpsg_tom_kundenmail')); ?>
+				
+				<?php /* Datenschutzhinweis an neue Kunden mit Rechnungsversand versenden (Checkbox) */ ?>
+				<?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
+					<?php echo wpsg_drawForm_Checkbox('wpsg_tom_invoice', __('Anhang an Rechnung', 'wpsg'), $this->get_option('wpsg_tom_invoice')); ?>
+				<?php } ?>
+				
+				<?php /* Datenschutzhinweis an neue Kunden mit AuftragsbestÀtigung versenden (Checkbox) */ ?>
+				<?php if ($this->hasMod('wpsg_mod_auftragsbestaetigung')) { ?>
+					<?php echo wpsg_drawForm_Checkbox('wpsg_tom_orderconfirm', __('Anhang an AuftragsbestÀtigung', 'wpsg'), $this->get_option('wpsg_tom_orderconfirm')); ?>
+				<?php } ?>
+				
+				<br />
+				
+				<?php echo wpsg_drawForm_TextStart(); ?>
+					<div role="presentation">
+					
+						<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_toms/'.$this->get_option('wpsg_toms'); ?>"><span class="glyphicon glyphicon-export"></span><?php echo __('gespeichertes PDF-Dokument', 'wpsg');?></a>			
+					
+					</div>
+				<?php echo wpsg_drawForm_TextEnd(); ?>
+			</div>
+		</div>
+		
+  		<div class="panel panel-default">
+  			<div class="panel-heading clearfix">
+          		<h3 class="panel-title"><?php echo __('Löschen der kundenspezifischen Daten', 'wpsg'); ?></h3>
+        	</div>
+  			<div class="panel-body">	
+						
+				<?php /* periodisches Löschen der persönlichen Daten */ ?>
+				<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_complete', __('vollstÀndig abgeschlossene Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_complete'));?>	
+				<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_completeeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_completeeinheit')); ?>
+				
+				<br />
+				
+				<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_storno', __('stonierte Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_storno')); ?>
+				<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_stornoeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_stornoeinheit')); ?>
+				
+				<br />
+				
+				<?php /* TODO: Abfrage greift nicht */ ?>
+				<?php if ($this->get_option('wpsg_showincompleteorder') == '1') { ?>
+					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_uncomplete', __('unvollstÀndige Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_uncomplete')); ?>
+					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_uncompleteeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_uncompleteeinheit')); ?>
+				<?php } ?>	
+					
+				<br />	
+					
+				<?php /* Abomodul aktiv */ ?>
+				<?php if ($this->hasMod('wpsg_mod_abo') == '1') { ?>
+					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_abos', __('gekÃŒndigte Abos', 'wpsg'), $this->get_option('wpsg_customerdatadelete_abos')); ?>
+					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_aboseinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_aboseinheit')); ?>
+				<?php } ?>
+	
+				<br />
+				
+				<?php /* Rechnungsmodul aktiv*/ ?>
+				<?php if ($this->hasMod('wpsg_mod_rechnungen') == '1') { ?>
+					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_rechnung', __('Rechnungen geschrieben', 'wpsg'), $this->get_option('wpsg_customerdatadelete_complete')); ?>
+					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_rechnungeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_rechnungeinheit')); ?>
+				<?php } ?>
+				
+			</div>
 			
-			<br />
+		</div>	
 			
-			<?php /* Datenschutzhinweis an neue Kunden mittels BestellbestÀtigung versenden (Checkbox) */ ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_tom_kundenmail', __('Anhang an BestellbestÀtigung', 'wpsg'), $this->get_option('wpsg_tom_kundenmail')); ?>
-			
-			<?php /* Datenschutzhinweis an neue Kunden mit Rechnungsversand versenden (Checkbox) */ ?>
-			<?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_tom_invoice', __('Anhang an Rechnung', 'wpsg'), $this->get_option('wpsg_tom_invoice')); ?>
-			<?php } ?>
-			
-			<?php /* Datenschutzhinweis an neue Kunden mit AuftragsbestÀtigung versenden (Checkbox) */ ?>
-			<?php if ($this->hasMod('wpsg_mod_auftragsbestaetigung')) { ?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_tom_orderconfirm', __('Anhang an AuftragsbestÀtigung', 'wpsg'), $this->get_option('wpsg_tom_orderconfirm')); ?>
-			<?php } ?>
-			
-			<br />
-			
-			<?php echo wpsg_drawForm_TextStart(); ?>
-				<div role="presentation">
-				
-					<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_toms/'.$this->get_option('wpsg_toms'); ?>"><span class="glyphicon glyphicon-export"></span><?php echo __('gespeichertes PDF-Dokument', 'wpsg');?></a>			
-				
-				</div>
-			<?php echo wpsg_drawForm_TextEnd(); ?>
-
-		</div>		
 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>