diff options
Diffstat (limited to 'views/warenkorb')
| -rw-r--r-- | views/warenkorb/checkout.phtml | 33 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 6 |
2 files changed, 29 insertions, 10 deletions
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml index 64a3ef3..9a26161 100644 --- a/views/warenkorb/checkout.phtml +++ b/views/warenkorb/checkout.phtml @@ -63,7 +63,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) {
@@ -186,12 +186,31 @@ <?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <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[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />
- </div>
+
+ <?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:', 'wspg'); ?>
+ <?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[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['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[checkout][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['nr'])); ?>" />
+ </label>
+ </div>
+
+ <?php } else { ?>
+
+ <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[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />
+ </div>
+
+ <?php } ?>
+
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index d0ee170..3dd40c3 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -69,7 +69,7 @@ <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+ <?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?>
@@ -104,7 +104,7 @@ <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
+ <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse'].rtrim(' '.($this->view['basket']['checkout']['shipping_nr']))); ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?>
@@ -145,7 +145,7 @@ <?php echo $this->view['basket']['checkout']['name']; ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+ <?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?>
|