- Bugfixing

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5671 0d5edaf7-2b12-4e95-93f4-047927463d4b

4 files changed, 19 insertions, 16 deletions

diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index c5f36ae..5237af3 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -8,11 +8,12 @@
 <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 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 if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>

+			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>

+		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>

+				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

+		<?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 1eed06e..d6666fa 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -8,11 +8,12 @@
 <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')?'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 if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>

+		 	<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>

+		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>

+		  	<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

+		<?php } else { /* Sonst sofort lieferbar */ ?>

+		 	<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>

 		<?php } ?>

 	</td>	

 </tr>

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 6deb9c1..67159f7 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -138,11 +138,12 @@
 				<?php } else {?>

 				

 					<div class="wpsg_mod_deliverytime">

-						<?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 if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>

+							<?php echo $this->view['data']['wpsg_mod_deliverytime_deliverytime']; ?>

+						<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>

+						 	<?php echo wpsg_translate(__('Lieferzeit: #1# Tage(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>

+						<?php } else { /* Sonst sofort lieferbar */ ?>

+							<?php echo wpsg_translate(__('Das Produkt ist sofort lieferbar', 'wpsg')); ?>

 						<?php } ?>

 					</div>

 					

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 19847cb..e1d5fd3 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -279,7 +279,7 @@
 		<input type="submit" class="wpsg_button wpsg_refreshbutton" value="<?php echo __('aktualisieren', 'wpsg'); ?>" name="wpsg_basket_refresh" />

 		<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />

 		<br /><br />

-		<a href="#"><button class="wpsg_button wpsg_button_continue_shopping" ><?php echo __('weiter shoppen', 'wpsg'); ?></button></a>  	

+		<a href="<?php echo WPSG_URL_WP;?>"><button class="wpsg_button wpsg_button_continue_shopping" ><?php echo __('weiter shoppen', 'wpsg'); ?></button></a>  	

 					

 		<div class="wpsg_clear"></div>