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

Fixed where contitions. Handle name parameter

This commit is contained in:
kidinov 2023-06-21 13:37:38 +02:00
parent 0e1f78318e
commit 08b08e5619
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce/src/Admin/API/Reports/Customers/Controller.php
View File

@ -536,7 +536,7 @@ class Controller extends GenericController implements ExportableInterface {
'name', 'name',
'country', 'country',
'city', 'city',
'region', 'state',
'postcode', 'postcode',
), ),
), ),

8
plugins/woocommerce/src/Admin/API/Reports/Customers/DataStore.php
View File

@ -316,15 +316,19 @@ class DataStore extends ReportsDataStore implements DataStoreInterface {
'name', 'name',
'country', 'country',
'city', 'city',
'region', 'state',
'postcode', 'postcode',
); );
if ( ! empty( $query_args['filter_empty'] ) ) { if ( ! empty( $query_args['filter_empty'] ) ) {
$fields_to_filter_by = array_intersect( $query_args['filter_empty'], $filter_empty_params ); $fields_to_filter_by = array_intersect( $query_args['filter_empty'], $filter_empty_params );
if ( in_array( 'name', $fields_to_filter_by, true ) ) {
$fields_to_filter_by = array_diff( $fields_to_filter_by, array( 'name' ) );
$fields_to_filter_by[] = "CONCAT_WS( ' ', first_name, last_name )";
}
$fields_with_not_condition = array_map( $fields_with_not_condition = array_map(
function ( $field ) { function ( $field ) {
return $field . ' IS NOT NULL'; return $field . ' <> \'\'';
}, },
$fields_to_filter_by $fields_to_filter_by
); );