This commit is contained in:
Jeff Stieler 2019-11-07 11:18:05 -07:00 committed by GitHub
parent afed4fba36
commit 27cf52c31c
2 changed files with 6 additions and 6 deletions

View File

@ -43,7 +43,7 @@ class SqlQuery {
'where', 'where',
'where_time', 'where_time',
), ),
'join' => array( 'join' => array(
'right_join', 'right_join',
'join', 'join',
'left_join', 'left_join',
@ -81,7 +81,7 @@ class SqlQuery {
* Get SQL clause by type. * Get SQL clause by type.
* *
* @param string $type Clause type. * @param string $type Clause type.
* @param string $handling Whether to filter the return value (filtered|unfiltered). Default unfiltered. * @param string $handling Whether to filter the return value (filtered|unfiltered). Default unfiltered.
* *
* @return string SQL clause. * @return string SQL clause.
*/ */
@ -100,7 +100,7 @@ class SqlQuery {
if ( isset( $this->sql_filters[ $type ] ) ) { if ( isset( $this->sql_filters[ $type ] ) ) {
$clauses = array(); $clauses = array();
foreach( $this->sql_filters[ $type ] as $subset ) { foreach ( $this->sql_filters[ $type ] as $subset ) {
$clauses = array_merge( $clauses, $this->sql_clauses[ $subset ] ); $clauses = array_merge( $clauses, $this->sql_clauses[ $subset ] );
} }
} else { } else {
@ -163,7 +163,6 @@ class SqlQuery {
$having = $this->get_sql_clause( 'having', 'filtered' ); $having = $this->get_sql_clause( 'having', 'filtered' );
$order_by = $this->get_sql_clause( 'order_by', 'filtered' ); $order_by = $this->get_sql_clause( 'order_by', 'filtered' );
$statement = " $statement = "
SELECT SELECT
{$this->get_sql_clause( 'select', 'filtered' )} {$this->get_sql_clause( 'select', 'filtered' )}

View File

@ -128,8 +128,9 @@ class ReportCSVEmail extends \WC_Email {
/** /**
* Trigger the sending of this email. * Trigger the sending of this email.
* *
* @param int $order_id The order ID. * @param int $user_id User ID to email.
* @param WC_Order|false $order Order object. * @param string $report_type The type of report export being emailed.
* @param string $download_url The URL for downloading the report.
*/ */
public function trigger( $user_id, $report_type, $download_url ) { public function trigger( $user_id, $report_type, $download_url ) {
$user = new \WP_User( $user_id ); $user = new \WP_User( $user_id );