diff options
Diffstat (limited to 'views/mods/mod_request')
| -rw-r--r-- | views/mods/mod_request/requestmail.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_request/requestmail_html.phtml | 1 | ||||
| -rw-r--r-- | views/mods/mod_request/requestpage.phtml | 31 |
3 files changed, 28 insertions, 6 deletions
diff --git a/views/mods/mod_request/requestmail.phtml b/views/mods/mod_request/requestmail.phtml index 0356a2a..2d619ca 100644 --- a/views/mods/mod_request/requestmail.phtml +++ b/views/mods/mod_request/requestmail.phtml @@ -99,7 +99,7 @@ <?php echo wpsg_pad_right(__('E-Mail', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['email']), 46); ?>
<?php echo wpsg_pad_right(__('Fax', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['fax']), 46); ?>
<?php echo wpsg_pad_right(__('Tel.', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['tel']), 46); ?>
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['strasse']), 46); ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['strasse']).rtrim(' '.$this->view['requestlist']['customer']['nr']), 46); ?>
<?php echo wpsg_pad_right(__('PLZ', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['plz']), 46); ?>
<?php echo wpsg_pad_right(__('Ort', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['ort']), 46); ?>
<?php echo wpsg_pad_right(__('UStIdNr.', 'wpsg').': ', 30); ?><?php echo wpsg_pad_left(wpsg_getStr($this->view['requestlist']['customer']['ustidnr']), 46); ?>
diff --git a/views/mods/mod_request/requestmail_html.phtml b/views/mods/mod_request/requestmail_html.phtml index daf3061..3bd016e 100644 --- a/views/mods/mod_request/requestmail_html.phtml +++ b/views/mods/mod_request/requestmail_html.phtml @@ -154,6 +154,7 @@ 'fax' => __('Fax', 'wpsg'),
'tel' => __('Tel.', 'wpsg'),
'strasse' => __('Straße', 'wpsg'),
+ 'nr' => __('Hausnummer', 'wpsg'),
'plz' => __('PLZ', 'wpsg'),
'ort' => __('Ort', 'wpsg'),
'ustidnr' => __('UStIdNr.', 'wpsg')
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml index cc37a27..fa24449 100644 --- a/views/mods/mod_request/requestpage.phtml +++ b/views/mods/mod_request/requestpage.phtml @@ -64,7 +64,7 @@ <?php /* Copy&Paste für das Eingabefeld "E-Mail-Wiederholung sperren */ ?>
window.onload = function() {
- const email2 = document.getElementById('email2');
+ var email2 = document.getElementById('email2');
email2.onpaste = function(e) {
@@ -349,10 +349,31 @@ </div>
<div class="wpsg_checkoutblock" id="wpsg_strasse">
- <label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
- <?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
- </label>
- <input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />
+
+ <?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+
+ <div class="wpsg_checkoutblock" id="wpsg_streetnr">
+
+ <label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?>
+ <?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />
+ </label>
+ <label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?>
+ <?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[request][customer][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['requestlist']['customer']['nr'])); ?>" />
+ </label>
+
+ </div>
+
+ <?php } else { ?>
+
+ <label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
+ <?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ </label>
+ <input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />
+
+ <?php } ?>
+
</div>
<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">
|