From 40bc0681c7114424f0cc1eae62025005e9157d13 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 19 Nov 2019 05:42:59 +0000
Subject: - Bugfix: Verlinkung zum Kunden in Statistik / Bestellverwaltung
 wiederhergestellt

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7612 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_kundenverwaltung/index_setAccount.phtml | 12 ++++++++++--
 views/mods/mod_statistics/customermap/all.phtml        |  6 +++++-
 views/mods/mod_statistics/produkt_edit_sidebar.phtml   |  6 +++++-
 views/mods/mod_statistics/statisticProduct.phtml       | 12 ++++++++++--
 views/order/view_customerdata.phtml                    | 13 +++++++++++--
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/views/mods/mod_kundenverwaltung/index_setAccount.phtml b/views/mods/mod_kundenverwaltung/index_setAccount.phtml
index a3af845..f5ebc2e 100644
--- a/views/mods/mod_kundenverwaltung/index_setAccount.phtml
+++ b/views/mods/mod_kundenverwaltung/index_setAccount.phtml
@@ -83,7 +83,11 @@
                                                 
                                             </td>
                                             <td class="col_name column-title">
-                                                <strong><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; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>
+                                                <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php 
+														
+													echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $c->id]);
+														
+												?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>
                                                 <?php if (strlen($c->getEMail()) > 0) { ?>
                                                     <a style="margin-bottom:3px; display:block;" href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>
                                                 <?php } ?>
@@ -143,7 +147,11 @@
                                             <input type="hidden" value="<?php echo $c->id; ?>" name="customer[]" />
                                         </td>
                                         <td class="col_name column-title">
-                                            <strong><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; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>
+                                            <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php 
+													
+												echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $c->id]); 
+												
+											?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>
                                             <?php if (strlen($c->getEMail()) > 0) { ?>
                                                 <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>
                                             <?php } ?>
diff --git a/views/mods/mod_statistics/customermap/all.phtml b/views/mods/mod_statistics/customermap/all.phtml
index 20e86d4..3116221 100644
--- a/views/mods/mod_statistics/customermap/all.phtml
+++ b/views/mods/mod_statistics/customermap/all.phtml
@@ -28,7 +28,11 @@
     	markers.push(marker<?php echo $i; ?>);
 
     	google.maps.event.addListener(marker<?php echo $i; ?>, 'click', function() {
-			location.href = '<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id='.$m['customer']['id']; ?>';
+			location.href = '<?php
+			
+				echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $m['customer']['id']]);
+				
+			?>';
     	} );    	  
     	bounds.extend(marker<?php echo $i; ?>.getPosition());  	
     	<?php $i ++; } ?>
diff --git a/views/mods/mod_statistics/produkt_edit_sidebar.phtml b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
index 639756f..d85587a 100644
--- a/views/mods/mod_statistics/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
@@ -63,7 +63,11 @@
 		        foreach ($this->view['odata'] as $pa) { ?>          
 		        <tr>
 					<td> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo __($pa['id'], 'wpsg');?>" target="_blank"><?php echo __($pa['onr'], 'wpsg');?></a></td>
-					<td> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo __($pa['kid'], 'wpsg');?>" target="_blank"><?php echo __($pa['name'], 'wpsg');?></a></td>
+					<td> <a href="<?php
+					
+						echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $pa['kid']]);
+							
+					?>" target="_blank"><?php echo __($pa['name'], 'wpsg'); ?></a></td>
 		            <td> <?php echo __($pa['vname'], 'wpsg');?></td>
 		            <td> <?php echo __($pa['menge'], 'wpsg');?></td>
 		            <td> <?php echo __($pa['email'], 'wpsg');?></td>
diff --git a/views/mods/mod_statistics/statisticProduct.phtml b/views/mods/mod_statistics/statisticProduct.phtml
index b542742..e9ca64b 100644
--- a/views/mods/mod_statistics/statisticProduct.phtml
+++ b/views/mods/mod_statistics/statisticProduct.phtml
@@ -31,8 +31,16 @@
         unset($this->view['odata']['sum']);
         foreach ($this->view['odata'] as $pa) { ?>          
         <tr>
-			<td> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo __($pa['id'], 'wpsg');?>" target="_blank"><?php echo __($pa['onr'], 'wpsg');?></a></td>
-			<td> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo __($pa['kid'], 'wpsg');?>" target="_blank"><?php echo __($pa['name'], 'wpsg');?></a></td>
+			<td> <a href="<?php 
+					
+				echo wpsg_admin_url('Order', 'view', ['edit_id' => $pa['id']]);
+				
+			?>" target="_blank"><?php echo __($pa['onr'], 'wpsg');?></a></td>
+			<td> <a href="<?php
+					
+				echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $pa['kid']]);
+					
+			?>" target="_blank"><?php echo __($pa['name'], 'wpsg');?></a></td>
             <td> <?php echo __($pa['vname'], 'wpsg');?></td>
             <td> <?php echo __($pa['menge'], 'wpsg');?></td>
             <td> <?php echo __($pa['email'], 'wpsg');?></td>
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 1fec340..11c65a2 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -45,7 +45,11 @@
                 <?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 echo wpsg_drawForm_Text(__('E-Mail', 'wpsg'),'<a href="'.
+							
+							wpsg_admin_url('Customer', 'edit', ['edit_id' => $this->view['data']['k_id']]).
+		            	
+		            	'">'.$this->view['data']['email'].'</a>'); ?>
 					<?php } ?>
 				<?php } ?>
                 <br />
@@ -93,7 +97,12 @@
     <?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;]
+	[&nbsp; <a href="<?php 
+			
+		echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $this->view['data']['k_id']]);
+		//echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id='.$this->view['data']['k_id']; 
+		
+	?>"><?php echo __('Zum Kunden', 'wpsg'); ?></a>&nbsp;]
 	<?php } ?>
     <?php echo wpsg_drawForm_TextEnd(__('Kundennummer', 'wpsg')); ?>
 
-- 
cgit v1.2.3