Merge branch 'pr/17315'

This commit is contained in:
Mike Jolley 2017-10-27 16:42:32 +01:00
commit 349e37399f
2 changed files with 24 additions and 18 deletions

View File

@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Deprecated_Action_Hooks extends WC_Deprecated_Hooks { class WC_Deprecated_Action_Hooks extends WC_Deprecated_Hooks {
/** /**
* Array of deprecated hooks we need to handle. * Array of deprecated hooks we need to handle. Format of 'new' => 'old'.
* *
* @var array * @var array
*/ */
@ -34,6 +34,7 @@ class WC_Deprecated_Action_Hooks extends WC_Deprecated_Hooks {
), ),
'woocommerce_new_payment_token' => 'woocommerce_payment_token_created', 'woocommerce_new_payment_token' => 'woocommerce_payment_token_created',
'woocommerce_new_product_variation' => 'woocommerce_create_product_variation', 'woocommerce_new_product_variation' => 'woocommerce_create_product_variation',
'woocommerce_order_details_after_order_table_items' => 'woocommerce_order_items_table'
); );
/** /**

View File

@ -13,7 +13,7 @@
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @author WooThemes * @author WooThemes
* @package WooCommerce/Templates * @package WooCommerce/Templates
* @version 3.2.0 * @version 3.3.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -34,6 +34,8 @@ if ( $show_downloads ) {
} }
?> ?>
<section class="woocommerce-order-details"> <section class="woocommerce-order-details">
<?php do_action( 'woocommerce_order_details_before_order_table', $order ); ?>
<h2 class="woocommerce-order-details__title"><?php _e( 'Order details', 'woocommerce' ); ?></h2> <h2 class="woocommerce-order-details__title"><?php _e( 'Order details', 'woocommerce' ); ?></h2>
<table class="woocommerce-table woocommerce-table--order-details shop_table order_details"> <table class="woocommerce-table woocommerce-table--order-details shop_table order_details">
@ -47,6 +49,8 @@ if ( $show_downloads ) {
<tbody> <tbody>
<?php <?php
do_action( 'woocommerce_order_details_before_order_table_items', $order );
foreach ( $order_items as $item_id => $item ) { foreach ( $order_items as $item_id => $item ) {
$product = apply_filters( 'woocommerce_order_item_product', $item->get_product(), $item ); $product = apply_filters( 'woocommerce_order_item_product', $item->get_product(), $item );
@ -59,8 +63,9 @@ if ( $show_downloads ) {
'product' => $product, 'product' => $product,
) ); ) );
} }
do_action( 'woocommerce_order_details_after_order_table_items', $order );
?> ?>
<?php do_action( 'woocommerce_order_items_table', $order ); ?>
</tbody> </tbody>
<tfoot> <tfoot>