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
---
 views/order/index.phtml             |  8 ++++----
 views/order/view.phtml              |  2 +-
 views/order/view_customerdata.phtml | 12 ++++++------
 views/order/view_shippay.phtml      |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'views/order')

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