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

Fix #18995 

Fixes #18995 by moving the note section outside the addresses container and unlink it from the shipping method conditional statement.
This commit is contained in:
Remi Corson 2018-02-16 12:12:15 +01:00
parent f3a524255a
commit 94802c7a8b
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/css/admin.scss
View File

@ -2264,6 +2264,21 @@ ul.wc_coupon_list_block {
}
}
}
.wc-order-preview-note {
overflow:hidden;
width: 100%;
padding: 1.5em;
box-sizing: border-box;
word-wrap: break-word;
h2 {
margin-top: 0;
}
strong {
display: block;
margin-top: 1em;
}
}
.wc-action-button,
.wc-action-button-group {
float: left;

12
includes/admin/list-tables/class-wc-admin-list-table-orders.php
View File

@ -375,11 +375,6 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
<a href="{{ data.shipping_address_map_url }}" target="_blank">{{{ data.formatted_shipping_address }}}</a>
<# } #>
<# if ( data.data.customer_note ) { #>
<strong><?php esc_html_e( 'Note', 'woocommerce' ); ?></strong>
{{ data.data.customer_note }}
<# } #>
<# if ( data.shipping_via ) { #>
<strong><?php esc_html_e( 'Shipping method', 'woocommerce' ); ?></strong>
{{ data.shipping_via }}
@ -388,6 +383,13 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
<# } #>
</div>
<div class="wc-order-preview-note">
<h2><?php esc_html_e( 'Note', 'woocommerce' ); ?></h2>
<# if ( data.data.customer_note ) { #>
{{ data.data.customer_note }}
<# } #>
</div>
{{{ data.item_html }}}
<?php do_action( 'woocommerce_admin_order_preview_end' ); ?>