Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 7579)
+++ /controller/wpsg_OrderController.class.php	(revision 7580)
@@ -1024,5 +1024,7 @@
 
 				$this->shop->addBackendMessage(__('URL Benachrichtigung (Bezahlung) wurde fÃŒr die Produkte der Bestellung simuliert.'));
-				$this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']);
+				$this->shop->redirect(
+					wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id']])					
+				);
 
 			}
@@ -1045,5 +1047,7 @@
 
 				$this->shop->addBackendMessage(__('URL Benachrichtigung (Kauf) wurde fÃŒr die Produkte der Bestellung simuliert.'));
-				$this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']);
+				$this->shop->redirect(
+					wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id']])
+				);
 
 			}
@@ -1057,5 +1061,7 @@
 
 				$this->shop->addBackendMessage(wpsg_translate(__('Kundenmail wurde erfolgreich an #1# simuliert.', 'wpsg'), $this->shop->get_option('wpsg_adminmail_empfaenger')));
-				$this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']);
+				$this->shop->redirect(
+					wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id']])
+				);
 
 			}
@@ -1069,5 +1075,7 @@
 
 				$this->shop->addBackendMessage(wpsg_translate(__('Adminmail wurde erfolgreich an #1# simuliert.', 'wpsg'), $this->shop->get_option('wpsg_adminmail_empfaenger')));
-				$this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']);
+				$this->shop->redirect(
+					wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id']])
+				);
 
 			}
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 7579)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 7580)
@@ -1347,5 +1347,7 @@
 			$this->shop->addBackendMessage(__('Rechnung wurde erfolgreich storniert', 'wpsg'));
 						
-			$this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$_REQUEST['edit_id']); 
+			$this->shop->redirect(
+				wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id']])
+			); 
 			
 		}
Index: /views/mods/mod_rechnungen/order_view.phtml
===================================================================
--- /views/mods/mod_rechnungen/order_view.phtml	(revision 7579)
+++ /views/mods/mod_rechnungen/order_view.phtml	(revision 7580)
@@ -118,5 +118,5 @@
                     <a target="_blank" href="<?php 
 						
-						echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_rechnungen&do=getRechnung&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'], 'wpsg-mod_invoice-order_ajax-getRechnung-'.$this->view['data']['id']);						
+						echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_rechnungen&do=getRechnung&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'], 'wpsg-mod_invoice-order_ajax-getRechnung-'.$r['id']);						
 						
 					?>"><?php echo __("Ansehen", "wpsg"); ?></a>
@@ -167,5 +167,9 @@
 
                                     window.setTimeout(function() {
-                                        location.href = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>";
+                                        location.href = "<?php 
+											
+											echo wpsg_admin_url('Order', 'view', ['edit_id' => $this->view['data']['id']]); 
+											
+										?>";
                                     }, 1500);
 
@@ -275,5 +279,9 @@
                     </script>
 
-                    <input class="button" style="float:right;" onclick="window.setTimeout(function() { location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>'; }, 1000);" name="wpsg_rechnungen_write" type="submit" value="<?php echo __("Rechnung schreiben", "wpsg"); ?>" />
+                    <input class="button" style="float:right;" onclick="window.setTimeout(function() { location.href = '<?php
+	
+						echo wpsg_admin_url('Order', 'view', ['edit_id' => $this->view['data']['id']]); 
+						
+					?>'; }, 1000);" name="wpsg_rechnungen_write" type="submit" value="<?php echo __("Rechnung schreiben", "wpsg"); ?>" />
                     <input class="button" style="float:right; margin-right:10px;" name="wpsg_rechnungen_preview" type="submit" value="<?php echo __("Vorschau", "wpsg"); ?>" />