Created my account > orders template

This commit is contained in:
Claudio Sanches 2016-01-19 19:02:26 -02:00
parent ad9374785f
commit 02e3c6362d
6 changed files with 205 additions and 8 deletions

View File

@ -94,7 +94,11 @@ class WC_Query {
$title = __( 'Order Received', 'woocommerce' );
break;
case 'orders' :
$title = __( 'Orders', 'woocommerce' );
if ( isset( $_GET['orders-page'] ) ) {
$title = sprintf( __( 'Orders (page %d)', 'woocommerce' ), intval( $_GET['orders-page'] ) );
} else {
$title = __( 'Orders', 'woocommerce' );
}
break;
case 'view-order' :
$order = wc_get_order( $wp->query_vars['view-order'] );

View File

@ -71,12 +71,12 @@ class WC_Shortcode_My_Account {
*/
private static function my_account( $atts ) {
extract( shortcode_atts( array(
'order_count' => 15
'order_count' => 15 // @deprecated 2.6.0. Keep for backward compatibility.
), $atts ) );
wc_get_template( 'myaccount/my-account.php', array(
'current_user' => get_user_by( 'id', get_current_user_id() ),
'order_count' => 'all' == $order_count ? -1 : $order_count
'current_user' => get_user_by( 'id', get_current_user_id() ),
'order_count' => 'all' == $order_count ? -1 : $order_count
) );
}

View File

@ -84,3 +84,50 @@ function wc_get_account_menu_items() {
'customer-logout' => __( 'Logout', 'woocommerce' ),
) );
}
/**
* Get My Account > Orders coluns.
*
* @since 2.6.0
* @return array
*/
function wc_get_account_orders_columns() {
$columns = apply_filters( 'woocommerce_account_orders_columns', array(
'order-number' => __( 'Order', 'woocommerce' ),
'order-date' => __( 'Date', 'woocommerce' ),
'order-status' => __( 'Status', 'woocommerce' ),
'order-total' => __( 'Total', 'woocommerce' ),
'order-actions' => ' ',
) );
// Deprecated filter since 2.6.0.
return apply_filters( 'woocommerce_my_account_my_orders_columns', $columns );
}
/**
* Get My Account > Orders query args.
*
* @return array
*/
function wc_get_account_orders_query_args() {
$args = array(
'numberposts' => 15,
'meta_key' => '_customer_user',
'meta_value' => get_current_user_id(),
'post_type' => wc_get_order_types( 'view-orders' ),
'post_status' => array_keys( wc_get_order_statuses() )
);
// @deprecated 2.6.0.
$args = apply_filters( 'woocommerce_my_account_my_orders_query', $args );
// Remove deprecated option.
$args['posts_per_page'] = $args['numberposts'];
unset( $args['numberposts'] );
if ( isset( $_GET['orders-page'] ) && 1 < $_GET['orders-page'] ) {
$args['paged'] = absint( $_GET['orders-page'] );
}
return apply_filters( 'woocommerce_account_orders_query', $args );
}

View File

@ -2025,10 +2025,20 @@ if ( ! function_exists( 'wc_dropdown_variation_attribute_options' ) ) {
}
}
if ( ! function_exists( 'woocommerce_account_orders' ) ) {
/**
* My Account > Orders template.
*/
function woocommerce_account_orders() {
wc_get_template( 'myaccount/orders.php' );
}
}
if ( ! function_exists( 'woocommerce_account_view_order' ) ) {
/**
* My Account view order template.
* My Account > View order template.
*
* @param int $order_id Order ID.
*/
@ -2037,10 +2047,20 @@ if ( ! function_exists( 'woocommerce_account_view_order' ) ) {
}
}
if ( ! function_exists( 'woocommerce_account_downloads' ) ) {
/**
* My Account > Downloads template.
*/
function woocommerce_account_downloads() {
wc_get_template( 'myaccount/downloads.php' );
}
}
if ( ! function_exists( 'woocommerce_account_edit_account' ) ) {
/**
* My Account edit account template.
* My Account > Edit account template.
*/
function woocommerce_account_edit_account() {
WC_Shortcode_My_Account::edit_account();
@ -2050,7 +2070,7 @@ if ( ! function_exists( 'woocommerce_account_edit_account' ) ) {
if ( ! function_exists( 'woocommerce_account_edit_address' ) ) {
/**
* My Account edit address template.
* My Account > Edit address template.
*
* @param string $type Address type.
*/
@ -2065,7 +2085,7 @@ if ( ! function_exists( 'woocommerce_account_edit_address' ) ) {
if ( ! function_exists( 'woocommerce_account_add_payment_method' ) ) {
/**
* My Account add payment method template.
* My Account > Add payment method template.
*/
function woocommerce_account_add_payment_method() {
WC_Shortcode_My_Account::add_payment_method();

View File

@ -243,7 +243,9 @@ add_filter( 'jetpack_comment_form_enabled_for_product', '__return_false' );
/**
* My Account.
*/
add_action( 'woocommerce_my_account_orders_endpoint', 'woocommerce_account_orders' );
add_action( 'woocommerce_my_account_view_order_endpoint', 'woocommerce_account_view_order' );
add_action( 'woocommerce_my_account_downloads_endpoint', 'woocommerce_account_downloads' );
add_action( 'woocommerce_my_account_edit_account_endpoint', 'woocommerce_account_edit_account' );
add_action( 'woocommerce_my_account_edit_address_endpoint', 'woocommerce_account_edit_address' );
add_action( 'woocommerce_my_account_add_payment_method_endpoint', 'woocommerce_account_add_payment_method' );

View File

@ -0,0 +1,124 @@
<?php
/**
* Orders
*
* Shows orders on the account page.
*
* This template can be overridden by copying it to yourtheme/woocommerce/myaccount/orders.php.
*
* HOWEVER, on occasion WooCommerce will need to update template files and you (the theme developer).
* will need to copy the new files to your theme to maintain compatibility. We try to do this.
* as little as possible, but it does happen. When this occurs the version of the template file will.
* be bumped and the readme will list any important changes.
*
* @see http://docs.woothemes.com/document/template-structure/
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.6.0
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
$orders = new WP_Query( wc_get_account_orders_query_args() );
$current_page = isset( $_GET['orders-page'] ) ? absint( $_GET['orders-page'] ) : 1;
wc_get_template( 'myaccount/navigation.php' ); ?>
<div class="my-account-content">
<?php if ( $orders->have_posts() ) : ?>
<table class="shop_table shop_table_responsive my_account_orders">
<thead>
<tr>
<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
<th class="<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
<?php endforeach; ?>
</tr>
</thead>
<tbody>
<?php foreach ( $orders->posts as $customer_order ) :
$order = wc_get_order( $customer_order );
$item_count = $order->get_item_count();
?>
<tr class="order">
<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
<td class="<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
<?php if ( has_action( 'woocommerce_my_account_my_orders_column_' . $column_id ) ) : ?>
<?php do_action( 'woocommerce_my_account_my_orders_column_' . $column_id, $order ); ?>
<?php elseif ( 'order-number' === $column_id ) : ?>
<a href="<?php echo esc_url( $order->get_view_order_url() ); ?>">
<?php echo _x( '#', 'hash before order number', 'woocommerce' ) . $order->get_order_number(); ?>
</a>
<?php elseif ( 'order-date' === $column_id ) : ?>
<time datetime="<?php echo date( 'Y-m-d', strtotime( $order->order_date ) ); ?>" title="<?php echo esc_attr( strtotime( $order->order_date ) ); ?>"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ); ?></time>
<?php elseif ( 'order-status' === $column_id ) : ?>
<?php echo wc_get_order_status_name( $order->get_status() ); ?>
<?php elseif ( 'order-total' === $column_id ) : ?>
<?php echo sprintf( _n( '%s for %s item', '%s for %s items', $item_count, 'woocommerce' ), $order->get_formatted_order_total(), $item_count ); ?>
<?php elseif ( 'order-actions' === $column_id ) : ?>
<?php
$actions = array(
'pay' => array(
'url' => $order->get_checkout_payment_url(),
'name' => __( 'Pay', 'woocommerce' )
),
'view' => array(
'url' => $order->get_view_order_url(),
'name' => __( 'View', 'woocommerce' )
),
'cancel' => array(
'url' => $order->get_cancel_order_url( wc_get_page_permalink( 'myaccount' ) ),
'name' => __( 'Cancel', 'woocommerce' )
)
);
if ( ! $order->needs_payment() ) {
unset( $actions['pay'] );
}
if ( ! in_array( $order->get_status(), apply_filters( 'woocommerce_valid_order_statuses_for_cancel', array( 'pending', 'failed' ), $order ) ) ) {
unset( $actions['cancel'] );
}
if ( $actions = apply_filters( 'woocommerce_my_account_my_orders_actions', $actions, $order ) ) {
foreach ( $actions as $key => $action ) {
echo '<a href="' . esc_url( $action['url'] ) . '" class="button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
}
}
?>
<?php endif; ?>
</td>
<?php endforeach; ?>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php if ( 1 < $orders->max_num_pages ) : ?>
<div class="wc-account-orders-pagination">
<?php if ( 1 !== $current_page ) : ?>
<a class="button" href="?orders-page=<?php echo esc_attr( $current_page - 1 ); ?>"><?php _e( 'Previous', 'woocommerce' ); ?></a>
<?php endif; ?>
<?php if ( $current_page !== intval( $orders->max_num_pages ) ) : ?>
<a class="button" href="?orders-page=<?php echo esc_attr( $current_page + 1 ); ?>"><?php _e( 'Next', 'woocommerce' ); ?></a>
<?php endif; ?>
</div>
<?php endif; ?>
<?php else : ?>
<div class="woocommerce-info">
<a class="button" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">
<?php _e( 'Go Shop', 'woocommerce' ) ?>
</a>
<?php _e( 'No order has been made yet.', 'woocommerce' ); ?>
</div>
<?php endif; ?>
</div>