summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorDaniel Schmitzer <noreply@maennchen1.de>2019-03-05 05:57:09 +0000
committerDaniel Schmitzer <noreply@maennchen1.de>2019-03-05 05:57:09 +0000
commit1487b11d583c90cfad0aa04e71775d8efe9929e0 (patch)
tree869e77621ec10c91b43ebc51e3994150c87991a8 /views
parente25384d44e3a91c8b0cda024633f5248611d1d97 (diff)
- Ausrichtung Betreff Vorkasse / Task #645
- Warnungen git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7329 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views')
-rw-r--r--views/mailtemplates/html/customer.phtml1
-rw-r--r--views/mailtemplates/html/logo.phtml7
-rw-r--r--views/mods/mod_prepayment/mail_html.phtml2
3 files changed, 8 insertions, 2 deletions
diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index f016d78..181fbcc 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -1,3 +1,4 @@
+
<?php if ($this->hasMod('wpsg_mod_shippingadress') && $this->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => $this->view['basket']['checkout']['k_id'], 'o_id' => $this->view['o_id']))) { ?>
<h2><?php echo __('Rechnungsadresse:', 'wpsg'); ?></h2>
diff --git a/views/mailtemplates/html/logo.phtml b/views/mailtemplates/html/logo.phtml
index a080084..c4ecb8d 100644
--- a/views/mailtemplates/html/logo.phtml
+++ b/views/mailtemplates/html/logo.phtml
@@ -4,6 +4,9 @@
</style>
<?php
+
+ $logoPath = '';
+
if($this->get_option('wpsg_email_logo_activated'))
{
@@ -26,8 +29,10 @@
}
?>
-<?php if(file_exists($logoPath) && $this->get_option('wpsg_email_logo_activated')) { ?>
+<?php if (file_exists($logoPath) && $this->get_option('wpsg_email_logo_activated')) { ?>
+
<?php echo "<div class='email-logo $logoWatermark' style='text-align:$logoAlignment; opacity:$logoTransparency;'>" ?>
<?php echo "<img alt='Emaillogo' class='email-logo-$logoAlignment' src='$logoBase64'>"; ?>
<?php echo "</div>"; ?>
+
<?php } ?>
diff --git a/views/mods/mod_prepayment/mail_html.phtml b/views/mods/mod_prepayment/mail_html.phtml
index 6706ad1..b1b35a4 100644
--- a/views/mods/mod_prepayment/mail_html.phtml
+++ b/views/mods/mod_prepayment/mail_html.phtml
@@ -28,6 +28,6 @@
</tr>
<tr>
<td><?php echo __('Betreff', 'wpsg'); ?>:</td>
- <td><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
+ <td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
</tr>
</table> \ No newline at end of file