Index: /changelog
===================================================================
--- /changelog	(revision 7671)
+++ /changelog	(revision 7672)
@@ -334,2 +334,3 @@
 - Bugfix: Satollo Newslettereinstellungen sind wieder sichtbar
 - Bugfix: Sparkasse Internetkasse HASH Vergleich funktioniert wieder
+- Bugfix: HTML Mail blendet Zahlungskosten/Versandkosten optional aus wenn 0,-
Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 7671)
+++ /controller/wpsg_OrderController.class.php	(revision 7672)
@@ -1316,5 +1316,5 @@
 
 			$this->shop->view['oOrder'] = wpsg_order::getInstance($_REQUEST['edit_id']);
-
+			
 			$basket = new wpsg_basket();
 			$basket->initFromDB($this->shop->view['data']['id'], true);
@@ -1412,7 +1412,7 @@
 				)
 			);
-
+			
 			$this->shop->callMods('order_view', array($_REQUEST['edit_id'], &$this->shop->view['arSubAction']));
-
+			
 			$this->shop->view['arSubAction']['orderlog'] = array(
 				'title' => __('Bestellprotokoll', 'wpsg'),
Index: /lib/helper_functions.inc.php
===================================================================
--- /lib/helper_functions.inc.php	(revision 7671)
+++ /lib/helper_functions.inc.php	(revision 7672)
@@ -644,5 +644,5 @@
 	{
 		
-		$TC = new wpsg_ShopController();
+		$TC = new wpsg_SystemController();
 		
 		$TC->view['field_name'] = $field_name;
@@ -659,5 +659,5 @@
 	{
 		
-		$TC = new wpsg_ShopController();
+		$TC = new wpsg_SystemController();
 		
 		$TC->view['field_name'] = $field_name;
Index: /mods/wpsg_mod_coverletter.class.php
===================================================================
--- /mods/wpsg_mod_coverletter.class.php	(revision 7671)
+++ /mods/wpsg_mod_coverletter.class.php	(revision 7672)
@@ -108,5 +108,5 @@
 		 */
 		public function order_view($order_id, &$arSidebarArray) {
-			
+			 
 			$this->shop->view['mod_coverletter']['arCoverLetter'] = $this->db->fetchAssoc("
 				SELECT
Index: /views/mailtemplates/html/order.phtml
===================================================================
--- /views/mailtemplates/html/order.phtml	(revision 7671)
+++ /views/mailtemplates/html/order.phtml	(revision 7672)
@@ -111,5 +111,6 @@
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">&nbsp;</td>
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?></td>
-		</tr> 
+		</tr>
+		<?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
 		<tr class="shippingtotalrow">
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="2"><?php echo __('Versandkosten', 'wpsg'); ?>:</td>
@@ -127,4 +128,5 @@
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?></td>
 		</tr>
+		<?php } ?>
 		<?php if (wpsg_isSizedArray($this->view['basket']['shipping']['methods'])) { ?>
 		<?php foreach ($this->view['basket']['shipping']['methods'] as $shipping) { ?>
@@ -152,4 +154,5 @@
 		<?php } ?>
 		<?php } ?>
+		<?php if ($this->view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>
 		<tr class="paymenttotalrow">
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="2"><?php echo __('Zahlungskosten', 'wpsg'); ?>:</td>
@@ -167,4 +170,5 @@
 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?></td>
 		</tr>
+		<?php } ?>
 		<?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
 		<tr class="smallbuisnessrulerow">
Index: /views/order/view_orderlog.phtml
===================================================================
--- /views/order/view_orderlog.phtml	(revision 7671)
+++ /views/order/view_orderlog.phtml	(revision 7672)
@@ -5,6 +5,6 @@
      * Date: 06.08.2016
      * Time: 11:24
-     */
-
+     */ 
+ 
 ?>