From 8640f5b97d54584b3b9687d14a841f97334e469e Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Tue, 24 May 2016 11:53:33 +0000
Subject: - optionale Variantenanzeige mit negativem Lagerbestand

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5515 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_varianten/produkt.phtml       | 93 ++++++++++++++++++----------
 views/mods/mod_varianten/settings_edit.phtml |  2 +
 2 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/views/mods/mod_varianten/produkt.phtml b/views/mods/mod_varianten/produkt.phtml
index 0f9f895..bf5b276 100644
--- a/views/mods/mod_varianten/produkt.phtml
+++ b/views/mods/mod_varianten/produkt.phtml
@@ -36,14 +36,28 @@
 			<?php if ($var['typ'] == "select") { ?>
 			<label>			 			
 				<select onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>">
-					<?php foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
-					<option value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
-						<?php echo $vari['name']; ?>
-						<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
-						(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+					<?php foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "1") { $j ++; ?>
+						<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?>
+								<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
+									<option value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+										<?php echo $vari['name']; ?>
+										<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+											(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+										<?php } ?>
+									</option>
+									
+									<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
+								<?php } else { ?>
+									<option disabled="disabled" value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+										<?php echo $vari['name']; ?>
+										<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+										(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
+										<?php } ?>
+									</option>
+								<?php }?>
+							<?php } ?>
 						<?php } ?>
-					</option>
-					<?php } } ?>
+					<?php } ?>	
 				</select> 
 				<?php if ($this->get_option("wpsg_vp_showpic") == "1" && $this->hasMod('wpsg_mod_produktbilder')) { ?>
 				<span class="wpsg_vp_field_image">				
@@ -83,33 +97,46 @@
 			</div>
 			<?php } ?>
 			
-			<?php if ($var['typ'] == "radio") { ?>
-			<?php $j = 0; foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { $j ++; ?>			
-			<label>
-				<input <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $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']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
-				<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
-				<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)</span>
-				<?php } ?>
-				<?php if ($this->get_option("wpsg_vp_showpic") == "1" && isset($vari['showpic']) && $vari['showpic'] != false) { ?>
-				<span class="wpsg_vp_field_image">
-				
-					<?php 
-							
-					$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
-						$this->getProduktId($this->view['data']['id']), 
-						$vari['showpic'],
-						$this->get_option("wpsg_vp_showpic_width"),
-						$this->get_option("wpsg_vp_showpic_height"), 
-						's'
-					));
+			<?php if ($var['typ'] == "radio") { ?>			
+				<?php $j = 0; foreach ($var['vari'] as $kv => $vari) { if ($vari['aktiv'] == "1") { $j ++; ?>
+					<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?>					
+						<label>
 						
-					?><img src="<?php echo $img_src; ?>" alt="" />
-					
-				</span>
-				<?php } ?>		
-			</label>
-			<?php } } ?>			
-			<?php } ?>
+							<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
+								<input <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $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']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
+							
+							<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
+							<?php } else { ?>
+								<input disabled="disabled" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $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']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
+							<?php } ?>
+							
+							<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)</span>
+							<?php } ?>
+							
+								<?php if ($this->get_option("wpsg_vp_showpic") == "1" && isset($vari['showpic']) && $vari['showpic'] != false) { ?>
+								<span class="wpsg_vp_field_image">
+								
+									<?php 
+											
+									$img_src = $this->callMod('wpsg_mod_produktbilder', 'makeTn', array(
+										$this->getProduktId($this->view['data']['id']), 
+										$vari['showpic'],
+										$this->get_option("wpsg_vp_showpic_width"),
+										$this->get_option("wpsg_vp_showpic_height"), 
+										's'
+									));
+										
+									?><img src="<?php echo $img_src; ?>" alt="" />
+							
+								</span>
+								<?php } // if image?>
+							
+						</label>
+						<?php } // if Kein lager oder lager oder ausverkaufte anzeigen ?>
+					<?php } // if aktiv ?>		
+				<?php } // for  ?>
+			<?php } // if radio ?>	
 			
 			<?php if ($var['typ'] == "checkbox" && $var['aktiv'] == 1) { ?>
 			<label>
diff --git a/views/mods/mod_varianten/settings_edit.phtml b/views/mods/mod_varianten/settings_edit.phtml
index aee4b68..09db918 100644
--- a/views/mods/mod_varianten/settings_edit.phtml
+++ b/views/mods/mod_varianten/settings_edit.phtml
@@ -7,6 +7,8 @@
 ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_vp_showpic', __('Direkte Anzeige eines Variantenbildes', 'wpsg'), $this->get_option('wpsg_vp_showpic'), array('help' => 'wpsg_vp_showpic')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_vp_detailview', __('Erweiterte Variantenanzeige aktivieren', 'wpsg'), $this->get_option('wpsg_vp_detailview'), array('help' => 'wpsg_vp_detailview')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_vp_showProduct', __('Ausverkaufte Varianten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_vp_showProduct'), array('help' => 'wpsg_mod_vp_showProduct')); ?>
+<br />
 <?php echo wpsg_drawForm_Input('wpsg_vp_showpic_width', __('Breite des Vorschaubildes', 'wpsg'), $this->get_option('wpsg_vp_showpic_width'), array('help' => 'wpsg_vp_showpic_width')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_vp_showpic_height', __('Höhe des Vorschaubildes', 'wpsg'), $this->get_option('wpsg_vp_showpic_height'), array('help' => 'wpsg_vp_showpic_height')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_vp_replaceanr', __('Produktartikelnummer ersetzen', 'wpsg'), $this->get_option('wpsg_vp_replaceanr'), array('hint' => __('Ersetzt die Produktartikelnummer durch die zusammengesetzte Artikelnummern der Varianten.', 'wpsg'), 'help' => 'wpsg_vp_replaceanr')); ?>
-- 
cgit v1.2.3