From afeea1364a31608cc136a9606c4d14c213ded9bc Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 17 Nov 2016 12:18:35 +0000
Subject: - Lagerbestand / Gewichte in die Module ausgegliedert

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5918 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_stock/product_addedit_content.phtml | 28 ++++++++++++++++++++++
 views/mods/mod_stock/produkt_edit_sidebar.phtml    | 16 -------------
 .../mods/mod_weight/product_addedit_content.phtml  | 17 +++++++++++++
 views/produkt/addedit_stock.phtml                  | 25 -------------------
 4 files changed, 45 insertions(+), 41 deletions(-)
 create mode 100644 views/mods/mod_stock/product_addedit_content.phtml
 delete mode 100644 views/mods/mod_stock/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_weight/product_addedit_content.phtml
 delete mode 100644 views/produkt/addedit_stock.phtml

diff --git a/views/mods/mod_stock/product_addedit_content.phtml b/views/mods/mod_stock/product_addedit_content.phtml
new file mode 100644
index 0000000..c797d7d
--- /dev/null
+++ b/views/mods/mod_stock/product_addedit_content.phtml
@@ -0,0 +1,28 @@
+<?php
+
+    /**
+     * Template für die Integration des Lagerbestandes in die Produktverwaltung
+     */
+
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Lagerbestand', 'wpsg')); ?>
+
+    <?php echo wpsg_drawForm_Input('wpsg_mod_stock_stock', __('Lagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['stock'], '0')); ?>
+    <?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_stock_count', __('Lagerbestand zählen', 'wpsg'), wpsg_getStr($this->view['data']['stock_count'], '0')); ?>
+
+    <br />
+
+    <div class="info"><?php echo __('Lagerbestand = Bestand(Variante 1) + Bestand(Variante 2) + Bestand(Variante X)','wpsg'); ?></div>
+    
+    <?php /* Mailbenachrichtigung beim Erreichen des Minimalbestandes des Produktes */ ?>
+    <?php if ($this->get_option('wpsg_mod_stock_minstockproduct') == '1') { ?>
+    <?php echo wpsg_drawForm_Input('wpsg_mod_minstockproduct', __('Mindestlagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_count'])); ?>
+    <?php echo wpsg_drawForm_Input('wpsg_mod_stock_minstockproduct_mail', __('Benachrichtigung an', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_mail'])); ?>	
+    <?php }?>
+
+    <br />
+
+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_stock"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Lagerbestandmoduls', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
diff --git a/views/mods/mod_stock/produkt_edit_sidebar.phtml b/views/mods/mod_stock/produkt_edit_sidebar.phtml
deleted file mode 100644
index 7056f0b..0000000
--- a/views/mods/mod_stock/produkt_edit_sidebar.phtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Lagerbestands Einstellungen innerhalb des Produkts
-	 */
-
-?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_stock_stock', __('Lagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['stock'], '0')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_stock_count', __('Lagerbestand zählen', 'wpsg'), wpsg_getStr($this->view['data']['stock_count'], '0')); ?>
-<?php echo __('Lagerbestand = Bestand(Variante 1) + Bestand(Variante 2) + Bestand(Variante X)','wpsg'); ?>
-
-<?php /* Mailbenachrichtigung beim Erreichen des Minimalbestandes des Produktes */ ?>
-<?php if ($this->get_option('wpsg_mod_stock_minstockproduct') == '1') { ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_minstockproduct', __('Mindestlagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_count'])); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_stock_minstockproduct_mail', __('Benachrichtigung an', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_mail'])); ?>	
-<?php }?>
diff --git a/views/mods/mod_weight/product_addedit_content.phtml b/views/mods/mod_weight/product_addedit_content.phtml
new file mode 100644
index 0000000..3f9be4e
--- /dev/null
+++ b/views/mods/mod_weight/product_addedit_content.phtml
@@ -0,0 +1,17 @@
+<?php
+ 
+	/**
+	 * Template für die Integration des Produktgewichts in die Produktverwaltung
+	 */
+
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktgewicht', 'wpsg')); ?>
+
+    <?php echo wpsg_drawForm_Input('wpsg_mod_weight[weight]', __('Produktgewicht', 'wpsg'), wpsg_ff($this->view['wpsg_mod_weight']['weight']), array('unit' => $this->get_option('wpsg_mod_weight_unit'))); ?>
+
+    <br />
+
+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Gewichtsmoduls', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/produkt/addedit_stock.phtml b/views/produkt/addedit_stock.phtml
deleted file mode 100644
index f5a1d95..0000000
--- a/views/produkt/addedit_stock.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-	/**
-	 * Template für den Reiter "Bestandsdaten" der Produktverwaltung
-	 */
-
-?>
-<?php /* Lagerbestand */ ?>
-<?php if ($this->hasMod('wpsg_mod_stock') == '1') { ?>
-	<?php echo wpsg_drawForm_AdminboxStart(__('Lagerbestand', 'wpsg')); ?>
-		<?php $this->callMod('wpsg_mod_stock', 'produkt_edit_allgemein', array(&$this->view['data']));?>
-		<br />
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_stock"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Lagerbestandmoduls', 'wpsg'); ?></a>			
-	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php } ?>
-
-<?php /* Gewicht */ ?>
-<?php if ($this->hasMod('wpsg_mod_weight') == '1') { ?>
-	<?php echo wpsg_drawForm_AdminboxStart(__('Produktgewicht', 'wpsg')); ?>
-		<?php $this->callMod('wpsg_mod_weight', 'produkt_edit_allgemein', array(&$this->view['data']));?>
-		<br />
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Produktgewichtmoduls', 'wpsg'); ?></a>			
-	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php } ?>
-
-- 
cgit v1.2.3