- Bugfix: Textvereinfachung bei fleixblen Preis Gutscheinprodukt

- Bugfix: Doppelter Downloadlink bei Gutscheinprodukt raus

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

2 files changed, 3 insertions, 6 deletions

diff --git a/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml b/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml
index c528a8d..5c931a3 100644
--- a/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml
+++ b/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml
@@ -15,9 +15,6 @@
 		&nbsp;/&nbsp;<a target="_blank" href="<?php echo $this->callMod('wpsg_mod_voucherproduct', 'getBackendDownloadURL', array($this->view['wpsg_mod_voucherproduct']['order_id'], $d['id'])); ?>">

 			<?php echo __('Download', 'wpsg'); ?>

 		</a>

-		&nbsp;/&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_voucherproduct&gs_id=<?php echo $d['id']; ?>&order_id=<?php echo $this->view['wpsg_mod_voucherproduct']['order_id']; ?>&noheader=1&cmd=getVoucher" target="_new">

-			<?php echo __('Ansehen', 'wpsg'); ?>

-		</a>

 		<?php } ?>	

 		<?php if ($d['calc_typ'] == 'w') { ?>

 		&nbsp;(<?php echo wpsg_ff($d['value'], $this->get_option('wpsg_currency'))?>)

diff --git a/views/mods/mod_voucherproduct/product_bottom.phtml b/views/mods/mod_voucherproduct/product_bottom.phtml
index 2acbec6..aecfd2d 100644
--- a/views/mods/mod_voucherproduct/product_bottom.phtml
+++ b/views/mods/mod_voucherproduct/product_bottom.phtml
@@ -15,9 +15,9 @@
     $max = wpsg_tf($oProduct->__get('wpsg_mod_voucherproduct_flexprice_max'));

     

     if ($min > 0 && $max > 0) $strInterval = __('#1# bis #2# #3#', 'wpsg');

-    else if ($min > 0) $strInterval = __('Mindestens #1# #3#', 'wpsg');

-	else if ($max > 0) $strInterval = __('Maximal #2# #3#', 'wpsg');

-	else throw new \Exception(__('Systemfehler'));

+    else if ($min > 0) $strInterval = __('ab #1# #3#', 'wpsg');

+	else if ($max > 0) $strInterval = __('bis #2# #3#', 'wpsg');

+	else $strInterval = "";

     

 	$strInterval = wpsg_translate($strInterval, wpsg_ff($min), wpsg_ff($max), $this->get_option('wpsg_currency'));