Redirect to the actual page after finishing a bulk action.

vendidero · Nov 11, 2024 · 94fff3d · 94fff3d
1 parent 38c3fe4
commit 94fff3d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/assets/js/static/admin-shipments-table.js b/assets/js/static/admin-shipments-table.js
@@ -37,7 +37,6 @@ window.shipments.admin = window.shipments.admin || {};
             });
 
             if ( self.params.bulk_actions.hasOwnProperty( action ) && ids.length > 0 ) {
-
                 var actionData = self.params.bulk_actions[ action ];
 
                 $( '.bulk-action-wrapper' ).find( '.bulk-title' ).text( actionData['title'] );
@@ -63,6 +62,7 @@ window.shipments.admin = window.shipments.admin || {};
                     bulk_action      : action,
                     step             : step,
                     type             : type,
+                    referer          : window.location.href,
                     ids              : ids,
                     security         : actionData['nonce']
                 },

diff --git a/src/Admin/BulkActionHandler.php b/src/Admin/BulkActionHandler.php
@@ -52,14 +52,23 @@ public function set_shipment_type( $type ) {
 		$this->type = $type;
 	}
 
-	public function get_success_redirect_url() {
+	public function get_success_redirect_url( $referer = false ) {
 		$page = 'wc-gzd-shipments';
 
 		if ( 'simple' !== $this->get_shipment_type() ) {
 			$page = 'wc-gzd-' . $this->get_shipment_type() . '-shipments';
 		}
 
-		return admin_url( 'admin.php?page=' . $page . '&bulk_action_handling=finished&current_bulk_action=' . sanitize_key( $this->get_action() ) );
+		$base_url = $referer ? $referer : admin_url( 'admin.php?page=' . $page );
+		$base_url = add_query_arg(
+			array(
+				'bulk_action_handling' => 'finished',
+				'current_bulk_action'  => sanitize_key( $this->get_action() ),
+			),
+			$base_url
+		);
+
+		return esc_url_raw( $base_url );
 	}
 
 	public function get_step() {

diff --git a/src/Ajax.php b/src/Ajax.php
@@ -518,8 +518,9 @@ public static function sort_shipping_provider() {
 	}
 
 	public static function shipments_bulk_action_handle() {
-		$action = isset( $_POST['bulk_action'] ) ? wc_clean( wp_unslash( $_POST['bulk_action'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$type   = isset( $_POST['type'] ) ? wc_clean( wp_unslash( $_POST['type'] ) ) : 'simple'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$action  = isset( $_POST['bulk_action'] ) ? wc_clean( wp_unslash( $_POST['bulk_action'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$type    = isset( $_POST['type'] ) ? wc_clean( wp_unslash( $_POST['type'] ) ) : 'simple'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$referer = isset( $_POST['referer'] ) ? wp_sanitize_redirect( wp_unslash( $_POST['referer'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		check_ajax_referer( "woocommerce_gzd_shipments_{$action}", 'security' );
 
@@ -570,7 +571,7 @@ public static function shipments_bulk_action_handle() {
 				array(
 					'step'       => 'done',
 					'percentage' => 100,
-					'url'        => $handler->get_success_redirect_url(),
+					'url'        => $handler->get_success_redirect_url( $referer ),
 					'type'       => $handler->get_shipment_type(),
 				)
 			);