- Kundenfelder weder ausgeblendet, wenn Option "Nicht anzeigen" aktiviert ist

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7087 0d5edaf7-2b12-4e95-93f4-047927463d4b

2 files changed, 130 insertions, 56 deletions

diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index da8afe5..421e2a1 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -44,20 +44,45 @@
                         <?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 if ($this->view['pflicht']['anrede'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Select('title', __('Anrede', 'wpsg'), $this->view['arTitles'], @$this->view['data']['title'], array('noIndex' => true)); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['name'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('name', __('Name', 'wpsg'), @$this->view['data']['name']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['vname'] != '2') { ?>

+	                        <?php echo wpsg_drawForm_Input('vname', __('Vorname', 'wpsg'), @$this->view['data']['vname']); ?>

+						<?php } ?>

+						<?php if ($this->view['pflicht']['geb'] != '2') { ?>

+	                    	<?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 } ?>

+                        <?php if ($this->view['pflicht']['email'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('email', __('E-Mail', 'wpsg'), @$this->view['data']['email']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['firma'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('firma', __('Firma', 'wpsg'), @$this->view['data']['firma']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['tel'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('tel', __('Telefon', 'wpsg'), @$this->view['data']['tel']); ?>

+    					<?php } ?>                    

+                        <?php if ($this->view['pflicht']['fax'] != '2') { ?>

+	                        <?php echo wpsg_drawForm_Input('fax', __('Fax', 'wpsg'), @$this->view['data']['fax']); ?>

+	                   	<?php }?>

+	                    <?php if ($this->view['pflicht']['strasse'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('strasse', __('Straße', 'wpsg'), @$this->view['data']['strasse']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['plz'] != '2') { ?>	

+                        	<?php echo wpsg_drawForm_Input('plz', __('PLZ', 'wpsg'), @$this->view['data']['plz']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['ort'] != '2') { ?>	

+                        	<?php echo wpsg_drawForm_Input('ort', __('Ort', 'wpsg'), @$this->view['data']['ort']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['land'] != '2') { ?>	

+                        	<?php echo wpsg_drawForm_Select('land', __('Land', 'wpsg'), @$this->view['arLand'], @$this->view['data']['land']); ?>

+                        <?php } ?>

+                        <?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>

+                        	<?php echo wpsg_drawForm_Input('ustidnr', __('UStIdNr.', 'wpsg'), @$this->view['data']['ustidnr']); ?>

+                        <?php } ?>

                         <?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']); ?>

diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index c63825a..0b89194 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -16,27 +16,51 @@
                 <h4 class="modal-title"><?php echo __('Kundendaten bearbeiten', 'wpsg'); ?></h4>

             </div>

             <div class="modal-body">

-

-                <?php echo wpsg_drawForm_Input('dialog_firma', __('Firma', 'wpsg'), $this->view['data']['firma']); ?>

-                <?php echo wpsg_drawForm_Input('dialog_ustidnr', __('UStIdNr', 'wpsg'), $this->view['data']['ustidnr']); ?>

+				<?php if ($this->view['pflicht']['firma'] != '2') { ?>	

+                	<?php echo wpsg_drawForm_Input('dialog_firma', __('Firma', 'wpsg'), $this->view['data']['firma']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_ustidnr', __('UStIdNr', 'wpsg'), $this->view['data']['ustidnr']); ?>

+               	<?php } ?>

                 <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']); ?>

+                <?php if ($this->view['pflicht']['anrede'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Select('dialog_title', __('Anrede', 'wpsg'), $this->view['arTitles'], $this->view['data']['title'], array('noIndex' => true)); ?>

+                 <?php } ?>

+                <?php if ($this->view['pflicht']['vname'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_vname', __('Vorname', 'wpsg'), $this->view['data']['vname']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['name'] != '2') { ?> 

+                	<?php echo wpsg_drawForm_Input('dialog_name', __('Name', 'wpsg'), $this->view['data']['name']); ?>

+                <?php } ?>

                 <br />

- 				<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), $this->view['data']['geb']); ?>

+                <?php if ($this->view['pflicht']['geb'] != '2') { ?>

+ 					<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), $this->view['data']['geb']); ?>

+                <?php } ?>

                 <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 if ($this->view['pflicht']['tel'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_tel', __('Telefon', 'wpsg'), $this->view['data']['tel']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['fax'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_fax', __('Fax', 'wpsg'), $this->view['data']['fax']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['email'] != '2') { ?>

+	                <?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 } ?>

 				<?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']); ?>

-                <?php echo wpsg_drawForm_Select('dialog_land', __('Land', 'wpsg'), $this->view['arCountry'], $this->view['data']['land']); ?>

-

+                <?php if ($this->view['pflicht']['strasse'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['plz'] != '2') { ?>     

+                	<?php echo wpsg_drawForm_Input('dialog_plz', __('Postleitzahl', 'wpsg'), $this->view['data']['plz']); ?>

+                <?php } ?>	

+                <?php if ($this->view['pflicht']['ort'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Input('dialog_ort', __('Ort', 'wpsg'), $this->view['data']['ort']); ?>

+                <?php } ?>

+                <?php if ($this->view['pflicht']['land'] != '2') { ?>

+                	<?php echo wpsg_drawForm_Select('dialog_land', __('Land', 'wpsg'), $this->view['arCountry'], $this->view['data']['land']); ?>	

+				<?php } ?>

                 <br />

 

                 <?php echo wpsg_drawForm_Checkbox('dialog_customer', __('Auch Kundendaten anpassen', 'wpsg'), false, array('help' => 'dialog_customer')); ?>

@@ -66,41 +90,66 @@
     <?php echo wpsg_drawForm_TextEnd(__('Kundennummer', 'wpsg')); ?>

 

     <?php echo wpsg_drawForm_TextStart(); ?>

-    <?php if (trim($this->view['data']['firma']) != '') { ?>

-    <?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']); ?> <?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 />

-

+	<?php if ($this->view['pflicht']['firma'] != '2') { ?>

+    	<?php if (trim($this->view['data']['firma']) != '') { ?>

+    		<?php echo wpsg_hspc($this->view['data']['firma']); ?><br />

+    	<?php } ?>

+    <?php } ?>                    

+ 	<?php if ($this->view['pflicht']['anrede'] != '2') { ?>

+    	<?php echo (($this->view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['arTitles'][$this->view['data']['title']]).' ':''); ?>

+    <?php } ?>                    

+    <?php if ($this->view['pflicht']['vname'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['data']['vname']); ?>

+    <?php } ?>                    

+    <?php if ($this->view['pflicht']['name'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['data']['name']); ?><br />

+    <?php } ?>                    

+    <?php if ($this->view['pflicht']['strasse'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc($this->view['data']['nr']); ?><br />

+    <?php } ?>                    

+   	<?php if ($this->view['pflicht']['plz'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['data']['plz']); ?>

+    <?php } ?>                    

+   	<?php if ($this->view['pflicht']['ort'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['data']['ort']); ?> 

+    <?php } ?>                    

+    <?php if ($this->view['pflicht']['land'] != '2') { ?>

+    	<?php echo wpsg_hspc($this->view['country']['kuerzel']); ?><br />

+	<?php } ?>

     <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 if (strtotime($this->view['data']['geb']) > 0) { ?>

-    <?php echo wpsg_drawForm_Text(__('Geburtsdatum', 'wpsg'), wpsg_fromDate($this->view['data']['geb']), array('text' => true)); ?>

-    <?php } ?>

-

-    <?php if (strlen($this->view['data']['fax']) > 0) { ?>

-    <?php echo wpsg_drawForm_Text(__('Fax', 'wpsg'), $this->view['data']['fax'], array('text' => true)); ?>

-    <?php } ?>

-

-    <?php if (strlen($this->view['data']['tel']) > 0) { ?>

-    <?php echo wpsg_drawForm_Text(__('Telefon', 'wpsg'), $this->view['data']['tel'], array('text' => true)); ?>

-    <?php } ?>

-

-    <?php if (strlen($this->view['data']['ustidnr']) > 0) { ?>

-    <?php echo wpsg_drawForm_Text(__('UStIdNr.', 'wpsg'), $this->view['data']['ustidnr'], array('text' => true)); ?>

-    <?php } ?>

-

+	    

+    <?php if ($this->view['pflicht']['geb'] != '2') { ?>

+    	<?php if (strtotime($this->view['data']['geb']) > 0) { ?>

+    		<?php echo wpsg_drawForm_Text(__('Geburtsdatum', 'wpsg'), wpsg_fromDate($this->view['data']['geb']), array('text' => true)); ?>

+    	<?php } ?>

+	<?php } ?>                    

+    <?php if ($this->view['pflicht']['fax'] != '2') { ?>

+	    <?php if (strlen($this->view['data']['fax']) > 0) { ?>

+	    	<?php echo wpsg_drawForm_Text(__('Fax', 'wpsg'), $this->view['data']['fax'], array('text' => true)); ?>

+	    <?php } ?>

+	<?php } ?>                    

+    <?php if ($this->view['pflicht']['tel'] != '2') { ?>

+	    <?php if (strlen($this->view['data']['tel']) > 0) { ?>

+	    	<?php echo wpsg_drawForm_Text(__('Telefon', 'wpsg'), $this->view['data']['tel'], array('text' => true)); ?>

+	    <?php } ?>

+	<?php } ?>                    

+    <?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>

+	    <?php if (strlen($this->view['data']['ustidnr']) > 0) { ?>

+	   		<?php echo wpsg_drawForm_Text(__('UStIdNr.', 'wpsg'), $this->view['data']['ustidnr'], array('text' => true)); ?>

+	    <?php } ?>

+	<?php } ?>                    

     <?php $this->callMods('wpsg_order_view_customerdata', array(&$this->view['data']['id'])); ?>

 

     <?php echo wpsg_drawForm_TextStart(); ?>

-    <a href="mailto:<?php echo $this->view['data']['email']; ?>"><?php echo $this->view['data']['email']; ?></a>

+     <?php if ($this->view['pflicht']['email'] != '2') { ?>

+    	<a href="mailto:<?php echo $this->view['data']['email']; ?>"><?php echo $this->view['data']['email']; ?></a>

+    <?php } ?>

     <?php echo wpsg_drawForm_TextEnd(__('E-Mail', 'wpsg')); ?>

-

+	

     <script type="text/javascript">/* <![CDATA[ */

 

         function wpsg_saveInvoiceAdress()