From e5e07fb382b3ebf59c8c698f8b83aecc12fd59df Mon Sep 17 00:00:00 2001
From: Roger Rehnelt <noreply@maennchen1.de>
Date: Sat, 3 Oct 2026 12:56:32 +0200
Subject: Produktvorlagen: „versandkostenfrei“ nur bei erlaubter Versandart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Vorlage 1 zeigte den Hinweis bei Produkten ohne eingeschränkte Versandarten nicht, die Vorlagen 2 und 3 auch bei Produkten, die die versandkostenfreie Art ausschließen.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 views/produkttemplates/standard.phtml  | 6 +++---
 views/produkttemplates/standard2.phtml | 5 +++--
 views/produkttemplates/standard3.phtml | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 9cc7ba1..c908dea 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -137,9 +137,9 @@
 
 				<div class="wpsg_produkt_preishinweis">
 
-					<?php $fs = explode(',', $this->view['data']['allowedshipping']); ?>
+					<?php $fs = explode(',', (string)$this->view['data']['allowedshipping']); ?>
 					<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
 								<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'), 
@@ -155,7 +155,7 @@
 							<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>
 						<?php }?>
 					<?php } else { /* Frontend = BRUTTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */ ?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */ ?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
 								<?php echo wpsg_translate(__('(inkl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'),
diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml
index 9ea88cb..d2c072e 100644
--- a/views/produkttemplates/standard2.phtml
+++ b/views/produkttemplates/standard2.phtml
@@ -135,8 +135,9 @@
 			<?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>
 
 				<div class="wpsg_produkt_preishinweis">
+					<?php $fs = explode(',', (string)$this->view['data']['allowedshipping']); ?>
 					<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
 								<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'), 
@@ -152,7 +153,7 @@
 							<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>
 						<?php }?>
 					<?php } else { /* Frontend = BRUTTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */ ?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */ ?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
 								<?php echo wpsg_translate(__('(inkl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'),
diff --git a/views/produkttemplates/standard3.phtml b/views/produkttemplates/standard3.phtml
index 1e2c510..567a308 100644
--- a/views/produkttemplates/standard3.phtml
+++ b/views/produkttemplates/standard3.phtml
@@ -124,8 +124,9 @@
                     <?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>
 
                         <div class="wpsg_produkt_preishinweis">
+                            <?php $fs = explode(',', (string)$this->view['data']['allowedshipping']); ?>
                             <?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>
-                                <?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */?>
+                                <?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */?>
 
                                     <?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
                                         <?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'),
@@ -141,7 +142,7 @@
                                     <?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>
                                 <?php }?>
                             <?php } else { /* Frontend = BRUTTO Preise */ ?>
-                                <?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */ ?>
+                                <?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (in_array('500', $fs, true) || in_array('', $fs, true))) { /* Versandkostenfrei aktiv */ ?>
 
                                     <?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
                                         <?php echo wpsg_translate(__('(inkl. #1#% MwSt. und <a href="#3#">ab #2# € versandkostenfrei</a>)', 'wpsg'),
-- 
cgit v1.2.3