diff options
Diffstat (limited to 'views/mailtemplates')
| -rw-r--r-- | views/mailtemplates/adminmail.phtml | 4 | ||||
| -rw-r--r-- | views/mailtemplates/html/customer.phtml | 4 | ||||
| -rw-r--r-- | views/mailtemplates/kundenmail.phtml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml index 4effc1e..4342841 100644 --- a/views/mailtemplates/adminmail.phtml +++ b/views/mailtemplates/adminmail.phtml @@ -18,7 +18,7 @@ <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?>
<?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?>
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?>
<?php } ?>
@@ -44,7 +44,7 @@ <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?>
<?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?>
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?>
<?php } ?>
diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml index 9e7e7c2..f016d78 100644 --- a/views/mailtemplates/html/customer.phtml +++ b/views/mailtemplates/html/customer.phtml @@ -12,7 +12,7 @@ </tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(_($this->view['basket']['checkout']['nr']??''))); ?></td>
</tr>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<tr>
@@ -81,7 +81,7 @@ </tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(($this->view['basket']['checkout']['nr']))); ?></td>
</tr>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<tr>
diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml index c754f59..fa79e40 100644 --- a/views/mailtemplates/kundenmail.phtml +++ b/views/mailtemplates/kundenmail.phtml @@ -21,7 +21,7 @@ <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?>
<?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?>
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>
<?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?>
@@ -47,7 +47,7 @@ <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?>
<?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?>
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse']; ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.$this->view['basket']['checkout']['nr']); ?>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?>
<?php } ?>
|