Merge pull request #17170 from woocommerce/fix/17165

Revert order detail header behavior
ClassicPress · Oct 12, 2017 · 5985089 · 5985089
2 parents 2f6246f + 660d663
commit 5985089
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/templates/emails/email-addresses.php b/templates/emails/email-addresses.php
@@ -32,7 +32,7 @@
 				<?php if ( $order->get_billing_phone() ) : ?>
 					<br/><?php echo esc_html( $order->get_billing_phone() ); ?>
 				<?php endif; ?>
-				<?php if ( $order->get_billing_email() ): ?>
+				<?php if ( $order->get_billing_email() ) : ?>
 					<p><?php echo esc_html( $order->get_billing_email() ); ?></p>
 				<?php endif; ?>
 			</address>

diff --git a/templates/emails/email-order-details.php b/templates/emails/email-order-details.php
@@ -24,7 +24,11 @@
 
 do_action( 'woocommerce_email_before_order_table', $order, $sent_to_admin, $plain_text, $email ); ?>
 
-<h2><?php _e( 'Order details', 'woocommerce' ); ?></h2>
+<?php if ( ! $sent_to_admin ) : ?>
+	<h2><?php _e( 'Order details', 'woocommerce' ); ?></h2>
+<?php else : ?>
+	<h2><a class="link" href="<?php echo esc_url( admin_url( 'post.php?post=' . $order->get_id() . '&action=edit' ) ); ?>"><?php printf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ); ?></a> (<?php printf( '<time datetime="%s">%s</time>', $order->get_date_created()->format( 'c' ), wc_format_datetime( $order->get_date_created() ) ); ?>)</h2>
+<?php endif; ?>
 
 <table class="td" cellspacing="0" cellpadding="6" style="width: 100%; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; margin-bottom: 40px;" border="1">
 	<thead>