From 209ec298b7653e203a00942ffe92d8d8596a36e8 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Mon, 11 Apr 2016 15:08:33 +0000
Subject: - Aboprodukte und Füllmenge in Produktbackend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5456 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/admin.css                                |  2 +-
 views/mods/mod_abo/produkt_addedit_content.phtml   | 58 ++++++++++++++++++++++
 views/mods/mod_abo/produkt_edit_content.phtml      | 58 ----------------------
 .../mods/mod_fuellmenge/produkt_edit_sidebar.phtml |  8 +++
 4 files changed, 67 insertions(+), 59 deletions(-)
 create mode 100644 views/mods/mod_abo/produkt_addedit_content.phtml
 delete mode 100644 views/mods/mod_abo/produkt_edit_content.phtml

(limited to 'views')

diff --git a/views/css/admin.css b/views/css/admin.css
index 264ba6a..cdbe36b 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -82,7 +82,7 @@
 .wpsg_admin_wrap { position:relative; }
 .wpsg_admin_submenu { width:180px; float:left; }
 .wpsg_admin_content { padding-left:20px; width:800px; float:left; }
-.wpsg_admin_content h3 { margin-top:0px; margin-bottom:25px; }
+.wpsg_admin_content h3 { margin:20px; }
 .wpsg_admin_content h3.panel-title { margin-bottom:0px; }
 .wpsg_admin_submenu .list-group-item { padding:5px 10px; }
 .list-group { margin-bottom:15px !important; }
diff --git a/views/mods/mod_abo/produkt_addedit_content.phtml b/views/mods/mod_abo/produkt_addedit_content.phtml
new file mode 100644
index 0000000..a4d0b67
--- /dev/null
+++ b/views/mods/mod_abo/produkt_addedit_content.phtml
@@ -0,0 +1,58 @@
+<?php
+
+	/**
+	 * Integriert die Abo-Einstellungen in das Produkt
+	 */
+	
+?>
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('#wpsg_mod_abo_activ').bind('change', function() {
+
+			if (jQuery(this).attr('checked')) jQuery('#wpsg_mod_abo_layer').show();
+			else jQuery('#wpsg_mod_abo_layer').hide();
+			
+		} ).change();
+
+		jQuery('#wpsg_mod_abo_resell').bind('change', function() {
+
+			if (jQuery(this).attr('checked')) jQuery('#wpsg_mod_abo_resell_layer').show();
+			else jQuery('#wpsg_mod_abo_resell_layer').hide();
+			
+		} ).change();
+		
+	} );
+
+/* ]]> */</script>
+
+<div class="postbox" id="wpsg_abo">		
+	<h3 class="wpsg_handlediv">
+		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+		<span><?php echo __('Abo Produkt', 'wpsg'); ?></span>
+	</h3>	
+	<div class="inside">
+	
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_activ', __('Abo Produkt', 'wpsg'), $this->view['product']['wpsg_mod_abo_activ']); ?>
+		
+		<div id="wpsg_mod_abo_layer">
+			
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_resell', __('Anzahl beschränken', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell']); ?>
+			
+			<div id="wpsg_mod_abo_resell_layer">
+				
+				<?php echo wpsg_drawForm_Input('wpsg_mod_abo_resell_count', __('Anzahl', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell_count']); ?>
+				
+			</div>
+			
+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_price', wpsg_translate(__('Abo Preis (#1#)', 'wpsg'), (($this->get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'))); ?>		
+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_durration', __('Abo Dauer (Tage)', 'wpsg'), $this->view['product']['wpsg_mod_abo_durration']); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_url', __('URL Benachrichtigung', 'wpsg'), $this->view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der <a href="#1#">Modulkonfiguration</a> bei Ablauf/Verlängerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'))); ?>			 
+			
+			<div class="wpsg_clear"></div>
+			
+		</div>
+		
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_abo/produkt_edit_content.phtml b/views/mods/mod_abo/produkt_edit_content.phtml
deleted file mode 100644
index a4d0b67..0000000
--- a/views/mods/mod_abo/produkt_edit_content.phtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-	/**
-	 * Integriert die Abo-Einstellungen in das Produkt
-	 */
-	
-?>
-<script type="text/javascript">/* <![CDATA[ */
-
-	jQuery(document).ready(function() {
-
-		jQuery('#wpsg_mod_abo_activ').bind('change', function() {
-
-			if (jQuery(this).attr('checked')) jQuery('#wpsg_mod_abo_layer').show();
-			else jQuery('#wpsg_mod_abo_layer').hide();
-			
-		} ).change();
-
-		jQuery('#wpsg_mod_abo_resell').bind('change', function() {
-
-			if (jQuery(this).attr('checked')) jQuery('#wpsg_mod_abo_resell_layer').show();
-			else jQuery('#wpsg_mod_abo_resell_layer').hide();
-			
-		} ).change();
-		
-	} );
-
-/* ]]> */</script>
-
-<div class="postbox" id="wpsg_abo">		
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Abo Produkt', 'wpsg'); ?></span>
-	</h3>	
-	<div class="inside">
-	
-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_activ', __('Abo Produkt', 'wpsg'), $this->view['product']['wpsg_mod_abo_activ']); ?>
-		
-		<div id="wpsg_mod_abo_layer">
-			
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_resell', __('Anzahl beschränken', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell']); ?>
-			
-			<div id="wpsg_mod_abo_resell_layer">
-				
-				<?php echo wpsg_drawForm_Input('wpsg_mod_abo_resell_count', __('Anzahl', 'wpsg'), $this->view['product']['wpsg_mod_abo_resell_count']); ?>
-				
-			</div>
-			
-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_price', wpsg_translate(__('Abo Preis (#1#)', 'wpsg'), (($this->get_option('wpsg_preisangaben') == WPSG_NETTO)?__('Netto', 'wpsg'):__('Brutto', 'wpsg'))), wpsg_ff($this->view['product']['wpsg_mod_abo_price']), array('unit' => $this->get_option('wpsg_currency'))); ?>		
-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_durration', __('Abo Dauer (Tage)', 'wpsg'), $this->view['product']['wpsg_mod_abo_durration']); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_abo_url', __('URL Benachrichtigung', 'wpsg'), $this->view['product']['wpsg_mod_abo_url'], array('hint' => wpsg_translate(__('nohspc_Wird hier nichts angegeben, so wird die URL aus der <a href="#1#">Modulkonfiguration</a> bei Ablauf/Verlängerung benachrichtigt.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo'))); ?>			 
-			
-			<div class="wpsg_clear"></div>
-			
-		</div>
-		
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
index c21c496..bdd6746 100644
--- a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
@@ -14,4 +14,12 @@
 		<?php echo wpsg_drawForm_Select('feinheit', __('Einheit', 'wpsg'), $this->view['data']['arFeinheiten'], $this->view['data']['feinheit']); ?>
 		<?php echo wpsg_drawForm_Input('fmenge', __('Füllmenge', 'wpsg'), wpsg_tf($this->view['data']['fmenge'])); ?>
 	</div>
+	
+	<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_einheit', __('Mögliche Einheiten (Kommagetrennt)', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?>
+	<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_bezug', __('Bezugsgröße', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?>
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?>
+	<?php if ($this->hasMod('wpsg_mod_productindex')) { ?>
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_fmenge', __('Füllmenge auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?>
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_grundpreis', __('Grundpreis auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?>
+	<?php } ?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3