summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--views/admin/emailconf.phtml2
-rw-r--r--views/admin/modulelist.phtml2
-rw-r--r--views/css/frontend.css29
-rw-r--r--views/css/smartcheckout.css9
-rw-r--r--views/css/wpsg-theme.css25
-rw-r--r--views/mailtemplates/adminmail.phtml2
-rw-r--r--views/mailtemplates/html/customer.phtml2
-rw-r--r--views/mailtemplates/html/kundenmail.phtml6
-rw-r--r--views/mailtemplates/kundenmail.phtml8
-rw-r--r--views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml12
-rw-r--r--views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml6
-rw-r--r--views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml7
-rw-r--r--views/mods/mod_kundenverwaltung/order.phtml101
-rw-r--r--views/mods/mod_prepayment/mail.phtml2
-rw-r--r--views/mods/mod_reviews/admin_index.phtml4
-rw-r--r--views/mods/mod_reviews/page.phtml8
-rw-r--r--views/mods/mod_reviews/rating.phtml4
-rw-r--r--views/mods/mod_statistics/produkt_edit_sidebar.phtml6
18 files changed, 131 insertions, 104 deletions
diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index be421fd..97b063c 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -60,7 +60,7 @@
<div class="form-group">
<div class="col-sm-6 control-label control-label-email-conf">
- <label><?php echo __("E-Maillogo (JPG)", 'wpsg'); ?></label>
+ <label><?php echo __("E-Maillogo (JPG, PNG, GIF)", 'wpsg'); ?></label>
</div>
<div class="col-sm-6">
<?php if(file_exists($logoPath)) { ?>
diff --git a/views/admin/modulelist.phtml b/views/admin/modulelist.phtml
index 3b7970d..4b6dc66 100644
--- a/views/admin/modulelist.phtml
+++ b/views/admin/modulelist.phtml
@@ -159,7 +159,7 @@
<?php echo __('Mit einem Update-Zugang (Pro- oder Enterprise-Edition) machst du aus deinem wpShopGermany mehr.', 'wpsg'); ?><br /><br />
<?php echo __('Du erhältst neben kostenlosem Support (per Mail oder Forum, 1 Jahr Updates frei) auch die Möglichkeit, die Vielzahl der zusätzlich erhältlichen wpShopGermany Module zu nutzen.', 'wpsg'); ?>
- <a href="https://shop.maennchen1.de/produkt/wpshopgermany4-lizenzkey/" target="_blank"><?php echo __('wpShopGermany im Shop ansehen', 'wpsg'); ?></a>
+ <a href="https://shop.maennchen1.de/produkt/wpshopgermany-update-zugang/" target="_blank"><?php echo __('wpShopGermany im Shop ansehen', 'wpsg'); ?></a>
<?php } ?>
diff --git a/views/css/frontend.css b/views/css/frontend.css
index 84e759b..6232f45 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -341,13 +341,19 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max
.wpsg_mod_produktattribute_value { display:inline-block; }
/* Bestellansicht */
-.wpsg_mod_kundenverwaltung_order .wpsg_mod_kundenverwaltung_producttable { margin-top:1rem; margin-bottom:2rem; }
-.wpsg_mod_kundenverwaltung_order {
- table { width:100%;
- td, th { text-align:left; }
- }
- .wpsg_box { border-bottom:1px solid black; padding-bottom:1rem; margin-bottom:1rem; }
-}
+/* Kundenkonto „Bestellungen“: je Bestellung eine Karte, Positionen aufklappbar (K135) */
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order { border:1px solid var(--wpsg-color-line, rgba(127,127,127,.35)); border-radius:var(--wpsg-radius, 4px); padding:1em 1.25em; margin:0 0 1em; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__head { display:flex; flex-wrap:wrap; justify-content:space-between; align-items:baseline; gap:.25em 1em; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__title { margin:0; font-size:1em; font-weight:700; line-height:1.4; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__sum, .col_price) { white-space:nowrap; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__sum { font-weight:700; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__meta { margin:.25em 0 0; font-size:var(--wpsg-font-size-small, .875em); }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__items { margin-top:.75em; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__items > summary { cursor:pointer; font-size:var(--wpsg-font-size-small, .875em); }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__items table { width:100%; margin:.5em 0 0; border-collapse:collapse; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__items td { padding:.5em 0; border-top:1px solid var(--wpsg-color-line-soft, rgba(127,127,127,.2)); vertical-align:top; text-align:left; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__items td.col_price { padding-left:1em; text-align:right; }
+.wpsg_mod_kundenverwaltung_order .wpsg-account-order__detail { display:block; font-size:var(--wpsg-font-size-small, .875em); opacity:var(--wpsg-muted-opacity, .85); }
/* Trusted Shops Integration */
.wpsg_checkout label[for="wpsg_mod_trustedshops_set"] { margin:1rem 0 1rem 0; display:block; }
@@ -420,7 +426,6 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max
.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:68%; }
/* Produktdetailansicht */
- .wpsg_productform .wpsg_produkt_shortdescription { display:none; }
.wpsg_productform .wpsg_mod_produktindex_stock { margin:10px 0; }
.wpsg_productform .wpsg_mod_produktindex_stock label { margin-bottom:0em; float:left; margin-right:10px; }
@@ -584,10 +589,18 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max
.wpsg_mod_request_requestpage .wpsg_checkout_typ_3 input { margin-right: 5px; width: auto; }
.wpsg_mod_request_requestpage input[type="text"],
.wpsg_mod_request_requestpage select { width:100%; height:30px; margin-top:5px; margin-bottom:5px;}
+.wpsg_mod_request_requestpage .wpsg_cell_amount input[type="text"] { box-sizing:border-box; width:4em; max-width:100%; }
+.wpsg_mod_request_requestpage .wpsg_commentblock textarea { box-sizing:border-box; width:100%; height:150px; padding:0.75em 1em; font-family:inherit; }
.wpsg_mod_request_requestpage h2 { margin-top:2rem; margin-bottom:1rem; }
.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock { display:flex; flex-direction:row; width:100%; }
.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock .street { flex-grow:1; padding-right:15px; }
.wpsg_mod_request_requestpage #wpsg_streetnr.wpsg_checkoutblock .nr input { width:75px; }
+.wpsg_mod_request_requestpage input, .wpsg_mod_request_requestpage select, .wpsg_mod_request_requestpage textarea { box-sizing:border-box; }
+@media (max-width:400px) {
+ .wpsg_mod_request_requestpage .wpsg_cell_amount, .wpsg_mod_request_requestpage .wpsg_cell_sumprice { width:auto; }
+ .wpsg_mod_request_requestpage thead th { font-size:0.8em; hyphens:auto; }
+ .wpsg_mod_request_requestpage table { display:block; overflow-x:auto; }
+}
.requestlist_ajax_wrap { padding-bottom:2rem; }
.wpsg_progress { padding:0px; margin:0px; width:100%; margin-bottom:100px; margin-top:30px; }
diff --git a/views/css/smartcheckout.css b/views/css/smartcheckout.css
index 6b1f0ec..c044545 100644
--- a/views/css/smartcheckout.css
+++ b/views/css/smartcheckout.css
@@ -286,13 +286,16 @@ html body.content-style-boxed .entry-content .wpsg_smartcheckout_after.alignwide
/* Bestellbedingungen und AGB */
.wpsg_smartcheckout .sc_modul_conditions,
-.wpsg_smartcheckout .sc_agb { margin-top:calc(1.1 * var(--sc-u, 1rem)); font-size:calc(0.85 * var(--sc-u, 1rem)); }
+.wpsg_smartcheckout .sc_agb,
+.wpsg_smartcheckout .wpsg-review-remind { margin-top:calc(1.1 * var(--sc-u, 1rem)); font-size:calc(0.85 * var(--sc-u, 1rem)); }
.wpsg_smartcheckout .sc_modul_conditions .wpsg_agb + .wpsg_agb { margin-top:calc(0.6 * var(--sc-u, 1rem)); }
/* Die Module setzen den Text als losen Textknoten ins label — Flex würde ihn zerreißen */
.wpsg_smartcheckout .sc_modul_conditions label,
-.wpsg_smartcheckout .sc_agb label { display:block; position:relative; padding-left:calc(1.5 * var(--sc-u, 1rem)); cursor:pointer; }
+.wpsg_smartcheckout .sc_agb label,
+.wpsg_smartcheckout .wpsg-review-remind label { display:block; position:relative; padding-left:calc(1.5 * var(--sc-u, 1rem)); cursor:pointer; }
.wpsg_smartcheckout .sc_modul_conditions label > input[type="checkbox"],
-.wpsg_smartcheckout .sc_agb label > input[type="checkbox"] { position:absolute; left:0; top:calc(0.15 * var(--sc-u, 1rem)); margin:0; }
+.wpsg_smartcheckout .sc_agb label > input[type="checkbox"],
+.wpsg_smartcheckout .wpsg-review-remind label > input[type="checkbox"] { position:absolute; left:0; top:calc(0.15 * var(--sc-u, 1rem)); margin:0; }
.wpsg_smartcheckout .sc_modul_conditions .wpsg_mod_ordercondition_hint { max-height:calc(9 * var(--sc-u, 1rem)); overflow-y:auto; margin-top:calc(0.5 * var(--sc-u, 1rem)); padding:calc(0.6 * var(--sc-u, 1rem)); border:1px solid var(--sc-line-soft); border-radius:var(--sc-radius); }
/* Fehlerhafte Eingaben */
diff --git a/views/css/wpsg-theme.css b/views/css/wpsg-theme.css
index 00f3bcf..74d48a7 100644
--- a/views/css/wpsg-theme.css
+++ b/views/css/wpsg-theme.css
@@ -286,10 +286,19 @@
[id="wpsg_pwd_info"] :where(ul li) { margin:10px 20px; display:block; }
.invalid { padding-left:22px; line-height:24px; color:var(--wpsg-color-error); }
.valid { padding-left:22px; line-height:24px; color:var(--wpsg-color-success); }
-.wpsg_mod_kundenverwaltung_order :where(.wpsg_mod_kundenverwaltung_producttable) { margin-top:var(--wpsg-gap); margin-bottom:2rem; }
-.wpsg_mod_kundenverwaltung_order :where(table) { width:100%; }
-.wpsg_mod_kundenverwaltung_order :where(table) :where(td, th) { text-align:left; }
-.wpsg_mod_kundenverwaltung_order :where(.wpsg_box) { border-bottom:1px solid var(--wpsg-color-line); padding-bottom:var(--wpsg-gap); margin-bottom:var(--wpsg-gap); }
+/* Kundenkonto „Bestellungen“: je Bestellung eine Karte, Positionen aufklappbar (K135) */
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order) { border:1px solid var(--wpsg-color-line, rgba(127,127,127,.35)); border-radius:var(--wpsg-radius, 4px); padding:1em 1.25em; margin:0 0 1em; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__head) { display:flex; flex-wrap:wrap; justify-content:space-between; align-items:baseline; gap:.25em 1em; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__title) { margin:0; font-size:1em; font-weight:700; line-height:1.4; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__sum, .col_price) { white-space:nowrap; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__sum) { font-weight:700; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__meta) { margin:.25em 0 0; font-size:var(--wpsg-font-size-small, .875em); }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__items) { margin-top:.75em; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__items > summary) { cursor:pointer; font-size:var(--wpsg-font-size-small, .875em); }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__items table) { width:100%; margin:.5em 0 0; border-collapse:collapse; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__items td) { padding:.5em 0; border-top:1px solid var(--wpsg-color-line-soft, rgba(127,127,127,.2)); vertical-align:top; text-align:left; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__items td.col_price) { padding-left:1em; text-align:right; }
+.wpsg_mod_kundenverwaltung_order :where(.wpsg-account-order__detail) { display:block; font-size:var(--wpsg-font-size-small, .875em); opacity:var(--wpsg-muted-opacity, .85); }
:where(.wpsg_mod_kundenverwaltung_widget) :where(input[type="text"], input[type="password"]) { width:100%; margin-bottom:0.5rem; }
:where(.wpsg_mod_kundenverwaltung_widget input[type="submit"]) { float:right; }
@@ -520,6 +529,9 @@ html body #wpsg_revocation_dialog .inner { background-color:var(--wpsg-color-bac
.wpsg_mod_request_requestpage :where(.wpsg_cell_total_brutto), .wpsg_mod_request_requestpage :where(.wpsg_cell_total_netto) { text-align:right; }
:where(.wpsg_mod_request_requestpage .wpsg_checkout_typ_3 input) { margin-right:5px; width:auto; }
:where(.wpsg_mod_request_requestpage) :where(input[type="text"], select) { width:100%; margin-top:5px; margin-bottom:5px; }
+:where(.wpsg_mod_request_requestpage .wpsg_cell_amount) :where(input[type="text"]) { box-sizing:border-box; width:4em; max-width:100%; }
+.wpsg_mod_request_requestpage :where(.wpsg_commentblock textarea) { box-sizing:border-box; width:100%; height:150px; }
+:where(.wpsg_mod_request_requestpage) :where(input, select, textarea) { box-sizing:border-box; }
:where(.wpsg_mod_request_requestpage h2) { margin-top:2rem; margin-bottom:var(--wpsg-gap); }
.requestlist_ajax_wrap { padding-bottom:2rem; }
@@ -790,7 +802,6 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max
@media (max-width:400px) {
/* Produkt */
- .wpsg_productform .wpsg_produkt_shortdescription { display:none; }
.wpsg_productform :where(.wpsg_mod_produktindex_stock) { margin:10px 0; }
.wpsg_produkt_add_basket_wrapper :where(.wpsg_add_basket) { flex:1 1 auto; }
@@ -804,4 +815,8 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max
.wpsg_basket :where(.wpsg_button), .wpsg_checkout :where(.wpsg_button), .wpsg_checkout2 :where(.wpsg_button) { width:100%; margin:0 0 10px 0; }
.wpsg_overview :where(.wpsg_checkoutbutton, .wpsg_orderbutton) { width:100%; margin:0 0 10px 0; }
+ /* Anfrageliste (K119) */
+ .wpsg_mod_request_requestpage :where(.wpsg_cell_amount, .wpsg_cell_sumprice) { width:auto; }
+ .wpsg_mod_request_requestpage :where(thead th) { font-size:0.8em; hyphens:auto; }
+ .wpsg_mod_request_requestpage :where(table) { display:block; overflow-x:auto; }
}
diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml
index 53d34bf..88dd300 100644
--- a/views/mailtemplates/adminmail.phtml
+++ b/views/mailtemplates/adminmail.phtml
@@ -66,7 +66,7 @@
<?php echo wpsg_pad_right(__('Kundennummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['knr']; ?>
<?php echo wpsg_pad_right(__('Bestellnummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['onr']; ?>
-<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?>
+<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo wp_date("d.m.Y H:i:s", intval($this->view['basket']['checkout']['datum'])); ?>
<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
<?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index ecd0943..ee5c27c 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -145,7 +145,7 @@
</tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Bestelldatum', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wp_date("d.m.Y H:i:s", intval($this->view['basket']['checkout']['datum'])); ?></td>
</tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Rechnungsbetrag', 'wpsg'); ?>:</td>
diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml
index 63d6751..ba3b1ff 100644
--- a/views/mailtemplates/html/kundenmail.phtml
+++ b/views/mailtemplates/html/kundenmail.phtml
@@ -35,15 +35,13 @@
<?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>
+<?php if (wpsg_isSizedString($this->get_option("wpsg_ps_mailwiderruf"))) { ?>
<h3><?php echo __("Widerrufsbelehrung", "wpsg"); ?></h3>
-<?php if (wpsg_isSizedString($this->get_option("wpsg_ps_mailwiderruf"))) { ?>
<p><?php echo nl2br($this->get_option("wpsg_ps_mailwiderruf")); ?></p>
-<?php } else { ?>
-<?php echo __("...hier steht der Text zum Widerrufsrecht...", "wpsg"); ?>
-<?php } ?>
<h3><?php echo __("Ende der Widerrufsbelehrung", "wpsg"); ?></h3>
+<?php } ?>
<p><?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?></p>
diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml
index 31193ec..d0908d2 100644
--- a/views/mailtemplates/kundenmail.phtml
+++ b/views/mailtemplates/kundenmail.phtml
@@ -68,7 +68,7 @@
<?php echo wpsg_pad_right(__('Kundennummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['knr']; ?>
<?php echo wpsg_pad_right(__('Bestellnummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['onr']; ?>
-<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?>
+<?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo wp_date("d.m.Y H:i:s", intval($this->view['basket']['checkout']['datum'])); ?>
<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
<?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>
@@ -101,15 +101,13 @@
<?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>
<?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>
+<?php if (trim($this->get_option("wpsg_ps_mailwiderruf")) != "") { ?>
-- <?php echo __("Widerrufsbelehrung", "wpsg"); ?> --
-<?php if (trim($this->get_option("wpsg_ps_mailwiderruf")) != "") { ?>
<?php echo $this->get_option("wpsg_ps_mailwiderruf"); ?>
-<?php } else { ?>
-<?php echo __("...hier steht der Text zum Widerrufsrecht...", "wpsg"); ?>
-<?php } ?>
-- <?php echo __("Ende der Widerrufsbelehrung", "wpsg"); ?> --
+<?php } ?>
<?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?>
diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
index 3b314d5..310934c 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
@@ -66,7 +66,7 @@
echo "\n";
echo $line(__('Kundennummer', 'wpsg'), $oCustomer->knr);
echo $line(__('Bestellnummer', 'wpsg'), $oOrder->getNr());
- echo $line(__('Bestelldatum', 'wpsg'), date('d.m.Y H:i:s', strtotime((string)$oOrder->cdate)));
+ echo $line(__('Bestelldatum', 'wpsg'), wp_date('d.m.Y H:i:s', intval($this->view['basket']['checkout']['datum']??0)));
echo $line(__('Rechnungsbetrag', 'wpsg'), wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto']??0, $strCurrency));
if ($this->get_option('wpsg_kleinunternehmer') == '1') {
@@ -110,9 +110,13 @@
echo __('Es gelten unsere Allgemeinen Geschäftsbedingungen (AGB).', 'wpsg')."\n\n";
echo $this->getURL(wpsg_ShopController::URL_AGB)."\n\n";
- echo '-- '.__('Widerrufsbelehrung', 'wpsg')." --\n\n";
- echo (($strRevocation !== '')?$strRevocation:__('...hier steht der Text zum Widerrufsrecht...', 'wpsg'))."\n\n";
- echo '-- '.__('Ende der Widerrufsbelehrung', 'wpsg')." --\n\n";
+ if ($strRevocation !== '') {
+
+ echo '-- '.__('Widerrufsbelehrung', 'wpsg')." --\n\n";
+ echo $strRevocation."\n\n";
+ echo '-- '.__('Ende der Widerrufsbelehrung', 'wpsg')." --\n\n";
+
+ }
echo __('Mit freundlichen Grüßen', 'wpsg')."\n\n";
echo __($this->get_option('wpsg_shopdata_name'), 'wpsg').' - '.__('Team', 'wpsg');
diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
index 42289cf..3202f0f 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml
@@ -43,15 +43,13 @@
<p><?php echo wp_kses_post(wpsg_translate(__('Es gelten unsere <a href="#1#">Allgemeinen Geschäftsbedingungen</a> (<a href="#1#">AGB</a>).', 'wpsg'), esc_url($this->getURL(wpsg_ShopController::URL_AGB)))); ?></p>
+<?php if ($strRevocation !== '') { ?>
<h3><?php echo esc_html__('Widerrufsbelehrung', 'wpsg'); ?></h3>
-<?php if ($strRevocation !== '') { ?>
<p><?php echo wp_kses_post($strRevocation); ?></p>
-<?php } else { ?>
-<?php echo esc_html__('...hier steht der Text zum Widerrufsrecht...', 'wpsg'); ?>
-<?php } ?>
<h3><?php echo esc_html__('Ende der Widerrufsbelehrung', 'wpsg'); ?></h3>
+<?php } ?>
<p><?php echo esc_html__('Mit freundlichen Grüßen', 'wpsg'); ?></p>
<p><?php echo esc_html(__($this->get_option('wpsg_shopdata_name'), 'wpsg')); ?> - <?php echo esc_html__('Team', 'wpsg'); ?></p>
diff --git a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
index 90680e1..1a6109f 100644
--- a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
+++ b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml
@@ -6,15 +6,18 @@
* @version 4.6.1
*/
+ // Bei Registrierungspflicht oder nach einem Fehler stehen die Passwortfelder offen (K124)
+ $bOpen = ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1' || in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']));
+
?>
<label for="checkout_login" style="line-height:35px; margin-top:25px; cursor:pointer;">
<?php /* display:none, bis Option aktiv */ ?>
- <input <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'checked="checked"':''); ?> type="checkbox" id="checkout_login" value="" onclick="jQuery('#checkout_login_fields').toggle();">&nbsp;
+ <input <?php echo (($bOpen)?'checked="checked"':''); ?> type="checkbox" id="checkout_login" value="" onclick="jQuery('#checkout_login_fields').toggle();">&nbsp;
<span class="wpsg-checkbox-label">Ich möchte ein Kundenkonto anlegen.</span>
</label>
<?php /* aktiv bei Registrierungszwang - aktiv bei Fehlermeldung */ ?>
-<div id="checkout_login_fields" style="display:<?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'block':'none'); ?>;">
+<div id="checkout_login_fields" style="display:<?php echo (($bOpen)?'block':'none'); ?>;">
<div class="wpsg_checkoutblock">
<label for="mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
<?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
diff --git a/views/mods/mod_kundenverwaltung/order.phtml b/views/mods/mod_kundenverwaltung/order.phtml
index d25d444..3af1beb 100644
--- a/views/mods/mod_kundenverwaltung/order.phtml
+++ b/views/mods/mod_kundenverwaltung/order.phtml
@@ -14,78 +14,64 @@
<?php echo $this->writeFrontendMessage(); ?>
<?php if (wpsg_isSizedArray($this->view['arOrder'])) { ?>
- <?php foreach ($this->view['arOrder'] as $order) { ?>
-
- <div class="wpsg_box">
+ <?php foreach ($this->view['arOrder'] as $order) { $strSum = wpsg_ff($order['price_gesamt'], $this->get_option('wpsg_currency')); ?>
- <h2><?php echo wpsg_translate(__('Bestellung vom #1# über #2#', 'wpsg'), date('d.m.Y', strtotime($order['cdate'])), wpsg_ff($order['price_gesamt'], $this->get_option('wpsg_currency'))); ?></h2>
-
- <div class="wpsg_inner wpsg_order_<?php echo $order['id']; ?>">
- <strong><?php echo __('Bestellstatus', 'wpsg'); ?>:</strong>&nbsp;
- <?php echo $this->arStatus[$order['status']]; ?>
- <?php if ($this->hasMod('wpsg_mod_rechnungen')) {
+ <section class="wpsg_box wpsg-account-order wpsg_order_<?php echo intval($order['id']); ?>">
- $arInvoice = \wpsg\wpsg_invoice::findByOrderId(intval($order['id']));
-
- ?>
-
- <?php foreach ($arInvoice as $oInvoice) { ?>
-
- <?php if ($oInvoice->isInvoice()) { ?>
-
- <a href="<?php echo $this->callMod('wpsg_mod_rechnungen', 'getFrontendLink', [$oInvoice->getId()]); ?>"><?php echo wpsg_translate(__('Rechnung #1#', 'wpsg'), $oInvoice->getNr()); ?></a>
-
- <?php } else if ($oInvoice->isStorno()) { ?>
-
- <a href="<?php echo $this->callMod('wpsg_mod_rechnungen', 'getFrontendLink', [$oInvoice->getId()]); ?>"><?php echo wpsg_translate(__('Rechnungskorrektur #1#', 'wpsg'), $oInvoice->getNr()); ?></a>
+ <div class="wpsg-account-order__head">
+ <h2 class="wpsg-account-order__title"><?php echo esc_html(date('d.m.Y', strtotime($order['cdate']))); ?> · <?php echo __('Bestellnummer', 'wpsg'); ?> <?php echo esc_html((string)($order['onr']??'')); ?></h2>
+ <span class="wpsg-account-order__sum"><?php echo $strSum; ?></span>
+ </div>
- <?php } ?>
+ <p class="wpsg-account-order__meta">
+ <?php echo $this->arStatus[$order['status']]??''; ?>
+ <?php if ($this->hasMod('wpsg_mod_rechnungen')) { foreach (\wpsg\wpsg_invoice::findByOrderId(intval($order['id'])) as $oInvoice) { ?>
+ <?php if ($oInvoice->isInvoice()) { ?>
+ · <a href="<?php echo $this->callMod('wpsg_mod_rechnungen', 'getFrontendLink', [$oInvoice->getId()]); ?>"><?php echo wpsg_translate(__('Rechnung #1#', 'wpsg'), $oInvoice->getNr()); ?></a>
+ <?php } else if ($oInvoice->isStorno()) { ?>
+ · <a href="<?php echo $this->callMod('wpsg_mod_rechnungen', 'getFrontendLink', [$oInvoice->getId()]); ?>"><?php echo wpsg_translate(__('Rechnungskorrektur #1#', 'wpsg'), $oInvoice->getNr()); ?></a>
+ <?php } ?>
+ <?php } } ?>
+ </p>
- <?php } ?>
+ <details class="wpsg-account-order__items">
+ <summary><?php echo __('Bestellte Produkte', 'wpsg'); ?> (<?php echo count((array)$order['arProdukte']); ?>)</summary>
- <?php } ?>
- <br />
- <strong><?php echo __('Rechnungsbetrag', 'wpsg'); ?>:</strong> <?php echo wpsg_ff($order['price_gesamt'], $this->get_option('wpsg_currency')); ?><br />
- <strong><?php echo __('Bestellte Produkte', 'wpsg'); ?>:</strong>
-
<table class="wpsg_mod_kundenverwaltung_producttable">
- <tr>
+ <tr class="screen-reader-text">
<th class="col_name"><?php echo __('Name', 'wpsg'); ?></th>
- <th class="col_price"><?php echo __('Preis', 'wpsg'); ?></th>
- </tr>
- <?php foreach ((array)$order['arProdukte'] as $p) { ?>
- <tr>
+ <th class="col_price"><?php echo __('Preis', 'wpsg'); ?></th>
+ </tr>
+ <?php foreach ((array)$order['arProdukte'] as $p) { ?>
+ <tr>
<td class="col_name">
<span><?php echo $p['menge']??0; ?> x </span>
- <a href="<?php echo $p['url']; ?>"><?php echo $this->getProductName($this->getProduktID($p['id']), true); ?></a>
- <br /><?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $p['anr']; ?>
+ <?php if (($p['url']??'') !== '') { ?><a href="<?php echo $p['url']; ?>"><?php echo $p['account_name']??''; ?></a><?php } else { ?><?php echo $p['account_name']??''; ?><?php } ?>
+ <span class="wpsg-account-order__detail"><?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $p['anr']??''; ?></span>
<?php if ($this->hasMod('wpsg_mod_productvariants') && wpsg_isSizedString($p['mod_vp_varkey'])) { $arVarInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['mod_vp_varkey'])); ?>
- <br /><?php echo __('Variante', 'wpsg'); ?>: <?php echo $arVarInfo['key']; ?>
- <?php } ?>
- <?php if ($this->hasMod('wpsg_mod_downloadplus')) { ?>
- <?php if ($this->callMod('wpsg_mod_downloadplus', 'isPDFProdukt', array($p['id'])) === true) { $arDownloads = $this->callMod('wpsg_mod_downloadplus', 'getIndivFiles', array($p['id'], $order['id'])); ?>
- <?php foreach ((array)$arDownloads as $d) { ?>
- <br /><?php echo wpsg_translate(__('Datei "#1#": ', 'wpsg'), ((strlen($d['file_out']) > 0)?$d['file_out']:$d['file'])); ?>
+ <span class="wpsg-account-order__detail"><?php echo __('Variante', 'wpsg'); ?>: <?php echo $arVarInfo['key']; ?></span>
+ <?php } ?>
+ <?php if ($this->hasMod('wpsg_mod_downloadplus') && empty($p['missing']) && $this->callMod('wpsg_mod_downloadplus', 'isPDFProdukt', array($p['id'])) === true) { ?>
+ <?php foreach ((array)$this->callMod('wpsg_mod_downloadplus', 'getIndivFiles', array($p['id'], $order['id'])) as $d) { ?>
+ <span class="wpsg-account-order__detail"><?php echo wpsg_translate(__('Datei "#1#": ', 'wpsg'), ((strlen($d['file_out']) > 0)?$d['file_out']:$d['file'])); ?>
<?php if ($d['status'] == '0') { ?>
- <?php echo __('Noch nicht geplant', 'wpsg'); ?>
+ <?php echo __('Noch nicht geplant', 'wpsg'); ?>
<?php } else if ($d['status'] == '1') { ?>
- <?php echo wpsg_translate(__('Geplant am #1#.', 'wpsg'), date('d.m.Y', strtotime($d['scheduled']))); ?>
- <?php } else if ($d['status'] == '2') { ?>
+ <?php echo wpsg_translate(__('Geplant am #1#.', 'wpsg'), date('d.m.Y', strtotime($d['scheduled']))); ?>
+ <?php } else if ($d['status'] == '2') { ?>
<?php $strURL = site_url().'?wpsg_action=wpsg_mod_downloadplus_download&hash='.$d['hash'].'&indi='.$d['indiv_id']; ?>
<?php echo wpsg_translate(__('<a href="#1#" target="blank">Download</a>', 'wpsg'), $strURL); ?>
- <?php } ?>
<?php } ?>
+ </span>
<?php } ?>
<?php } ?>
- <br />
<?php if ($this->hasMod('wpsg_mod_productvars')) { $arPV = $this->callMod('wpsg_mod_productvars', 'getAllProductVarValues', array($order['id'], $p['product_index'])); ?>
- <?php if (wpsg_isSizedArray($arPV)) { ?>
- <?php foreach ($arPV as $pv) { ?>
- <?php echo wpsg_hspc($pv['name']); ?>: <?php echo wpsg_hspc($pv['value']); ?>
+ <?php /* Etwa für eine Referenznummer, die der Kunde hier nicht sehen soll; siehe doc/einhaengepunkte.md */ $arPV = (array)\apply_filters('wpsg_account_order_productvars', (wpsg_isSizedArray($arPV)?$arPV:[]), intval($order['id']), $p['product_index']??null); ?>
+ <?php foreach ($arPV as $pv) { if (!is_array($pv)) continue; ?>
+ <span class="wpsg-account-order__detail"><?php echo wpsg_hspc($pv['name']); ?>: <?php echo wpsg_hspc($pv['value']); ?></span>
<?php } ?>
- <?php } ?>
<?php } ?>
- </td>
+ </td>
<td class="col_price">
<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
<?php echo wpsg_ff($p['preis_netto'], $this->get_option('wpsg_currency')); ?>
@@ -94,13 +80,14 @@
<?php } ?>
</td>
</tr>
- <?php \do_action('wpsg_mod_kundenverwaltung_order_after_products', $order, $p); ?>
+ <?php if (empty($p['missing'])) \do_action('wpsg_mod_kundenverwaltung_order_after_products', $order, $p); ?>
<?php } ?>
</table>
-
- </div>
- </div>
-
+
+ </details>
+
+ </section>
+
<?php } ?>
<?php } else { ?>
<p><?php echo __('Bisher keine Bestellungen durchgeführt.', 'wpsg'); ?></p>
diff --git a/views/mods/mod_prepayment/mail.phtml b/views/mods/mod_prepayment/mail.phtml
index 395ddeb..f437f74 100644
--- a/views/mods/mod_prepayment/mail.phtml
+++ b/views/mods/mod_prepayment/mail.phtml
@@ -13,4 +13,4 @@
<?php echo wpsg_pad_right(__('IBAN', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?>
<?php echo wpsg_pad_right(__('Bank', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_bank')); ?>
<?php echo wpsg_pad_right(__('BIC-/SWIFT-Code', 'wpsg').':', 35); ?><?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift')); ?>
-<?php echo wpsg_pad_right(__('Betreff: #1#', 'wpsg'), 35); ?><?php echo $this->view['mod_prepayment']['subject']; ?> \ No newline at end of file
+<?php echo wpsg_pad_right(__('Betreff', 'wpsg').':', 35); ?><?php echo $this->view['mod_prepayment']['subject']; ?> \ No newline at end of file
diff --git a/views/mods/mod_reviews/admin_index.phtml b/views/mods/mod_reviews/admin_index.phtml
index a9e3fba..74f6fc5 100644
--- a/views/mods/mod_reviews/admin_index.phtml
+++ b/views/mods/mod_reviews/admin_index.phtml
@@ -117,7 +117,7 @@
<div class="wpsg-reviews-admin__stars"><span aria-hidden="true"><?php echo str_repeat('★', intval($review['stars'])).str_repeat('☆', 5 - intval($review['stars'])); ?></span><span class="screen-reader-text"><?php echo esc_html(wpsg_translate(__('#1# von 5 Sternen', 'wpsg'), intval($review['stars']))); ?></span></div>
<?php if ((string)$review['title'] !== '') { ?><strong class="wpsg-reviews-admin__title"><?php echo esc_html($review['title']); ?></strong><?php } ?>
<div class="wpsg-reviews-admin__text"><?php echo nl2br(esc_html((string)$review['text'])); ?></div>
- <div class="wpsg-reviews-admin__meta"><?php echo esc_html($review['product']); ?> · <?php echo esc_html($review['display_name']); ?></div>
+ <div class="wpsg-reviews-admin__meta"><?php echo esc_html($review['product']); ?> · <?php echo esc_html($review['display_name']); ?><?php if (intval($review['anonymous']??0) === 1) { ?> (<?php echo esc_html__('angezeigt als „Anonym“', 'wpsg'); ?>)<?php } ?></div>
<?php if ($bReply) { ?><div class="wpsg-reviews-admin__reply-text"><strong><?php echo esc_html__('Ihre Antwort:', 'wpsg'); ?></strong> <?php echo nl2br(esc_html((string)$review['reply'])); ?></div><?php } ?>
<div class="row-actions">
<?php if (isset($arActions['approve'])) { ?><span class="wpsg-approve"><button type="submit" name="wpsg_review_action" value="approve:<?php echo $review_id; ?>" class="button-link"><?php echo esc_html($arActions['approve']); ?></button> | </span><?php } ?>
@@ -130,7 +130,7 @@
<td class="column-product" data-colname="<?php echo esc_attr__('Produkt', 'wpsg'); ?>"><?php echo esc_html($review['product']); ?><br />
<small><?php echo ((intval($review['verified']) === 1)?esc_html__('Verifizierter Kauf', 'wpsg'):esc_html__('Ohne Kaufnachweis (übernommen)', 'wpsg')); ?></small>
<?php if (!$review['allowed']) { ?><br /><small><?php echo esc_html__('Bewertungen für dieses Produkt aus', 'wpsg'); ?></small><?php } ?></td>
- <td class="column-author" data-colname="<?php echo esc_attr__('Name', 'wpsg'); ?>"><?php echo esc_html($review['display_name']); ?></td>
+ <td class="column-author" data-colname="<?php echo esc_attr__('Name', 'wpsg'); ?>"><?php echo esc_html($review['display_name']); ?><?php if (intval($review['anonymous']??0) === 1) { ?><br /><?php echo esc_html__('angezeigt als „Anonym“', 'wpsg'); ?><?php } ?></td>
<td class="column-date" data-colname="<?php echo esc_attr__('Abgegeben', 'wpsg'); ?>"><?php echo esc_html((string)wp_date(get_option('date_format').' '.get_option('time_format'), (int)strtotime((string)$review['submitted'].' UTC'))); ?></td>
</tr>
<?php /* Leere Zeile hält die Streifen im Wechsel, wie die Schnellbearbeitung im Kern */ ?>
diff --git a/views/mods/mod_reviews/page.phtml b/views/mods/mod_reviews/page.phtml
index ef3d53f..ce0e640 100644
--- a/views/mods/mod_reviews/page.phtml
+++ b/views/mods/mod_reviews/page.phtml
@@ -84,8 +84,14 @@
<input type="text" id="wpsg_review_name" class="wpsg_input_text wpsg_checkout" name="wpsg_review_data[display_name]" maxlength="<?php echo intval(wpsg_review::MAX_NAME); ?>" autocomplete="nickname" value="<?php echo esc_attr((string)$data['display_name']); ?>" required<?php if (isset($errors['display_name'])) { ?> aria-invalid="true"<?php } ?> />
</div>
+ <?php if (wpsg_review::hasAnonymousColumn()) { ?>
<div class="wpsg_checkoutblock">
- <label><input type="checkbox" name="wpsg_review_data[consent]" value="1" <?php checked((string)$data['consent'], '1'); ?> required<?php if (isset($errors['consent'])) { ?> aria-invalid="true"<?php } ?> /> <?php echo esc_html__('Ich bin einverstanden, dass meine Bewertung mit dem Anzeigenamen auf dieser Website veröffentlicht wird. Ich kann das jederzeit widerrufen.', 'wpsg'); ?> <span class="wpsg_required">*</span></label>
+ <label><input type="checkbox" name="wpsg_review_data[anonymous]" value="1" <?php checked(intval($data['anonymous']??0), 1); ?> /> <?php echo esc_html__('Name anonymisieren', 'wpsg'); ?></label>
+ </div>
+ <?php } ?>
+
+ <div class="wpsg_checkoutblock">
+ <label><input type="checkbox" name="wpsg_review_data[consent]" value="1" <?php checked((string)$data['consent'], '1'); ?> required<?php if (isset($errors['consent'])) { ?> aria-invalid="true"<?php } ?> /> <?php echo esc_html__('Ich bin einverstanden, dass meine Bewertung mit dem Anzeigenamen oder anonym auf dieser Website veröffentlicht wird. Ich kann das jederzeit widerrufen.', 'wpsg'); ?> <span class="wpsg_required">*</span></label>
</div>
<p class="wpsg_checkoutblock"><button type="submit" name="wpsg_review_submit" value="1" class="wpsg_button<?php echo wpsg_button_class(); ?>"><?php echo esc_html__('Bewertung absenden', 'wpsg'); ?></button></p>
diff --git a/views/mods/mod_reviews/rating.phtml b/views/mods/mod_reviews/rating.phtml
index 63379ff..8c6fa25 100644
--- a/views/mods/mod_reviews/rating.phtml
+++ b/views/mods/mod_reviews/rating.phtml
@@ -3,11 +3,11 @@
* Sterne mit Schnitt und Anzahl (Modul Produktbewertungen)
*
* Die Sternzeichen sind aria-hidden, den Wert sagt der Text. Leere Sterne sind Umrisse, volle Sterne liegen darüber. Modus full: Text sichtbar; compact: sichtbar „4,5 (12)“,
- * der ganze Text für Screenreader; single: nur Sterne, der Text für Screenreader.
+ * der ganze Text für Screenreader; single: nur Sterne, der Text für Screenreader. Mit href ist in full die Anzahl der Link zur Liste derselben Seite.
* @version 4.6.1
*/
defined('ABSPATH') || exit;
$r = $this->view['wpsg_mod_reviews']['rating'];
?>
-<p class="wpsg-rating<?php if ($r['class'] !== '') echo ' '.esc_attr($r['class']); ?>"><span class="wpsg-rating__stars" aria-hidden="true"><span class="wpsg-rating__empty">☆☆☆☆☆</span><span class="wpsg-rating__fill" style="width:<?php echo intval($r['percent']); ?>%">★★★★★</span></span><?php if ($r['mode'] === 'full') { ?> <span class="wpsg-rating__text"><?php echo esc_html($r['text']); ?></span><?php } else if ($r['mode'] === 'compact') { ?> <span class="wpsg-rating__text" aria-hidden="true"><?php echo esc_html($r['short']); ?></span><span class="screen-reader-text"><?php echo esc_html($r['text']); ?></span><?php } else { ?><span class="screen-reader-text"><?php echo esc_html($r['text']); ?></span><?php } ?></p>
+<p class="wpsg-rating<?php if ($r['class'] !== '') echo ' '.esc_attr($r['class']); ?>"><span class="wpsg-rating__stars" aria-hidden="true"><span class="wpsg-rating__empty">☆☆☆☆☆</span><span class="wpsg-rating__fill" style="width:<?php echo intval($r['percent']); ?>%">★★★★★</span></span><?php if ($r['mode'] === 'full' && ($r['href']??'') !== '') { ?> <span class="wpsg-rating__text"><?php echo esc_html($r['stars']); ?>, <a class="wpsg-rating__link" href="<?php echo esc_url($r['href']); ?>"><?php echo esc_html($r['count']); ?></a></span><?php } else if ($r['mode'] === 'full') { ?> <span class="wpsg-rating__text"><?php echo esc_html($r['text']); ?></span><?php } else if ($r['mode'] === 'compact') { ?> <span class="wpsg-rating__text" aria-hidden="true"><?php echo esc_html($r['short']); ?></span><span class="screen-reader-text"><?php echo esc_html($r['text']); ?></span><?php } else { ?><span class="screen-reader-text"><?php echo esc_html($r['text']); ?></span><?php } ?></p>
diff --git a/views/mods/mod_statistics/produkt_edit_sidebar.phtml b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
index b41d240..e7c7d7c 100644
--- a/views/mods/mod_statistics/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
@@ -99,7 +99,8 @@
jQuery.ajax( {
url: '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'aktualisieren'); ?>',
data: {
- 'edit_id': <?php echo $_REQUEST['edit_id']?>,
+ 'edit_id': <?php echo intval($_REQUEST['edit_id']); ?>,
+ 'wpsg_nonce': '<?php echo esc_js(wp_create_nonce('wpsg-mod-statistics')); ?>',
'von': jQuery('#st_von').val(),
'bis': jQuery('#st_bis').val(),
},
@@ -114,7 +115,8 @@
jQuery('#st_export').bind('click', function(){
location.href = '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'export', array(
- 'edit_id' => $_REQUEST['edit_id']
+ 'edit_id' => intval($_REQUEST['edit_id']),
+ 'wpsg_nonce' => wp_create_nonce('wpsg-mod-statistics')
)); ?>&von=' + jQuery('#st_von').val() + '&bis=' + jQuery('#st_bis').val();
});
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-20 08:08:59 +0000