From af8d967ce5cf59b728a4a35e1fa42000d45d0129 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 6 Sep 2017 12:13:57 +0000
Subject: - Bilderumschaltung AttachmentID normales Produkttemplate

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6458 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_productvariants/admin_edit.phtml |  2 +-
 views/mods/mod_productvariants/produkt.phtml    | 59 +++++--------------------
 views/produkttemplates/standard.phtml           |  2 +-
 3 files changed, 12 insertions(+), 51 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index 0ee21dc..ff68119 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -174,7 +174,7 @@
     			<td class="col_id">&nbsp;</td>
    				<?php 
 				 
-					$arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['product_id'], $vari['id']);
+					$arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['product_id'], $vari['id'], true);
 					
 				?>
 				<td class="ui-sortable" colspan="<?php echo $colspan; ?>"  id="wpsg_images_productimage_<?php echo $this->view['variant']['id']; ?>_<?php echo $vari['id']; ?>" >
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml
index ee87255..cbf15a4 100644
--- a/views/mods/mod_productvariants/produkt.phtml
+++ b/views/mods/mod_productvariants/produkt.phtml
@@ -61,32 +61,7 @@
 										<?php } ?>
 									<?php } ?>
 								<?php } ?>	
-								</select> 
-								<?php if ($this->get_option("wpsg_vp_showpic") == "1") { ?>
-									<span class="wpsg_vp_field_image">				
-										<?php foreach ($var['arVariation'] as $kv => $vari) { 
-											if ($vari['active'] == "1" && isset($vari['showpic'])) { ?>
-												<span class="wpsg_vp_image wpsg_vp_image_<?php echo $kv; ?>" style="display:<?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'block':'none'); ?>;">
-													
-													<?php 
-													if (isset($this->view['data']['product_key'])) {
-														$arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['data']['product_key']);
-														$attachmentID = $this->imagehandler->getAttachmentID($this->view['data']['product_key']);
-														
-														echo wp_get_attachment_image($attachmentID, 'medium');
-														
-													}
-													
-													$pbw = $this->get_option("wpsg_vp_showpic_width");
-													$pbh = $this->get_option("wpsg_vp_showpic_height");
-													$img_src = $vari['guid'];
-													?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
-																			
-												</span>
-											<?php } ?>
-										<?php } ?>
-									</span>
-								<?php } ?>		
+								</select>
 							</label>
 						<?php } /* SELECT-Box ENDE */ ?>
 						
@@ -94,20 +69,17 @@
 						<?php if ($var['type'] == wpsg_mod_productvariants::TYPE_IMAGE) { ?>
 							<div class="wpsg_mod_productvariants_imageselect wpsg_mod_productvariants_imageselect_<?php echo $k; ?>">
 							<span>
-								<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vp_<?php echo $k; ?>" value="<?php echo wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]); ?>" />
+								<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vp_<?php echo $k; ?>" value="<?php echo wpsg_getStr($this->view['vp_info'][$k]['vari_id']); ?>" />
 								<?php $kkv = -1; foreach ($var['arVariation'] as $kv => $vari) { $kkv++;
 									if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
 
-										<?php
-										if (isset($this->view['data']['product_key'])) {
-											$arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['data']['product_key']);
-											$attachmentID = $this->imagehandler->getAttachmentID($this->view['data']['product_key']);
-											?>
-											<a data-wpsg-id="<?php echo $kv; ?>" class="wpsg_vp_update_image image <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'akt':''); ?>" href="#">
-												<?php echo wp_get_attachment_image($attachmentID, 'thumbnail'); ?>
-											</a>
-											
-										<?php } ?>
+										<?php $simulated_product_key = $this->callMod('wpsg_mod_productvariants', 'getSimulatedVariKey', array($this->view['data']['product_key'], $var['id'], $vari['id'])); ?>
+										<?php $attachmentID = $this->imagehandler->getAttachmentID($simulated_product_key); ?>
+										
+										<a data-wpsg-id="<?php echo $kv; ?>" class="wpsg_vp_update_image image <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'akt':''); ?>" href="#">
+											<?php echo wp_get_attachment_image($attachmentID, 'thumbnail'); ?>
+										</a>
+											 
 										
 									<?php } ?>
 								<?php } ?>
@@ -122,7 +94,7 @@
 									<label>
 									
 										<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
-											<input <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$kk]) == $kv)?'checked="checked"':''); ?> 
+											<input <?php echo ((wpsg_getStr($this->view['vp_info'][$k]['vari_id']) == $kv)?'checked="checked"':''); ?> 
 											id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" 
 											onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>, this);" 
 											type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
@@ -143,17 +115,6 @@
 										<?php } ?>
 										<?php /* Abfrage ENDE */ ?>
 											
-											<?php if ($this->get_option("wpsg_vp_showpic") == "1" && isset($vari['showpic']) && $vari['showpic'] != false) { ?>
-											<span class="wpsg_vp_field_image">
-											
-												<?php 
-												$pbw = $this->get_option("wpsg_vp_showpic_width");
-												$pbh = $this->get_option("wpsg_vp_showpic_height");
-												$img_src = $vari['guid'];
-												?><img src="<?php echo $img_src; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>" alt="" />
-												
-											</span>
-											<?php } /* if image */ ?>		
 									</label>
 								<?php } /* If aktiv && stock */ ?>
 							<?php } } /* Foreach/Aktiv Radio ENDE */ ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 691c5a1..865634c 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -12,7 +12,7 @@
 
 	$arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['data']['product_key']);
 	$arAttachmentIDsAll = $this->imagehandler->getAttachmentIDs($this->view['data']['product_id']);
-		
+
 ?>
 
 <div class="wpsg_produkt_wrapper">
-- 
cgit v1.2.3