Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 5974)
+++ /controller/wpsg_AdminController.class.php	(revision 5979)
@@ -1344,4 +1344,44 @@
 		
 		} // public function discountDataAction()
+
+		/**
+		 * Wird aufgerufen wenn eine Mail an den Kunden gesendet werden soll
+		 */
+		public function sendMailAction()
+		{
+			//die('sendMail');
+			
+			$oid = 0;
+			$option = $this->shop->get_option('wpsg_preisangaben');
+			if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']);
+			
+			// Order-Daten sammeln und Tabelle neu generieren
+			$basket = new wpsg_basket();
+			$basket->initFromDB($oid, true);
+			$this->shop->view['basket'] = $basket->toArray(true);
+			
+			if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'send')
+			{
+
+				$temp = date("d.m.Y H:i:s", strtotime($basket->arCheckout['datum']));
+				//$temp = date("d.m.Y H:i:s", strtotime('2016-12-14'));
+				$this->shop->basket->initFromDB($_REQUEST['edit_id'], true);
+				$arBasket = $this->shop->basket->toArray(true);
+				
+				$this->shop->basket->sendOrderSaveMails($_REQUEST['edit_id'], $arBasket, true, false, false);
+				
+				$this->shop->addBackendMessage(wpsg_translate(__('Kundenmail wurde erfolgreich an #1# gesendet.', 'wpsg'), $basket->arCheckout['email']));
+				
+			}
+			
+			$this->shop->view['colspan'] = 3;
+			if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++;
+
+			$this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml');
+
+			exit;
+		
+		} // public function sendMailAction()
+		
 		
 		/**
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 5974)
+++ /mods/wpsg_mod_basic.class.php	(revision 5979)
@@ -1094,5 +1094,5 @@
 				}
 				
-				wpsg_addSet($arBasket['sum']['mwst'], $mwst_sum);
+				wpsg_addSet($arBasket['sum']['mwst'], $tax_sum);
 				
 				/* HR
Index: /views/mailtemplates/kundenmail.phtml
===================================================================
--- /views/mailtemplates/kundenmail.phtml	(revision 5974)
+++ /views/mailtemplates/kundenmail.phtml	(revision 5979)
@@ -60,5 +60,5 @@
 <?php echo wpsg_pad_right(__('Kundennummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['knr']; ?> 
 <?php echo wpsg_pad_right(__('Bestellnummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['onr']; ?> 
-<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?> 
+<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", strtotime($this->view['basket']['checkout']['datum'])); ?> 
 <?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> 
 <?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
Index: /views/order/view.phtml
===================================================================
--- /views/order/view.phtml	(revision 5974)
+++ /views/order/view.phtml	(revision 5979)
@@ -59,4 +59,7 @@
         <?php } ?>
 		
+        <a href="" id="LinkSendMail" onclick="return wpsg_sendMail(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-envelope"></span>&nbsp;
+	 	<?php echo __("Mail an Kunde", "wpsg"); ?>
+	 	</a><br />
 		
 		<div id='wpsg_kv_list'>
@@ -80,4 +83,22 @@
 <script type="text/javascript">/* <![CDATA[ */
 
+
+	/**
+	 * FÃŒgt einen neuen Rabatt hinzu (nur wenn keiner da ist)
+	 */	                                            	
+	function wpsg_sendMail(oid)
+	{
+		jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=sendMail&do=send&edit_id=' + oid + '&noheader=1',
+			success: function(data) {
+				jQuery('#wpsg_produkte_table').replaceWith(data);
+			}
+		} );
+	
+		return false;
+	
+	} // function wpsg_sendMail()
 
 	/**