Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 8308)
+++ /lib/wpsg_basket.class.php	(revision 8309)
@@ -218,9 +218,11 @@
 		 */
 		public function removeProduktFromSession($produkt_index) {
+
+			$this->shop->callMods('basket_removeProduktFromSession', [$produkt_index]);	
 			
 			unset($_SESSION['wpsg']['basket'][$produkt_index]);
-			\wpsg\wpsg_calculation::getSessionCalculation()->update();;
-			
-			$this->shop->callMods('basket_removeProduktFromSession', [$produkt_index]);			
+			\wpsg\wpsg_calculation::getSessionCalculation()->update();
+
+			//$this->shop->callMods('basket_removeProduktFromSession', [$produkt_index]);	
 			$this->shop->cache->clearShopBasketArray();
 			$this->shop->basket->initFromSession(true);
Index: /mods/wpsg_mod_statistics.class.php
===================================================================
--- /mods/wpsg_mod_statistics.class.php	(revision 8308)
+++ /mods/wpsg_mod_statistics.class.php	(revision 8309)
@@ -64,5 +64,5 @@
 			$this->shop->checkDefault('wpsg_mod_statistics_bar_chart_width', '600');
 			$this->shop->checkDefault('wpsg_mod_statistics_bar_chart_height', '500');
-			$this->shop->checkDefault('wpsg_mod_statistics_piwik_SiteId', '1'); 
+			$this->shop->checkDefault('wpsg_mod_statistics_piwik_trackingcode', '1'); 
 			
 			$this->shop->checkDefault('wpsg_mod_statistics_status', implode(',', array(100, 110)));
@@ -149,10 +149,13 @@
 		}
 
-		public function product_bottom(&$product_id, $template_index) 
+		public function basket_preInsert() 
 		{  
 
-			if ($this->shop->get_option('wpsg_mod_statistics_piwik_productView') == '1') 
-			{
-
+			if ($this->shop->get_option('wpsg_mod_statistics_piwik_basketdata') == '1') 
+			{
+
+				echo '<script type="text/javascript"> if (typeof _paq === "undefined") window._paq = []; </script>';
+	
+				$product_id = $_POST['wpsg']['produkt_id'];
 				$oProduct = wpsg_product::getInstance($product_id);
 
@@ -176,15 +179,134 @@
 					}
 
+					if(!empty($arCategoryName)) 
+					{
+				
+						echo '
+							<script type="text/javascript">
+
+								_paq.push(["addEcommerceItem",
+									"'.wpsg_hspc($oProduct->getNr()).'", 
+									"'.wpsg_hspc($oProduct->getProductName()).'",
+									'.$arCategoryName.',
+									'.wpsg_tf($oProduct->getPrice()).', 
+									'.$_POST['wpsg']['menge'].'
+								]);
+
+							</script>
+						';
+
+					}
+					else 
+					{
+
+						echo '
+							<script type="text/javascript">
+								_paq.push(["addEcommerceItem",
+									"'.wpsg_hspc($oProduct->getNr()).'", 
+									"'.wpsg_hspc($oProduct->getProductName()).'",
+									false, 
+									'.wpsg_tf($oProduct->getPrice()).',
+									'.$_POST['wpsg']['menge'].'
+								]);
+							</script>
+						';
+
+					}
+				
+				}
+				else 
+				{
+
 					echo '
 						<script type="text/javascript">
-							_paq.push(["setEcommerceView",
+							_paq.push(["addEcommerceItem",
 								"'.wpsg_hspc($oProduct->getNr()).'",
-								"'.wpsg_hspc($oProduct->getProductName()).'",
-								'.$arCategoryName.',
-								'.wpsg_tf($oProduct->getPrice()).'
+								"'.wpsg_hspc($oProduct->getProductName()).'", 
+								false, 
+								'.wpsg_tf($oProduct->getPrice()).', 
+								'.$_POST['wpsg']['menge'].'
 							]);
 						</script>
 					';
-				
+
+				}
+				
+			}
+
+		} // public function basket_preInsert() 
+
+		public function basket_removeProduktFromSession($produkt_index)
+		{
+
+			if ($this->shop->get_option('wpsg_mod_statistics_piwik_basketdata') == '1') 
+			{
+
+				echo '<script type="text/javascript"> if (typeof _paq === "undefined") window._paq = []; </script>';
+
+				$product_id = $_SESSION['wpsg']['basket'][$produkt_index]['id'];
+				echo '<script type="text/javascript"> _paq.push(["removeEcommerceItem", '.$product_id.']); </script>';
+
+			}
+
+		} // public function basket_removeProduktFromSession()
+
+		public function product_bottom(&$product_id, $template_index) 
+		{  
+
+			if ($this->shop->get_option('wpsg_mod_statistics_piwik_productView') == '1') 
+			{
+
+				$oProduct = wpsg_product::getInstance($product_id);
+
+				if ($this->shop->hasMod('wpsg_mod_produktartikel')) 
+				{
+
+					$categoryID = $oProduct->getPostID();
+					$terms = get_the_terms($categoryID, get_taxonomies());
+
+					if ($terms) 
+					{
+
+						$termNames = array(); 
+
+						foreach ($terms as $term) $termNames[] = $term->name;
+
+    					$termNames = array_slice($termNames, 0, 5); // Matomo API Limitierung - max. 5 Kategorien
+
+						$arCategoryName = json_encode($termNames);
+
+					}
+
+					if(!empty($arCategoryName)) 
+					{
+
+						echo '
+							<script type="text/javascript">
+								_paq.push(["setEcommerceView",
+									"'.wpsg_hspc($oProduct->getNr()).'",
+									"'.wpsg_hspc($oProduct->getProductName()).'",
+									'.$arCategoryName.',
+									'.wpsg_tf($oProduct->getPrice()).'
+								]);
+							</script>
+						';	
+
+					} 
+					else 
+					{
+
+						echo '
+							<script type="text/javascript">
+								_paq.push(["setEcommerceView",
+									"'.wpsg_hspc($oProduct->getNr()).'",
+									"'.wpsg_hspc($oProduct->getProductName()).'",
+									false,
+									'.wpsg_tf($oProduct->getPrice()).'
+								]);
+							</script>
+						';
+
+					}
+
 				} 
 				else
@@ -296,19 +418,97 @@
 				echo '<script type="text/javascript">';
 
-				foreach ($done_view['basket']['produkte'] as $k => $p) 
-				{
-
-					echo '_paq.push(["addEcommerceItem", "'.wpsg_hspc($p['id']).'", "'.wpsg_hspc($p['name']).'", "", '.wpsg_tf($p['preis']).', '.wpsg_hspc($p['menge']).']);';
-
-				}
-
-				echo '_paq.push(["trackEcommerceOrder", 
-					"BestellNr.: '.$done_view['o_id'].'", 
-					'.wpsg_tf($done_view['basket']['sum']['preis_gesamt_brutto']).', 
-					'.wpsg_tf($done_view['basket']['sum']['preis_brutto']).',
-					'.wpsg_tf($done_view['basket']['sum']['mwst']).',
-					'.wpsg_tf($done_view['basket']['sum']['preis_shipping_brutto']).',
-					'.wpsg_tf($done_view['basket']['sum']['preis_rabatt_brutto']).'
-				]);';
+					// OLD - Wurde, bevor "Warenkorbtracking" integriert wurde, benötigt fÌr "eCommerce Tracking"
+					// foreach ($done_view['basket']['produkte'] as $k => $p) 
+					// {
+
+					// 	$oProduct = wpsg_product::getInstance($p['id']);
+
+					// 	if ($this->shop->hasMod('wpsg_mod_produktartikel')) 
+					// 	{
+
+					// 		$categoryID = $oProduct->getPostID();
+					// 		$terms = get_the_terms($categoryID, get_taxonomies());
+
+					// 		if ($terms) 
+					// 		{
+
+					// 			$termNames = array(); 
+
+					// 			foreach ($terms as $term) $termNames[] = $term->name;
+
+					// 			$termNames = array_slice($termNames, 0, 5); // Matomo API Limitierung - max. 5 Kategorien
+
+					// 			$arCategoryName = json_encode($termNames);
+
+					// 		}
+
+					// 		if(!empty($arCategoryName)) 
+					// 		{
+
+					// 			echo '_paq.push(["addEcommerceItem", 
+					// 				"'.wpsg_hspc($p['id']).'", 
+					// 				"'.wpsg_hspc($p['name']).'", 
+					// 				'.$arCategoryName.', 
+					// 				'.wpsg_tf($p['preis']).', 
+					// 				'.wpsg_hspc($p['menge']).'
+					// 			]);';
+
+					// 		} 
+					// 		else 
+					// 		{
+								
+					// 			echo '_paq.push(["addEcommerceItem", 
+					// 				"'.wpsg_hspc($p['id']).'", 
+					// 				"'.wpsg_hspc($p['name']).'", 
+					// 				false, 
+					// 				'.wpsg_tf($p['preis']).', 
+					// 				'.wpsg_hspc($p['menge']).'
+					// 			]);';
+
+					// 		}
+
+					// 	} 
+					// 	else
+					// 	{
+
+					// 		echo '_paq.push(["addEcommerceItem", 
+					// 			"'.wpsg_hspc($p['id']).'", 
+					// 			"'.wpsg_hspc($p['name']).'", 
+					// 			false, 
+					// 			'.wpsg_tf($p['preis']).', 
+					// 			'.wpsg_hspc($p['menge']).'
+					// 		]);';
+
+					// 	}
+
+					// }
+
+					if ($this->shop->hasMod('wpsg_mod_discount'))
+					{
+
+						echo '_paq.push(["trackEcommerceOrder", 
+							"BestellNr.: '.$done_view['o_id'].'", 
+							'.wpsg_tf($done_view['basket']['sum']['preis_gesamt_brutto']).', 
+							'.wpsg_tf($done_view['basket']['sum']['preis_brutto']).',
+							'.wpsg_tf($done_view['basket']['sum']['mwst']).',
+							'.wpsg_tf($done_view['basket']['sum']['preis_shipping_brutto']).',
+							'.wpsg_tf($done_view['basket']['sum']['preis_rabatt_brutto']).'
+						]);';
+
+					} 
+					else
+					{
+
+						echo '_paq.push(["trackEcommerceOrder", 
+							"BestellNr.: '.$done_view['o_id'].'", 
+							'.wpsg_tf($done_view['basket']['sum']['preis_gesamt_brutto']).', 
+							'.wpsg_tf($done_view['basket']['sum']['preis_brutto']).',
+							'.wpsg_tf($done_view['basket']['sum']['mwst']).',
+							'.wpsg_tf($done_view['basket']['sum']['preis_shipping_brutto']).',
+							false
+						]);';
+
+					}
+
 				echo '</script>';
 
@@ -333,5 +533,5 @@
 			// https://matomo.org/faq/reports/implement-event-tracking-with-matomo/
 			
-			if ($target_id > 0) echo '<script type="text/javascript"> _paq.push(["trackGoal", <?php echo $target_id; ?>]); </script>';
+			if ($target_id > 0) echo '<script type="text/javascript"> _paq.push(["trackGoal", '.$target_id.']); </script>';
 			
 		} // private function trackTarget($target_id)
@@ -356,38 +556,31 @@
 			
 			if (!$this->usePiwik()) return false;
-			
-			$url = $this->shop->get_option('wpsg_mod_statistics_piwik_url');
-			
-			echo '
-				<script type="text/javascript">
-					var protocol = document.location.protocol;
-					var pkBaseURL = protocol + "//piwik.maennchen1.de/";
-					document.write(unescape("%3Cscript src=\'" + pkBaseURL + "matomo.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-				</script>
-			';
-			
-			if ($this->shop->get_option('wpsg_mod_statistics_piwik_generel') == '1')
-			{
-
+
+			echo '<script type="text/javascript"> window._paq = []; </script>';
+
+			if ($this->shop->get_option('wpsg_mod_statistics_piwik_trackingcode') == '1')
+			{
+			
+				$url = $this->shop->get_option('wpsg_mod_statistics_piwik_url');
+				
 				echo '
-					<!-- Piwik Tracking Code -->				
+					<!-- Piwik Library -->	
 					<script type="text/javascript">
-						try {
-					
-							window._paq = [];
-							_paq.push(["trackPageView"]);
-							_paq.push(["enableLinkTracking"]);
-							_paq.push(["setTrackerUrl", pkBaseURL + "matomo.php"]);
-							_paq.push(["setSiteId", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').']);
-
-						} catch(err) { }
+
+						var protocol = document.location.protocol;
+						var pkBaseURL = protocol + "//'.$url.'/";
+
+						var scriptElement = document.createElement("script");
+						scriptElement.type = "text/javascript";
+						scriptElement.src = unescape(pkBaseURL + "matomo.js");
+
+						var firstScriptElement = document.getElementsByTagName("script")[0];
+						var parentElement = firstScriptElement.parentNode;
+						parentElement.appendChild(scriptElement);
+
 					</script>
-					<!-- End Piwik Tracking Code -->
+					<!-- End Piwik Library -->	
 				';
-				
-			}
-			else
-			{
-				
+
 				echo '
 					<!-- Piwik Tracking Code -->				
@@ -395,11 +588,28 @@
 						try {
 						
-							window._paq = [];
 							_paq.push(["setTrackerUrl", pkBaseURL + "matomo.php"]);
 							_paq.push(["setSiteId", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').']);
-	
+
 						} catch(err) { }
 					</script>
 					<!-- End Piwik Tracking Code -->
+				';
+
+			}
+			
+			if ($this->shop->get_option('wpsg_mod_statistics_piwik_generel') == '1')
+			{
+
+				echo '
+					<!-- Piwik Protokollierung -->				
+					<script type="text/javascript">
+						try {
+
+							_paq.push(["trackPageView"]);
+							_paq.push(["enableLinkTracking"]);
+
+						} catch(err) { }
+					</script>
+					<!-- End Piwik Protokollierung -->
 				';
 				
@@ -806,12 +1016,14 @@
 		public function settings_save() {
 			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_trackingcode', $_REQUEST['wpsg_mod_statistics_piwik_trackingcode'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_statistics_piwik_url', $_REQUEST['wpsg_mod_statistics_piwik_url'], false, false, WPSG_SANITIZE_DOMAIN, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_SiteId', $_REQUEST['wpsg_mod_statistics_piwik_SiteId'], false, false, WPSG_SANITIZE_INT);
 			
 			$this->shop->update_option('wpsg_mod_statistics_piwik_generel', $_REQUEST['wpsg_mod_statistics_piwik_generel'], false, false, WPSG_SANITIZE_CHECKBOX);
-			$this->shop->update_option('wpsg_mod_statistics_piwik_SiteId', $_REQUEST['wpsg_mod_statistics_piwik_SiteId'], false, false, WPSG_SANITIZE_INT);
 			$this->shop->update_option('wpsg_mod_statistics_piwik_ecommerce', $_REQUEST['wpsg_mod_statistics_piwik_ecommerce'], false, false, WPSG_SANITIZE_CHECKBOX);
 			
 			$this->shop->update_option('wpsg_mod_statistics_piwik_productView', $_REQUEST['wpsg_mod_statistics_piwik_productView'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_statistics_piwik_categoryView', $_REQUEST['wpsg_mod_statistics_piwik_categoryView'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_basketdata', $_REQUEST['wpsg_mod_statistics_piwik_basketdata'], false, false, WPSG_SANITIZE_CHECKBOX);
 			
 			$this->shop->update_option('wpsg_mod_statistics_piwik_basket', $_REQUEST['wpsg_mod_statistics_piwik_basket'], false, false, WPSG_SANITIZE_CHECKBOX);
@@ -952,4 +1164,5 @@
 				'wpsg_mod_statistics_piwik_productView',
 				'wpsg_mod_statistics_piwik_categoryView',
+				'wpsg_mod_statistics_piwik_basketdata',
 				'wpsg_mod_statistics_piwik_basket', 
 				'wpsg_mod_statistics_piwik_checkout', 
Index: /views/mods/mod_statistics/settings_edit.phtml
===================================================================
--- /views/mods/mod_statistics/settings_edit.phtml	(revision 8308)
+++ /views/mods/mod_statistics/settings_edit.phtml	(revision 8309)
@@ -4,5 +4,5 @@
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Auswertung Bestellstatus', 'wpsg'); ?></a></li>
-        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Piwik', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Matomo', 'wpsg'); ?></a></li>
         <li role="presentation"><a href="#tab3" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Google', 'wpsg'); ?></a></li>
         <li role="presentation"><a href="#tab4" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Social Media', 'wpsg'); ?></a></li>
@@ -47,33 +47,121 @@
 			<br/>
 			
-			<?php echo __('Ermöglicht die Integration des Trackintools "Piwik".', 'wpsg'); ?>
+			<?php echo __('Ermöglicht die Integration des Trackintools "Matomo".', 'wpsg'); ?>
 			
 			<br/><br/>
 		
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_url', __('URL zur Piwik Installation', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_url'), array('hint' => __('Ohne Protokoll, Beispiel: piwik.domain.de', 'wpsg'))); ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_trackingcode', __('Trackingcode einbinden', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_trackingcode')); ?>
+			<div id="wpsg_mod_statistik_tracking_layer" style="display:none;">
+				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_url', __('URL zur Matomo Installation', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_url'), array('hint' => __('Ohne Protokoll, Beispiel: matomo.domain.de', 'wpsg'))); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_SiteId', __('Matomo Seiten ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_SiteId'), array('help' => 'wpsg_mod_statistics_piwik_SiteId')); ?>
+			</div>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_generel', __('Allgemeine Protokollierung', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_generel')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_SiteId', __('Piwik Seiten ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_SiteId'), array('help' => 'wpsg_mod_statistics_piwik_SiteId')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_ecommerce', __('KÀufe (eCommerce) tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_ecommerce')); ?>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_productView', __('Produkte tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_productView')); ?>
 			<?php if ($this->hasMod('wpsg_mod_produktartikel')) echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_categoryView', __('Produktkategorien tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_categoryView')); ?>
-			<br />
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_basketdata', __('Warenkorbdaten tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_basketdata')); ?>
+			
+			<br /><br />
+
+			<strong><?php echo __('Matomo Goals tracken:', 'wpsg'); ?></strong>
+			
+			<br />
+
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_basket', __('Warenkorb tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_basket')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_basket_target', __('Ziel ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_basket_target')); ?>
+			<div id="wpsg_mod_statistics_piwik_basket_layer" style="display: none;">
+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_basket_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_basket_target')); ?>
+			</div>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_checkout', __('Checkout tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout_target', __('Ziel ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout_target')); ?>
+			<div id="wpsg_mod_statistics_piwik_checkout_layer" style="display: none;">
+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout_target')); ?>
+			</div>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_checkout2', __('Checkout2 tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout2_target', __('Ziel ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2_target')); ?>
+			<div id="wpsg_mod_statistics_piwik_checkout2_layer" style="display: none;">
+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_checkout2_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_checkout2_target')); ?>
+			</div>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_overview', __('Overview tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_overview_target', __('Ziel ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview_target')); ?>
+			<div id="wpsg_mod_statistics_piwik_overview_layer" style="display: none;">
+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_overview_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_overview_target')); ?>
+			</div>
 			<br />
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_done', __('Done tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_done_target', __('Ziel ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done_target')); ?>
-			<div class="wpsg_clearer"></div>
-		</div>
+			<div id="wpsg_mod_statistics_piwik_done_layer" style="display: none;">
+			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_piwik_done_target', __('Matomo ID', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_done_target')); ?>
+			</div>
+
+			<div class="wpsg_clearer"></div>
+		</div>
+
+		<script>
+
+			document.addEventListener("DOMContentLoaded", function() {
+
+				var trackingCheckbox = document.getElementById('wpsg_mod_statistics_piwik_trackingcode');
+				var trackingDiv = document.getElementById('wpsg_mod_statistik_tracking_layer');
+
+				var basketCheckbox = document.getElementById("wpsg_mod_statistics_piwik_basket");
+				var basketDiv = document.getElementById("wpsg_mod_statistics_piwik_basket_layer");
+
+				var checkoutCheckbox = document.getElementById("wpsg_mod_statistics_piwik_checkout");
+				var checkoutDiv = document.getElementById("wpsg_mod_statistics_piwik_checkout_layer");
+
+				var checkout2Checkbox = document.getElementById("wpsg_mod_statistics_piwik_checkout2");
+				var checkout2Div = document.getElementById("wpsg_mod_statistics_piwik_checkout2_layer");
+
+				var overviewCheckbox = document.getElementById("wpsg_mod_statistics_piwik_overview");
+				var overviewDiv = document.getElementById("wpsg_mod_statistics_piwik_overview_layer");
+
+				var doneCheckbox = document.getElementById("wpsg_mod_statistics_piwik_done");
+				var doneDiv = document.getElementById("wpsg_mod_statistics_piwik_done_layer");
+
+
+				function toggleDivVisibility(checkbox, div) 
+				{
+
+					if (checkbox.checked) div.style.display = "block";
+					else div.style.display = "none";
+
+				}
+
+				// Event Listener fÃŒr die Checkboxen
+				trackingCheckbox.addEventListener("change", function() {
+				toggleDivVisibility(trackingCheckbox, trackingDiv);
+				});
+
+				basketCheckbox.addEventListener("change", function() {
+				toggleDivVisibility(basketCheckbox, basketDiv);
+				});
+
+				checkoutCheckbox.addEventListener("change", function() {
+				toggleDivVisibility(checkoutCheckbox, checkoutDiv);
+				});
+
+				checkout2Checkbox.addEventListener("change", function() {
+				toggleDivVisibility(checkout2Checkbox, checkout2Div);
+				});
+
+				overviewCheckbox.addEventListener("change", function() {
+				toggleDivVisibility(overviewCheckbox, overviewDiv);
+				});
+
+				doneCheckbox.addEventListener("change", function() {
+				toggleDivVisibility(doneCheckbox, doneDiv);
+				});
+
+				// ÜberprÃŒfen und Initialisieren des Anfangszustands der Checkboxen
+				toggleDivVisibility(trackingCheckbox, trackingDiv);
+				toggleDivVisibility(basketCheckbox, basketDiv);
+				toggleDivVisibility(checkoutCheckbox, checkoutDiv);
+				toggleDivVisibility(checkout2Checkbox, checkout2Div);
+				toggleDivVisibility(overviewCheckbox, overviewDiv);
+				toggleDivVisibility(doneCheckbox, doneDiv);
+			});
+
+		</script>
 		
 		<div role="tabpanel" class="tab-pane" id="tab3">