From 3ad235186e5698b29b9497eb9489b83ccdde9116 Mon Sep 17 00:00:00 2001 From: Roger Rehnelt Date: Sat, 3 Oct 2026 12:35:44 +0200 Subject: Produktseite: Preiszeile im Modus „neu“ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unter dem Preis stehen MwSt., Versandkosten und Grundpreis in einer Zeile ohne Klammern, darunter die Lieferzeit. „Stückpreis:“ entfällt. Co-Authored-By: Claude Opus 5.5 --- views/css/wpsg-theme.css | 5 + views/produktseite/produkt.phtml | 258 ++++++++++++++++----------------------- 2 files changed, 111 insertions(+), 152 deletions(-) diff --git a/views/css/wpsg-theme.css b/views/css/wpsg-theme.css index 3cdfa58..78f4b91 100644 --- a/views/css/wpsg-theme.css +++ b/views/css/wpsg-theme.css @@ -317,6 +317,11 @@ .wpsg_productform :where(.wpsg_produkt_wrapper .wpsg_produkt_preishinweis) { font-size:0.75em; } .wpsg_productform :where(.wpsg_produkt_wrapper .wpsg_mod_productview_oldprice), .product_wrap :where(.productdetails .oldprice) { text-decoration:line-through; } .wpsg_productform :where(.wpsg_produkt_wrapper .wpsg_mod_productview_price) { font-weight:bold; } +.wpsg-product :where(.wpsg-product__offer) { display:flex; flex-direction:column; gap:0.25em; margin:0.75em 0; } +.wpsg-product :where(.wpsg-product__price) { font-size:1.75em; font-weight:700; line-height:1.2; } +.wpsg-product :where(.wpsg-product__price .wpsg_mod_productview_oldprice) { margin-left:0.4em; font-size:0.6em; font-weight:400; opacity:var(--wpsg-muted-opacity); } +.wpsg-product :where(.wpsg-product__taxnote, .wpsg-product__deliverytime, .wpsg-kuhint) { font-size:var(--wpsg-font-size-small); opacity:var(--wpsg-muted-opacity); } +.wpsg-product :where(.wpsg-product__deliverytime .label) { font-weight:normal; } .wpsg_productform :where(.wpsg_produkt_wrapper) :where(.wpsg_produkt_shortdescription, .wpsg_product_only_store, .wpsg_mod_productvariants_product_wrap) { margin-top:0.75em; margin-bottom:0.75em; } :where(.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select) { width:100%; } .wpsg_productform :where(.wpsg_produkt_wrapper .wpsg_product_informationarea) { margin-top:1.5em; margin-bottom:1.5em; } diff --git a/views/produktseite/produkt.phtml b/views/produktseite/produkt.phtml index 4c9efe0..e093f16 100644 --- a/views/produktseite/produkt.phtml +++ b/views/produktseite/produkt.phtml @@ -18,14 +18,14 @@ /** @var wpsg_product $oProduct */ $oProduct = $this->view['oProduct']; if (($this->view['data']['product_key']??'') !== '') $oProduct->setProductKey($this->view['data']['product_key']); - + ?>
- +
titleDisplayed) { ?> @@ -38,29 +38,29 @@ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
- + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
- + getAllProductCodes() as $product_code) { ?> - + imagehandler->getAttachmentID($this->view['data']['product_key']); /* Array mit allen AttachmentIDs der Produktbilder */ $arAttachmentIDsAll = $this->imagehandler->getAttachmentIDs($this->view['data']['product_id']); - + ?> @@ -78,9 +78,9 @@ rel="gallery-wpsg-getTemplateIndex(); ?>" title="getProductName(); ?>" href="" data-fslightbox="getTemplateIndex(); ?>"> - + - +
@@ -94,158 +94,151 @@ : getNr()); ?>
- + getAllProductCodes(); ?> 0) { ?>
- +
:
- +
- - view['oProduct']->canDisplayPrice()) { ?> + +
-
+ canDisplayPrice()) { $price = $oProduct->getPrice($this->view['data']['product_key']); $oldPrice = $oProduct->getOldPrice(); $hint_id = \wpsg\Blocks::kleinunternehmerHintID('product-'.$oProduct->getId()); ?> - - +
- + + - view['oProduct']->getOldPrice(); ?> - - view['oProduct']->getPrice($this->view['data']['product_key'])) { ?> - view['oProduct']->getPrice($this->view['data']['product_key']), 'product'); ?> - + + + - view['oProduct']->getPrice($this->view['data']['product_key']), 'product'); ?> +
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + hasMod('wpsg_mod_fuellmenge')) $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$price, $this->view['data']['fmenge'], $oProduct->getId()]); $baseprice = (string)ob_get_clean(); ?> +
-
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', ''.__('Endpreis', 'wpsg').''); ?> -
+ + hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> +
+ + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?> + +
callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?>
+ + callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?> + + +   - - -
- - view['data']['allowedshipping']); ?> - getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */?> - - get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?> - ab #2# € versandkostenfrei)', 'wpsg'), - wpsg_ff($this->view['data']['mwst_value']), - wpsg_ff($this->get_option('wpsg_mod_freeshipping_minvalue')), - $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN) - ); ?> - - view['data']['mwst_value'])); ?> - - - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - - hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */ ?> - - get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?> - ab #2# € versandkostenfrei)', 'wpsg'), - wpsg_ff($this->view['data']['mwst_value']), - wpsg_ff($this->get_option('wpsg_mod_freeshipping_minvalue')), - $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN) - ); ?> - - view['data']['mwst_value'])); ?> - - - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - -
+ + + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + + +
+ +
+ +
+ + + +
+ + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> +
+ + + + + +
- - + - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + +
getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?>
+ + + +
+ - - -
- + view['data']['shortdesc']; ?> - +
- + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { - + $stock_source_display = '0'; // Variantenbestand - + if ($oProduct->getMeta('wpsg_vp_product_stock_display', false, '0') === '0') { - + // Einstellung if ($this->get_option('wpsg_vp_product_stock_display') === '1') $stock_source_display = '1'; - + } else if ($oProduct->getMeta('wpsg_vp_product_stock_display') === '1') { - + $stock_source_display = '1'; // Produktbestand - + } - + $stock_display = $this->view['data']['stock']; - + if ($stock_source_display === '1') $stock_display = $oProduct->__get('stock'); - + ?> - +
- + 0) {?> - + - + - + - + - +
- - hasMod('wpsg_mod_fuellmenge')) { ?> - callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$oProduct->getPrice($this->view['data']['product_key']), $this->view['data']['fmenge'], $oProduct->getId()]); ?> - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
- + view['data']['weight']) > '0') { ?> view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> @@ -256,45 +249,6 @@ - - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - - callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?> - -
callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?>
- - callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?> - - -   - - - - - - callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> - - -
- -
- -
- - - -
- - callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> -
- - - - - - -
@@ -317,29 +271,29 @@ callMod('wpsg_mod_productvariants', 'renderTemplate', array($this->view['data']['product_key'])); ?>
- + callMods('product_bottom', array(&$this->view['data']['product_key'], $this->getTemplateIndex())); ?> - + isGARAN()) { ?> - + - + - +
hasMod('wpsg_mod_deliverytime') && $this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
- + view['oProduct']->canOrder()) { ?>
view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> /> - + @@ -363,11 +317,11 @@ success: function(data) { wpsg_refreshBasketWidget(); - + get_option('wpsg_afterinsert') == '2') { ?> - + tb_show('', 'getURL(wpsg_ShopController::URL_BASKET_AJAX); ?>&height=500'); - + jQuery('body').append(data); @@ -398,7 +352,7 @@ hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> /> - + @@ -417,7 +371,7 @@
- +
@@ -433,7 +387,7 @@
- +
@@ -460,7 +414,7 @@
- + callMods('product_bottom_end', array(&$this->view['data']['product_key'], $this->getTemplateIndex())); ?>
\ No newline at end of file -- cgit v1.2.3