diff options
| -rw-r--r-- | views/mailtemplates/html/order.phtml | 6 | ||||
| -rw-r--r-- | views/order/view_orderlog.phtml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml index f134e2e..cb0f2de 100644 --- a/views/mailtemplates/html/order.phtml +++ b/views/mailtemplates/html/order.phtml @@ -110,7 +110,8 @@ <?php } ?>
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount"> </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>
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"> </td>
@@ -126,6 +127,7 @@ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount"> </td>
<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) { ?>
<tr class="shippingtotalrow shippingsubrow">
@@ -151,6 +153,7 @@ </tr>
<?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>
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"> </td>
@@ -166,6 +169,7 @@ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount"> </td>
<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">
<td style="padding:4px; line-height:100%; vertical-align:middle;" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') === '1')?'6':'5'); ?>">
diff --git a/views/order/view_orderlog.phtml b/views/order/view_orderlog.phtml index 79cd65d..d68ae85 100644 --- a/views/order/view_orderlog.phtml +++ b/views/order/view_orderlog.phtml @@ -4,8 +4,8 @@ * User: Daschmi (daschmi@daschmi.de)
* Date: 06.08.2016
* Time: 11:24
- */
-
+ */
+
?>
<?php echo wpsg_drawForm_AdminboxStart(__('Bestellprotokoll', 'wpsg')); ?>
|