Add the new `/orders/{id}/actions` endpoint (#52050)
* Add new /orders/{id}/details endpoint first version * Add tests for the OrderDetailsRestController * Fix lint errors and service provider * Add changefile(s) from automation for the following project(s): woocommerce * Update note to mention it was created via a REST API request * Document the original actions and reference them from the endpoint * Refactor the endpoint to be `/actions` * Add changefile(s) from automation for the following project(s): woocommerce * Add back loading payment gateway and shipping classes * Refactor endpoint to be `actions/send_order_details` * Address feedback: improve error message and note --------- Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
parent
df47723e1e
commit
42b4c1f25d
|
@ -0,0 +1,4 @@
|
||||||
|
Significance: minor
|
||||||
|
Type: add
|
||||||
|
|
||||||
|
Add the new `POST /orders/{id}/actions` endpoint to allow re-sending the order details to customers.
|
|
@ -103,7 +103,7 @@ class WC_Meta_Box_Order_Actions {
|
||||||
$trash_order_url = add_query_arg(
|
$trash_order_url = add_query_arg(
|
||||||
array(
|
array(
|
||||||
'action' => 'trash',
|
'action' => 'trash',
|
||||||
'id' => array( $order_id ),
|
'id' => array( $order_id ),
|
||||||
'_wp_http_referer' => $order_list_url,
|
'_wp_http_referer' => $order_list_url,
|
||||||
),
|
),
|
||||||
$order_list_url
|
$order_list_url
|
||||||
|
@ -131,6 +131,11 @@ class WC_Meta_Box_Order_Actions {
|
||||||
$action = wc_clean( wp_unslash( $_POST['wc_order_action'] ) ); // @codingStandardsIgnoreLine
|
$action = wc_clean( wp_unslash( $_POST['wc_order_action'] ) ); // @codingStandardsIgnoreLine
|
||||||
|
|
||||||
if ( 'send_order_details' === $action ) {
|
if ( 'send_order_details' === $action ) {
|
||||||
|
/**
|
||||||
|
* Fires before an order email is resent.
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
|
do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
|
||||||
|
|
||||||
// Send the customer invoice email.
|
// Send the customer invoice email.
|
||||||
|
@ -141,6 +146,11 @@ class WC_Meta_Box_Order_Actions {
|
||||||
// Note the event.
|
// Note the event.
|
||||||
$order->add_order_note( __( 'Order details manually sent to customer.', 'woocommerce' ), false, true );
|
$order->add_order_note( __( 'Order details manually sent to customer.', 'woocommerce' ), false, true );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fires after an order email has been resent.
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
|
do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
|
||||||
|
|
||||||
// Change the post saved message.
|
// Change the post saved message.
|
||||||
|
|
|
@ -7,12 +7,13 @@ namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
|
||||||
|
|
||||||
use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
|
use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
|
||||||
use Automattic\WooCommerce\Internal\Orders\CouponsController;
|
use Automattic\WooCommerce\Internal\Orders\CouponsController;
|
||||||
|
use Automattic\WooCommerce\Internal\Orders\OrderActionsRestController;
|
||||||
use Automattic\WooCommerce\Internal\Orders\TaxesController;
|
use Automattic\WooCommerce\Internal\Orders\TaxesController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service provider for the orders controller classes in the Automattic\WooCommerce\Internal\Orders namespace.
|
* Service provider for the orders controller classes in the Automattic\WooCommerce\Internal\Orders namespace.
|
||||||
*/
|
*/
|
||||||
class OrdersControllersServiceProvider extends AbstractServiceProvider {
|
class OrdersControllersServiceProvider extends AbstractInterfaceServiceProvider {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The classes/interfaces that are serviced by this service provider.
|
* The classes/interfaces that are serviced by this service provider.
|
||||||
|
@ -22,6 +23,7 @@ class OrdersControllersServiceProvider extends AbstractServiceProvider {
|
||||||
protected $provides = array(
|
protected $provides = array(
|
||||||
CouponsController::class,
|
CouponsController::class,
|
||||||
TaxesController::class,
|
TaxesController::class,
|
||||||
|
OrderActionsRestController::class,
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,5 +32,6 @@ class OrdersControllersServiceProvider extends AbstractServiceProvider {
|
||||||
public function register() {
|
public function register() {
|
||||||
$this->share( CouponsController::class );
|
$this->share( CouponsController::class );
|
||||||
$this->share( TaxesController::class );
|
$this->share( TaxesController::class );
|
||||||
|
$this->share_with_implements_tags( OrderActionsRestController::class );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,135 @@
|
||||||
|
<?php
|
||||||
|
declare( strict_types=1 );
|
||||||
|
|
||||||
|
namespace Automattic\WooCommerce\Internal\Orders;
|
||||||
|
|
||||||
|
use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
|
||||||
|
use Automattic\WooCommerce\Internal\RestApiControllerBase;
|
||||||
|
use WP_Error;
|
||||||
|
use WP_REST_Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Controller for the REST endpoint to run actions on orders.
|
||||||
|
*
|
||||||
|
* This first version only supports sending the order details to the customer (`send_order_details`).
|
||||||
|
*/
|
||||||
|
class OrderActionsRestController extends RestApiControllerBase {
|
||||||
|
use AccessiblePrivateMethods;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the WooCommerce REST API namespace for the class.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function get_rest_api_namespace(): string {
|
||||||
|
return 'order-actions';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register the REST API endpoints handled by this controller.
|
||||||
|
*/
|
||||||
|
public function register_routes() {
|
||||||
|
register_rest_route(
|
||||||
|
$this->route_namespace,
|
||||||
|
'/orders/(?P<id>[\d]+)/actions/send_order_details',
|
||||||
|
array(
|
||||||
|
array(
|
||||||
|
'methods' => \WP_REST_Server::CREATABLE,
|
||||||
|
'callback' => fn( $request ) => $this->run( $request, 'send_order_details' ),
|
||||||
|
'permission_callback' => fn( $request ) => $this->check_permissions( $request ),
|
||||||
|
'args' => $this->get_args_for_order_actions(),
|
||||||
|
'schema' => $this->get_schema_for_order_actions(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permission check for REST API endpoint.
|
||||||
|
*
|
||||||
|
* @param WP_REST_Request $request The request for which the permission is checked.
|
||||||
|
* @return bool|WP_Error True if the current user has the capability, otherwise a WP_Error object.
|
||||||
|
*/
|
||||||
|
private function check_permissions( WP_REST_Request $request ) {
|
||||||
|
$order_id = $request->get_param( 'id' );
|
||||||
|
$order = wc_get_order( $order_id );
|
||||||
|
|
||||||
|
if ( ! $order ) {
|
||||||
|
return new WP_Error( 'woocommerce_rest_not_found', __( 'Order not found', 'woocommerce' ), array( 'status' => 404 ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->check_permission( $request, 'read_shop_order', $order_id );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the accepted arguments for the POST request.
|
||||||
|
*
|
||||||
|
* @return array[]
|
||||||
|
*/
|
||||||
|
private function get_args_for_order_actions(): array {
|
||||||
|
return array(
|
||||||
|
'id' => array(
|
||||||
|
'description' => __( 'Unique identifier of the order.', 'woocommerce' ),
|
||||||
|
'type' => 'integer',
|
||||||
|
'context' => array( 'view', 'edit' ),
|
||||||
|
'readonly' => true,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the schema for both the GET and the POST requests.
|
||||||
|
*
|
||||||
|
* @return array[]
|
||||||
|
*/
|
||||||
|
private function get_schema_for_order_actions(): array {
|
||||||
|
$schema['properties'] = array(
|
||||||
|
'message' => array(
|
||||||
|
'description' => __( 'A message indicating that the action completed successfully.', 'woocommerce' ),
|
||||||
|
'type' => 'string',
|
||||||
|
'context' => array( 'view', 'edit' ),
|
||||||
|
'readonly' => true,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return $schema;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle the POST /orders/{id}/actions/send_order_details.
|
||||||
|
*
|
||||||
|
* @param WP_REST_Request $request The received request.
|
||||||
|
* @return array|WP_Error Request response or an error.
|
||||||
|
*/
|
||||||
|
public function send_order_details( WP_REST_Request $request ) {
|
||||||
|
$order_id = $request->get_param( 'id' );
|
||||||
|
$order = wc_get_order( $order_id );
|
||||||
|
if ( ! $order ) {
|
||||||
|
return new WP_Error( 'woocommerce_rest_invalid_order', __( 'Invalid order ID.', 'woocommerce' ), array( 'status' => 404 ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
// phpcs:disable WooCommerce.Commenting.CommentHooks.MissingSinceComment
|
||||||
|
/** This action is documented in includes/admin/meta-boxes/class-wc-meta-box-order-actions.php */
|
||||||
|
do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
|
||||||
|
|
||||||
|
WC()->payment_gateways();
|
||||||
|
WC()->shipping();
|
||||||
|
WC()->mailer()->customer_invoice( $order );
|
||||||
|
|
||||||
|
$user_agent = esc_html( $request->get_header( 'User-Agent' ) );
|
||||||
|
$note = sprintf(
|
||||||
|
// translators: %1$s is the customer email, %2$s is the user agent that requested the action.
|
||||||
|
esc_html__( 'Order details sent to %1$s, via %2$s.', 'woocommerce' ),
|
||||||
|
esc_html( $order->get_billing_email() ),
|
||||||
|
$user_agent ? $user_agent : 'REST API'
|
||||||
|
);
|
||||||
|
$order->add_order_note( $note, false, true );
|
||||||
|
|
||||||
|
// phpcs:disable WooCommerce.Commenting.CommentHooks.MissingSinceComment
|
||||||
|
/** This action is documented in includes/admin/meta-boxes/class-wc-meta-box-order-actions.php */
|
||||||
|
do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'message' => __( 'Order details email sent to customer.', 'woocommerce' ),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,96 @@
|
||||||
|
<?php
|
||||||
|
declare( strict_types=1 );
|
||||||
|
|
||||||
|
namespace Automattic\WooCommerce\Tests\Internal\Orders;
|
||||||
|
|
||||||
|
use Automattic\WooCommerce\Internal\Orders\OrderActionsRestController;
|
||||||
|
use WC_REST_Unit_Test_Case;
|
||||||
|
use WP_REST_Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OrderActionsRestController API controller test.
|
||||||
|
*
|
||||||
|
* @class OrderActionsRestController
|
||||||
|
*/
|
||||||
|
class OrderActionsRestControllerTest extends WC_REST_Unit_Test_Case {
|
||||||
|
/**
|
||||||
|
* @var OrderActionsRestController
|
||||||
|
*/
|
||||||
|
protected $controller;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var int User ID.
|
||||||
|
*/
|
||||||
|
private $user;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set up test.
|
||||||
|
*/
|
||||||
|
public function setUp(): void {
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
$this->controller = new OrderActionsRestController();
|
||||||
|
$this->controller->register_routes();
|
||||||
|
|
||||||
|
$this->user = $this->factory->user->create( array( 'role' => 'shop_manager' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test sending order details email.
|
||||||
|
*/
|
||||||
|
public function test_send_order_details() {
|
||||||
|
$order = wc_create_order();
|
||||||
|
$order->set_billing_email( 'customer@email.com' );
|
||||||
|
$order->save();
|
||||||
|
|
||||||
|
wp_set_current_user( $this->user );
|
||||||
|
|
||||||
|
$request = new WP_REST_Request( 'POST', '/wc/v3/orders/' . $order->get_id() . '/actions/send_order_details' );
|
||||||
|
$request->add_header( 'User-Agent', 'some app' );
|
||||||
|
|
||||||
|
$response = $this->server->dispatch( $request );
|
||||||
|
|
||||||
|
$this->assertEquals( 200, $response->get_status() );
|
||||||
|
|
||||||
|
$data = $response->get_data();
|
||||||
|
$this->assertArrayHasKey( 'message', $data );
|
||||||
|
$this->assertEquals( 'Order details email sent to customer.', $data['message'] );
|
||||||
|
|
||||||
|
$notes = wc_get_order_notes( array( 'order_id' => $order->get_id() ) );
|
||||||
|
$this->assertCount( 1, $notes );
|
||||||
|
$this->assertEquals( 'Order details sent to customer@email.com, via some app.', $notes[0]->content );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test sending order details email for a non-existent order.
|
||||||
|
*/
|
||||||
|
public function test_send_order_details_with_non_existent_order() {
|
||||||
|
wp_set_current_user( $this->user );
|
||||||
|
|
||||||
|
$request = new WP_REST_Request( 'POST', '/wc/v3/orders/999/actions/send_order_details' );
|
||||||
|
$response = $this->server->dispatch( $request );
|
||||||
|
|
||||||
|
$this->assertEquals( 404, $response->get_status() );
|
||||||
|
|
||||||
|
$data = $response->get_data();
|
||||||
|
$this->assertEquals( 'woocommerce_rest_not_found', $data['code'] );
|
||||||
|
$this->assertEquals( 'Order not found', $data['message'] );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test sending order details email without proper permissions.
|
||||||
|
*/
|
||||||
|
public function test_send_order_details_without_permission() {
|
||||||
|
$order = wc_create_order();
|
||||||
|
|
||||||
|
// Use a customer user who shouldn't have permission.
|
||||||
|
$customer = $this->factory->user->create( array( 'role' => 'customer' ) );
|
||||||
|
|
||||||
|
wp_set_current_user( $customer );
|
||||||
|
|
||||||
|
$request = new WP_REST_Request( 'POST', '/wc/v3/orders/' . $order->get_id() . '/actions/send_order_details' );
|
||||||
|
$response = $this->server->dispatch( $request );
|
||||||
|
|
||||||
|
$this->assertEquals( 403, $response->get_status() );
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue