From 9f455c0f40db5d1b6e49745f18c950409a623c19 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 28 Apr 2017 13:25:04 +0000
Subject: Produktvarianten

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6241 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_productvariants/produkt.phtml | 45 +++++-----------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml
index c810963..9dadc9d 100644
--- a/views/mods/mod_productvariants/produkt.phtml
+++ b/views/mods/mod_productvariants/produkt.phtml
@@ -4,8 +4,14 @@
 	 * Template für die Varianten wird vom Produkttemplate z.B. standard.phtml geladen
 	 */
  
+<<<<<<< .mine
+	//die("Veraltet");
+
+||||||| .r6234
+=======
 	die("Veraltet");
 
+>>>>>>> .r6240
 ?>
  
 <script type="text/javascript">/* <![CDATA[ */
@@ -54,7 +60,7 @@
 										<?php /* Lagerbestand > 0 */ ?>
 										<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
 										
-											<option value="<?php echo $kv; ?>" <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$j]) == $kv)?'selected="selected"':''); ?>>						
+											<option value="<?php echo $kv; ?>" <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'selected="selected"':''); ?>>						
 											<?php echo $vari['name']; ?>
 												
 												<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer START */?>
@@ -185,43 +191,6 @@
 						<?php } } /* Foreach/Aktiv Radio ENDE */ ?>
                     <?php } /* Radio ENDE */ ?>
 
-					<?php /* Checkboxen START */ ?>
-					<?php if ($var['typ'] == "checkbox" && $var['active'] == 1) { ?>
-					<label>
-						<input onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="hidden" value="0" name="wpsg_vp[<?php echo $k; ?>]" />
-						<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == '1')?'checked="checked"':''); ?> onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="checkbox" value="1" name="wpsg_vp[<?php echo $k; ?>]" />
-						<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer 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')) { ?>
-							<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($var['price']))) { ?>
-								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['price'], $this->get_option('wpsg_currency')); ?>)</span>
-							<?php } ?>
-						<?php } else {?>
-							<?php echo wpsg_translate(__('(Preise nur für eingeloggte Benutzer)', 'wpsg')); ?>
-						<?php } ?>
-						<?php /* Abfrage ENDE */ ?>
-
-						<?php if ($this->get_option("wpsg_vp_showpic") == "1" && $var['showpic'] != false) { ?>
-						<span class="wpsg_vp_field_image">
-
-							<?php
-							/*
-							$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
-								$this->getProduktId($this->view['data']['id']),
-								$var['showpic'],
-								$this->get_option("wpsg_vp_showpic_width"),
-								$this->get_option("wpsg_vp_showpic_height"),
-								's'
-							));
-							*/
-							$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 } ?>
-					</label>
-					<?php } /* Checkboxen ENDE */ ?>
 
 				    <div style="clear:both;"></div>
 
-- 
cgit v1.2.3