From 4699f08728ca20c41b239aeb550cbeacc2b359af Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 12 May 2017 14:44:21 +0000
Subject: Korrektur Variationen und Produktbilder

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6265 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_productvariants/admin_edit.phtml |  6 +-----
 views/warenkorb/basket.phtml                    |  6 ++++++
 views/warenkorb/overview.phtml                  | 10 +++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index 8f54077..f55bc9f 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -181,11 +181,7 @@
     			<td class="ui-sortable" colspan="<?php echo $colspan; ?>"  id="wpsg_mod_productvariants_productimage_<?php echo $k; ?>_<?php echo $kv; ?>" >
 					<?php $j = 0; foreach ($temp as $b) { $j ++; ?>
 							<?php // $this->view['variant']['id']	$vari  $var  $kv  $_REQUEST['pic']
-							$file = $b['basename'];
-							$pos1 = strrpos($file, '-');
-							$pos2 = strrpos($file, '.');
-							$file2 = substr_replace($file, '', $pos1, $pos2 - $pos1);
-
+							$file2 = $b['basenameori'];
 							$href = wp_get_attachment_image_src($b['post_id'], Array(25, 25));
 							?>	
 							<a class="<?php echo ((in_array($file2, explode(",", $vari['pic'])))?'mark':''); ?> pic" id="<?php echo $file2; ?>" 
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 5f43120..93dc7cc 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -72,9 +72,15 @@
 					?>
 					<div class="wpsg_basket_productimage">
 						<?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'])); ?>" />
+						*/
+						
+						$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium'));
+						echo "<img src=".$url." alt='' />";
+						
 						<?php } ?>
 					</div>
 					<?php } ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 386e6fa..48e6602 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -145,10 +145,18 @@
 							
 						?>
 						<div class="wpsg_overview_productimage">
+							
 							<?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 $img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail')); ?>
+							<?php if ($img_url !== false) { ?>
+							   <img class="theme_border_color_2 theme_color_2" src="<?php echo $img_url; ?>" alt="<?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wspg'), $p['name']); ?>" />
+							<?php } ?>
+							
 							<?php } ?>
 						</div>
 						<?php } ?>
-- 
cgit v1.2.3