Mediathek-Unterstützung

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

11 files changed, 407 insertions, 59 deletions

diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml
index 39706c9..45ae41c 100644
--- a/views/mailtemplates/html/order.phtml
+++ b/views/mailtemplates/html/order.phtml
@@ -18,13 +18,14 @@
 				<table cellpadding="0" cellspacing="0">

 					<tr>

 						<td style="padding:0px; ">

-							<?php if ($this->hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_mod_produktbilder_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($p['id']))); ?>

+							<?php if ($this->hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_mod_produktbilder_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($p['id']))); ?>

 							<?php if (wpsg_isSizedArray($arBilder)) { ?>  				

 							<a style="width:50px; width:50px; margin-right:10px; float:left;" href="<?php echo $this->getProduktLink($this->getProduktId($p['id'])); ?>" title="<?php echo wpsg_hspc(((wpsg_isSizedString($p['detailname'])?$p['detailname']:$p['name']))); ?>">

 								

 								<?php if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);	?>

-								

-								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($p['id']), array_shift($arBilder), 50, 50, 'sz')); ?>" alt="<?php echo wpsg_hspc(((wpsg_isSizedString($p['detailname'])?$p['detailname']:$p['name']))); ?>" />

+	

+								<?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(50, 50)); ?>

+								<img src="<?php echo $href[0];?>" width="50" height="50" alt="" />

 							</a>

 							<?php } ?>

 							<?php } ?>			

diff --git a/views/mods/mod_produktartikel/header_facebook.phtml b/views/mods/mod_produktartikel/header_facebook.phtml
index 670923d..f8a8045 100644
--- a/views/mods/mod_produktartikel/header_facebook.phtml
+++ b/views/mods/mod_produktartikel/header_facebook.phtml
@@ -9,13 +9,7 @@
 <meta property="og:title" content="<?php echo $this->view['data']['name']; ?>" />

 <meta property="og:type" content="product" />

 <?php if ($this->hasMod('wpsg_mod_produktbilder') && isset($this->view['data']['bilder'][0])) { ?>

-<meta property="og:image" content="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(

-	$this->view['data']['id'],

-	$this->view['data']['bilder'][0],

-	100,

-	100,

-	's'

-)); ?>" />

+<meta property="og:image" content="<?php echo $this->view['data']['bilder'][0] ?>" />

 <?php } ?>

 <meta property="og:url" content="<?php echo $this->view['data']['url']; ?>" />

 <meta property="og:description" content="<?php echo $this->view['data']['beschreibung']; ?>" />

diff --git a/views/mods/mod_produktartikel/header_google.phtml b/views/mods/mod_produktartikel/header_google.phtml
index c49420c..9d21a7a 100644
--- a/views/mods/mod_produktartikel/header_google.phtml
+++ b/views/mods/mod_produktartikel/header_google.phtml
@@ -9,11 +9,5 @@
 <meta itemprop="name" content="<?php echo $this->view['data']['name']; ?>" />

 <meta itemprop="description" content="<?php echo $this->view['data']['beschreibung']; ?>" />

 <meta itemprop="url" content="<?php echo $this->view['data']['url']; ?>" />

-<meta itemprop="image" content="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(

-	$this->view['data']['id'],

-	$this->view['data']['bilder'][0],

-	100,

-	100,

-	's'

-)); ?>" />

+<meta itemprop="image" content="<?php echo $this->view['data']['bilder'][0] ?>" />

  
\ No newline at end of file
diff --git a/views/mods/mod_produktartikel/schemaorg.phtml b/views/mods/mod_produktartikel/schemaorg.phtml
index 20cfd1e..daa8294 100644
--- a/views/mods/mod_produktartikel/schemaorg.phtml
+++ b/views/mods/mod_produktartikel/schemaorg.phtml
@@ -8,13 +8,7 @@
 ?> 

 <div itemscope itemtype="http://schema.org/Product" style="display:none;">

 	<span itemprop="name"><?php echo wpsg_hspc($this->view['data']['name']); ?></span>

-	<img itemprop="image" src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(

-		$this->view['data']['id'],

-		$this->view['data']['bilder'][0],

-		100,

-		100,

-		's'

-	)); ?>" /> 

+	<img itemprop="image" src="<?php echo $this->view['data']['bilder'][0] ?>" />

 	<a itemprop="url" href="<?php echo $this->view['data']['url']; ?>"><?php echo $this->view['data']['name']; ?></a>

 	<div itemprop="description"><?php echo $this->view['data']['beschreibung']; ?></div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml
index 96aff04..47a4a89 100644
--- a/views/mods/mod_request/requestpage.phtml
+++ b/views/mods/mod_request/requestpage.phtml
@@ -103,12 +103,14 @@
 							<?php if ($this->hasMod('wpsg_mod_produktbilder') && $this->get_option('wpsg_mod_request_requestpageimage') == '1') { 

 						

 								if (wpsg_isSizedString($request_product['product_data']['varianten_image'])) $arBilder = array($request_product['product_data']['varianten_image']);						

-								else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($request_product['product_id'])); 

+								else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($request_product['product_id'])); 

 								

 							?>

 							<?php if (wpsg_isSizedArray($arBilder)) { ?>

 							<div class="wpsg_basket_productimage">

-								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($request_product['product_id'], array_shift($arBilder), 30, 30, 'c')); ?>" alt="<?php echo wpsg_hspc((($request_product['product_data']['detailname'] != '')?$request_product['product_data']['detailname']:$request_product['product_data']['name'])); ?>" />

+								<?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>

+								<?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>

+								<img src="<?php echo $href[0]; ?>" width="30" height="30" alt="<?php echo wpsg_hspc((($request_product['product_data']['detailname'] != '')?$request_product['product_data']['detailname']:$request_product['product_data']['name'])); ?>" />

 							</div>

 							<?php } ?>

 							<?php } ?>

diff --git a/views/produkttemplates/ausverkauft.phtml b/views/produkttemplates/ausverkauft.phtml
index aa4262b..21a711e 100644
--- a/views/produkttemplates/ausverkauft.phtml
+++ b/views/produkttemplates/ausverkauft.phtml
@@ -18,24 +18,38 @@
 		<?php /* Block für die Produktbilder START */ ?>

 		<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>	

 		<div class="wpsg_produkt_produktbilder">

-			<?php if (sizeof($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>

-			<?php $i = 0; foreach ($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>

-			<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?>

-			<div class="wpsg_produkt_preview wpsg_pb_pic">	

-				<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

-					<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

-				</a>

-			</div>

-			<?php } else { ?>

-			<div class="wpsg_pb_pic" style="display:none;">

-				<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

-					<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

-				</a>

-			</div>

-			<?php } ?>

-			<?php } ?>

-			<?php } ?>

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

+						<?php 

+						$pbw = $this->get_option('wpsg_mod_produktbilder_width');

+						$pbh = $this->get_option('wpsg_mod_produktbilder_height');

+						$pbm = $this->get_option('wpsg_mod_produktbilder_mode');

+						$pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id']));

+						?>

+						<?php if (sizeof($pbArr)) { ?>

+						<?php $i = 0; foreach ($pbArr as $b) { $i++; ?>

+						<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?>

+						<div class="wpsg_produkt_preview wpsg_pb_pic">

+							<?php 

+							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));

+							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));

+							?>	

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" 

+							href="<?php echo $href[0]; ?>"> <?php echo $imgtag; ?>

+							</a>

+						</div>

+						<?php } else { ?>

+						<div class="wpsg_pb_pic" style="display:none;">

+							<?php 

+							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));

+							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));

+							?>	

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $href[0]; ?>">

+								<?php echo $imgtag; ?>

+							</a>

+						</div>

+						<?php } ?>

+						<?php } ?>

+						<?php } ?>

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

 		</div>

 		<?php } ?>

 		<?php /* Block für die Produktbilder ENDE */ ?>

diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index af3c3e3..09e3ffe 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -30,18 +30,32 @@ if (!function_exists('is_plugin_active'))
 					<?php /* Block für die Produktbilder START */ ?>

 					<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>	

 					<div class="wpsg_produkt_produktbilder">

-						<?php if (sizeof($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>

-						<?php $i = 0; foreach ($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>

-						<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?>

-						<div class="wpsg_produkt_preview wpsg_pb_pic">	

-							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

-								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

+						<?php 

+						$pbw = $this->get_option('wpsg_mod_produktbilder_width');

+						$pbh = $this->get_option('wpsg_mod_produktbilder_height');

+						$pbm = $this->get_option('wpsg_mod_produktbilder_mode');

+						$pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id']));

+						?>

+						<?php if (sizeof($pbArr)) { ?>

+						<?php $i = 0; foreach ($pbArr as $b) { $i++; ?>

+						<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?>

+						<div class="wpsg_produkt_preview wpsg_pb_pic">

+							<?php 

+							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));

+							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));

+							?>	

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" 

+							href="<?php echo $href[0]; ?>"> <?php echo $imgtag; ?>

 							</a>

 						</div>

 						<?php } else { ?>

 						<div class="wpsg_pb_pic" style="display:none;">

-							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

-								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

+							<?php 

+							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));

+							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));

+							?>	

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $href[0]; ?>">

+								<?php echo $imgtag; ?>

 							</a>

 						</div>

 						<?php } ?>

diff --git a/views/produkttemplates/standard_alt.phtml b/views/produkttemplates/standard_alt.phtml
new file mode 100644
index 0000000..3f419a5
--- /dev/null
+++ b/views/produkttemplates/standard_alt.phtml
@@ -0,0 +1,327 @@
+<?php

+

+	/*

+	 * Template für das Produkt im Frontend

+	 */

+

+	//Ausgabe der verfügbaren Variablen

+	//wpsg_debug($this->view['data']);

+

+	// Damit keine Zubehörprodukte ausgegeben werden

+	//$this->noReleatedProducts = true; 

+

+	//wpsg_debug($_SESSION);

+  

+if (!function_exists('is_plugin_active'))

+	require_once(ABSPATH.'/wp-admin/includes/plugin.php');

+?>

+<div class="container container-fluid-page">

+	

+	<div class="wpsg_produkt_wrapper">

+	

+		<input type="hidden" name="wpsg_post_id" value="<?php echo get_the_ID(); ?>" />

+	

+		<?php $this->callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>

+	

+		<div itemscope itemtype="http://schema.org/Product" class="wpsg_produkt wpsg_produkt_<?php echo $this->view['data']['id']; ?>">

+							

+			<div class="wpsg_product_mod_information_left">		

+				<div class="wpsg_product_afterimage">

+					<?php /* Block für die Produktbilder START */ ?>

+					<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>	

+					<div class="wpsg_produkt_produktbilder">

+						<?php if (sizeof($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?>

+						<?php $i = 0; foreach ($this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?>

+						<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?>

+						<div class="wpsg_produkt_preview wpsg_pb_pic">	

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

+								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

+							</a>

+						</div>

+						<?php } else { ?>

+						<div class="wpsg_pb_pic" style="display:none;">

+							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, 800, 600, $this->get_option('wpsg_mod_produktbilder_mode'))); ?>">

+								<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="<?php echo wpsg_hspc($this->view['data']['name']); ?>" />

+							</a>

+						</div>

+						<?php } ?>

+						<?php } ?>

+						<?php } ?>

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

+					</div>

+					<?php } ?>

+					<?php /* Block für die Produktbilder ENDE */ ?>

+				</div>

+			</div>

+			

+			<div class="wpsg_product_mod_information_right">	

+				<?php /* Block für Produktbeschreibung START */ ?>

+				<div class="wpsg_produkt wpsg_product_name">

+					<h1 itemprop="name" class="wpsg_producttitle"><?php echo $this->getProductName($this->view['data']['id']); ?></h1>

+					<?php $this->callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>	

+				</div>

+				<br/>

+				<?php if ($this->get_option('wpsg_showArticelnumber') == '1') { ?>

+				<div class="wpsg_artikelnummer"> 

+					<?php echo __('Artikelnummer', 'wpsg'); ?>: <span class="wpsg_anr"><?php echo wpsg_hspc($this->view['data']['anr']); ?></span><br />

+					<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_produktartikel_ean'))) {?>

+						<?php echo __('EAN','wpsg');?>:<span class="wpsg_ean"><?php echo wpsg_hspc($this->view['data']['ean']); ?></span><br />

+					<?php } ?>

+					<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_produktartikel_gtin'))) {?>

+						<?php echo __('GTIN','wpsg');?>:<span class="wpsg_gtin"><?php echo wpsg_hspc($this->view['data']['gtin']); ?></span><br />

+					<?php }?></div>

+				<?php } ?>

+			

+				<?php /* Abfrage Preisanzeige nur für eingeloggte User aktiv und User eingeloggt START*/ ?> 

+				<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>

+							

+					<div itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="wpsg_produkt_preis">

+						<label><?php echo __('Stückpreis:', 'wpsg'); ?></label>				

+						<meta itemprop="priceCurrency" content="<?php echo $this->get_option('wpsg_currency'); ?>" />

+						<span itemprop="price" class="wpsg_preis preis_<?php echo $this->view['data']['id']; ?>" id="preis_<?php echo $this->view['data']['id']; ?>">

+							<?php echo wpsg_ff($this->view['data']['preis'], $this->get_option('wpsg_currency')); ?>

+						</span> <?php if (wpsg_isSizedString($this->view['data']['price_info'])) { echo '<div class="wpsg_priceinfo">'.wpsg_hspc($this->view['data']['price_info']).'</div>'; } ?>

+						

+						<?php if ($this->hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>				

+						<div itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="wpsg_produkt_preis new_price">

+		            		<?php echo __('Originalpreis', 'wpsg'); ?>: <span class="wpsg_preis_prediscount"><?php echo wpsg_ff($this->view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?></span>		

+						</div>

+						<?php } ?>		

+					</div>

+								

+					<?php if ($this->get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>		

+					

+						<div class="wpsg_produkt_preishinweis">

+							<?php echo wpsg_translate(__('#2# zzgl. #1#', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>', '<a href="#kkhint" title="'.wpsg_hspc($this->get_option('wpsg_kleinunternehmer_text')).'">Endpreis</a>'); ?>

+						</div>

+					

+					<?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>	

+			

+						<div class="wpsg_produkt_preishinweis">		

+							<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>

+							<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>

+							<?php } else { /* Frontend = BRUTTO Preise */ ?>

+							<?php echo wpsg_translate(__('(inkl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>

+							<?php } ?>

+						</div>

+						

+					<?php } ?>

+				<?php } else {?>

+				

+					<?php echo wpsg_translate(__('Die Produktpreise werden nur eingeloggten Benutzern angezeigt. Loggen Sie sich <a href="'.$this->getURL(wpsg_ShopController::URL_PROFIL).'">hier</a> bitte ein, um zu bestellen.')); ?>

+				

+				

+				<?php }?>

+				<?php /* Abfrage Preisanzeige nur für eingeloggte User aktiv und User eingeloggt ENDE */ ?> 	

+				 			

+				<div itemprop="description" class="wpsg_produkt_shortdescription"> 

+					<h3><?php echo wpsg_translate(__('Produktbeschreibung', 'wpsg')); ?></h3>

+					<span><?php echo $this->view['data']['shortdesc']; ?></span>

+				</div>			

+				

+				<div class="wpsg_product_informations_left"> 

+					<?php /* Lagerbestand START*/?>

+					<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?>

+					<div class="wpsg_mod_produktindex_stock">

+						<img src="<?php echo WPSG_URL_WP;?>wp-content/plugins/wpshopgermany/views/gfx/stock_pos.png" />

+						<label><?php echo wpsg_translate(__('#1#','wpsg'), $this->view['data']['stock']);  ?></label><?php echo wpsg_translate(__(' Artikel auf Lager', 'wpsg')); ?>	

+					</div>

+					<?php } ?>

+					<?php /* Lagerbestand ENDE*/?>

+					

+					<?php /* Füllmengenanzeige START */ ?>

+					<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>

+					

+						<div class="wpsg_produkt_fuellmenge">

+						<label><?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?></label>

+						<?php echo wpsg_translate(__('#1# (#2# / #3#)', 'wpsg'), 

+							'<span class="wpsg_fmenge">'.wpsg_ff($this->view['data']['fmenge'], '', true).'</span> '.$this->view['data']['feinheit'],

+							'<span class="fmenge_preis">'.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).'</span> ',

+							wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])

+						); ?>

+						</div>

+										

+					<?php } ?>		

+					<?php /* Füllmengenanzeige ENDE */ ?>

+				</div>

+				

+				<div class="wpsg_product_informations_right">				

+					<?php /* Lieferzeit Anzeige START */ ?>

+					<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>

+						

+						<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>				

+						<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key'])))  {?>

+							

+							<span class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span>

+		                    <?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>

+		                    &nbsp;<a href="<?php echo get_permalink($this->get_option('wpsg_page_mod_deliverytime_storelink')); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>

+		                    <?php } ?>

+		                    <br />

+						

+						<?php } else {?>

+							<div class="wpsg_mod_deliverytime">

+								<img src="<?php echo WPSG_URL_WP;?>wp-content/plugins/wpshopgermany/views/gfx/deliverytime.png" />

+								<label><?php echo wpsg_translate(__('Lieferzeit:', 'wpsg')); ?></label>

+								<?php echo $this->callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?>

+														

+							</div>

+							

+							<?php $strDelayNote = $this->callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?>

+							<?php if (wpsg_isSizedString($strDelayNote)) { ?>

+							<div class="wpsg_mod_deliverytime_offline">

+								<img src="<?php echo WPSG_URL_WP;?>wp-content/plugins/wpshopgermany/views/gfx/deliverytime-offline.png" />

+								<div class="wpsg_mod_deliverytime_delay"><?php echo wpsg_hspc($strDelayNote); ?></div>

+							</div>

+							<?php } ?> 

+							

+						<?php } ?>

+					<?php } ?>

+					<?php /* Lieferzeit Anzeige ENDE */ ?>

+								

+					<?php /* Gewichtsanzeige START */ ?>

+					<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>

+					<div class="wpsg_mod_weight_produkt">

+						<label><?php echo wpsg_translate(__('Gewicht:', 'wpsg')); ?></label>

+						<?php echo wpsg_translate(__('#1# #2#', 'wpsg'), '<span class="wpsg_weight" id="weight_'.$this->view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'</span>', $this->get_option('wpsg_mod_weight_unit')); ?>

+					</div>

+					<?php } ?>

+					<?php /* Gewichtsanzeige ENDE */ ?>

+					

+					<?php /* Varianten START */ ?>

+					<div class="wpsg_produkt_varianten">

+						<?php echo $this->callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?>

+					</div>

+					<?php /* Varianten ENDE */ ?>			

+				</div>

+				

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

+				

+				<div class="wpsg_product_buttonarea">

+					<div class="wpsg_product_buttons_add_basket">							

+						<?php if ($this->callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?>

+						<div class="wpsg_produkt_add_basket_wrapper">	

+							

+							<label class="wpsg_amount_label" for="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>"><?php echo __('Anzahl', 'wpsg'); ?>:</label>

+							

+							<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" 

+								<?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?>	

+							/>	

+										

+							<?php if (in_array($this->get_option('wpsg_afterinsert'), array('2', '3'))) { ?>

+							<script type="text/javascript">

+				

+								jQuery(document).ready(function() { 

+									

+									jQuery('.wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>').bind('click', function() {

+										

+										jQuery('.wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>').prop('disabled', true);

+							 			 

+										jQuery.ajax( {

+											url: '<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>',

+											data:

+											{

+												'wpsg_form_data': jQuery('#wpsg_produktform_<?php echo $this->getTemplateIndex(); ?>').serialize(),

+												'wpsg[ajax]': '1',

+												'wpsg[submit]': '1'					

+											}, 

+											success: function(data) 

+											{

+												  

+												<?php if ($this->get_option('wpsg_afterinsert') == '2') { ?>

+												tb_show('<?php echo __('Ihr Warenkorb', 'wpsg'); ?>', '<?php echo $this->getURL(wpsg_ShopController::URL_BASKET_AJAX); ?>&height=500');

+												<?php } else { ?>

+			

+												jQuery('#wpsg_basket_ajax_message_wrap').remove();

+												jQuery('body').append('<div id="wpsg_basket_ajax_message_wrap">' + data + '</div>');

+												

+												<?php } ?>

+			

+												wpsg_refreshBasketWidget();

+												jQuery('.wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>').prop('disabled', false);

+												

+											}

+										} );	

+										

+										return false;

+										

+									} );

+				

+								} );

+							 

+							</script>

+							<?php } ?>

+							

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

+							

+						</div>

+						<?php } ?>

+					</div>

+					

+					<?php /* Abfrage Warenkorbanzeige nur für eingeloggte Benutzer START */ ?>

+					<div class="wpsg_product_button_basket">

+						<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>

+							<?php if ($this->callMods('productForSale', array($this->view['data']['product_key']))) { ?>

+								<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />

+							<?php } ?>		

+						<?php }else{?>

+							<a class="wpsg_blind_basket_button" href="#"><?php echo wpsg_translate(__('Loggen Sie sich bitte ein, um zu bestellen', 'wpsg')); ?></a>

+						<?php } ?>

+						<?php /* Abfrage Warenkorbanzeige nur für eingeloggte Benutzer ENDE */ ?>

+					</div>

+				</div>

+				

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

+				

+				<?php if ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> 

+					<input class="wpsg_button wpsg_add_requestlist" id="wpsg_add_requestlist_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('Auf die Anfrageliste', 'wpsg'); ?>" name="wpsg[submit_request]" />

+				<?php } ?>

+

+			</div>

+				

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

+				

+		</div> 

+		

+		<?php /* Produktcontentbereich START */ ?>

+		<div class="wpsg_product_informationarea">

+						

+			<?php if (strlen(trim($this->view['data']['longdescription'])) > 0) { ?>

+			<div class="wpsg_product_information_large">

+				<div class="wpsg_produkt_additional_information">

+					<div itemprop="description" class="wpsg_produkt_longdescription">

+						<h3><?php echo wpsg_translate(__('Beschreibung', 'wpsg')); ?></h3>

+						<span><?php echo $this->view['data']['longdescription']; ?></span>

+					</div>

+				</div>

+			</div>

+			<?php } ?>

+			

+			<div class="wpsg_product_information_more">

+				<div itemprop="description" class="wpsg_produkt_more_information">

+					<h3><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h3>

+				</div>

+			</div>

+			

+			<div class="wpsg_product_assessment">

+				<div itemprop="description" class="wpsg_product_assessments">

+					<h3><?php echo wpsg_translate(__('Bewertungen', 'wpsg')); ?></h3>

+				</div>

+			</div>

+			

+		<?php /* Produktcontentbereich ENDE */ ?>

+		</div>			

+		

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

+		

+		<?php /* Social Media Integration */ ?>

+		<div class="wpsg_product_social_media">

+			<?php if ( is_plugin_active( 'plugin-directory/shariff.php' )) {?>

+				<?=do_shortcode('[shariff]')?>

+			<?php } ?>

+		</div>

+		

+		<?php $this->callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>

+

+	</div>	

+		

+</div> 
\ No newline at end of file
diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
index cad27f5..ae2ac19 100644
--- a/views/warenkorb/ajaxDialog.phtml
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -31,9 +31,11 @@
  	

 	 		<div class="wpsg_basket_ajax_message_content_left">

 	 		<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?> 

-	 			<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($this->view['product_data']['id']))); ?>

+	 			<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?>

 	  			<?php if (wpsg_isSizedArray($arBilder)) { ?> 

-	  				<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($this->view['product_data']['id']), $arBilder[0], 150, 150, 's')); ?>" alt="" />

+					<?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>

+					<?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>

+	  				<img src="<?php echo $href[0]; ?>" width="30" height="30" alt="" />

 	  			<?php } ?>

 	 		<?php } ?>

 	 		</div>

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index ea9a4cb..6e3b685 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -59,12 +59,14 @@
 					<?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { 

 						

 						if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);						

-						else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id']))); 

+						else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id']))); 

 						

 					?>

 					<div class="wpsg_basket_productimage">

-						<?php if (wpsg_isSizedString($arBilder[0])) { ?>

-						<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktID($p['id']), $arBilder[0], 30, 30, 'c')); ?>" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />

+						<?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>

+						<?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>

+						<?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>

+						<img src="<?php echo $href[0]; ?>" width="30" height="30" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />

 						<?php } ?>

 					</div>

 					<?php } ?>

diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 4599ab3..0b92464 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -130,11 +130,15 @@
 						<?php if ($this->get_option('wpsg_mod_produktbilder_overviewimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { 

 							

 							if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);						

-							else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktID($p['id'])));  

+							else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id'])));  

 							

 						?>

 						<div class="wpsg_overview_productimage">

-							<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktID($p['id']), $arBilder[0], 30, 30, 'c')); ?>" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />

+							<?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>

+							<?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>

+							<?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>

+							<?php } ?>

+							<img src="<?php echo $href[0]; ?>" width="30" height="30" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />

 						</div>

 						<?php } ?>

 						<?php if ($this->getProduktLink($p)) { ?>