Merge pull request #11009 from antoscarface/enhancements

Use hook to include navigation.php template
This commit is contained in:
Claudio Sanches 2016-05-30 11:42:23 -03:00
commit a32dd153bb
10 changed files with 65 additions and 12 deletions

View File

@ -2091,6 +2091,16 @@ if ( ! function_exists( 'wc_dropdown_variation_attribute_options' ) ) {
}
}
if ( ! function_exists( 'woocommerce_account_navigation' ) ) {
/**
* My Account navigation template.
*/
function woocommerce_account_navigation() {
wc_get_template( 'myaccount/navigation.php' );
}
}
if ( ! function_exists( 'woocommerce_account_orders' ) ) {
/**

View File

@ -256,6 +256,7 @@ add_filter( 'jetpack_comment_form_enabled_for_product', '__return_false' );
/**
* My Account.
*/
add_action( 'woocommerce_account_navigation', 'woocommerce_account_navigation' );
add_action( 'woocommerce_account_orders_endpoint', 'woocommerce_account_orders' );
add_action( 'woocommerce_account_view-order_endpoint', 'woocommerce_account_view_order' );
add_action( 'woocommerce_account_downloads_endpoint', 'woocommerce_account_downloads' );

View File

@ -25,9 +25,14 @@ if ( ! defined( 'ABSPATH' ) ) {
$downloads = WC()->customer->get_downloadable_products();
$has_downloads = (bool) $downloads;
wc_print_notices(); ?>
wc_print_notices();
<?php wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">

View File

@ -20,7 +20,12 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">
<?php if ( $available_gateways = WC()->payment_gateways->get_available_payment_gateways() ) : ?>

View File

@ -22,7 +22,12 @@ if ( ! defined( 'ABSPATH' ) ) {
wc_print_notices();
wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">

View File

@ -24,7 +24,12 @@ $page_title = ( $load_address === 'billing' ) ? __( 'Billing Address', 'woocomme
wc_print_notices();
wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">

View File

@ -20,9 +20,14 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
wc_print_notices(); ?>
wc_print_notices();
<?php wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">
<p>

View File

@ -23,7 +23,13 @@ if ( ! defined( 'ABSPATH' ) ) {
}
wc_print_notices();
wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">

View File

@ -25,9 +25,15 @@ if ( ! defined( 'ABSPATH' ) ) {
$saved_methods = wc_get_customer_saved_methods_list( get_current_user_id() );
$has_methods = (bool) $saved_methods;
$types = wc_get_account_payment_methods_types();
wc_print_notices(); ?>
<?php wc_get_template( 'myaccount/navigation.php' ); ?>
wc_print_notices();
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">

View File

@ -22,9 +22,14 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
wc_print_notices(); ?>
wc_print_notices();
<?php wc_get_template( 'myaccount/navigation.php' ); ?>
/**
* My Account navigation.
*
* @since 2.6.0
*/
do_action( 'woocommerce_account_navigation' ); ?>
<div class="woocommerce-MyAccount-content">
<p><?php