From 371cad66b817a54fdc5670bbaa80195fbaec8df5 Mon Sep 17 00:00:00 2001
From: Roger Rehnelt <noreply@maennchen1.de>
Date: Sat, 26 Sep 2026 16:12:28 +0200
Subject: Deckkraft, Lieferung auf Rechnung, Rechnungskopie, Lieferzeit-Urlaub,
 Steuerspalte, Geburtsdatum

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 views/mods/mod_coverletter/coverletter_pdf.phtml   |  7 +------
 views/mods/mod_coverletter/settings_edit.phtml     |  2 +-
 views/mods/mod_deliverynote/deliverynote_pdf.phtml |  7 +------
 views/mods/mod_deliverynote/settings_edit.phtml    |  2 +-
 .../produkt_addedit_allgemein.phtml                | 10 ++++-----
 views/mods/mod_printshop/producttemplate.phtml     | 24 ++++++----------------
 views/mods/mod_rechnungen/invoice_pdf.phtml        |  7 +------
 views/mods/mod_rechnungen/multi_invoice_pdf.phtml  |  7 +------
 views/order/product_table.phtml                    |  4 ++--
 views/produkttemplates/standard.phtml              | 24 ++++++----------------
 views/produkttemplates/standard2.phtml             | 24 ++++++----------------
 views/produkttemplates/standard3.phtml             | 24 ++++++----------------
 12 files changed, 37 insertions(+), 105 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_coverletter/coverletter_pdf.phtml b/views/mods/mod_coverletter/coverletter_pdf.phtml
index f81eb5c..21b9511 100644
--- a/views/mods/mod_coverletter/coverletter_pdf.phtml
+++ b/views/mods/mod_coverletter/coverletter_pdf.phtml
@@ -39,12 +39,7 @@
 				$wPix = (25.4 * $width) / 96;
 				$hPix = (25.4 * $height) / 96;
   
-				$transparency = str_replace("%", "", $shop->get_option('wpsg_mod_coverletter_logo_transparency'));
-				if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency);
-
-				$alpha = 1;
-				if (wpsg_isSizedString($transparency) && $transparency !== "100") $alpha = "0.$transparency";
-				if (wpsg_isSizedString($transparency) && $transparency === "100") $alpha = $transparency;
+				$alpha = wpsg_logo_alpha($shop->get_option('wpsg_mod_coverletter_logo_transparency'));
 
 				/*
 				$logo_pos = $shop->get_option('wpsg_mod_coverletter_logo_position');
diff --git a/views/mods/mod_coverletter/settings_edit.phtml b/views/mods/mod_coverletter/settings_edit.phtml
index f593b2f..400f7a7 100644
--- a/views/mods/mod_coverletter/settings_edit.phtml
+++ b/views/mods/mod_coverletter/settings_edit.phtml
@@ -52,7 +52,7 @@
 				<?php $alignCenter = $logo_pos === 'center' ? "align-buttons-active" : ""; ?>
 				<?php $alignRight = $logo_pos === 'right' ? "align-buttons-active" : ""; ?>
 
-				<?php $logo_transparency = $this->get_option("wpsg_mod_coverletter_logo_transparency") ?: "0%"; ?>
+				<?php $logo_transparency = $this->get_option("wpsg_mod_coverletter_logo_transparency") ?: "100%"; ?>
 
 				<?php $strSuffix = ''; if ($this->view['wpsg_mod_coverletter']['logo'] !== false) { $strSuffix = '
 					<div class="row"><br />
diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index e0899b4..58328f9 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -53,12 +53,7 @@
 				$abscissa = $rightPos;
 				$ordinate = 0;
 
-				$transparency = str_replace("%", "", $shop->get_option('wpsg_mod_deliverynote_logo_transparency'));
-				if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency);
-
-				$alpha = 1;
-				if(!is_null($transparency) && $transparency !== "100") $alpha = "0.$transparency";
-				if(!is_null($transparency) && $transparency === "100") $alpha = $transparency;
+				$alpha = wpsg_logo_alpha($shop->get_option('wpsg_mod_deliverynote_logo_transparency'));
 
 				$logo_pos = $shop->get_option('wpsg_mod_deliverynote_logo_position');
 
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index 0761c24..c4e6ff0 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -55,7 +55,7 @@
 				<?php $alignCenter = $logo_pos === 'center' ? "align-buttons-active" : ""; ?>
 				<?php $alignRight = $logo_pos === 'right' ? "align-buttons-active" : ""; ?>
 
-				<?php $logo_transparency = $this->get_option("wpsg_mod_deliverynote_logo_transparency") ?: "0%"; ?>
+				<?php $logo_transparency = $this->get_option("wpsg_mod_deliverynote_logo_transparency") ?: "100%"; ?>
 
 				<?php $strSuffix = ''; if (($this->view['wpsg_mod_deliverynote']['logo'] ?? false) !== false) { $strSuffix = '
 					<div class="row">
diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
index b25033e..f761c55 100644
--- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
+++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
@@ -8,18 +8,18 @@
 
 <?php echo wpsg_drawForm_AdminboxStart(__('Lieferzeit', 'wpsg')); ?>
 
-	<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_source]', __('Lieferzeit anzeigen von', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produkt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_source')); ?>
+	<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_source]', __('Lieferzeit anzeigen von', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produkt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'], array('help' => 'wpsg_mod_deliverytime_source')); ?>
 
 	<div class="wpsg_mod_deliverytime_show">
 	<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_select')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('help' => 'wpsg_mod_deliverytime_select')); ?>
 	<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
 		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), wpsg_getStr($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?>
 	<?php } ?>
 	</div>
 
 	<?php if (isset($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) {?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store')); ?>
 	
 		<div class="wpsg_mod_deliverytime_store wpsg_mod_deliverytime_store_1">
 		    <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storetext]', __('Hinweistext', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'], array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
@@ -36,7 +36,7 @@
 
 	<?php /* Verzögerung */ ?>
 	<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_delay') == '1')) { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_delay')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('help' => 'wpsg_mod_deliverytime_delay')); ?>
 		<div class="wpsg_mod_deliverytime_delay_activ" style="display:none;">
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytext]', __('Grund für verzögerte Lieferung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'], array('help' => 'wpsg_mod_deliverytime_delayText')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytime]', __('Zeitangabe der Verzögerung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'], array('help' => 'wpsg_mod_deliverytime_delayTime')); ?>
@@ -47,7 +47,7 @@
 	
 	<?php /* Urlaubsmodus aktiv */ ?>
 	<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holiday]', __('Urlaubszeit', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produktspezifische Einstellung'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holiday'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_holiday')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holiday]', __('Urlaubszeit', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produktspezifische Einstellung'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holiday'], array('help' => 'wpsg_mod_deliverytime_holiday')); ?>
 		<div class="wpsg_mod_deliverytime_holiday_activ" style="display:none;">
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holidayStart]', __('Urlaubsbeginn', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayStart'], array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayStart')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holidayEnd]', __('Urlaubsende', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayEnd'], array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayEnd')); ?>
diff --git a/views/mods/mod_printshop/producttemplate.phtml b/views/mods/mod_printshop/producttemplate.phtml
index ed8ad94..dd344ab 100644
--- a/views/mods/mod_printshop/producttemplate.phtml
+++ b/views/mods/mod_printshop/producttemplate.phtml
@@ -313,6 +313,11 @@
 
 		<div class="wpsg_product_buttonarea">			
 			<div class="wpsg_product_buttons_add_basket">
+				<?php /* Urlaubsgruß im Urlaubszeitraum */ ?>
+				<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
+					<div class="wpsg_product_deliverytime_holiday" style="padding:10px; border:1px solid #ff0000;"><?php echo wpsg_hspc($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?></div>
+				<?php } ?>
+				
 				<?php if ($this->view['oProduct']->canOrder()) { ?>
 				<div class="wpsg_produkt_add_basket_wrapper">
 
@@ -320,24 +325,7 @@
 
 					<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
 							
-					<?php /* Urlaubsmodus aktiv */ ?>
-					<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
-						
-						<?php if ($this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
-						
-							<div class="wpsg_product_deliverytime_holiday" style="height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000;">
-																													
-								<?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
-								
-							</div>					
-					
-						<?php } ?>
-							
-					<?php } else {?>
-					
-						<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
-					
-					<?php } ?>
+					<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
 					
 					<?php if (in_array($this->get_option('wpsg_afterinsert'), array('2', '3'))) { ?>
 					<script type="text/javascript">
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index 75a547a..2f497c1 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -75,12 +75,7 @@
 				$abscissa = $rightPos;
 				$ordinate = 0;
 				
-				$transparency = str_replace("%", "", $shop->get_option('wpsg_rechnungen_logo_transparency'));
-				if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency);
-				
-				$alpha = 1;
-				if(!is_null($transparency) && $transparency !== "100") $alpha = "0.$transparency";
-				if(!is_null($transparency) && $transparency === "100") $alpha = $transparency;
+				$alpha = wpsg_logo_alpha($shop->get_option('wpsg_rechnungen_logo_transparency'));
 				
 				$logo_pos = $shop->get_option('wpsg_rechnungen_logo_position');
 				
diff --git a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
index a0f1b3a..c1aea97 100644
--- a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
@@ -91,12 +91,7 @@ $sum = $this->view['multi_data']['orders'][0]['sum'];
 				$abscissa = $rightPos;
 				$ordinate = 0;
 				
-				$transparency = str_replace("%", "", $shop->get_option('wpsg_rechnungen_logo_transparency'));
-				if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency);
-				
-				$alpha = 1;
-				if(!is_null($transparency) && $transparency !== "100") $alpha = "0.$transparency";
-				if(!is_null($transparency) && $transparency === "100") $alpha = $transparency;
+				$alpha = wpsg_logo_alpha($shop->get_option('wpsg_rechnungen_logo_transparency'));
 				
 				$logo_pos = $shop->get_option('wpsg_rechnungen_logo_position');
 				
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml
index e568fd3..2cbcb13 100644
--- a/views/order/product_table.phtml
+++ b/views/order/product_table.phtml
@@ -184,7 +184,7 @@
 				</td>
 				<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 
-				<td><?php echo (($arCalculation['shipping'][0]['brutto'] === $arCalculation['shipping'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['shipping'][0]['tax_key']]); ?></td> 
+				<td><?php echo ((floatval($arCalculation['shipping'][0]['brutto']) != 0 && abs($arCalculation['shipping'][0]['brutto'] - $arCalculation['shipping'][0]['netto']) < 0.00001)?wpsg_ff(0, '%'):($arTaxShort[$arCalculation['shipping'][0]['tax_key']]??'')); ?></td> 
 				
 				<?php } ?>
 				<td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis" colspan="2">
@@ -221,7 +221,7 @@
 				</td>
 				<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 
-					<td><?php echo (($arCalculation['payment'][0]['brutto'] === $arCalculation['payment'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['payment'][0]['tax_key']]); ?></td> 
+					<td><?php echo ((floatval($arCalculation['payment'][0]['brutto']) != 0 && abs($arCalculation['payment'][0]['brutto'] - $arCalculation['payment'][0]['netto']) < 0.00001)?wpsg_ff(0, '%'):($arTaxShort[$arCalculation['payment'][0]['tax_key']]??'')); ?></td> 
 
 				<?php } ?>
 				<td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" colspan="2">
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index cb12146..ea1087a 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -321,6 +321,11 @@
  
 		<div class="wpsg_product_buttonarea">			
 			<div class="wpsg_product_buttons_add_basket">
+				<?php /* Urlaubsgruß im Urlaubszeitraum */ ?>
+				<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
+					<div class="wpsg_product_deliverytime_holiday" style="padding:10px; border:1px solid #ff0000;"><?php echo wpsg_hspc($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?></div>
+				<?php } ?>
+				
 				<?php if ($this->view['oProduct']->canOrder()) { ?>
 				<div class="wpsg_produkt_add_basket_wrapper">
 
@@ -328,24 +333,7 @@
 
 					<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
 					
-					<?php /* Urlaubsmodus aktiv */ ?>
-					<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
-						
-						<?php if ($this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
-						
-							<div class="wpsg_product_deliverytime_holiday" style="height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000;">
-																													
-								<?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
-								
-							</div>					
-					
-						<?php } ?>
-							
-					<?php } else {?>
-					
-						<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
-					
-					<?php } ?>
+					<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
 
 					<?php echo do_action('wpsg_producttemplate_afterButton'); ?>
 
diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml
index dd6576f..f61e688 100644
--- a/views/produkttemplates/standard2.phtml
+++ b/views/produkttemplates/standard2.phtml
@@ -308,6 +308,11 @@
 		
 		<div class="wpsg_product_buttonarea">
 			<div class="wpsg_product_buttons_add_basket">
+				<?php /* Urlaubsgruß im Urlaubszeitraum */ ?>
+				<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
+					<div class="wpsg_product_deliverytime_holiday" style="padding:10px; border:1px solid #ff0000;"><?php echo wpsg_hspc($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?></div>
+				<?php } ?>
+				
 				<?php if ($this->view['oProduct']->canOrder()) { ?>
 				<div class="wpsg_produkt_add_basket_wrapper">
 
@@ -315,24 +320,7 @@
 
 					<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
 							
-					<?php /* Urlaubsmodus aktiv */ ?>
-					<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
-						
-						<?php if ($this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
-						
-							<div class="wpsg_product_deliverytime_holiday" style="height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000;">
-																													
-								<?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
-								
-							</div>					
-					
-						<?php } ?>
-							
-					<?php } else {?>
-					
-						<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
-					
-					<?php } ?>
+					<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
 					
 					<?php if (in_array($this->get_option('wpsg_afterinsert'), array('2', '3'))) { ?>
 					<script type="text/javascript">
diff --git a/views/produkttemplates/standard3.phtml b/views/produkttemplates/standard3.phtml
index 92f4998..788b21c 100644
--- a/views/produkttemplates/standard3.phtml
+++ b/views/produkttemplates/standard3.phtml
@@ -278,6 +278,11 @@
 
                 <div class="wpsg_product_buttonarea">
                     <div class="wpsg_product_buttons_add_basket">
+                        <?php /* Urlaubsgruß im Urlaubszeitraum */ ?>
+                        <?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
+                        	<div class="wpsg_product_deliverytime_holiday" style="padding:10px; border:1px solid #ff0000;"><?php echo wpsg_hspc($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?></div>
+                        <?php } ?>
+                        
                         <?php if ($this->view['oProduct']->canOrder()) { ?>
                         <div class="wpsg_produkt_add_basket_wrapper">
 
@@ -285,24 +290,7 @@
 
                             <input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
 
-                            <?php /* Urlaubsmodus aktiv */ ?>
-                            <?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
-
-                                <?php if ($this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
-
-                                    <div class="wpsg_product_deliverytime_holiday" style="height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000;">
-
-                                        <?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
-
-                                    </div>
-
-                                <?php } ?>
-
-                            <?php } else {?>
-
-                                <input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
-
-                            <?php } ?>
+                            <input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
 
                             <?php if (in_array($this->get_option('wpsg_afterinsert'), array('2', '3'))) { ?>
                             <script type="text/javascript">
-- 
cgit v1.2.3