Tidy up order markup and add our new css classes. #11784
This commit is contained in:
James Koster
parent
376a53de04
commit
0edfadaf0d
|
|
@ -13,59 +13,70 @@
|
|||
* @see https://docs.woocommerce.com/document/template-structure/
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates
|
||||
* @version 2.2.0
|
||||
* @version 2.7.0
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
|
||||
if ( $order ) : ?>
|
||||
<div class="woocommerce-order">
|
||||
|
||||
<?php if ( $order->has_status( 'failed' ) ) : ?>
|
||||
<?php if ( $order ) : ?>
|
||||
|
||||
<p class="woocommerce-thankyou-order-failed"><?php _e( 'Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction. Please attempt your purchase again.', 'woocommerce' ); ?></p>
|
||||
<?php if ( $order->has_status( 'failed' ) ) : ?>
|
||||
|
||||
<p class="woocommerce-thankyou-order-failed-actions">
|
||||
<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e( 'Pay', 'woocommerce' ) ?></a>
|
||||
<?php if ( is_user_logged_in() ) : ?>
|
||||
<a href="<?php echo esc_url( wc_get_page_permalink( 'myaccount' ) ); ?>" class="button pay"><?php _e( 'My Account', 'woocommerce' ); ?></a>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
<p class="woocommerce-notice woocommerce-notice--error woocommerce-thankyou-order-failed"><?php _e( 'Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction. Please attempt your purchase again.', 'woocommerce' ); ?></p>
|
||||
|
||||
<p class="woocommerce-notice woocommerce-notice--error woocommerce-thankyou-order-failed-actions">
|
||||
<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e( 'Pay', 'woocommerce' ) ?></a>
|
||||
<?php if ( is_user_logged_in() ) : ?>
|
||||
<a href="<?php echo esc_url( wc_get_page_permalink( 'myaccount' ) ); ?>" class="button pay"><?php _e( 'My Account', 'woocommerce' ); ?></a>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
|
||||
<?php else : ?>
|
||||
|
||||
<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); ?></p>
|
||||
|
||||
<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
|
||||
|
||||
<li class="woocommerce-order-overview__order order">
|
||||
<?php _e( 'Order Number:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_order_number(); ?></strong>
|
||||
</li>
|
||||
|
||||
<li class="woocommerce-order-overview__date date">
|
||||
<?php _e( 'Date:', 'woocommerce' ); ?>
|
||||
<strong><?php echo date_i18n( get_option( 'date_format' ), $order->get_date_created() ); ?></strong>
|
||||
</li>
|
||||
|
||||
<li class="woocommerce-order-overview__total total">
|
||||
<?php _e( 'Total:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_formatted_order_total(); ?></strong>
|
||||
</li>
|
||||
|
||||
<?php if ( $order->get_payment_method_title() ) : ?>
|
||||
|
||||
<li class="woocommerce-order-overview__payment-method method">
|
||||
<?php _e( 'Payment Method:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_payment_method_title(); ?></strong>
|
||||
</li>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
</ul>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_thankyou_' . $order->get_payment_method(), $order->get_id() ); ?>
|
||||
<?php do_action( 'woocommerce_thankyou', $order->get_id() ); ?>
|
||||
|
||||
<?php else : ?>
|
||||
|
||||
<p class="woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); ?></p>
|
||||
|
||||
<ul class="woocommerce-thankyou-order-details order_details">
|
||||
<li class="order">
|
||||
<?php _e( 'Order Number:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_order_number(); ?></strong>
|
||||
</li>
|
||||
<li class="date">
|
||||
<?php _e( 'Date:', 'woocommerce' ); ?>
|
||||
<strong><?php echo date_i18n( get_option( 'date_format' ), $order->get_date_created() ); ?></strong>
|
||||
</li>
|
||||
<li class="total">
|
||||
<?php _e( 'Total:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_formatted_order_total(); ?></strong>
|
||||
</li>
|
||||
<?php if ( $order->get_payment_method_title() ) : ?>
|
||||
<li class="method">
|
||||
<?php _e( 'Payment Method:', 'woocommerce' ); ?>
|
||||
<strong><?php echo $order->get_payment_method_title(); ?></strong>
|
||||
</li>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
<div class="clear"></div>
|
||||
<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), null ); ?></p>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_thankyou_' . $order->get_payment_method(), $order->get_id() ); ?>
|
||||
<?php do_action( 'woocommerce_thankyou', $order->get_id() ); ?>
|
||||
|
||||
<?php else : ?>
|
||||
|
||||
<p class="woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', __( 'Thank you. Your order has been received.', 'woocommerce' ), null ); ?></p>
|
||||
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,65 +13,75 @@
|
|||
* @see https://docs.woocommerce.com/document/template-structure/
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates
|
||||
* @version 2.4.0
|
||||
* @version 2.7.0
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<header><h2><?php _e( 'Customer Details', 'woocommerce' ); ?></h2></header>
|
||||
|
||||
<table class="shop_table customer_details">
|
||||
<?php if ( $order->get_customer_note() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Note:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo wptexturize( $order->get_customer_note() ); ?></td>
|
||||
</tr>
|
||||
<section class="woocommerce-customer-details">
|
||||
|
||||
<h2><?php _e( 'Customer Details', 'woocommerce' ); ?></h2>
|
||||
|
||||
<table class="woocommerce-table woocommerce-table--customer-details shop_table customer_details">
|
||||
|
||||
<?php if ( $order->get_customer_note() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Note:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo wptexturize( $order->get_customer_note() ); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( $order->get_billing_email() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Email:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo esc_html( $order->get_billing_email() ); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( $order->get_billing_phone() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Telephone:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo esc_html( $order->get_billing_phone() ); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_order_details_after_customer_details', $order ); ?>
|
||||
|
||||
</table>
|
||||
|
||||
<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
|
||||
|
||||
<section class="woocommerce-columns woocommerce-columns--2 woocommerce-columns--addresses col2-set addresses">
|
||||
|
||||
<div class="woocommerce-column woocommerce-column--1 woocommerce-column--billing-address col-1">
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<h3 class="woocommerce-column__title"><?php _e( 'Billing Address', 'woocommerce' ); ?></h3>
|
||||
|
||||
<address>
|
||||
<?php echo ( $address = $order->get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
|
||||
</address>
|
||||
|
||||
<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
|
||||
|
||||
</div><!-- /.col-1 -->
|
||||
|
||||
<div class="woocommerce-column woocommerce-column--2 woocommerce-column--shipping-address col-2">
|
||||
|
||||
<h3 class="woocommerce-column__title"><?php _e( 'Shipping Address', 'woocommerce' ); ?></h3>
|
||||
|
||||
<address>
|
||||
<?php echo ( $address = $order->get_formatted_shipping_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
|
||||
</address>
|
||||
|
||||
</div><!-- /.col-2 -->
|
||||
|
||||
</section><!-- /.col2-set -->
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( $order->get_billing_email() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Email:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo esc_html( $order->get_billing_email() ); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( $order->get_billing_phone() ) : ?>
|
||||
<tr>
|
||||
<th><?php _e( 'Telephone:', 'woocommerce' ); ?></th>
|
||||
<td><?php echo esc_html( $order->get_billing_phone() ); ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_order_details_after_customer_details', $order ); ?>
|
||||
</table>
|
||||
|
||||
<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
|
||||
|
||||
<div class="col2-set addresses">
|
||||
<div class="col-1">
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<header class="title">
|
||||
<h3><?php _e( 'Billing Address', 'woocommerce' ); ?></h3>
|
||||
</header>
|
||||
<address>
|
||||
<?php echo ( $address = $order->get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
|
||||
</address>
|
||||
|
||||
<?php if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() ) : ?>
|
||||
|
||||
</div><!-- /.col-1 -->
|
||||
<div class="col-2">
|
||||
<header class="title">
|
||||
<h3><?php _e( 'Shipping Address', 'woocommerce' ); ?></h3>
|
||||
</header>
|
||||
<address>
|
||||
<?php echo ( $address = $order->get_formatted_shipping_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?>
|
||||
</address>
|
||||
</div><!-- /.col-2 -->
|
||||
</div><!-- /.col2-set -->
|
||||
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,9 @@ if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
|
|||
return;
|
||||
}
|
||||
?>
|
||||
<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
|
||||
<td class="product-name">
|
||||
<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'woocommerce-table__line-item order_item', $item, $order ) ); ?>">
|
||||
|
||||
<td class="woocommerce-table__product-name product-name">
|
||||
<?php
|
||||
$is_visible = $product && $product->is_visible();
|
||||
$product_permalink = apply_filters( 'woocommerce_order_item_permalink', $is_visible ? $product->get_permalink( $item ) : '', $item, $order );
|
||||
|
|
@ -41,12 +42,19 @@ if ( ! apply_filters( 'woocommerce_order_item_visible', true, $item ) ) {
|
|||
do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order );
|
||||
?>
|
||||
</td>
|
||||
<td class="product-total">
|
||||
|
||||
<td class="woocommerce-table__product-total product-total">
|
||||
<?php echo $order->get_formatted_line_subtotal( $item ); ?>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<?php if ( $show_purchase_note && $purchase_note ) : ?>
|
||||
<tr class="product-purchase-note">
|
||||
|
||||
<tr class="woocommerce-table__product-purchase-note product-purchase-note">
|
||||
|
||||
<td colspan="3"><?php echo wpautop( do_shortcode( wp_kses_post( $purchase_note ) ) ); ?></td>
|
||||
|
||||
</tr>
|
||||
|
||||
<?php endif; ?>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* @see https://docs.woocommerce.com/document/template-structure/
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates
|
||||
* @version 2.6.0
|
||||
* @version 2.7.0
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
|
|
@ -25,47 +25,57 @@ $order = wc_get_order( $order_id );
|
|||
$show_purchase_note = $order->has_status( apply_filters( 'woocommerce_purchase_note_order_statuses', array( 'completed', 'processing' ) ) );
|
||||
$show_customer_details = is_user_logged_in() && $order->get_user_id() === get_current_user_id();
|
||||
?>
|
||||
<h2><?php _e( 'Order Details', 'woocommerce' ); ?></h2>
|
||||
<table class="shop_table order_details">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
|
||||
<th class="product-total"><?php _e( 'Total', 'woocommerce' ); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
foreach ( $order->get_items() as $item_id => $item ) {
|
||||
$product = apply_filters( 'woocommerce_order_item_product', $item->get_product(), $item );
|
||||
|
||||
wc_get_template( 'order/order-details-item.php', array(
|
||||
'order' => $order,
|
||||
'item_id' => $item_id,
|
||||
'item' => $item,
|
||||
'show_purchase_note' => $show_purchase_note,
|
||||
'purchase_note' => $product ? get_post_meta( $product->id, '_purchase_note', true ) : '',
|
||||
'product' => $product,
|
||||
) );
|
||||
}
|
||||
?>
|
||||
<?php do_action( 'woocommerce_order_items_table', $order ); ?>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<?php
|
||||
foreach ( $order->get_order_item_totals() as $key => $total ) {
|
||||
?>
|
||||
<tr>
|
||||
<th scope="row"><?php echo $total['label']; ?></th>
|
||||
<td><?php echo $total['value']; ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</tfoot>
|
||||
</table>
|
||||
<section class="woocommerce-order-details">
|
||||
|
||||
<?php do_action( 'woocommerce_order_details_after_order_table', $order ); ?>
|
||||
<h2 class="woocommerce-order-details__title"><?php _e( 'Order Details', 'woocommerce' ); ?></h2>
|
||||
|
||||
<?php if ( $show_customer_details ) : ?>
|
||||
<?php wc_get_template( 'order/order-details-customer.php', array( 'order' => $order ) ); ?>
|
||||
<?php endif; ?>
|
||||
<table class="woocommerce-table woocommerce-table--order-details shop_table order_details">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="woocommerce-table__product-name product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
|
||||
<th class="woocommerce-table__product-table product-total"><?php _e( 'Total', 'woocommerce' ); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<?php
|
||||
foreach ( $order->get_items() as $item_id => $item ) {
|
||||
$product = apply_filters( 'woocommerce_order_item_product', $item->get_product(), $item );
|
||||
|
||||
wc_get_template( 'order/order-details-item.php', array(
|
||||
'order' => $order,
|
||||
'item_id' => $item_id,
|
||||
'item' => $item,
|
||||
'show_purchase_note' => $show_purchase_note,
|
||||
'purchase_note' => $product ? get_post_meta( $product->id, '_purchase_note', true ) : '',
|
||||
'product' => $product,
|
||||
) );
|
||||
}
|
||||
?>
|
||||
<?php do_action( 'woocommerce_order_items_table', $order ); ?>
|
||||
</tbody>
|
||||
|
||||
<tfoot>
|
||||
<?php
|
||||
foreach ( $order->get_order_item_totals() as $key => $total ) {
|
||||
?>
|
||||
<tr>
|
||||
<th scope="row"><?php echo $total['label']; ?></th>
|
||||
<td><?php echo $total['value']; ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</tfoot>
|
||||
|
||||
</table>
|
||||
|
||||
<?php do_action( 'woocommerce_order_details_after_order_table', $order ); ?>
|
||||
|
||||
<?php if ( $show_customer_details ) : ?>
|
||||
<?php wc_get_template( 'order/order-details-customer.php', array( 'order' => $order ) ); ?>
|
||||
<?php endif; ?>
|
||||
|
||||
</section>
|
||||
|
|
|
|||
Loading…
Reference in New Issue