diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2019-08-20 10:47:08 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2019-08-20 10:47:08 +0000 |
| commit | d916544f52acd93d7d5272508b5c9e6845189840 (patch) | |
| tree | d71fbfe838f0f4a758f19c7c2bdf0b0eb6517e94 | |
| parent | 7ed5d761d3bef75151e1eb583e4afd52f0d3caf1 (diff) | |
- Validierung E-Mail Konfiguration (RegEx muss noch ergänzt werden)
- Neuer Zahlbetrag in HTML Mails
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7506 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rw-r--r-- | views/mailtemplates/adminmail.phtml | 4 | ||||
| -rw-r--r-- | views/mailtemplates/html/customer.phtml | 4 | ||||
| -rw-r--r-- | views/mailtemplates/kundenmail.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/mail_order_end_html.phtml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml index 4342841..c2aa4ac 100644 --- a/views/mailtemplates/adminmail.phtml +++ b/views/mailtemplates/adminmail.phtml @@ -6,7 +6,7 @@ $this->htmlMail = false;
- //wpsg_debug($this->view);
+ wpsg_debug($this->view);
?><?php echo __('Hallo Administrator,', 'wpsg'); ?>
@@ -60,7 +60,7 @@ <?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(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
<?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
<?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml index 9832fba..89ff0bd 100644 --- a/views/mailtemplates/html/customer.phtml +++ b/views/mailtemplates/html/customer.phtml @@ -108,7 +108,7 @@ </tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('E-Mail Adresse', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><a href="mailto:<?php echo wpsg_hspc($this->view['basket']['checkout']['email']); ?>"><?php echo wpsg_hspc($this->view['basket']['checkout']['email']); ?></a></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><a href="mailto:<?php echo wpsg_hspc($this->view['basket']['arCalculation']['sum']['topay_brutto']); ?>"><?php echo wpsg_hspc($this->view['basket']['checkout']['email']); ?></a></td>
</tr>
</table>
@@ -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']['arCalculation']['topay_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']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
</tr>
<?php if ($this->get_option('wpsg_kleinunternehmer') != '1') { ?>
<tr>
diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml index dababfc..5564e31 100644 --- a/views/mailtemplates/kundenmail.phtml +++ b/views/mailtemplates/kundenmail.phtml @@ -63,7 +63,7 @@ <?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(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
+<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
<?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
<?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
diff --git a/views/mods/mod_gutschein/mail_order_end_html.phtml b/views/mods/mod_gutschein/mail_order_end_html.phtml index fc543aa..6f81e70 100644 --- a/views/mods/mod_gutschein/mail_order_end_html.phtml +++ b/views/mods/mod_gutschein/mail_order_end_html.phtml @@ -45,6 +45,6 @@ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_mwst"></td>
<?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"><strong><?php echo wpsg_ff($this->view['basket']['arCalculation']['topay_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
+ <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><strong><?php echo wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>
</tr>
\ No newline at end of file |