diff options
Diffstat (limited to 'views/mailtemplates/html')
| -rw-r--r-- | views/mailtemplates/html/customer.phtml | 2 | ||||
| -rw-r--r-- | views/mailtemplates/html/order.phtml | 32 |
2 files changed, 21 insertions, 13 deletions
diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml index 60d1b2b..9832fba 100644 --- a/views/mailtemplates/html/customer.phtml +++ b/views/mailtemplates/html/customer.phtml @@ -131,7 +131,7 @@ </tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Rechnungsbetrag', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><strong><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><strong><?php echo wpsg_ff($this->view['basket']['arCalculation']['topay_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
</tr>
<?php if ($this->get_option('wpsg_kleinunternehmer') != '1') { ?>
<tr>
diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml index 0b5bfbd..efc3e19 100644 --- a/views/mailtemplates/html/order.phtml +++ b/views/mailtemplates/html/order.phtml @@ -1,4 +1,9 @@ -<div class="baskettable_wrap">
+<?php
+
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
+
+?><div class="baskettable_wrap">
<table class="baskettable" cellpadding="2" cellspacing="0" style="cell-padding:4px;">
<tr class="head">
<th valign="middle" style="cell-padding:4px; padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"><?php echo __('Pos', 'wpsg'); ?></th>
@@ -69,18 +74,20 @@ </tr>
<?php } ?>
<?php } ?>
- <?php if (isset($this->view['basket']['gs'])) { ?>
- <tr class="voucherrow">
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"><?php echo $i + 1; ?>.</td>
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $this->view['basket']['gs']['code']); ?></td>
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"><?php echo wpsg_ff($this->view['basket']['gs']['value'], (($this->view['basket']['gs']['calc'] == 'w')?$this->get_option('wpsg_currency'):'%')); ?></td>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+ <?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>
+ <?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
+ <tr class="voucherrow">
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"> <?php print_r($gs); ?></td>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $gs['code']); ?></td>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"><?php echo wpsg_ff($gs['set'], ((strpos($gs['set'], '%') !== false)?'%':$this->get_option('wpsg_currency'))); ?></td>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_mwst"><?php echo __('Anteilig', 'wpsg'); ?></td>
+ <?php } ?>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">1</td>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency')); ?></td>
+ </tr>
<?php } ?>
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">1</td>
- <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
- </tr>
- <?php } ?>
+ <?php } ?>
<tr class="spacer">
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="td_bt" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'6':'5'); ?>"> </td>
</tr>
@@ -188,6 +195,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"><strong><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
</tr>
+ <?php $this->callMods('mail_order_end', [$this->view['basket']['arCalculation'], true]); ?>
</table>
</div>
|