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

Fixed conflicts for #8075

This commit is contained in:
Claudio Sanches 2015-05-05 08:52:28 -03:00
parent 5f67a63b43 d94b2c95fc
commit 2c52e0e973
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/admin/meta-boxes/class-wc-meta-box-order-data.php
View File

@ -153,6 +153,7 @@ class WC_Meta_Box_Order_Data {
$payment_method = ! empty( $order->payment_method ) ? $order->payment_method : ''; $payment_method = ! empty( $order->payment_method ) ? $order->payment_method : '';
$order_type_object = get_post_type_object( $post->post_type );
wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' ); wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
?> ?>
<style type="text/css"> <style type="text/css">
@ -163,7 +164,7 @@ class WC_Meta_Box_Order_Data {
<input name="post_status" type="hidden" value="<?php echo esc_attr( $post->post_status ); ?>" /> <input name="post_status" type="hidden" value="<?php echo esc_attr( $post->post_status ); ?>" />
<div id="order_data" class="panel"> <div id="order_data" class="panel">
<h2><?php printf( __( 'Order #%s Details', 'woocommerce' ), esc_html( $order->get_order_number() ) ); ?></h2> <h2><?php printf( __( '%s %s details', 'woocommerce' ), $order_type_object->labels->singular_name, esc_html( $order->get_order_number() ) ); ?></h2>
<p class="order_number"><?php <p class="order_number"><?php
if ( $payment_method ) { if ( $payment_method ) {