From 539520773683864d9d92cba1151ff65c6c455635 Mon Sep 17 00:00:00 2001
From: karl <noreply@maennchen1.de>
Date: Mon, 27 Feb 2023 13:47:18 +0000
Subject: - Bugfix: Versandart Versandkostenfrei schaut nun ob die Versandart
 im Produkt konfiguriert wurde

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8239 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/produkttemplates/standard.phtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index cdd5931..872422a 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -117,8 +117,10 @@
 			<?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>
 
 				<div class="wpsg_produkt_preishinweis">
+
+					<?php $fs = explode(',', $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' && (array_search('500', $fs) || array_search('', $fs))) { /* 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'), 
@@ -134,7 +136,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' && (array_search('500', $fs) || array_search('', $fs))) { /* 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