Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 6665)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 6666)
@@ -352,4 +352,29 @@
 
 		} // public function loadProduktArray(&$produkt_data)
+
+        public function mail_row($index, $produkt)
+        {
+
+            if (!preg_match('/pv_(.*)/', $produkt['id'])) return;
+
+            $this->shop->view['variante'] = $this->getVariantenInfoArray($produkt['id']);
+            $this->shop->view['i'] = $index;
+
+            if ($this->shop->htmlMail === true) $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/mail_row_html.phtml');
+            else $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/mail_row.phtml');
+
+        } // public function mail_row($index, $produkt)
+
+        public function order_view_row(&$p, $i)
+        {
+
+            if (!preg_match('/pv_(.*)/', $p['id'])) return;
+
+            $this->shop->view['variante'] = $this->getVariantenInfoArray($p['id']);
+            $this->shop->view['i'] = $i;
+
+            $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/order_view_row.phtml');
+
+        } // public function order_view_row(&$p, $i)
 
         public function getProductKeyFromRequest(&$product_key, $product_id, $form_data)
@@ -2040,5 +2065,4 @@
             //die();
 		}	// public function produkt_save(&$produkt_id)
-		
 
 	} // class wpsg_mod_productvariants extends wpsg_mod_basic
Index: /views/mods/mod_productvariants/mail_row.phtml
===================================================================
--- /views/mods/mod_productvariants/mail_row.phtml	(revision 6666)
+++ /views/mods/mod_productvariants/mail_row.phtml	(revision 6666)
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * Template fÃŒr die Variantenintegration in die Kunden- und Adminmail
+ */
+
+?><?php echo wpsg_pad_left(__('Variante:', 'wpsg').' ', 15); ?><?php echo $this->view['variante']['key']; ?>
Index: /views/mods/mod_productvariants/mail_row_html.phtml
===================================================================
--- /views/mods/mod_productvariants/mail_row_html.phtml	(revision 6666)
+++ /views/mods/mod_productvariants/mail_row_html.phtml	(revision 6666)
@@ -0,0 +1,16 @@
+<?php
+
+    /**
+    * Template fÃŒr die Variantenintegration in die HTML Kunden- und Adminmail
+    */
+
+    $i = $this->view['i'];
+
+?>
+<tr class="productrow productrow2 <?php echo ((($i % 2) == 0)?'productrow_odd':'productrow_even'); ?>">
+    <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos">&nbsp;</td>
+    <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo __('Variante', 'wpsg'); ?>:</td>
+    <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
+        <?php echo wpsg_hspc($this->view['variante']['key']); ?>
+    </td>
+</tr>
Index: /views/mods/mod_productvariants/order_view_row.phtml
===================================================================
--- /views/mods/mod_productvariants/order_view_row.phtml	(revision 6666)
+++ /views/mods/mod_productvariants/order_view_row.phtml	(revision 6666)
@@ -0,0 +1,18 @@
+<?php
+
+    /**
+     * Anzeige des Variantennamens in der Bestellverwaltung
+     */
+
+    $i = $this->view['i'];
+
+?>
+
+<tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+    <td class="wpsg_cell_name">
+        <?php echo __('Variante', 'wpsg'); ?>:
+    </td>
+    <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?4:3); ?>">
+        <?php echo $this->view['variante']['key']; ?>
+    </td>
+</tr>