From cfc854a91c6683870cdbec8c7dd67082e07e03f1 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 29 Mar 2016 09:31:43 +0000
Subject:  - Feature - Produktbilder - Bilder unter /wpsg verschoben (!)  -
 Feature - Produktbilder - Einzelnes löschen des Bildercaches für ein Produkt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5449 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/adminbox.phtml                    |  6 ++++++
 views/css/admin.css                                |  2 +-
 .../produkt_addedit_content.phtml                  | 22 ++++++++++++++++++++--
 views/mods/mod_produktbilder/settings_edit.phtml   |  2 +-
 views/produkt/addedit_general.phtml                | 15 ++++++++++++++-
 5 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 views/admin/form/adminbox.phtml

(limited to 'views')

diff --git a/views/admin/form/adminbox.phtml b/views/admin/form/adminbox.phtml
new file mode 100644
index 0000000..a8328e0
--- /dev/null
+++ b/views/admin/form/adminbox.phtml
@@ -0,0 +1,6 @@
+<div class="panel panel-default">
+	<div class="panel-heading clearfix">
+		<h3 class="panel-title"><?php $this->view['title']; ?></h3>
+	</div>
+	<div class="panel-body"><?php echo $this->view['content']; ?></div>
+</div>
\ No newline at end of file
diff --git a/views/css/admin.css b/views/css/admin.css
index fc3ef9b..b8ae3d3 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -80,7 +80,7 @@
 
 /* Produktverwaltung */
 .wpsg_pic_col { width:50px; }
-.wpsg_admin_submenu input { width:100%; margin-bottom:10px !important; }
+.wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; }
 
 /* Modulverwaltung */
 .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; }
diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml
index b5b5029..25607fd 100644
--- a/views/mods/mod_produktbilder/produkt_addedit_content.phtml
+++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml
@@ -89,6 +89,22 @@
 			
 			<script type="text/javascript">/* <![CDATA[ */
 
+				/**
+				 * Löscht den Bildercache dieses Produktes
+				 */
+				function wpsg_clearImageCache()
+				{
+
+					jQuery.ajax( {
+						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_produktbilder&cmd=clearProductCache&noheader=1&edit_id=<?php echo $this->view['data']['id']; ?>',
+						async: true,						
+						success: function(data) { alert(data); }
+					} );
+					
+					return false;
+
+				} // function wpsg_clearImageCache()					
+            
 				/**
 				 * Wird beim löschen eines Bilds (anklicken) aufgerufen
 				 */
@@ -126,7 +142,9 @@
 		
 		<br /><br />
 	
-		<a href="#" data-toggle="modal" data-target="#wpsg_mod_produktbilder_ftppath"><span class="wpsg-glyphicon glyphicon glyphicon-folder-open"></span><?php echo __('FTP Pfad anzeigen', 'wpsg'); ?></a>	
-				
+		<a href="#" data-toggle="modal" data-target="#wpsg_mod_produktbilder_ftppath"><span class="wpsg-glyphicon glyphicon glyphicon-folder-open"></span><?php echo __('FTP Pfad anzeigen', 'wpsg'); ?></a><br />
+		<a href="#" onclick="return wpsg_clearImageCache();"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span><?php echo __('Bildercache dieses Produktes löschen', 'wpsg'); ?></a><br />	
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktbilder"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktbilder', 'wpsg'); ?></a>
+						
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/mods/mod_produktbilder/settings_edit.phtml b/views/mods/mod_produktbilder/settings_edit.phtml
index 2b7ace8..1c035ef 100644
--- a/views/mods/mod_produktbilder/settings_edit.phtml
+++ b/views/mods/mod_produktbilder/settings_edit.phtml
@@ -10,4 +10,4 @@
 <?php echo wpsg_drawForm_Select('wpsg_mod_produktbilder_mode', __('Bildmodus (Vorschau)', 'wpsg'), $this->callMod('wpsg_mod_produktbilder', 'getImageModes'), $this->get_option('wpsg_mod_produktbilder_mode'), array('help' => 'wpsg_mod_produktbilder')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_produktbilder_quality', __('Bildqualität (PNG/JPG)', 'wpsg'), $this->get_option('wpsg_mod_produktbilder_quality'), array('help' => 'wpsg_mod_produktbilder_quality','hint' => __('0 = Schlechte Qualität, 100 = Gute Qualität', 'wpsg'))); ?>
 
-<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktbilder&wpsg_mod_produktbilder_clearcache=1&noheader=1"><?php echo __('Bildercache löschen', 'wpsg'); ?></a>
\ No newline at end of file
+<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktbilder&wpsg_mod_produktbilder_clearcache=1&noheader=1"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span><?php echo __('Bildercache löschen', 'wpsg'); ?></a>
\ No newline at end of file
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index 5f1897a..2b2613c 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -4,4 +4,17 @@
 	 * Template für den Reiter "Allgemein" der Produktverwaltung
 	 */
 
-?>TODO
\ No newline at end of file
+?>
+
+<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+	
+	<?php echo wpsg_drawForm_AdminboxStart(); ?>
+		<?php echo wpsg_drawForm_Select('mwst_key', __('Steuergruppe', 'wpsg'), wpsg_tax_groups(true), @$this->view['data']['mwst_key']); ?>								
+		<?php echo wpsg_drawForm_Input('preis', wpsg_translate(__('Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?>
+		<?php echo wpsg_drawForm_Input('oldprice', wpsg_translate(__('Alter Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?>
+		<?php echo wpsg_drawForm_Input('', __('Steueranteil', 'wpsg'), wpsg_ff(@$this->view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?>
+		<?php echo wpsg_drawForm_Checkbox('euleistungsortregel', __('Produkt unterliegt den EU-Leistungsortregeln', 'wpsg'), @$this->view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="glyphicon glyphicon-globe wpsg-glyphicon"></span><?php echo __('Länderverwaltung', 'wpsg'); ?></a>
+	<?php echo wpsg_drawForm_AdminboxEnd(__('Preis / Steuer', 'wpsg')); ?>
+	 
+<?php } ?>
\ No newline at end of file
-- 
cgit v1.2.3