From beded4ccc841a7dbb1d18feab94649cb98ed2764 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 17 Nov 2016 11:07:53 +0000
Subject: - Modul Lieferzeiten Backend Produktverwaltung überarbeitet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5917 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../produkt_addedit_allgemein.phtml                | 33 +++++++++++-----------
 .../mod_deliverytime/produkt_edit_allgemein.phtml  | 15 ----------
 views/produkt/addedit.phtml                        |  6 ++--
 views/produkt/addedit_general.phtml                |  5 +---
 views/produkttemplates/standard.phtml              |  4 +--
 5 files changed, 22 insertions(+), 41 deletions(-)
 delete mode 100644 views/mods/mod_deliverytime/produkt_edit_allgemein.phtml

diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
index 341dbd1..f690203 100644
--- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
+++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
@@ -6,20 +6,19 @@
 
 ?>
 
-<div id="wpsg_minquantity" class="panel panel-default"> 
-	<div class="panel-heading clearfix">
-		<h3 class="panel-title">
-			<span><?php echo __('Lieferzeit', 'wpsg'); ?></span>
-		</h3>
-	</div>
-	<div class="panel-body">	
-		<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['deliverytime'], array('noIndex' => true)); ?>
-		<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>
-		<?php } ?>
-		<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['data']['storeproduct']);?>
-		<?php } ?>
-	</div>
-</div>
\ No newline at end of file
+<?php echo wpsg_drawForm_AdminboxStart(__('Lieferzeit', 'wpsg')); ?>
+
+	<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true)); ?>
+	<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>
+	<?php } ?>
+	<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']);?>
+	<?php } ?>
+	
+	<br />
+
+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverytime"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Lieferzeit', 'wpsg'); ?></a>
+	
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
diff --git a/views/mods/mod_deliverytime/produkt_edit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_edit_allgemein.phtml
deleted file mode 100644
index 40fa659..0000000
--- a/views/mods/mod_deliverytime/produkt_edit_allgemein.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Eingabe der Lieferzeit im Produkt 
-	 */
-
-?> 
-<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['deliverytime'], array('noIndex' => true)); ?>
-<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>
-<?php } ?>
-<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['data']['storeproduct']);?>
-<?php } ?>
\ No newline at end of file
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml
index 89b90e9..aecb281 100644
--- a/views/produkt/addedit.phtml
+++ b/views/produkt/addedit.phtml
@@ -41,14 +41,14 @@
 				<a class="list-group-item <?php echo ((wpsg_getStr($_COOKIE['wpsg_product_addedit_tab'], 'general') === $k)?'active':''); ?>" wpsg-data-target="<?php echo $k; ?>" href="#"><?php echo $v['title']; ?></a>		
 				<?php } ?>								
 			</div>
-			
-			<br />
-			
+									
 			<?php if (wpsg_getStr($_REQUEST['action'], 'add')) { ?>
 				<div class="info"><?php echo __('Nach dem erstmaligen Speichern können weitere Einstellungen vorgenommen werden.', 'wpsg'); ?></div>
 				<br />
 			<?php } ?>
 			
+			<br />
+			
 			<?php if (wpsg_isSizedString($_REQUEST['edit_id'])) { ?>
 			<input type="hidden" name="edit_id" value="<?php echo $_REQUEST['edit_id']; ?>" />
 			<?php } ?>
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index 498cc6f..33ddf66 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -55,11 +55,8 @@
 
 	<?php echo wpsg_drawForm_Select('rating', __('Bewertungspunkte', 'wpsg'), array('0', '1', '2', '3', '4', '5'), wpsg_getInt($this->view['data']['rating'])); ?>
 
-	<?php //$this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>	
+	<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>	
 	
-	<?php /* Anfrageprodukt */ ?>
-	<?php $this->callMod('wpsg_mod_request', 'produkt_edit_allgemein', array(&$this->view['data']));?>
-
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
 <?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 399c8e5..fa51444 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -131,7 +131,7 @@
 			<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?>
 				
 				<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
-				<?php if ($this->view['data']['storeproduct'] >= '1') {?>
+				<?php if ($this->view['data']['wpsg_mod_deliverytime_storeproduct'] >= '1') {?>
 					
 					<span class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span>
                     <?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>
@@ -245,7 +245,7 @@
 			<?php } ?>
 			
 			<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
-				<?php if (wpsg_isSizedInt($this->view['data']['storeproduct'])) {?>
+				<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_storeproduct'])) {?>
 					
 					<span class="wpsg_product_only_store"><?php  echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span><br />
 				
-- 
cgit v1.2.3