summaryrefslogtreecommitdiff
path: root/views/mods
diff options
context:
space:
mode:
Diffstat (limited to 'views/mods')
-rw-r--r--views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml4
-rw-r--r--views/mods/mod_deliverynote/deliverynote_pdf.phtml2
-rw-r--r--views/mods/mod_kundenverwaltung/edit.phtml6
-rw-r--r--views/mods/mod_kundenverwaltung/mail_register.phtml2
-rw-r--r--views/mods/mod_kundenverwaltung/mail_register_html.phtml2
-rw-r--r--views/mods/mod_kundenverwaltung/profil.phtml33
-rw-r--r--views/mods/mod_kundenverwaltung/register.phtml33
-rw-r--r--views/mods/mod_onepagecheckout/onepage.phtml31
-rw-r--r--views/mods/mod_rechnungen/accounting_pdf.phtml2
-rw-r--r--views/mods/mod_request/requestmail.phtml2
-rw-r--r--views/mods/mod_request/requestmail_html.phtml1
-rw-r--r--views/mods/mod_request/requestpage.phtml31
-rw-r--r--views/mods/mod_shippingadress/checkout_inner_prebutton.phtml33
-rw-r--r--views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml9
-rw-r--r--views/mods/mod_si/cannotorder.phtml2
-rw-r--r--views/mods/mod_skrill/order_done.phtml2
16 files changed, 153 insertions, 42 deletions
diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
index 11c6ef1..7efc523 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
@@ -9,7 +9,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']; ?>
@@ -34,7 +34,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']; ?>
diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index c6f763b..1a5a478 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -82,7 +82,7 @@
$pdf->SetFont('Arial', '', 12);
$pdf->Text($adress_left, $adress_top, $shop->view['data']['firma']);
$pdf->Text($adress_left, $adress_top + 5, $shop->view['data']['vname'].' '.$shop->view['data']['name']);
- $pdf->Text($adress_left, $adress_top + 10, $shop->view['data']['strasse'].' '.$shop->view['data']['hausnr']);
+ $pdf->Text($adress_left, $adress_top + 10, $shop->view['data']['strasse'].' '.$shop->view['data']['nr']);
$pdf->Text($adress_left, $adress_top + 15, $shop->view['data']['plz'].' '.$shop->view['data']['ort']);
//if ($shop->get_option('wpsg_mod_deliverynote_hideCountry') != '1') $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getShippingCountryName()));
if ($shop->get_option('wpsg_mod_deliverynote_hideCountry') != '1') $pdf->Text($adress_left, $adress_top + 20, $shop->view['data']['land']);
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index e4a7bab..e6477e5 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -69,7 +69,13 @@
<?php echo wpsg_drawForm_Input('fax', __('Fax', 'wpsg'), @$this->view['data']['fax']); ?>
<?php }?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
+
<?php echo wpsg_drawForm_Input('strasse', __('Straße', 'wpsg'), @$this->view['data']['strasse']); ?>
+
+ <?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
+ <?php echo wpsg_drawForm_Input('nr', __('Hausnummer', 'wpsg'), @$this->view['data']['nr']); ?>
+ <?php } ?>
+
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
<?php echo wpsg_drawForm_Input('plz', __('PLZ', 'wpsg'), @$this->view['data']['plz']); ?>
diff --git a/views/mods/mod_kundenverwaltung/mail_register.phtml b/views/mods/mod_kundenverwaltung/mail_register.phtml
index 30ea964..5b5c4bd 100644
--- a/views/mods/mod_kundenverwaltung/mail_register.phtml
+++ b/views/mods/mod_kundenverwaltung/mail_register.phtml
@@ -18,7 +18,7 @@
<?php echo wpsg_translate(__('E-Mail: #1#', 'wpsg'), $this->view['kunde']['email']); ?>
<?php echo wpsg_translate(__('Telefon: #1#', 'wpsg'), $this->view['kunde']['tel']); ?>
<?php echo wpsg_translate(__('Fax: #1#', 'wpsg'), $this->view['kunde']['fax']); ?>
-<?php echo wpsg_translate(__('Straße: #1#', 'wpsg'), $this->view['kunde']['strasse']); ?>
+<?php echo wpsg_translate(__('Straße: #1#', 'wpsg'), $this->view['kunde']['strasse'].rtrim(' '.$this->view['kunde']['nr'])); ?>
<?php echo wpsg_translate(__('PLZ: #1#', 'wpsg'), $this->view['kunde']['plz']); ?>
<?php echo wpsg_translate(__('Ort: #1#', 'wpsg'), $this->view['kunde']['ort']); ?>
<?php echo wpsg_translate(__('Land: #1#', 'wpsg'), $this->view['kunde']['land']); ?>
diff --git a/views/mods/mod_kundenverwaltung/mail_register_html.phtml b/views/mods/mod_kundenverwaltung/mail_register_html.phtml
index 2a302b4..6022e2f 100644
--- a/views/mods/mod_kundenverwaltung/mail_register_html.phtml
+++ b/views/mods/mod_kundenverwaltung/mail_register_html.phtml
@@ -36,7 +36,7 @@
</tr>
<tr>
<td style="padding-right:15px;"><?php echo __('Straße', 'wpsg'); ?>:</td>
- <td><?php echo wpsg_hspc($this->view['kunde']['strasse']); ?></td>
+ <td><?php echo wpsg_hspc($this->view['kunde']['strasse'].rtrim(' '.$this->view['kunde']['nr'])); ?></td>
</tr>
<tr>
<td style="padding-right:15px;"><?php echo __('PLZ', 'wpsg'); ?>:</td>
diff --git a/views/mods/mod_kundenverwaltung/profil.phtml b/views/mods/mod_kundenverwaltung/profil.phtml
index 046a5ce..856a761 100644
--- a/views/mods/mod_kundenverwaltung/profil.phtml
+++ b/views/mods/mod_kundenverwaltung/profil.phtml
@@ -116,7 +116,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) {
@@ -225,12 +225,31 @@
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <div class="wpsg_checkoutblock">
- <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[profil][strasse]" value="<?php echo htmlspecialchars($this->view['data']['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[profil][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['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[profil][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['nr'])); ?>" />
+ </label>
+ </div>
+
+ <?php } else { ?>
+
+ <div class="wpsg_checkoutblock">
+ <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[profil][strasse]" value="<?php echo htmlspecialchars($this->view['data']['strasse']); ?>" />
+ </div>
+
+ <?php } ?>
+
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
diff --git a/views/mods/mod_kundenverwaltung/register.phtml b/views/mods/mod_kundenverwaltung/register.phtml
index c4e4c84..a05542a 100644
--- a/views/mods/mod_kundenverwaltung/register.phtml
+++ b/views/mods/mod_kundenverwaltung/register.phtml
@@ -131,7 +131,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) {
@@ -259,12 +259,31 @@
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <div class="wpsg_checkoutblock">
- <label for="strasse" class="wpsg_register"><?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_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['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[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['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[register][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['nr'])); ?>" />
+ </label>
+ </div>
+
+ <?php } else { ?>
+
+ <div class="wpsg_checkoutblock">
+ <label for="strasse" class="wpsg_register"><?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_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />
+ </div>
+
+ <?php } ?>
+
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index c5270c9..c99c6c0 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -266,12 +266,31 @@
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <div class="wpsg_checkoutblock">
- <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($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">
+ <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($this->view['basket']['checkout']['strasse']); ?>" />
+ </div>
+
+ <?php } ?>
+
<?php } ?>
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml
index 19ce05c..8d4036a 100644
--- a/views/mods/mod_rechnungen/accounting_pdf.phtml
+++ b/views/mods/mod_rechnungen/accounting_pdf.phtml
@@ -85,7 +85,7 @@
$pdf->SetFont('Arial', '', 12);
$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);
$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);
- $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));
+ $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['nr']));
$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);
if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0')
$pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));
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">
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index a506c92..9923ec3 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -59,14 +59,33 @@
<?php } ?>
<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
- <div class="wpsg_checkoutblock">
- <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_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_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_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['shipping_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_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_nr" name="wpsg[checkout][shipping_nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['shipping_nr'])); ?>" />
+ </label>
+ </div>
+
+ <?php } else { ?>
+
+ <div class="wpsg_checkoutblock">
+ <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_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />
+ </div>
+
+ <?php } ?>
+
<?php } ?>
-
+
<?php if ($this->view['pflicht']['plz'] != '2') { ?>
<div class="wpsg_checkoutblock">
<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?>
diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
index 5442575..d2c37d2 100644
--- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
+++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
@@ -46,6 +46,13 @@
<?php echo wpsg_drawForm_Input('dialog_shipping_vname', __('Vorname', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_vname']); ?>
<?php echo wpsg_drawForm_Input('dialog_shipping_name', __('Name', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_name']); ?>
<?php echo wpsg_drawForm_Input('dialog_shipping_strasse', __('Straße', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
+
+ <?php if (($this->view['pflicht']['wpsg_showNr']??'') === '1') { ?>
+
+ <?php echo wpsg_drawForm_Input('dialog_shipping_nr', __('Hausnummer', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_nr']); ?>
+
+ <?php } ?>
+
<?php echo wpsg_drawForm_Input('dialog_shipping_plz', __('Postleitzahl', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_plz']); ?>
<?php echo wpsg_drawForm_Input('dialog_shipping_ort', __('Ort', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_ort']); ?>
<?php echo wpsg_drawForm_Select('dialog_shipping_land', __('Land', 'wpsg'), $this->view['arCountry'], $this->view['wpsg_mod_shippingadress']['shipping_land']); ?>
@@ -72,7 +79,7 @@
echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']];
?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
- <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
+ <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse'].rtrim(' '.($this->view['wpsg_mod_shippingadress']['shipping_nr']??''))); ?><br />
<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($lk); ?><br />
<a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Lieferanschrift ändern', 'wpsg'); ?>">
diff --git a/views/mods/mod_si/cannotorder.phtml b/views/mods/mod_si/cannotorder.phtml
index a3ff5d5..a34e606 100644
--- a/views/mods/mod_si/cannotorder.phtml
+++ b/views/mods/mod_si/cannotorder.phtml
@@ -11,7 +11,7 @@
'project_id' => $this->get_option('wpsg_mod_si_project_id'), // Ihre Projektnummer des SOFORT Ident Projekts, z.B. "54321"
'firstname' => $this->view['basket']['checkout']['vname'], // Vorname des Kunden, z.B. "Max"
'lastname' => $this->view['basket']['checkout']['name'], // Nachname des Kunden, z.B. "Mustermann"
- 'street' => $this->view['basket']['checkout']['strasse'], // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
+ 'street' => $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')), // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
'city' => $this->view['basket']['checkout']['ort'], // Wohnort des Kunden, z.B. "Berlin"
'zipcode' => $this->view['basket']['checkout']['plz'], // PLZ des Kunden, z.B. "10117"
'birthday' => date('Y-m-d', strtotime($this->view['basket']['checkout']['plz'])), // Geburtsdatum des Kunden im Format YYYY-MM-DD, z.B. "1978-09-24"
diff --git a/views/mods/mod_skrill/order_done.phtml b/views/mods/mod_skrill/order_done.phtml
index 4310854..1f60b35 100644
--- a/views/mods/mod_skrill/order_done.phtml
+++ b/views/mods/mod_skrill/order_done.phtml
@@ -26,7 +26,7 @@
<input type="hidden" name="firstname" value="<?php echo wpsg_hspc($this->view['kunde']['vname']); ?>" />
<input type="hidden" name="lastname" value="<?php echo wpsg_hspc($this->view['kunde']['name']); ?>" />
<input type="hidden" name="date_of_birth" value="<?php echo wpsg_hspc(date('dmY', strtotime($this->view['kunde']['geb']))); ?>" />
- <input type="hidden" name="address" value="<?php echo wpsg_hspc($this->view['kunde']['strasse']); ?>" />
+ <input type="hidden" name="address" value="<?php echo wpsg_hspc(rtrim($this->view['kunde']['strasse'].' '.($this->view['kunde']['nr']??''))); ?>" />
<input type="hidden" name="phone_number" value="<?php echo wpsg_hspc($this->view['kunde']['tel']); ?>" />
<input type="hidden" name="postal_code" value="<?php echo wpsg_hspc($this->view['kunde']['plz']); ?>" />
<input type="hidden" name="city" value="<?php echo wpsg_hspc($this->view['kunde']['ort']); ?>" />
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-16 21:42:08 +0000