summaryrefslogtreecommitdiff
path: root/views/mods
diff options
context:
space:
mode:
authorthomas <noreply@maennchen1.de>2016-07-08 07:46:55 +0000
committerthomas <noreply@maennchen1.de>2016-07-08 07:46:55 +0000
commitbed4440e4053ddce77ef3d54f0280f690d740ae0 (patch)
tree22ab2d29332e646dd2d73024333a1c6c3932f87a /views/mods
parent3d397100e12094596122ca7a43ff1e55221c7634 (diff)
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5669 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views/mods')
-rw-r--r--views/mods/mod_deliverytime/basket_row.phtml9
-rw-r--r--views/mods/mod_deliverytime/overview_row.phtml15
2 files changed, 13 insertions, 11 deletions
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>
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml
index 2c449e6..1eed06e 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -7,13 +7,14 @@
?>
<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']) || $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 } ?>
- </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 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>
<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>