Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 5753)
+++ /lib/filter_functions.inc.php	(revision 5759)
@@ -85,5 +85,5 @@
 				echo '<div id="wpsg_lizenz" style="display:none; margin-top:10px;">';
 				echo '<input type="file" name="wpsg_licence_file" />';
-				echo '<input type="submit" class="button" value="'.__('Lizenz aktivieren.', 'wpsg').'" name="wpsg_insertlicence_submit" />';
+				echo '<input type="submit" onclick="jQuery(this).parents(\'tr\').prev().find(\'input\').prop(\'checked\', true);" class="button" value="'.__('Lizenz aktivieren.', 'wpsg').'" name="wpsg_insertlicence_submit" />';
 				echo '</div>';
 				
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 5753)
+++ /model/wpsg_product.class.php	(revision 5759)
@@ -411,5 +411,5 @@
 		{
 			
-			list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
 				
 			$strQuery = "
@@ -434,5 +434,5 @@
 		{
 		
-			list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
 			
 			$strQuery = "
Index: /mods/wpsg_mod_keygen.class.php
===================================================================
--- /mods/wpsg_mod_keygen.class.php	(revision 5753)
+++ /mods/wpsg_mod_keygen.class.php	(revision 5759)
@@ -8,5 +8,5 @@
 		
 		var $id = 14;		
-		var $lizenz = 3;
+		var $lizenz = 0;
 		var $inline = true;
 		
Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 5753)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 5759)
@@ -235,6 +235,10 @@
 		public function productTemplate($product_data)
 		{
-
-
+			
+			$arVariants = $this->getVariants($product_data['product_id'], true, true, true);
+			
+			$this->shop->view['wpsg_mod_productvariants']['arVariants'] = $arVariants;
+			
+			$this->shop->render(WPSG_PATH_VIEW.'mods/mod_productvariants/productTemplate.phtml');
 
 		} // public function productTemplate($product_key)
@@ -477,15 +481,21 @@
 			$strQueryJOIN = "";
 			$strQueryWHERE = "";
+			$strQueryHAVING = "";
 						
 			if (wpsg_isSizedArray($arProductFilter))
 			{
 				
-				list($strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter);
-				
+				//return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER);
+				//list($strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter);
+				
+				list($strQueryP_SELECT, $strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter);
+
 				$strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_PRODUCTS_VARIATION."` AS PV ON (PV.`variation_id` = VI.`id`) ";
 				$strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_PRODUCTS."` AS P ON (P.`id` = PV.`product_id`) ";
 			
+				$strQuerySELECT .= $strQueryP_SELECT;
 				$strQueryJOIN .= $strQueryP_JOIN;
 				$strQueryWHERE .= $strQueryP_WHERE;
+				$strQueryHAVING .= $strQueryP_HAVING;
 						
 			}
@@ -511,4 +521,7 @@
 				GROUP BY
 					VI.`id`
+				HAVING 
+					1
+					".$strQueryHAVING."
 				ORDER BY
 					VI.`pos`
Index: /mods/wpsg_mod_productview.class.php
===================================================================
--- /mods/wpsg_mod_productview.class.php	(revision 5753)
+++ /mods/wpsg_mod_productview.class.php	(revision 5759)
@@ -271,8 +271,8 @@
 				
 				$this->shop->view['wpsg_mod_productview']['cols'] = 3;
-				$this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-0';
-				$this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-4';
-				$this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-8';
-				$this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-4';
+				$this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-0 col-md-0';
+				$this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-4 col-md-6';
+				$this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-8 col-md-6';
+				$this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-4 col-md-4';
 								
 			}
@@ -281,8 +281,8 @@
 				
 				$this->shop->view['wpsg_mod_productview']['cols'] = 4;
-				$this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-3';
-				$this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-3';
-				$this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-6';
-				$this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-3';
+				$this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-3 col-md-3';
+				$this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-3 col-md-3';
+				$this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-6 col-md-6';
+				$this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-3 col-lg-6';
 				
 			}
Index: /mods/wpsg_mod_produktattribute.class.php
===================================================================
--- /mods/wpsg_mod_produktattribute.class.php	(revision 5753)
+++ /mods/wpsg_mod_produktattribute.class.php	(revision 5759)
@@ -436,5 +436,5 @@
 			$strQueryJOIN = " LEFT JOIN `".WPSG_TBL_PRODUCTS."` AS P ON (P.`id` = AT.`p_id`) ";
 			
-			list($strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter);
+			list($strQueryP_SELECT, $strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter);
 					
 			$strQueryJOIN .= $strQueryP_JOIN;
Index: /views/mods/mod_productvariants/productTemplate.phtml
===================================================================
--- /views/mods/mod_productvariants/productTemplate.phtml	(revision 5759)
+++ /views/mods/mod_productvariants/productTemplate.phtml	(revision 5759)
@@ -0,0 +1,13 @@
+<?php
+
+    /**
+     * Integration der Variantenauswahl in die Produktverwaltung
+     */
+
+?>
+
+<?php foreach ($this->view['wpsg_mod_productvariants']['arVariants'] as $var) { ?>
+
+        
+    
+<?php } ?>