Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9082 from bekarice/purchase-note-improvements 

[2.5] Filter when purchase note is showed
This commit is contained in:
Mike Jolley 2015-09-15 16:21:49 +01:00
parent b8172b173e bef88f2e82
commit d754ad79c8
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/order/order-details-item.php
View File

@ -4,7 +4,7 @@
* *
* @author WooThemes * @author WooThemes
* @package WooCommerce/Templates * @package WooCommerce/Templates
* @version 2.4.0 * @version 2.5.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -35,7 +35,7 @@ if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
<?php echo $order->get_formatted_line_subtotal( $item ); ?> <?php echo $order->get_formatted_line_subtotal( $item ); ?>
</td> </td>
</tr> </tr>
<?php if ( $order->has_status( array( 'completed', 'processing' ) ) && ( $purchase_note = get_post_meta( $product->id, '_purchase_note', true ) ) ) : ?> <?php if ( $show_purchase_note && $purchase_note ) : ?>
<tr class="product-purchase-note"> <tr class="product-purchase-note">
<td colspan="3"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td> <td colspan="3"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td>
</tr> </tr>

17
templates/order/order-details.php
View File

@ -4,7 +4,7 @@
* *
* @author WooThemes * @author WooThemes
* @package WooCommerce/Templates * @package WooCommerce/Templates
* @version 2.4.0 * @version 2.5.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -12,6 +12,8 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
$order = wc_get_order( $order_id ); $order = wc_get_order( $order_id );
$show_purchase_note = $order->has_status( apply_filters( 'woocommerce_purchase_note_order_statuses', array( 'completed', 'processing' ) ) );
?> ?>
<h2><?php _e( 'Order Details', 'woocommerce' ); ?></h2> <h2><?php _e( 'Order Details', 'woocommerce' ); ?></h2>
<table class="shop_table order_details"> <table class="shop_table order_details">
@ -24,11 +26,16 @@ $order = wc_get_order( $order_id );
<tbody> <tbody>
<?php <?php
foreach( $order->get_items() as $item_id => $item ) { foreach( $order->get_items() as $item_id => $item ) {
$product = apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item );
$purchase_note = get_post_meta( $product->id, '_purchase_note', true );
wc_get_template( 'order/order-details-item.php', array( wc_get_template( 'order/order-details-item.php', array(
'order' => $order, 'order' => $order,
'item_id' => $item_id, 'item_id' => $item_id,
'item' => $item, 'item' => $item,
'product' => apply_filters( 'woocommerce_order_item_product', $order->get_product_from_item( $item ), $item ) 'show_purchase_note' => $show_purchase_note,
'purchase_note' => $purchase_note,
'product' => $product,
) ); ) );
} }
?> ?>