From 32a192024f2e4d7559e1c1c9e826f5b5a35228ae Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 24 Feb 2017 15:38:06 +0000
Subject: Bestellverwaltung Kundendaten an mehrere Adressen anpassen
 Kundendaten/Adressdaten trennen in Kundenverwaltung, Registrierung, Profil
 Import/Export Kundendaten WP-User nicht löschen bei Kundenimport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6081 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../mods/mod_deliverynote/order_view_content.phtml |  6 ++--
 views/mods/mod_kundenverwaltung/index.phtml        |  2 +-
 views/mods/mod_kundenverwaltung/register.phtml     | 34 +++++++++++-----------
 views/mods/mod_produktartikel/settings_edit.phtml  |  1 -
 views/mods/mod_rechnungen/order_view.phtml         |  8 ++---
 .../wpsg_order_view_customerdata.phtml             |  2 +-
 views/order/index.phtml                            |  8 ++---
 views/order/view.phtml                             |  2 +-
 views/order/view_customerdata.phtml                | 12 ++++----
 views/order/view_shippay.phtml                     |  4 +--
 10 files changed, 39 insertions(+), 40 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_deliverynote/order_view_content.phtml b/views/mods/mod_deliverynote/order_view_content.phtml
index 8634dbd..0543365 100644
--- a/views/mods/mod_deliverynote/order_view_content.phtml
+++ b/views/mods/mod_deliverynote/order_view_content.phtml
@@ -33,14 +33,14 @@
 						
 						<label style="height:25px; width:240px; float:left; margin-top:10px;">	
 							<input onchange="if (this.checked) jQuery('#wpsg_mod_deliverynote_email').show(); else jQuery('#wpsg_mod_deliverynote_email').hide();" type="checkbox" checked="checked" value="1" name="wpsg_mod_deliverynote_showmail" />
-							&nbsp;<?php echo __("E-Mail an Kunden senden.", "wpsg"); ?>
+							&nbsp;<?php echo __("E-Mail an Kunden senden", "wpsg"); ?>
 						</label>
 						<input type="text" style="display:block; width:300px; float:right;" id="wpsg_mod_deliverynote_email" name="wpsg_mod_deliverynote_email" value="<?php echo wpsg_hspc($this->view['data']['email']); ?>" />
 						<div style="clear:both; width:100%; height:5px;"></div>
 						 
 						<label style="height:25px; width:220px; float:left;">									
 							<input checked="checked" onchange="if (this.checked) jQuery('#wpsg_mod_deliverynote_status').show(); else jQuery('#wpsg_mod_deliverynote_status').hide();" type="checkbox" value="1" name="wpsg_mod_deliverynote_setstatus" />
-							&nbsp;<?php echo __("Neuer Status:", "wpsg"); ?>										
+							&nbsp;<?php echo __("Neuer Status", "wpsg"); ?>										
 						</label>
 						<select style="width:300px; float:right;" id="wpsg_mod_deliverynote_status" name="wpsg_mod_deliverynote_status">
 							<?php foreach ($this->arStatus as $k => $v) { ?>
@@ -56,7 +56,7 @@
 						<div style="clear:both; width:100%; height:5px;"></div>
 									
 						<label style="height:25px; width:240px; float:left; padding-left:22px;">
-							<?php echo __("Lieferdatum", "wpsg"); ?>:											
+							<?php echo __("Lieferdatum", "wpsg"); ?>										
 						</label>
 						<input style="display:block;float:right; width:300px;" type="text" name="wpsg_mod_deliverynote_date" value="<?php echo date("d.m.Y", time()); ?>" />
 						<div style="clear:both; width:100%; height:5px;"></div>
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index 332515f..49d06d7 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -21,7 +21,7 @@
 				</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'])) { ?>
+					<?php if (wpsg_isSizedArray($this->view['arData'])) { ?>
 					<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>
diff --git a/views/mods/mod_kundenverwaltung/register.phtml b/views/mods/mod_kundenverwaltung/register.phtml
index 6b2657f..5f9e36f 100644
--- a/views/mods/mod_kundenverwaltung/register.phtml
+++ b/views/mods/mod_kundenverwaltung/register.phtml
@@ -141,7 +141,7 @@
 			<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[register][firma]" value="<?php echo htmlspecialchars($this->view['data']['firma']); ?>" />
+			<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[register][firma]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['firma'])); ?>" />
 		</div>
 	
 		<div class="wpsg_checkoutblock">
@@ -159,42 +159,42 @@
 			<label for="vname" class="wpsg_register"><?php echo __("Vorname", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[register][vname]" value="<?php echo htmlspecialchars($this->view['data']['vname']); ?>" />		
+			<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[register][vname]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['vname'])); ?>" />		
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="name" class="wpsg_register"><?php echo __("Name", "wpsg"); ?>
-			<?php if ($this->data['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+			<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[register][name]" value="<?php echo htmlspecialchars($this->view['data']['name']); ?>" />
+			<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[register][name]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['name'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_register"><?php echo __("E-Mail Adresse", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[register][email]" value="<?php echo htmlspecialchars($this->view['data']['email']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[register][email]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['email'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="email" class="wpsg_register"><?php echo __("E-Mail Adresse (Wiederholung)", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[register][email2]" value="<?php echo htmlspecialchars($this->view['data']['register']['email2']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[register][email2]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['register']['email2'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="pwd1" class="wpsg_register"><?php echo __("Passwort", "wpsg"); ?>
-			<?php if ($this->view['pflicht']['pwd1'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+			<?php if (wpsg_getStr($this->view['pflicht']['pwd1']) != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['pwd1'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd1" name="wpsg[register][register_pwd1]" value="" /><span id="wpsg_checkoutblock_password_result"></span>
+			<input class="<?php echo ((wpsg_getStr($this->view['pflicht']['pwd1']) != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd1" name="wpsg[register][register_pwd1]" value="" /><span id="wpsg_checkoutblock_password_result"></span>
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="pwd2" class="wpsg_register"><?php echo __("Passwort (Wiederholung)", "wpsg"); ?>
-			<?php if ($this->view['pflicht']['pwd2'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+			<?php if (wpsg_getStr($this->view['pflicht']['pwd2']) != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['pwd2'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd2" name="wpsg[register][register_pwd2]" value="" />
+			<input class="<?php echo ((wpsg_getStr($this->view['pflicht']['pwd2']) != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd2" name="wpsg[register][register_pwd2]" value="" />
 		</div>
 		
 		<div id="wpsg_pwd_info"> 
@@ -212,42 +212,42 @@
 			<label for="geb" class="wpsg_register"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)', 'wpsg'); ?>
 			<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[register][geb]" value="<?php echo htmlspecialchars($this->view['data']['geb']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[register][geb]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['geb'])); ?>" />
 		</div>
 				
 		<div class="wpsg_checkoutblock">
 			<label for="fax" class="wpsg_register"><?php echo __("Fax.", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[register][fax]" value="<?php echo htmlspecialchars($this->view['data']['fax']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[register][fax]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['fax'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="tel" class="wpsg_register"><?php echo __("Tel.", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[register][tel]" value="<?php echo htmlspecialchars($this->view['data']['tel']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[register][tel]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['tel'])); ?>" />
 		</div>
 	
 		<div class="wpsg_checkoutblock">
 			<label for="strasse" class="wpsg_register"><?php echo __("Straße Nr.", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars($this->view['data']['strasse']); ?>" />		
+			<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[register][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['strasse'])); ?>" />		
 		</div>
 	
 		<div class="wpsg_checkoutblock">
 			<label for="plz" class="wpsg_register"><?php echo __("Postleitzahl", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[register][plz]" value="<?php echo htmlspecialchars($this->view['data']['plz']); ?>" />
+			<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[register][plz]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['plz'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
 			<label for="ort" class="wpsg_register"><?php echo __("Ort", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[register][ort]" value="<?php echo htmlspecialchars($this->view['data']['ort']); ?>" />
+			<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[register][ort]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['ort'])); ?>" />
 		</div>
 		
 		<div class="wpsg_checkoutblock">
@@ -266,7 +266,7 @@
 			<label for="wpsg_ustidnr" class="wpsg_register"><?php echo __("UStIdNr.", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[register][ustidnr]" value="<?php echo htmlspecialchars($this->view['data']['ustidnr']); ?>" />
+			<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[register][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['data']['ustidnr'])); ?>" />
 		</div>
 		
 		<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml
index 3b2b824..3c84e8f 100644
--- a/views/mods/mod_produktartikel/settings_edit.phtml
+++ b/views/mods/mod_produktartikel/settings_edit.phtml
@@ -20,7 +20,6 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_ean', __('Darstellung der EAN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_ean'), array('help' => 'wpsg_mod_produktartikel_ean')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_gtin', __('Darstellung der GTIN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_gtin'), array('help' => 'wpsg_mod_produktartikel_gtin')); ?>
 
-<?php var_dump($this->get_option('wpsg_mod_produktartikel_hometemplate'));?>
 <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
 <?php echo wpsg_drawForm_Text(__('Produkttemplate für Ansicht auf Startseite', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
 <?php } else { ?>
diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml
index 3b68a39..7f8d341 100644
--- a/views/mods/mod_rechnungen/order_view.phtml
+++ b/views/mods/mod_rechnungen/order_view.phtml
@@ -192,21 +192,21 @@
 
                     <label style="height:25px; width:240px; float:left; margin-top:10px;">
                         <input onchange="if (this.checked) jQuery('#wpsg_rechnungen_email').show(); else jQuery('#wpsg_rechnungen_email').hide();" type="checkbox" checked="checked" value="1" name="wpsg_rechnungen_sendmail" />
-                        &nbsp;<?php echo __("E-Mail an Kunden senden.", "wpsg"); ?>
+                        &nbsp;<?php echo __("E-Mail an Kunden senden", "wpsg"); ?>
                     </label>
                     <input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_email" name="wpsg_rechnungen_email" value="<?php echo wpsg_hspc($this->view['data']['email']); ?>" />
                     <div style="clear:both; width:100%; height:5px;"></div>
 
                     <label style="height:25px; width:240px; float:left;">
                         <input checked="checked"  onchange="if (this.checked) jQuery('#wpsg_rechnungen_faelligkeitsdatum').show(); else jQuery('#wpsg_rechnungen_faelligkeitsdatum').hide();" type="checkbox" value="1" name="wpsg_rechnungen_faelligkeit" />
-                        &nbsp;<?php echo __("Fälligkeit anzeigen.", "wpsg"); ?>
+                        &nbsp;<?php echo __("Fälligkeit anzeigen", "wpsg"); ?>
                     </label>
                     <input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_faelligkeitsdatum" name="wpsg_rechnungen_faelligkeitsdatum" value="<?php echo date("d.m.Y", time() + ($this->get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" />
                     <div style="clear:both; width:100%; height:5px;"></div>
 
                     <label style="height:25px; width:220px; float:left;">
                         <input checked="checked" onchange="if (this.checked) jQuery('#wpsg_rechnungen_status').show(); else jQuery('#wpsg_rechnungen_status').hide();" type="checkbox" value="1" name="wpsg_rechnungen_status" />
-                        &nbsp;<?php echo __("Neuer Status:", "wpsg"); ?>
+                        &nbsp;<?php echo __("Neuer Status", "wpsg"); ?>
                     </label>
                     <select style="width:300px; float:right;" id="wpsg_rechnungen_status_neu" name="wpsg_rechnungen_status_neu">
                         <?php foreach ($this->arStatus as $k => $v) { ?>
@@ -222,7 +222,7 @@
                     <div style="clear:both; width:100%; height:5px;"></div>
 
                     <label style="height:25px; width:240px; float:left; padding-left:22px;">
-                        <?php echo __("Rechnungsdatum", "wpsg"); ?>:
+                        <?php echo __("Rechnungsdatum", "wpsg"); ?>
                     </label>
                     <input style="display:block;float:right; width:300px;" type="text" name="wpsg_rechnungen_datum" value="<?php echo date("d.m.Y", time()); ?>" />
                     <div style="clear:both; width:100%; height:5px;"></div>
diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
index ff3723c..d27f09a 100644
--- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
+++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
@@ -36,7 +36,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title"><?php echo __('Lieferanschrift beatbeiten', 'wpsg'); ?></h4>
+                <h4 class="modal-title"><?php echo __('Lieferanschrift bearbeiten', 'wpsg'); ?></h4>
             </div>
             <div class="modal-body">
 
diff --git a/views/order/index.phtml b/views/order/index.phtml
index 1133d52..add65fc 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -195,13 +195,13 @@
 
                         </td>
                         <td class="col_customer">
-                            <?php $firma = $oOrder->getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?>
+                            <?php $firma = $oOrder->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>
                             <?php echo $firma; ?><br />
                             <?php } ?>
-                            <?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getCustomer()->vname; ?> <?php echo $oOrder->getCustomer()->name; ?>
+                            <?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getInvoiceFirstname(); ?> <?php echo $oOrder->getInvoiceName(); ?>
                             <br />
-                            <span class="wpsg_grey"><?php echo $oOrder->getCustomer()->strasse; ?><br />
-                            <?php echo ltrim($oOrder->getCustomer()->plz.' '.$oOrder->getCustomer()->ort); ?> <?php echo $oOrder->getCustomer()->getCountryKuerzel(); ?>
+                            <span class="wpsg_grey"><?php echo $oOrder->getInvoiceStreet(); ?><br />
+                            <?php echo ltrim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> <?php echo $oOrder->getInvoiceCountryKuerzel(); ?>
                             </span>
                         </td>
                         <td class="col_payment">
diff --git a/views/order/view.phtml b/views/order/view.phtml
index 00a5233..59e9d4e 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -84,7 +84,7 @@
 
 
 	/**
-	 * Fügt einen neuen Rabatt hinzu (nur wenn keiner da ist)
+	 * Sendet eine eMail
 	 */	                                            	
 	function wpsg_sendMail(oid)
 	{
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 20200ca..317339e 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -13,7 +13,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title"><?php echo __('Kundendaten beatbeiten', 'wpsg'); ?></h4>
+                <h4 class="modal-title"><?php echo __('Kundendaten bearbeiten', 'wpsg'); ?></h4>
             </div>
             <div class="modal-body">
 
@@ -49,9 +49,9 @@
     <?php echo wpsg_drawForm_TextStart(); ?>
     <?php echo $this->view['oOrder']->getCustomer()->getNr(); ?>
     <?php if ($this->hasMod('wpsg_mod_kundenverwaltung')) { ?>
-	[&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $this->view['data']['k_id']; ?>"><?php echo __('Zum Kunden', 'wpsg'); ?></a>&nbsp;]</a>
+	[&nbsp; <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $this->view['data']['k_id']; ?>"><?php echo __('Zum Kunden', 'wpsg'); ?></a>&nbsp;]</a>
 	<?php } ?>
-    <?php echo wpsg_drawForm_TextEnd(__('Kundennummer:', 'wpsg')); ?>
+    <?php echo wpsg_drawForm_TextEnd(__('Kundennummer', 'wpsg')); ?>
 
     <?php echo wpsg_drawForm_TextStart(); ?>
     <?php if (trim($this->view['data']['firma']) != '') { ?>
@@ -61,11 +61,11 @@
     <?php echo wpsg_hspc($this->view['data']['strasse']); ?><br />
     <?php echo wpsg_hspc($this->view['data']['plz']); ?> <?php echo wpsg_hspc($this->view['data']['ort']); ?> <?php echo wpsg_hspc($this->view['country']['kuerzel']); ?><br />
 
-    <a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_edit" href="#" title="<?php echo __('Rechnungsanschrift ändern', 'wpsg'); ?>">
+    <a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_edit" href="#" title="<?php echo __('Anschrift ändern', 'wpsg'); ?>">
         <span class="glyphicon glyphicon-pencil"></span>
     </a>
 
-    <?php echo wpsg_drawForm_TextEnd(__('Anschrift:', 'wpsg')); ?>
+    <?php echo wpsg_drawForm_TextEnd(__('Anschrift', 'wpsg')); ?>
 
     <?php if (strtotime($this->view['data']['geb']) > 0) { ?>
     <?php echo wpsg_drawForm_Input('', __('Geburtsdatum', 'wpsg'), wpsg_fromDate($this->view['data']['geb']), array('text' => true)); ?>
@@ -87,7 +87,7 @@
 
     <?php echo wpsg_drawForm_TextStart(); ?>
     <a href="mailto:<?php echo $this->view['data']['email']; ?>"><?php echo $this->view['data']['email']; ?></a>
-    <?php echo wpsg_drawForm_TextEnd(__('E-Mail:', 'wpsg')); ?>
+    <?php echo wpsg_drawForm_TextEnd(__('E-Mail', 'wpsg')); ?>
 
     <script type="text/javascript">/* <![CDATA[ */
 
diff --git a/views/order/view_shippay.phtml b/views/order/view_shippay.phtml
index 50c1388..38a1afc 100644
--- a/views/order/view_shippay.phtml
+++ b/views/order/view_shippay.phtml
@@ -16,7 +16,7 @@
         <?php if ($shippingCost > 0) { ?>
         (<?php echo wpsg_ff($shippingCost, $this->get_option('wpsg_currency')); ?>)
         <?php } ?>
-    <?php echo wpsg_drawForm_TextEnd(__('Versandart:', 'wpsg')); ?>
+    <?php echo wpsg_drawForm_TextEnd(__('Versandart', 'wpsg')); ?>
 
     <?php echo wpsg_drawForm_TextStart(); ?>
         <?php echo wpsg_hspc($this->view['oOrder']->getPaymentLabel()); ?>
@@ -24,7 +24,7 @@
         <?php if ($paymentCost > 0) { ?>
         (<?php echo wpsg_ff($paymentCost, $this->get_option('wpsg_currency')); ?>)
         <?php } ?>
-    <?php echo wpsg_drawForm_TextEnd(__('Zahlungsart:', 'wpsg')); ?>
+    <?php echo wpsg_drawForm_TextEnd(__('Zahlungsart', 'wpsg')); ?>
 
     <?php $this->callMods('order_view_afterpayment', array(&$this->view['data']['id'])); ?>
 
-- 
cgit v1.2.3