summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/mods/mod_deliverytime/basket_row.phtml2
-rw-r--r--views/mods/mod_deliverytime/overview_row.phtml2
-rw-r--r--views/produkttemplates/standard.phtml2
3 files changed, 3 insertions, 3 deletions
diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index a5bbbdf..a1d0015 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -8,7 +8,7 @@
<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
<td colspan="1"><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>" class="wpsg_cell_deliverytime_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
- <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) >= '1') { /* Lieferzeit > 0 */ ?>
+ <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
<?php } else {?>
<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml
index 177f363..2c449e6 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -8,7 +8,7 @@
<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
<td><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_deliverytime_value">
- <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) >= '1') { /* Lieferzeit > 0 */ ?>
+ <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
<?php } else {?>
<?php echo wpsg_translate(__('sofort lieferbar','wpsg')); ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 78aebba..d9b0a6a 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -138,7 +138,7 @@
<?php } else {?>
<div class="wpsg_mod_deliverytime">
- <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) >= '1') { /* Lieferzeit > 0 */ ?>
+ <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
<?php } else { /* Lieferzeit = 0 */ ?>
<?php echo wpsg_translate(__('Lieferzeit: sofort lieferbar', 'wpsg')); ?>