From bed4440e4053ddce77ef3d54f0280f690d740ae0 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Fri, 8 Jul 2016 07:46:55 +0000
Subject: git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5669
 0d5edaf7-2b12-4e95-93f4-047927463d4b

---
 views/mods/mod_deliverytime/basket_row.phtml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'views/mods/mod_deliverytime/basket_row.phtml')

diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index a1d0015..c5f36ae 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -8,10 +8,11 @@
 <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']) || $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')); ?>
+		<?php if ($this->view['data']['wpsg_mod_deliverytime_deliverytime'] >= '1') { /* Lieferzeit > 0 im Produkte */ ?>
+ 			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
+		<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 Global */ ?>
+		<?php } else { /*Sonst sofort lieferbar*/ ?>
+ 			<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>
 		<?php } ?>
 	</td>
 </tr>
-- 
cgit v1.2.3