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

Merge pull request woocommerce/woocommerce-admin#2190 from woocommerce/fix/2180 

fix customer name logic on populating customer lookup data
This commit is contained in:
Ron Rennick 2019-05-09 09:39:49 -03:00 committed by GitHub
parent 2cd44376de 0f2788ed1c
commit 41a341f690
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-customers-data-store.php
View File

@ -525,25 +525,24 @@ class WC_Admin_Reports_Customers_Data_Store extends WC_Admin_Reports_Data_Store
if (
$user_id &&
get_user_meta( $user_id, 'first_name', true ) ||
get_user_meta( $user_id, 'last_name', true )
(
get_user_meta( $user_id, 'first_name', true ) ||
get_user_meta( $user_id, 'last_name', true )
)
) {
$first_name = get_user_meta( $user_id, 'first_name', true );
$last_name = get_user_meta( $user_id, 'last_name', true );
} elseif (
$order &&
$order->get_billing_first_name( 'edit' ) ||
$order->get_billing_last_name( 'edit' )
) {
$first_name = $order->get_billing_first_name( 'edit' );
$last_name = $order->get_billing_last_name( 'edit' );
} elseif (
$order &&
$order->get_shipping_first_name( 'edit' ) ||
$order->get_shipping_last_name( 'edit' )
) {
$first_name = $order->get_shipping_first_name( 'edit' );
$last_name = $order->get_shipping_last_name( 'edit' );
} elseif ( $order ) {
if (
$order->get_billing_first_name( 'edit' ) ||
$order->get_billing_last_name( 'edit' )
) {
$first_name = $order->get_billing_first_name( 'edit' );
$last_name = $order->get_billing_last_name( 'edit' );
} else {
$first_name = $order->get_shipping_first_name( 'edit' );
$last_name = $order->get_shipping_last_name( 'edit' );
}
}
return apply_filters( 'woocommerce_reports_customer_name', array( $first_name, $last_name ), $order );