diff options
| author | thomas <noreply@maennchen1.de> | 2016-07-08 07:46:55 +0000 |
|---|---|---|
| committer | thomas <noreply@maennchen1.de> | 2016-07-08 07:46:55 +0000 |
| commit | bed4440e4053ddce77ef3d54f0280f690d740ae0 (patch) | |
| tree | 22ab2d29332e646dd2d73024333a1c6c3932f87a /views | |
| parent | 3d397100e12094596122ca7a43ff1e55221c7634 (diff) | |
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5669 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views')
| -rw-r--r-- | views/mods/mod_deliverytime/basket_row.phtml | 9 | ||||
| -rw-r--r-- | views/mods/mod_deliverytime/overview_row.phtml | 15 | ||||
| -rw-r--r-- | views/produkttemplates/standard.phtml | 3 |
3 files changed, 15 insertions, 12 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 */ ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index d9b0a6a..6deb9c1 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -138,8 +138,9 @@ <?php } else {?>
<div class="wpsg_mod_deliverytime">
- <?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
+ <?php if ($this->view['data']['wpsg_mod_deliverytime_deliverytime'] >= '1') { /* Lieferzeit > 0 im Produkte */ ?>
<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
+ <?php } else if ($this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 Global */ ?>
<?php } else { /* Lieferzeit = 0 */ ?>
<?php echo wpsg_translate(__('Lieferzeit: sofort lieferbar', 'wpsg')); ?>
<?php } ?>
|