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

Use `get_filtered_ids` consistently in `taxes` and `…/stats` datastores (#51219)

This commit is contained in:
Tomek Wytrębowicz 2024-09-10 23:17:10 +02:00 committed by GitHub
parent be79bcca84
commit 065470dea8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce/changelog/fix-49635-tax-totals-filter Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Use `get_filtered_ids` consistently in `reports/taxes` and `reports/taxes/stats` datastores

1
plugins/woocommerce/src/Admin/API/Reports/Taxes/DataStore.php
View File

@ -124,6 +124,7 @@ class DataStore extends ReportsDataStore implements DataStoreInterface {
/** /**
* Updates the database query with parameters used for Taxes report: categories and order status. * Updates the database query with parameters used for Taxes report: categories and order status.
* *
* @see Automattic\WooCommerce\Admin\API\Reports\Taxes\Stats\DataStore::update_sql_query_params()
* @param array $query_args Query arguments supplied by the user. * @param array $query_args Query arguments supplied by the user.
*/ */
protected function add_sql_query_params( $query_args ) { protected function add_sql_query_params( $query_args ) {

15
plugins/woocommerce/src/Admin/API/Reports/Taxes/Stats/DataStore.php
View File

@ -79,28 +79,29 @@ class DataStore extends ReportsDataStore implements DataStoreInterface {
/** /**
* Updates the database query with parameters used for Taxes Stats report * Updates the database query with parameters used for Taxes Stats report
* *
* @see Automattic\WooCommerce\Admin\API\Reports\Taxes\DataStore::add_sql_query_params()
* @param array $query_args Query arguments supplied by the user. * @param array $query_args Query arguments supplied by the user.
*/ */
protected function update_sql_query_params( $query_args ) { protected function update_sql_query_params( $query_args ) {
global $wpdb; global $wpdb;
$taxes_where_clause = '';
$order_tax_lookup_table = self::get_db_table_name(); $order_tax_lookup_table = self::get_db_table_name();
$this->add_time_period_sql_params( $query_args, $order_tax_lookup_table );
$taxes_where_clause = '';
$order_status_filter = $this->get_status_subquery( $query_args );
if ( isset( $query_args['taxes'] ) && ! empty( $query_args['taxes'] ) ) { if ( isset( $query_args['taxes'] ) && ! empty( $query_args['taxes'] ) ) {
$query_args['taxes'] = (array) $query_args['taxes']; $allowed_taxes = self::get_filtered_ids( $query_args, 'taxes' );
$tax_id_placeholders = implode( ',', array_fill( 0, count( $query_args['taxes'] ), '%d' ) ); /* phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- `$allowed_taxes` was prepared by get_filtered_ids above. */
/* phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared */ $taxes_where_clause .= " AND {$order_tax_lookup_table}.tax_rate_id IN ({$allowed_taxes})";
$taxes_where_clause .= $wpdb->prepare( " AND {$order_tax_lookup_table}.tax_rate_id IN ({$tax_id_placeholders})", $query_args['taxes'] );
/* phpcs:enable */ /* phpcs:enable */
} }
$order_status_filter = $this->get_status_subquery( $query_args );
if ( $order_status_filter ) { if ( $order_status_filter ) {
$taxes_where_clause .= " AND ( {$order_status_filter} )"; $taxes_where_clause .= " AND ( {$order_status_filter} )";
} }
$this->add_time_period_sql_params( $query_args, $order_tax_lookup_table );
$this->total_query->add_sql_clause( 'where', $taxes_where_clause ); $this->total_query->add_sql_clause( 'where', $taxes_where_clause );
$this->add_intervals_sql_params( $query_args, $order_tax_lookup_table ); $this->add_intervals_sql_params( $query_args, $order_tax_lookup_table );