- Nounce Bestellverwaltung / Produktgruppen / Produktverwaltung / Konfigurtion

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

4 files changed, 63 insertions, 16 deletions

diff --git a/views/order/backendEdit/addProduct.phtml b/views/order/backendEdit/addProduct.phtml
index afd946b..3511e60 100644
--- a/views/order/backendEdit/addProduct.phtml
+++ b/views/order/backendEdit/addProduct.phtml
@@ -25,7 +25,7 @@
     </div>

     

 </form>

-

+ 

 <script>

     

     function wpsg_loadProduct(product_id, order_product_id) {

@@ -33,7 +33,11 @@
         jQuery('#wpsg_product_add_target').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

         

         jQuery.ajax( {

-            url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=product&noheader=1&edit_id=<?php $_REQUEST['edit_id']; ?>',

+            url: '<?php

+	

+				echo wpsg_admin_url('Order', 'view', ['subaction' => 'addProduct', 'do' => 'product', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true);

+				

+			?>',

             data: {

                 product_id: product_id,

                 order_product_id: order_product_id

@@ -52,7 +56,11 @@
         jQuery('#wpsg_product_add_form').on('submit', function() { return false; } );

         

         jQuery('#product_search').autocomplete( {

-            source: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=search&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>',

+            source: '<?php 

+				

+				echo wpsg_admin_url('Order', 'view', ['subaction' => 'addProduct', 'do' => 'search', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true); 

+				

+			?>',

             minLength: 2,

             appendTo: ".autocomplete_wrap",

             select: function(event, ui) {

diff --git a/views/order/index.phtml b/views/order/index.phtml
index 0f6d6ee..267732c 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -38,6 +38,8 @@
 				<div class="col-lg-5">

 					<form method="post" id="filter_form" >

 

+						<?php echo wp_nonce_field('wpsg-order-search'); ?>

+						

 						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo @$this->view['arFilter']['page']; ?>" class="current-page" />

 						<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo @$this->view['arFilter']['order']; ?>" />

 						<input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo @$this->view['arFilter']['ascdesc']; ?>" />

@@ -124,9 +126,9 @@
                     <div class="col-lg-4">

                         

                         <form method="POST" id="add_form" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=add&noheader=1">

-    

-                            <?php echo wp_nonce_field('order-index-add'); ?>

-                            

+	

+							<?php echo wp_nonce_field('wpsg-order-add'); ?>

+							                            

                             <br />

                             

                             <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), @$_REQUEST['search_customer']); ?>

@@ -250,11 +252,23 @@
                             <?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />

 

                             <div class="actions">

-                                <span class="view"><a title="<?php echo __("Diese Bestellung ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>

+                                <span class="view"><a title="<?php echo __("Diese Bestellung ansehen", "wpsg"); ?>" href="<?php

+		

+									echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()]);

+	

+								?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>

                                 |

-                                <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung stornieren möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Bestellung stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Stornieren", "wpsg"); ?></a></span>

+                                <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung stornieren möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Bestellung stornieren", "wpsg"); ?>" href="<?php 

+										

+									echo wpsg_admin_url('Order', 'storno', ['edit_id' => $oOrder->getId()], ['noheader' => '1']); 

+										

+								?>"><?php echo __("Stornieren", "wpsg"); ?></a></span>

                                 |

-                                <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Bestellung löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>

+                                <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Bestellung löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Bestellung löschen', 'wpsg'); ?>" href="<?php

+									

+									echo wpsg_admin_url('Order', 'delete', ['edit_id' => $oOrder->getId()], ['noheader' => '1']);

+									

+								?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>

                             </div>

 

                             <?php if (trim($oOrder->admincomment) != "") { ?>

diff --git a/views/order/view.phtml b/views/order/view.phtml
index fd0670c..9888e6c 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -130,6 +130,7 @@
 	 */

 	function wpsg_sendMail(oid)

 	{

+		

 		jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

 

 		jQuery.ajax( {

diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml
index 5f63a8d..55bafd9 100644
--- a/views/order/view_orderdata.phtml
+++ b/views/order/view_orderdata.phtml
@@ -51,7 +51,11 @@
 				jQuery('#wpsg_shipping_dialog').modal( { } ).modal('show');

 								

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editPayShipping&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',

+					url: '<?php 

+						

+						echo wpsg_admin_url('Order', 'view', ['subaction' => 'editPayShipping', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true);

+					

+					?>',

 					success: function(data) {

 	

 						jQuery('#wpsg_shipping_dialog .modal-body').html(data);

@@ -105,7 +109,11 @@
 				jQuery('#wpsg_product_dialog .btn-primary').prop('disabled', true);

 				

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',

+					url: '<?php 

+						

+						echo wpsg_admin_url('Order', 'view', ['subaction' => 'addProduct', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true); 

+						

+					?>',

 					success: function(data) {

 		

 						jQuery('#wpsg_product_dialog .modal-body').html(data);

@@ -122,7 +130,11 @@
 				jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

 				

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=removeProduct&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>',

+					url: '<?php 

+						

+						echo wpsg_admin_url('Order', 'view', ['subaction' => 'removeProduct', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true);

+						

+					?>',

 					data: { 

 						order_product_id: order_product_id

 					},

@@ -144,7 +156,11 @@
 				jQuery('#wpsg_product_dialog .btn-primary').prop('disabled', true);

 	

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',

+					url: '<?php

+					

+						echo wpsg_admin_url('Order', 'view', ['subaction' => 'addProduct', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true);

+					

+					?>',

 					data: {

 						order_product_id: order_product_id  

 					},

@@ -165,7 +181,11 @@
 				jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

 	

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=submit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',

+					url: '<?php 

+					

+						echo wpsg_admin_url('Order', 'view', ['edit_id' => $_REQUEST['edit_id'], 'do' => 'submit', 'subaction' => 'addProduct'], ['noheader' => '1'], true);

+						

+					?>',

 					data: jQuery('#wpsg_product_add_form').serialize(),

 					success: function(data) {

 	

@@ -178,7 +198,7 @@
 	

 			}

 		

-		}

+		};

 	

 		var WPSG_BE_Voucher = {

 			

@@ -301,7 +321,11 @@
 			sendCustomerMail: function(order_id) {

 

 				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=sendMail&do=customer&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',

+					url: '<?php 

+						

+						echo wpsg_admin_url('Order', 'view', ['subaction' => 'sendMail', 'do' => 'customer', 'edit_id' => $_REQUEST['edit_id']], ['noheader' => '1'], true);				

+						

+					?>',

 					data: jQuery('#wpsg_be_discount_form').serialize(),

 					success: function(data) { alert(data); }

 				} );