From 6dfd233227169c8ad53c7fb0b67ae188100b49a1 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Mon, 10 Apr 2017 09:36:48 +0000
Subject: - Kundenkontakt vervollständigen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6204 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/admin.css                           |  5 +++++
 views/mods/mod_kundenkontakt/order_view.phtml | 22 ++++++++--------------
 views/order/view_customerdata.phtml           | 17 ++++++++++++++---
 3 files changed, 27 insertions(+), 17 deletions(-)

(limited to 'views')

diff --git a/views/css/admin.css b/views/css/admin.css
index 2ee658d..6293e90 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -71,6 +71,11 @@
 #wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; }
 #wpsg-bs .wpsg_customervar_row2 td { border-top:0px; }
 
+/* Kundenkontakt */
+.wpsg_kundenkontakt_template, 
+.wpsg_kundenkontakt_betreff { width:80%; float:right; margin-bottom:20px; }
+.wpsg_kundenkontakt_textarea { width:100%; float:right; height:150px; }
+
 /* Länderverwaltung */
 .wpsg_table_country { margin-bottom:0px; }
 .wpsg_table_country .col_mwst { width:25px; }
diff --git a/views/mods/mod_kundenkontakt/order_view.phtml b/views/mods/mod_kundenkontakt/order_view.phtml
index fbe8b24..df12385 100644
--- a/views/mods/mod_kundenkontakt/order_view.phtml
+++ b/views/mods/mod_kundenkontakt/order_view.phtml
@@ -140,21 +140,17 @@
 			
 			<form method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&edit_id=<?php echo $this->view['data']['id']; ?>&noheader=1">	
 					
-				<label>
-					<?php echo __("Template", "wpsg"); ?>:
-					<select name="kk_template" style="width:50%; float:right;" id="kk_template" onchange="kk_switchTemplate();">
+				<label><?php echo __("Template", "wpsg"); ?>:</label>
+				<select name="kk_template" class="wpsg_kundenkontakt_template" id="kk_template" onchange="kk_switchTemplate();">
 					<option value="-1"><?php echo __("Bitte auswählen", "wpsg"); ?></option>
 					<?php foreach ($this->view['arTemplates'] as $k => $v) { ?>
-					<option value="<?php echo rawurlencode($v['filename']); ?>"><?php echo htmlspecialchars($v['name']); ?></option>
+						<option value="<?php echo rawurlencode($v['filename']); ?>"><?php echo htmlspecialchars($v['name']); ?></option>
 					<?php } ?>
-					</select>			
-				</label>
+				</select>			
 				<div class="wpsg_clear"></div>
 									
-				<label>
-					<?php echo __("Betreff", "wpsg"); ?>:
-					<input type="text" name="kk_subject" style="width:50%; float:right;" id="kk_subject" />
-				</label>
+				<label><?php echo __("Betreff", "wpsg"); ?>:</label>
+				<input type="text" name="kk_subject" class="wpsg_kundenkontakt_betreff" id="kk_subject" />
 				<div class="wpsg_clear"></div>
 							
 				<?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>				
@@ -166,10 +162,8 @@
 				
 				<div class="wpsg_clear"></div>
 				<?php } else { ?>			
-				<label>
-					<?php echo __("Text", "wpsg"); ?>:<br />
-					<textarea id="kk_text" style="width:100%; float:right; height:150px;"></textarea>
-				</label>
+				<label><?php echo __("Text", "wpsg"); ?>:<br /></label>
+				<textarea id="kk_text" class="wpsg_kundenkontakt_textarea"></textarea>
 				<div class="wpsg_clear"></div>
 				<?php } ?>
 									
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 6950a96..ffeb354 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -18,9 +18,20 @@
             <div class="modal-body">
 
                 <?php echo wpsg_drawForm_Input('dialog_firma', __('Firma', 'wpsg'), $this->view['data']['firma']); ?>
-                <?php echo wpsg_drawForm_Select('dialog_title', __('Anschrift', 'wpsg'), $this->view['arTitles'], $this->view['data']['title'], array('noIndex' => true)); ?>
+                <?php echo wpsg_drawForm_Input('dialog_ustidnr', __('UStIdNr', 'wpsg'), $this->view['data']['ustidnr']); ?>
+                <br />
+                <?php echo wpsg_drawForm_Select('dialog_title', __('Anrede', 'wpsg'), $this->view['arTitles'], $this->view['data']['title'], array('noIndex' => true)); ?>
                 <?php echo wpsg_drawForm_Input('dialog_vname', __('Vorname', 'wpsg'), $this->view['data']['vname']); ?>
                 <?php echo wpsg_drawForm_Input('dialog_name', __('Name', 'wpsg'), $this->view['data']['name']); ?>
+                <br />
+ 				<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), $this->view['data']['geb']); ?>
+                <br />
+                <?php echo wpsg_drawForm_Input('dialog_tel', __('Telefon', 'wpsg'), $this->view['data']['tel']); ?>
+                <?php echo wpsg_drawForm_Input('dialog_fax', __('Fax', 'wpsg'), $this->view['data']['fax']); ?>
+                <?php if ($this->hasMod('wpsg_mod_kundenverwaltung')) { ?>
+	            	<?php echo wpsg_drawForm_Text(__('E-Mail', 'wpsg'),'<a href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id='.$this->view['data']['k_id'].'">'.$this->view['data']['email'].'</a>'); ?>
+				<?php } ?>
+                <br />
                 <?php echo wpsg_drawForm_Input('dialog_strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
                 <?php echo wpsg_drawForm_Input('dialog_plz', __('Postleitzahl', 'wpsg'), $this->view['data']['plz']); ?>
                 <?php echo wpsg_drawForm_Input('dialog_ort', __('Ort', 'wpsg'), $this->view['data']['ort']); ?>
@@ -49,7 +60,7 @@
     <?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;]
 	<?php } ?>
     <?php echo wpsg_drawForm_TextEnd(__('Kundennummer', 'wpsg')); ?>
 
@@ -58,7 +69,7 @@
     <?php echo wpsg_hspc($this->view['data']['firma']); ?><br />
     <?php } ?>
     <?php echo (($this->view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['arTitles'][$this->view['data']['title']]).' ':''); ?><?php echo wpsg_hspc($this->view['data']['vname']); ?> <?php echo wpsg_hspc($this->view['data']['name']); ?><br />
-    <?php echo wpsg_hspc($this->view['data']['strasse']); ?><br />
+    <?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc($this->view['data']['nr']); ?><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 __('Anschrift ändern', 'wpsg'); ?>">
-- 
cgit v1.2.3