From ca65f7ffa88de92dbe4c43caa97563a56c9b60b5 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Fri, 5 Apr 2019 09:13:17 +0000
Subject: - optionale Darstellung in der Produktverwaltung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7384 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_produktartikel/settings_edit.phtml |  12 ++-
 views/produkt/index.phtml                         | 100 ++++++++++++++++++++--
 2 files changed, 105 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml
index ece29ef..49be190 100644
--- a/views/mods/mod_produktartikel/settings_edit.phtml
+++ b/views/mods/mod_produktartikel/settings_edit.phtml
@@ -18,8 +18,16 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showSearch', __('Direkt in den Suchergebnissen anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showSearch'), array('help' => 'wpsg_mod_produktartikel_showSearch')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showFeed', __('Direkt in den Feeds anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showFeed'), array('help' => 'wpsg_mod_produktartikel_showFeed')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_onlyMainQuery', __('Nur Main Query berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_onlyMainQuery'), array('help' => 'wpsg_mod_produktartikel_onlyMainQuery')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_ean', __('Darstellung der EAN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_ean'), array('help' => 'wpsg_mod_produktartikel_ean')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_gtin', __('Darstellung der GTIN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_gtin'), array('help' => 'wpsg_mod_produktartikel_gtin')); ?>
+
+<br />
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_ean', __('Darstellung der EAN aktivieren', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_ean'), array('help' => 'wpsg_mod_produktartikel_ean')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_gtin', __('Darstellung der GTIN aktivieren', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_gtin'), array('help' => 'wpsg_mod_produktartikel_gtin')); ?>
+<br />
+
+<?php /* echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_positionnumber', __('Positionsnummer in Produktverwaltung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_positionnumber'), array('help' => 'wpsg_mod_produktartikel_positionnumber'));  */ ?>
+
+<br />
 
 <?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_comment', __('Kommentarfunktion', 'wpsg'), array(
 	'0' => __('Produktspezifisch', 'wpsg'),
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml
index 5376495..64a1fb2 100644
--- a/views/produkt/index.phtml
+++ b/views/produkt/index.phtml
@@ -141,9 +141,35 @@
                     <tr>
                         <th class="manage-column column-title wpsg_pic_col"></th>
                         <th class="wpsg_order" data-order="name"><?php echo __("Name", 'wpsg'); ?></th>
-                        <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
-
-                        <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
+                        <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
+	                        <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
+    					<?php } ?>    
+    					                
+                        <?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
+							<th class="wpsg_order" data-order="pos-nr"><?php echo __("Positionsnummer", "wpsg"); ?></th>
+						<?php } */ ?>
+						
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
+							<th class="wpsg_order" data-order="gtin-nr"><?php echo __("GTIN", "wpsg"); ?></th>
+						<?php } ?>
+						
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
+							<th class="wpsg_order" data-order="ean-nr"><?php echo __("EAN", "wpsg"); ?></th>
+						<?php } ?>					
+						
+						<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
+                        <th class="wpsg_order" data-order="deliverytime"><?php echo __("Lieferzeit", 'wpsg'); ?></th>
+                        <?php  } ?>
+                        
+                        <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+                        <th class="wpsg_order" data-order="weight"><?php echo __("Gewicht", 'wpsg'); ?></th>
+                        <?php  } ?>
+                        
+                        <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+                        <th class="wpsg_order" data-order="fuellmenge"><?php echo __("Füllmenge", 'wpsg'); ?></th>
+                        <?php  } ?>
+						
+                        <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
                         <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th>
                         <?php } ?>
 
@@ -194,8 +220,72 @@
                                 <?php $this->callMods('produkt_index_editmenu', array(&$d)); ?>
                             </div>
                         </td>
-                        <td><?php echo wpsg_hspc($d['anr']); ?></td>
-                        <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
+                        <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
+                        	<td><?php echo wpsg_hspc($d['anr']); ?></td>
+                        <?php } ?>
+                        <?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
+                        	<td>
+                        	<?php  ?>
+                        	</td>                     	
+                        <?php } */ ?>
+                        <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
+                        	<td><?php echo wpsg_hspc($d['gtin']); ?></td>
+                        <?php } ?>
+                        <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
+                        	<td><?php echo wpsg_hspc($d['ean']); ?></td>
+                        <?php } ?>
+                        
+                        <?php  if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
+                        <td>
+                        	<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($oProduct->getProductKey()))) { ?>
+						
+								<div class="wpsg_product_only_store">
+									<?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayStoreText', array($oProduct->getProductKey()))); ?>
+								</div>									
+								<?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($oProduct->getProductKey())) ?>
+								<?php if (wpsg_isSizedInt($stl)) { ?>
+									&nbsp;<a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+								<?php } ?>
+								
+							<?php } else { ?>
+																										
+							<?php $strDelayNote = $this->callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($oProduct->getProductKey())); ?>
+							<?php if (wpsg_isSizedString($strDelayNote)) { ?>
+								<div class="wpsg_mod_deliverytime_offline">
+								    <div class="wpsg_mod_deliverytime_delay"><?php echo wpsg_hspc($strDelayNote); ?></div>
+								</div>										
+							<?php } else { ?>			
+                            	<?php if ($d['wpsg_mod_deliverytime_deliverytime'] == '' ) { ?>
+	                            	<?php echo $this->callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($oProduct->getProductKey())); ?>
+                           		<?php } else { ?>
+                            		<?php echo $this->callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($oProduct->getProductKey())); ?>										
+                            	<?php } ?>
+                            <?php } ?>
+                        	<?php } ?>
+                        </td>
+                        <?php } ?>
+                        
+                        <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+                        <td>
+                             <?php if (($oProduct->weight) > '0') { ?>
+    							<?php echo wpsg_translate(__('#1# #2#', 'wpsg'), '<span class="wpsg_weight" id="weight_'.$oProduct->id.'">'.wpsg_ff($oProduct->weight).'</span>', $this->get_option('wpsg_mod_weight_unit')); ?>
+    						<?php } else { ?>
+    							<label><?php wpsg_translate(__('', 'wpsg'))?></label>
+    						<?php } ?>
+                        </td>
+                        <?php } ?>
+                        
+                        <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+                        <td>
+                        	<?php if (($oProduct->fmenge) > '0') { ?>										
+								<?php echo wpsg_translate(__('#1#', 'wpsg'), '<span class="wpsg_fmenge">'.wpsg_ff($oProduct->fmenge, '', true).'</span> '.$this->callMod('wpsg_mod_fuellmenge', 'getUnit', [$oProduct->feinheit])); ?>										
+							<?php } else { ?>					
+								<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>						
+							<?php } ?>	 
+                        </td>
+                        <?php } ?>
+                        
+                        <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
                         <td>
                             <?php if ($d['pgruppe'] <= 0) { ?>
                             <?php echo __('Nicht zugewiesen', 'wpsg'); ?>
-- 
cgit v1.2.3