From 61f979e07c3024c82771359d1ad159beb54b7204 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sat, 10 Sep 2016 19:23:43 +0000
Subject: - Kundenverwaltung / Kunde bearbeiten/anlegen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5752 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/input.phtml                |   2 +-
 views/css/admin.css                         |   3 +-
 views/mods/mod_kundenverwaltung/edit.phtml  | 466 +++++++++++-----------------
 views/mods/mod_kundenverwaltung/index.phtml |   2 +-
 4 files changed, 190 insertions(+), 283 deletions(-)

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 3a936a6..d788b10 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -6,7 +6,7 @@
 	
 		<div class="wpsg_field_wrap">
 			<input 
-				type="text" 
+				type="<?php echo wpsg_getStr($this->view['field_config']['type'], 'text'); ?>"
 				class="form-control input-sm" 
 				name="<?php echo $this->view['field_name']; ?>"
 				autofocus="true"
diff --git a/views/css/admin.css b/views/css/admin.css
index 0f0a380..2fe0a98 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -18,6 +18,7 @@
 #wpsg-bs .popover { max-width:400px; margin-right:20px; }
 #wpsg-bs .arrow { margin-left:0px !important; }
 #wpsg-bs .popover.left > .arrow { left:auto; }
+#wpsg-bs .content .panel-title { font-size:14px; }
 #wpsg-bs .wpsg_admin_content .panel-title { line-height:10px; font-size:14px; }
 #wpsg-bs .table .wpsg-sm { height:20px; line-height:20px; font-size:12px; }
 #wpsg-bs .wpsg_code { background-color:#EFEFEF; border:1px solid #000000; padding:3px; margin-top:5px; margin-bottom:5px; font-family:monospace; font-size:12px; }
@@ -61,7 +62,7 @@
 
 /* Kundenverwaltung -> Kundendaten */
 #wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; }
-#wpsg-bs .wpsg_customervar_row2 td { border-top:0px; } 
+#wpsg-bs .wpsg_customervar_row2 td { border-top:0px; }
 
 /* Länderverwaltung */
 .wpsg_table_country { margin-bottom:0px; }
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index dee38da..965c401 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -5,332 +5,238 @@
 	 */
 
 ?>
-<script type="text/javascript">
-/* <![CDATA[ */
-	
-	jQuery(document).ready( function() {
- 
-	    jQuery("#normal-sortables, #side-sortables").sortable({
-			connectWith: ".meta-box-sortables",
-			placeholder: 'wpsg_placeholder',
-			dropOnEmpty: true,
-			cursor: 'move',
-			handle: '.wpsg_handlediv',
-			grid: [50, 20],
-			forceHelperSize: true,
-			forcePlaceholderSize: true,
-			opacity: 0.8,
-			stop: function(e,ui) {
-
-				var ser = jQuery("#normal-sortables").sortable("serialize");				
-				ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-
-				jQuery.cookie('wpsg_customer_view_normal', ser);
-
-				var ser = jQuery("#side-sortables").sortable("serialize");				
-				ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-
-				jQuery.cookie('wpsg_customer_view_side', ser);
-				
-			},
-			receive: function(e, ui) {
-			}
-		}); 
+<div class="wpsg_customer" id="wpsg-bs">
 
-	    if (jQuery.cookie('wpsg_customer_view_normal') != null)
-		{
+	<nav class="navbar navbar-default">
 
-			var divs = jQuery.cookie('wpsg_customer_view_normal').split(',').reverse();
+		<div class="container-fluid">
+			<div class="navbar-header">
+				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
+			</div>
+			<div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">
+				<ul class="nav navbar-nav">
+					<li role="presentation" class="wpsg-customer-tab-a active"><a href="#" onclick="return false;"><?php echo __("Kundenverwaltung", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
+				</ul>
+				<ul class="nav navbar-nav navbar-right">
+					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=import&noheader=1"><span class="glyphicon glyphicon-import"></span><?php echo __("Import", "wpsg"); ?></a></li>
+					<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
+						<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Export", "wpsg"); ?></a></li>
+					<?php } ?>
+				</ul>
+			</div>
+		</div>
 
-			for (index in divs)
-			{
+	</nav>
 
-				jQuery('#normal-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-				
-			}
-			
-		}
+	<div class="wpsg_clear"></div>
 
-		if (jQuery.cookie('wpsg_customer_view_side') != null)
-		{
+	<?php echo $this->writeBackendMessage(); ?>
 
-			var divs = jQuery.cookie('wpsg_customer_view_side').split(',').reverse();
+	<div class="content form-horizontal">
+
+		<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=save&noheader=1" enctype="multipart/form-data">
+
+			<div class="row">
+				<div class="col-md-8 col-lg-8">
+
+					<?php echo wpsg_drawForm_AdminboxStart(__('Allgemein', 'wpsg')); ?>
+                        <?php echo wpsg_drawForm_Input('knr', __('Kundennummer', 'wpsg'), $this->view['data']['knr']); ?>
+
+                        <?php if ($this->hasMod('wpsg_mod_customergroup')) { ?>
+                            <?php echo wpsg_drawForm_Select('group_id', __('Kundengruppe', 'wpsg'), $this->view['arCustomergroup'], $this->view['data']['group_id']); ?>
+                        <?php } ?>
+
+                        <?php echo wpsg_drawForm_Select('title', __('Anrede', 'wpsg'), $this->view['arTitles'], $this->view['data']['title'], array('noIndex' => true)); ?>
+                        <?php echo wpsg_drawForm_Input('name', __('Name', 'wpsg'), $this->view['data']['name']); ?>
+                        <?php echo wpsg_drawForm_Input('vname', __('Vorname', 'wpsg'), $this->view['data']['vname']); ?>
+                        <?php echo wpsg_drawForm_Input('geb', __('Geburtsdatum', 'wpsg'), wpsg_formatTimestamp(strtotime($this->view['data']['geb']), true), array('datepicker' => true, 'hint' => __('Format: TT.MM.JJJJ', 'wpsg'))); ?>
+                        <?php echo wpsg_drawForm_Input('email', __('E-Mail', 'wpsg'), $this->view['data']['email']); ?>
+                        <?php echo wpsg_drawForm_Input('firma', __('Firma', 'wpsg'), $this->view['data']['firma']); ?>
+                        <?php echo wpsg_drawForm_Input('tel', __('Telefon', 'wpsg'), $this->view['data']['tel']); ?>
+                        <?php echo wpsg_drawForm_Input('fax', __('Fax', 'wpsg'), $this->view['data']['fax']); ?>
+                        <?php echo wpsg_drawForm_Input('strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
+                        <?php echo wpsg_drawForm_Input('plz', __('PLZ', 'wpsg'), $this->view['data']['plz']); ?>
+                        <?php echo wpsg_drawForm_Input('ort', __('Ort', 'wpsg'), $this->view['data']['ort']); ?>
+                        <?php echo wpsg_drawForm_Select('land', __('Land', 'wpsg'), $this->view['arLand'], $this->view['data']['land']); ?>
+                        <?php echo wpsg_drawForm_Input('ustidnr', __('UStIdNr.', 'wpsg'), $this->view['data']['ustidnr']); ?>
+                        <?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), array('inaktiv', 'aktiv'), $this->view['data']['status'], array()); ?>
+                        <?php echo wpsg_drawForm_Checkbox('info-mail', __('Mail bei Statusänderung', 'wpsg'), '', array()); ?>
+                        <?php echo wpsg_drawForm_Textarea('comment', __('Kundenkommentar', 'wpsg'), $this->view['data']['comment']); ?>
+					<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+                    <?php if (wpsg_isSizedArray($this->view['pflicht']['custom'])) { ?>
+                    <?php echo wpsg_drawForm_AdminboxStart(__('Benutzerdefinierte Felder', 'wpsg')); ?>
+                    <?php foreach ($this->view['pflicht']['custom'] as $c_id => $c) { ?>
+                        <?php if ($c['typ'] == '0') { // Textfeld ?>
+                            <?php echo wpsg_drawForm_Input('custom['.$c_id.']', __($c['name'], 'wpsg'), @$this->view['data']['custom'][$c_id]); ?>
+                        <?php } else if ($c['typ'] == '1') { // Auswahl ?>
+                            <?php echo wpsg_drawForm_Select('custom['.$c_id.']', __($c['name'], 'wpsg'), wpsg_array_merge(array('' => __('Keine Auswahl', 'wpsg')), explode('|', $c['auswahl'])), @$this->view['data']['custom'][$c_id], array('noIndex' => true)); ?>
+                        <?php } else if ($c['typ'] == '2') { // Checkbox?>
+                            <?php echo wpsg_drawForm_Checkbox('custom['.$c_id.']', __($c['name'], 'wpsg'), @$this->view['data']['custom'][$c_id]); ?>
+                        <?php } ?>
+                    <?php } ?>
+                    <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+                    <?php } ?>
 
-			for (index in divs)
-			{
-				 
-				jQuery('#side-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-				
-			}
-			
-		}
+				</div>
+				<div class="col-md-4 col-lg-4">
+
+					<?php echo wpsg_drawForm_AdminboxStart(__('Passwortänderung', 'wpsg')); ?>
+						<?php echo wpsg_drawForm_Input('password1', __('Passwort', 'wpsg'), '', array('type' => 'password')); ?>
+						<?php echo wpsg_drawForm_Input('password2', __('Wiederholung', 'wpsg'), '', array('type' => 'password')); ?>
+                        <div id="wpsg_pwd_info">
+                            <h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
+                            <ul>
+                                <li id="wpsg_pwd_length" class="invalid"><?php echo __('Das Passwort ist zu kurz!','wpsg')?></li>
+                                <li id="wpsg_pwd_letter" class="invalid"><?php echo __('Mindestens ein Kleinbuchstabe','wpsg') ?></li>
+                                <li id="wpsg_pwd_capital" class="invalid"><?php echo __('Mindestens ein Großbuchstabe','wpsg') ?></li>
+                                <li id="wpsg_pwd_number" class="invalid"><?php echo __('Mindestens eine Zahl','wpsg') ?></li>
+                                <li id="wpsg_pwd_speziell" class="invalid"><?php echo __('Mindestens ein Sonderzeichen','wpsg') ?></li>
+                            </ul>
+                        </div>
+					<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+					<?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>
+					<?php echo wpsg_drawForm_AdminboxStart(__('Information', 'wpsg')) ?>
+
+						<?php echo wpsg_drawForm_TextStart(); ?>
+						<p>
+							<?php echo $this->view['data']['countOrder']; ?>
+							<?php if ($this->view['data']['countOrder'] > 0) { ?>
+								[ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $this->view['data']['id']; ?>"><?php echo __('Bestellungen anzeigen', 'wpsg'); ?></a> ]
+							<?php } ?>
+						</p>
+						<?php echo wpsg_drawForm_TextEnd(__('Bestellungen', 'wpsg'), array('noP' => true)); ?>
+
+						<?php echo wpsg_drawForm_TextStart(); ?>
+						<p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['lastorder'])); ?></p>
+						<?php echo wpsg_drawForm_TextEnd(__('Letzte Bestellung', 'wpsg'), array('noP' => true)); ?>
+
+						<?php if ($this->hasMod('wpsg_mod_statistics')) { ?>
+						<?php echo wpsg_drawForm_TextStart(); ?>
+						<p>
+							<?php
+
+							echo wpsg_translate(__('<a href="#1#" title="Storniert" class="wpsg_storno">#2#</a> / <a href="#3#" title="Offen" class="wpsg_open">#4#</a> / <a href="#5#" title="Bezahlt" class="wpsg_payed">#6#</a>', 'wpsg'),
+								WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=500&filter[k_id]='.$this->view['data']['id'],
+								wpsg_ff($this->view['amountStorno']),
+								WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=0&filter[k_id]='.$this->view['data']['id'],
+								wpsg_ff($this->view['amountAll'] - $this->view['amountStorno'] - $this->view['amountPayed']),
+								WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=100,110&filter[k_id]='.$this->view['data']['id'],
+								wpsg_ff($this->view['amountPayed'])
+							);
+
+							?>
+						</p>
+						<?php echo wpsg_DrawForm_TextEnd(wpsg_translate(__('Umsatz in #1#', 'wpsg'), $this->get_option('wpsg_currency')), array('noP' => true)); ?>
+						<?php } ?>
+
+					<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+					<?php } ?>
+                    
+                    <?php $this->callMods('wpsg_mod_customer_sidebar', array(&$this->view['data'])); ?>
 
-		jQuery('.wpsg_handlediv').bind('click', function() {
-			jQuery(this).next().toggle();
+				</div>
+			</div>
 
-			var arClose = new Array();
-			jQuery('.wpsg_customer_view .postbox .inside:hidden').each(function() {
-				arClose.push(jQuery(this).parent().attr("id"));
-			} );
+            <?php if ($_REQUEST['edit_id'] > 0) { ?>
+                <input type="hidden" name="edit_id" value="<?php echo $_REQUEST['edit_id']; ?>" />
+            <?php } ?>
 
-			jQuery.cookie('wpsg_customer_closed', arClose.join(','));
-			
-		} );
+            <input type="submit" value="<?php echo __('Kunde speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
+            <input type="submit" value="<?php echo __('Kunde speichern und zur Übersicht', 'wpsg'); ?>" class="button-primary" id="submit_index" name="submit_index" />
 
-		if (jQuery.cookie('wpsg_customer_closed') != null)
-		{
+		</form>
 
-			var arClose = jQuery.cookie('wpsg_customer_closed').split(',');
+	</div>
 
-			for (index in arClose)
-			{
-				
-				jQuery('#' + arClose[index] + ' .inside').hide();
-							
-			}
-			
-		}
-		
-// Visualisierung der Passwortstärke 
+</div>
 
-	jQuery('input[type=password]').keyup(function(){
+<script type="text/javascript">/* <![CDATA[ */
+	
+	jQuery(document).ready(function() {
+		
+		// Visualisierung der Passwortstärke
+		jQuery('input[type=password]').keyup(function() {
 
 			var password = jQuery(this).val();
-			
-			if (password.length < 6) {
-				
+
+			if (password.length < 6)
+			{
+
 				jQuery('#wpsg_pwd_length').removeClass('valid').addClass('invalid');
 
-			}else{
+			}
+			else
+			{
 
 				jQuery('#wpsg_pwd_length').removeClass('invalid').addClass('valid');
-	
+
 			}
 
-			if (password.match(/([a-z])/)) {
-				
+			if (password.match(/([a-z])/))
+			{
+
 				jQuery('#wpsg_pwd_letter').removeClass('invalid').addClass('valid');
 
-			}else{
+			}
+			else
+			{
 
 				jQuery('#wpsg_pwd_letter').removeClass('valid').addClass('invalid');
-	
+
 			}
 
-			if (password.match(/([A-Z])/)) {
-				
+			if (password.match(/([A-Z])/))
+			{
+
 				jQuery('#wpsg_pwd_capital').removeClass('invalid').addClass('valid');
 
-			}else{
+			}
+			else
+			{
 
 				jQuery('#wpsg_pwd_capital').removeClass('valid').addClass('invalid');
-	
+
 			}
-			
-			if (password.match(/([0-9])/)) {
-				
+
+			if (password.match(/([0-9])/))
+			{
+
 				jQuery('#wpsg_pwd_number').removeClass('invalid').addClass('valid');
 
-			}else{
+			}
+			else
+			{
 
 				jQuery('#wpsg_pwd_number').removeClass('valid').addClass('invalid');
-	
+
 			}
 
-			if (password.match(/([~,!,%,@,&,#,°,^,$,?,_,*,§])/)) {
-				
+			if (password.match(/([~,!,%,@,&,#,°,^,$,?,_,*,§])/))
+            {
+
 				jQuery('#wpsg_pwd_speziell').removeClass('invalid').addClass('valid');
 
-			}else{
+			}
+            else
+            {
 
 				jQuery('#wpsg_pwd_speziell').removeClass('valid').addClass('invalid');
-	
+
 			}
-			
 
-			jQuery('#wpsg_pwd_info').show(); 
+			jQuery('#wpsg_pwd_info').show();
 
-			jQuery(this).blur(function(){
+			jQuery(this).blur(function() {
 
-				jQuery('#wpsg_pwd_info').hide(); 
-				
-			});
-		});	
-	});		
-		
+				jQuery('#wpsg_pwd_info').hide();
 
-/* ]]> */
-</script>
-             
-<div class="wrap columns-2 wpsg_produkt_addedit wpsg_customer_view">
-	<div class="icon32 icon32-posts-post" id="icon-edit"><br /></div>
-	<h2>
-		<?php echo wpsg_hspc($this->view['data']['vname'].' '.$this->view['data']['name']); ?>		
-	</h2>
-	<br />
-	
-	<?php echo $this->writeBackendMessage(); ?>
-	
- 	<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=save&amp;noheader=1" enctype="multipart/form-data">
+			} );
 
-		<div id="postbox" class="metabox-holder has-right-sidebar">
-		
-			<div id="side-info-column" class="inner-sidebar" style="width:386px;">
-				<div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;">
-				
-					<div id="wpsg_customerpasswd" class="postbox">
-						<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-						<h3 class="wpsg_handlediv">
-							<span><?php echo __('Passwortänderung', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<?php echo wpsg_drawForm_Input('password1', __('Passwort', 'wpsg'), ''); ?>
-							<span id="wpsg_customerpassword_result"></span>	
-							<?php echo wpsg_drawForm_Input('password2', __('Wiederholung', 'wpsg'), ''); ?>
-							<div id="wpsg_pwd_info"> 
-							<h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
-							<ul>
-									<li id="wpsg_pwd_length" class="invalid"><?php echo __('Das Passwort ist zu kurz!','wpsg')?></li>
-									<li id="wpsg_pwd_letter" class="invalid"><?php echo __('Mindestens ein Kleinbuchstabe','wpsg') ?></li>
-									<li id="wpsg_pwd_capital" class="invalid"><?php echo __('Mindestens ein Großbuchstabe','wpsg') ?></li>
-									<li id="wpsg_pwd_number" class="invalid"><?php echo __('Mindestens eine Zahl','wpsg') ?></li>
-									<li id="wpsg_pwd_speziell" class="invalid"><?php echo __('Mindestens ein Sonderzeichen','wpsg') ?></li>
-								</ul>
-							</div>
-							<div class="wpsg_clear"></div>	
-						</div>
-					</div>
-					
-					<div id="wpsg_customerstats" class="postbox">
-						<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-						<h3 class="wpsg_handlediv">
-							<span><?php echo __('Information', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left"><?php echo __('Bestellungen', 'wpsg'); ?>:</div>
-								<div class="wpsg_form_right">
-									<p>
-										<?php echo $this->view['data']['countOrder']; ?>
-										<?php if ($this->view['data']['countOrder'] > 0) { ?>
-										[ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $this->view['data']['id']; ?>"><?php echo __('Bestellungen anzeigen', 'wpsg'); ?></a> ]										
-										<?php } ?>
-									</p>
-								</div>
-							</div>
-							<div class="wpsg_clear"></div>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left"><?php echo __('Letzte Bestellung', 'wpsg'); ?>:</div>
-								<div class="wpsg_form_right"><p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['lastorder'])); ?></p></div>
-							</div>
-							<div class="wpsg_clear"></div>
-							<?php if ($this->hasMod('wpsg_mod_statistics')) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left"><?php echo wpsg_translate(__('Umsatz in #1#', 'wpsg'), $this->get_option('wpsg_currency')); ?>:</div>
-								<div class="wpsg_form_right wpsg_mod_kundenverwaltung_customeramount">
-									<p>
-										<?php 
-											echo wpsg_translate(__('<a href="#1#" title="Storniert" class="wpsg_storno">#2#</a> / <a href="#3#" title="Offen" class="wpsg_open">#4#</a> / <a href="#5#" title="Bezahlt" class="wpsg_payed">#6#</a>', 'wpsg'),
-												WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=500&filter[k_id]='.$this->view['data']['id'],
-												wpsg_ff($this->view['amountStorno']),
-												WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=0&filter[k_id]='.$this->view['data']['id'],
-												wpsg_ff($this->view['amountAll'] - $this->view['amountStorno'] - $this->view['amountPayed']),
-												WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&filter[status]=100,110&filter[k_id]='.$this->view['data']['id'],
-												wpsg_ff($this->view['amountPayed'])
-											); 
-										?>
-									</p>
-								</div>
-							</div>
-							<?php } ?>
-							<div class="wpsg_clear"></div>														
-						</div>
-					</div>
-					
-					<?php if (wpsg_isSizedArray($this->view['pflicht']['custom'])) { ?>
-					<div id="wpsg_customercustomfields" class="postbox">
-						<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-						<h3 class="wpsg_handlediv">
-							<span><?php echo __('Benutzerdefinierte Felder', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<?php foreach ($this->view['pflicht']['custom'] as $c_id => $c) { ?>							
-								<?php if ($c['typ'] == '0') { // Textfeld ?>
-								<?php echo wpsg_drawForm_Input('custom['.$c_id.']', __($c['name'], 'wpsg'), @$this->view['data']['custom'][$c_id]); ?>
-								<?php } else if ($c['typ'] == '1') { // Auswahl ?>
-								<?php echo wpsg_drawForm_Select('custom['.$c_id.']', __($c['name'], 'wpsg'), wpsg_array_merge(array('' => __('Keine Auswahl', 'wpsg')), explode('|', $c['auswahl'])), @$this->view['data']['custom'][$c_id], array('noIndex' => true)); ?>
-								<?php } else if ($c['typ'] == '2') { // Checkbox?>
-								<?php echo wpsg_drawForm_Checkbox('custom['.$c_id.']', __($c['name'], 'wpsg'), @$this->view['data']['custom'][$c_id]); ?>	
-								<?php } ?>			
-							<?php } ?>	
-						</div>
-					</div>
-					<?php } ?>
-					
-					<?php $this->callMods('wpsg_mod_customer_sidebar', array(&$this->view['data'])); ?>
-					
-				</div>
-			</div>
-				
-			<div id="post-body">	
-			
-				<div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px;">
-				
-					<div id="wpsg_customeraddress" class="postbox">								
-						<h3 class="wpsg_handlediv">
-							<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-							<span><?php echo __('Name/Anschrift', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<?php echo wpsg_drawForm_Input('knr', __('Kundennummer', 'wpsg'), $this->view['data']['knr']); ?>
-							
-							<?php if ($this->hasMod('wpsg_mod_customergroup')) { ?>
-							<?php echo wpsg_drawForm_Select('group_id', __('Kundengruppe', 'wpsg'), $this->view['arCustomergroup'], $this->view['data']['group_id']); ?>
-							<?php } ?>							
-							
-							<?php echo wpsg_drawForm_Select('title', __('Anrede', 'wpsg'), $this->view['arTitles'], $this->view['data']['title'], array('noIndex' => true)); ?>
-							<?php echo wpsg_drawForm_Input('name', __('Name', 'wpsg'), $this->view['data']['name']); ?>
-							<?php echo wpsg_drawForm_Input('vname', __('Vorname', 'wpsg'), $this->view['data']['vname']); ?>
-							<?php echo wpsg_drawForm_Input('geb', __('Geburtsdatum', 'wpsg'), wpsg_formatTimestamp(strtotime($this->view['data']['geb']), true), array('datepicker' => true, 'hint' => __('Format: TT.MM.JJJJ', 'wpsg'))); ?>
-							<?php echo wpsg_drawForm_Input('email', __('E-Mail', 'wpsg'), $this->view['data']['email']); ?>
-							<?php echo wpsg_drawForm_Input('firma', __('Firma', 'wpsg'), $this->view['data']['firma']); ?>
-							<?php echo wpsg_drawForm_Input('tel', __('Telefon', 'wpsg'), $this->view['data']['tel']); ?>
-							<?php echo wpsg_drawForm_Input('fax', __('Fax', 'wpsg'), $this->view['data']['fax']); ?>
-							<?php echo wpsg_drawForm_Input('strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
-							<?php echo wpsg_drawForm_Input('plz', __('PLZ', 'wpsg'), $this->view['data']['plz']); ?>
-							<?php echo wpsg_drawForm_Input('ort', __('Ort', 'wpsg'), $this->view['data']['ort']); ?>
-							<?php echo wpsg_drawForm_Select('land', __('Land', 'wpsg'), $this->view['arLand'], $this->view['data']['land']); ?>
-							<?php echo wpsg_drawForm_Input('ustidnr', __('UStIdNr.', 'wpsg'), $this->view['data']['ustidnr']); ?>	
-							<?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), array('inaktiv', 'aktiv'), $this->view['data']['status'], array()); ?>						
-							<?php echo wpsg_drawForm_Checkbox('info-mail', __('Mail bei Statusänderung', 'wpsg'), '', array()); ?>
-						</div>
-					</div>
-					
-					<div id="wpsg_customercomment" class="postbox">
-						<h3 class="wpsg_handlediv">
-							<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-							<span><?php echo __('Kundenkommentar', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<textarea name="comment"><?php echo wpsg_hspc($this->view['data']['comment']); ?></textarea>
-						</div>
-					</div>
-					
-				</div>
-				
-				<?php if ($_REQUEST['edit_id'] > 0) { ?>
-				<input type="hidden" name="edit_id" value="<?php echo $_REQUEST['edit_id']; ?>" />
-				<?php } ?>
-					
-				<p class="submit">
-					<input type="submit" value="<?php echo __('Kunde speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
-					<input type="submit" value="<?php echo __('Kunde speichern und zur Übersicht', 'wpsg'); ?>" class="button-primary" id="submit_index" name="submit_index" />
-				</p>
-				
-			</div>
-			
-		</div>
-		
-						
-	</form>
-</div>
\ No newline at end of file
+		} );
+
+	} );
+
+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index 3494ddb..9af170d 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -96,7 +96,7 @@
                                 <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>
                             <?php } ?>
                             <div class="row-actions">
-                                <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
+                                <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
                                 |
                                 <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
                                 |
-- 
cgit v1.2.3