diff options
| -rw-r--r-- | views/mailtemplates/html/kundenmail.phtml | 6 | ||||
| -rw-r--r-- | views/mailtemplates/kundenmail.phtml | 6 | ||||
| -rw-r--r-- | views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml | 10 | ||||
| -rw-r--r-- | views/mods/mod_prepayment/mail.phtml | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml index 63d6751..ba3b1ff 100644 --- a/views/mailtemplates/html/kundenmail.phtml +++ b/views/mailtemplates/html/kundenmail.phtml @@ -35,15 +35,13 @@ <?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>
+<?php if (wpsg_isSizedString($this->get_option("wpsg_ps_mailwiderruf"))) { ?>
<h3><?php echo __("Widerrufsbelehrung", "wpsg"); ?></h3>
-<?php if (wpsg_isSizedString($this->get_option("wpsg_ps_mailwiderruf"))) { ?>
<p><?php echo nl2br($this->get_option("wpsg_ps_mailwiderruf")); ?></p>
-<?php } else { ?>
-<?php echo __("...hier steht der Text zum Widerrufsrecht...", "wpsg"); ?>
-<?php } ?>
<h3><?php echo __("Ende der Widerrufsbelehrung", "wpsg"); ?></h3>
+<?php } ?>
<p><?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?></p>
diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml index 31193ec..3fc7275 100644 --- a/views/mailtemplates/kundenmail.phtml +++ b/views/mailtemplates/kundenmail.phtml @@ -101,15 +101,13 @@ <?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>
<?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>
+<?php if (trim($this->get_option("wpsg_ps_mailwiderruf")) != "") { ?>
-- <?php echo __("Widerrufsbelehrung", "wpsg"); ?> --
-<?php if (trim($this->get_option("wpsg_ps_mailwiderruf")) != "") { ?>
<?php echo $this->get_option("wpsg_ps_mailwiderruf"); ?>
-<?php } else { ?>
-<?php echo __("...hier steht der Text zum Widerrufsrecht...", "wpsg"); ?>
-<?php } ?>
-- <?php echo __("Ende der Widerrufsbelehrung", "wpsg"); ?> --
+<?php } ?>
<?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?>
diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml index 3b314d5..7762fe8 100644 --- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml +++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml @@ -110,9 +110,13 @@ echo __('Es gelten unsere Allgemeinen Geschäftsbedingungen (AGB).', 'wpsg')."\n\n";
echo $this->getURL(wpsg_ShopController::URL_AGB)."\n\n";
- echo '-- '.__('Widerrufsbelehrung', 'wpsg')." --\n\n";
- echo (($strRevocation !== '')?$strRevocation:__('...hier steht der Text zum Widerrufsrecht...', 'wpsg'))."\n\n";
- echo '-- '.__('Ende der Widerrufsbelehrung', 'wpsg')." --\n\n";
+ if ($strRevocation !== '') {
+
+ echo '-- '.__('Widerrufsbelehrung', 'wpsg')." --\n\n";
+ echo $strRevocation."\n\n";
+ echo '-- '.__('Ende der Widerrufsbelehrung', 'wpsg')." --\n\n";
+
+ }
echo __('Mit freundlichen Grüßen', 'wpsg')."\n\n";
echo __($this->get_option('wpsg_shopdata_name'), 'wpsg').' - '.__('Team', 'wpsg');
diff --git a/views/mods/mod_prepayment/mail.phtml b/views/mods/mod_prepayment/mail.phtml index 395ddeb..f437f74 100644 --- a/views/mods/mod_prepayment/mail.phtml +++ b/views/mods/mod_prepayment/mail.phtml @@ -13,4 +13,4 @@ <?php echo wpsg_pad_right(__('IBAN', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?>
<?php echo wpsg_pad_right(__('Bank', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?>
<?php echo wpsg_pad_right(__('BIC-/SWIFT-Code', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?>
-<?php echo wpsg_pad_right(__('Betreff: #1#', 'wpsg'), 35); ?><?php echo $this->view['mod_prepayment']['subject']; ?>
\ No newline at end of file +<?php echo wpsg_pad_right(__('Betreff', 'wpsg').':', 35); ?><?php echo $this->view['mod_prepayment']['subject']; ?>
\ No newline at end of file |