AyeCode / invoicing

includes/api/class-getpaid-rest-reports-controller.php

Indentation +172 added lines, -172 removed lines

@@ -18,176 +18,176 @@
  */
 class GetPaid_REST_Reports_Controller extends GetPaid_REST_Controller {
 
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'reports';
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		// List all available reports.
-		register_rest_route(
-			$namespace,
-			$this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-					'args'                => $this->get_collection_params(),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Makes sure the current user has access to READ the report APIs.
-	 *
-	 * @since  2.0.0
-	 * @param WP_REST_Request $request Full data about the request.
-	 * @return WP_Error|boolean
-	 */
-	public function get_items_permissions_check( $request ) {
-
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get reports list.
-	 *
-	 * @since 2.0.0
-	 * @return array
-	 */
-	protected function get_reports() {
-
-		$reports = array(
-			array(
-				'slug'        => 'sales',
-				'description' => __( 'List of sales reports.', 'invoicing' ),
-			),
-			array(
-				'slug'        => 'top_sellers',
-				'description' => __( 'List of top selling items.', 'invoicing' ),
-			),
-			array(
-				'slug'        => 'top_earners',
-				'description' => __( 'List of top earning items.', 'invoicing' ),
-			),
-			array(
-				'slug'        => 'invoices/counts',
-				'description' => __( 'Invoice counts.', 'invoicing' ),
-			),
-		);
-
-		return apply_filters( 'getpaid_available_api_reports', $reports );
-
-	}
-
-	/**
-	 * Get all reports.
-	 *
-	 * @since 2.0.0
-	 * @param WP_REST_Request $request
-	 * @return array|WP_Error
-	 */
-	public function get_items( $request ) {
-		$data    = array();
-		$reports = $this->get_reports();
-
-		foreach ( $reports as $report ) {
-			$item   = $this->prepare_item_for_response( (object) $report, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
-		}
-
-		return rest_ensure_response( $data );
-	}
-
-	/**
-	 * Prepare a report object for serialization.
-	 *
-	 * @since 2.0.0
-	 * @param stdClass $report Report data.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $report, $request ) {
-		$data = array(
-			'slug'        => $report->slug,
-			'description' => $report->description,
-		);
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links( array(
-			'self' => array(
-				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $report->slug ) ),
-			),
-			'collection' => array(
-				'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
-			),
-		) );
-
-		return apply_filters( 'getpaid_rest_prepare_report', $response, $report, $request );
-	}
-
-	/**
-	 * Get the Report's schema, conforming to JSON Schema.
-	 *
-	 * @since 2.0.0
-	 * @return array
-	 */
-	public function get_item_schema() {
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'report',
-			'type'       => 'object',
-			'properties' => array(
-				'slug' => array(
-					'description' => __( 'An alphanumeric identifier for the resource.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'description' => array(
-					'description' => __( 'A human-readable description of the resource.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		return $this->add_additional_fields_schema( $schema );
-	}
-
-	/**
-	 * Get the query params for collections.
-	 *
-	 * @since 2.0.0
-	 * @return array
-	 */
-	public function get_collection_params() {
-		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-		);
-	}
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'reports';
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 2.0.0
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        // List all available reports.
+        register_rest_route(
+            $namespace,
+            $this->rest_base,
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
+            )
+        );
+
+    }
+
+    /**
+     * Makes sure the current user has access to READ the report APIs.
+     *
+     * @since  2.0.0
+     * @param WP_REST_Request $request Full data about the request.
+     * @return WP_Error|boolean
+     */
+    public function get_items_permissions_check( $request ) {
+
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Get reports list.
+     *
+     * @since 2.0.0
+     * @return array
+     */
+    protected function get_reports() {
+
+        $reports = array(
+            array(
+                'slug'        => 'sales',
+                'description' => __( 'List of sales reports.', 'invoicing' ),
+            ),
+            array(
+                'slug'        => 'top_sellers',
+                'description' => __( 'List of top selling items.', 'invoicing' ),
+            ),
+            array(
+                'slug'        => 'top_earners',
+                'description' => __( 'List of top earning items.', 'invoicing' ),
+            ),
+            array(
+                'slug'        => 'invoices/counts',
+                'description' => __( 'Invoice counts.', 'invoicing' ),
+            ),
+        );
+
+        return apply_filters( 'getpaid_available_api_reports', $reports );
+
+    }
+
+    /**
+     * Get all reports.
+     *
+     * @since 2.0.0
+     * @param WP_REST_Request $request
+     * @return array|WP_Error
+     */
+    public function get_items( $request ) {
+        $data    = array();
+        $reports = $this->get_reports();
+
+        foreach ( $reports as $report ) {
+            $item   = $this->prepare_item_for_response( (object) $report, $request );
+            $data[] = $this->prepare_response_for_collection( $item );
+        }
+
+        return rest_ensure_response( $data );
+    }
+
+    /**
+     * Prepare a report object for serialization.
+     *
+     * @since 2.0.0
+     * @param stdClass $report Report data.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $report, $request ) {
+        $data = array(
+            'slug'        => $report->slug,
+            'description' => $report->description,
+        );
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data = $this->add_additional_fields_to_object( $data, $request );
+        $data = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+        $response->add_links( array(
+            'self' => array(
+                'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $report->slug ) ),
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+            ),
+        ) );
+
+        return apply_filters( 'getpaid_rest_prepare_report', $response, $report, $request );
+    }
+
+    /**
+     * Get the Report's schema, conforming to JSON Schema.
+     *
+     * @since 2.0.0
+     * @return array
+     */
+    public function get_item_schema() {
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'report',
+            'type'       => 'object',
+            'properties' => array(
+                'slug' => array(
+                    'description' => __( 'An alphanumeric identifier for the resource.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'description' => array(
+                    'description' => __( 'A human-readable description of the resource.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        return $this->add_additional_fields_schema( $schema );
+    }
+
+    /**
+     * Get the query params for collections.
+     *
+     * @since 2.0.0
+     * @return array
+     */
+    public function get_collection_params() {
+        return array(
+            'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+        );
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST reports controller class.
@@ -32,7 +32,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// List all available reports.
 		register_rest_route(
@@ -41,11 +41,11 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_items'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => $this->get_collection_params(),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		);
 
@@ -58,10 +58,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_view', __('Sorry, you cannot list resources.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -78,23 +78,23 @@ 
 		$reports = array(
 			array(
 				'slug'        => 'sales',
-				'description' => __( 'List of sales reports.', 'invoicing' ),
+				'description' => __('List of sales reports.', 'invoicing'),
 			),
 			array(
 				'slug'        => 'top_sellers',
-				'description' => __( 'List of top selling items.', 'invoicing' ),
+				'description' => __('List of top selling items.', 'invoicing'),
 			),
 			array(
 				'slug'        => 'top_earners',
-				'description' => __( 'List of top earning items.', 'invoicing' ),
+				'description' => __('List of top earning items.', 'invoicing'),
 			),
 			array(
 				'slug'        => 'invoices/counts',
-				'description' => __( 'Invoice counts.', 'invoicing' ),
+				'description' => __('Invoice counts.', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'getpaid_available_api_reports', $reports );
+		return apply_filters('getpaid_available_api_reports', $reports);
 
 	}
 
@@ -105,16 +105,16 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		$data    = array();
 		$reports = $this->get_reports();
 
-		foreach ( $reports as $report ) {
-			$item   = $this->prepare_item_for_response( (object) $report, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
+		foreach ($reports as $report) {
+			$item   = $this->prepare_item_for_response((object) $report, $request);
+			$data[] = $this->prepare_response_for_collection($item);
 		}
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 	}
 
 	/**
@@ -125,28 +125,28 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $report, $request ) {
+	public function prepare_item_for_response($report, $request) {
 		$data = array(
 			'slug'        => $report->slug,
 			'description' => $report->description,
 		);
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
+		$context = !empty($request['context']) ? $request['context'] : 'view';
+		$data = $this->add_additional_fields_to_object($data, $request);
+		$data = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links( array(
+		$response = rest_ensure_response($data);
+		$response->add_links(array(
 			'self' => array(
-				'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $report->slug ) ),
+				'href' => rest_url(sprintf('/%s/%s/%s', $this->namespace, $this->rest_base, $report->slug)),
 			),
 			'collection' => array(
-				'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+				'href' => rest_url(sprintf('%s/%s', $this->namespace, $this->rest_base)),
 			),
-		) );
+		));
 
-		return apply_filters( 'getpaid_rest_prepare_report', $response, $report, $request );
+		return apply_filters('getpaid_rest_prepare_report', $response, $report, $request);
 	}
 
 	/**
@@ -162,21 +162,21 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'slug' => array(
-					'description' => __( 'An alphanumeric identifier for the resource.', 'invoicing' ),
+					'description' => __('An alphanumeric identifier for the resource.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'description' => array(
-					'description' => __( 'A human-readable description of the resource.', 'invoicing' ),
+					'description' => __('A human-readable description of the resource.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function get_collection_params() {
 		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param(array('default' => 'view')),
 		);
 	}
 }

includes/reports/class-getpaid-reports-report-earnings.php

Indentation +133 added lines, -133 removed lines

@@ -12,43 +12,43 @@ 
  */
 class GetPaid_Reports_Report_Earnings extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * Retrieves the earning graphs.
-	 *
-	 */
-	public function get_graphs() {
+    /**
+     * Retrieves the earning graphs.
+     *
+     */
+    public function get_graphs() {
 
-		$graphs = array(
+        $graphs = array(
 
             'total'      => __( 'Earnings', 'invoicing' ),
             'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'fees_total' => __( 'Fees', 'invoicing' ),
+            'tax'        => __( 'Tax', 'invoicing' ),
 
-		);
+        );
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+        return apply_filters( 'getpaid_earning_graphs', $graphs );
 
-	}
+    }
 
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
 
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
-		$graphs_sql = array();
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+        $graphs     = array_keys( $this->get_graphs() );
+        $graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
-			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
-		}
+        foreach ( $graphs as $graph ) {
+            $graphs_sql[] = "SUM( meta.$graph ) AS $graph";
+        }
 
-		$graphs_sql = implode( ', ', $graphs_sql );
-		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
+        $graphs_sql = implode( ', ', $graphs_sql );
+        $sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
             WHERE meta.post_id IS NOT NULL
@@ -58,94 +58,94 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-	}
-
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels( $range ) {
-
-		$labels = array(
-			'today'     => $this->get_hours_in_a_day(),
-			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
-		);
-
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
-	}
-
-	/**
-	 * Retrieves report datasets.
-	 *
-	 */
-	public function get_datasets( $labels ) {
-
-		$datasets = array();
-
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
-				'label' => $label,
-				'data'  => $this->get_data( $key, $labels )
-			);
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
-	}
-
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data( $key, $labels ) {
-
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
-		$prepared = array();
-
-		foreach ( $labels as $label ) {
-
-			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
-			}
-
-			$prepared[] = $value;
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
-
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-
-		$labels     = $this->get_labels( $this->get_range() );
-		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
-		);
-
-		?>
+        return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+    }
+
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels( $range ) {
+
+        $labels = array(
+            'today'     => $this->get_hours_in_a_day(),
+            'yesterday' => $this->get_hours_in_a_day(),
+            '7_days'    => $this->get_days_in_period( 7 ),
+            '30_days'   => $this->get_days_in_period( 30 ),
+            '60_days'   => $this->get_days_in_period( 60 ),
+            '90_days'   => $this->get_weeks_in_period( 90 ),
+            '180_days'  => $this->get_weeks_in_period( 180 ),
+            '360_days'  => $this->get_weeks_in_period( 360 ),
+        );
+
+        $label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
+        return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+    }
+
+    /**
+     * Retrieves report datasets.
+     *
+     */
+    public function get_datasets( $labels ) {
+
+        $datasets = array();
+
+        foreach ( $this->get_graphs() as $key => $label ) {
+            $datasets[ $key ] = array(
+                'label' => $label,
+                'data'  => $this->get_data( $key, $labels )
+            );
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+    }
+
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data( $key, $labels ) {
+
+        $data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+        $prepared = array();
+
+        foreach ( $labels as $label ) {
+
+            $value = 0;
+            if ( isset( $data[ $label ] ) ) {
+                $value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+            }
+
+            $prepared[] = $value;
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+
+        $labels     = $this->get_labels( $this->get_range() );
+        $chart_data = array(
+            'labels'   => array_values( $labels ),
+            'datasets' => $this->get_datasets( array_keys( $labels ) ),
+        );
+
+        ?>
 
 			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
 				<div class="row mb-4">
@@ -165,15 +165,15 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_graph( $key, $dataset, $labels ) {
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_graph( $key, $dataset, $labels ) {
 
-		?>
+        ?>
 
 		<canvas id="getpaid-chartjs-earnings-<?php echo sanitize_key( $key ); ?>"></canvas>
 
@@ -223,20 +223,20 @@ 
 		</script>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {}
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {}
 
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
 
-	}
+    }
 
 }

Spacing +44 added lines, -44 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Earnings Class.
@@ -20,14 +20,14 @@ 
 
 		$graphs = array(
 
-            'total'      => __( 'Earnings', 'invoicing' ),
-            'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'total'      => __('Earnings', 'invoicing'),
+            'discount'   => __('Discount', 'invoicing'),
+			'fees_total' => __('Fees', 'invoicing'),
+			'tax'        => __('Tax', 'invoicing'),
 
 		);
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+		return apply_filters('getpaid_earning_graphs', $graphs);
 
 	}
 
@@ -35,19 +35,19 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
+		$clauses    = $this->get_range_sql($range);
+		$graphs     = array_keys($this->get_graphs());
 		$graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
+		foreach ($graphs as $graph) {
 			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
 		}
 
-		$graphs_sql = implode( ', ', $graphs_sql );
+		$graphs_sql = implode(', ', $graphs_sql);
 		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
@@ -58,7 +58,7 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_earning_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -68,68 +68,68 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
 	}
 
 	/**
 	 * Retrieves report labels.
 	 *
 	 */
-	public function get_labels( $range ) {
+	public function get_labels($range) {
 
 		$labels = array(
 			'today'     => $this->get_hours_in_a_day(),
 			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
+			'7_days'    => $this->get_days_in_period(7),
+			'30_days'   => $this->get_days_in_period(30),
+			'60_days'   => $this->get_days_in_period(60),
+			'90_days'   => $this->get_weeks_in_period(90),
+			'180_days'  => $this->get_weeks_in_period(180),
+			'360_days'  => $this->get_weeks_in_period(360),
 		);
 
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+		$label = isset($labels[$range]) ? $labels[$range] : $labels['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_labels', $label, $range);
 	}
 
 	/**
 	 * Retrieves report datasets.
 	 *
 	 */
-	public function get_datasets( $labels ) {
+	public function get_datasets($labels) {
 
 		$datasets = array();
 
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
+		foreach ($this->get_graphs() as $key => $label) {
+			$datasets[$key] = array(
 				'label' => $label,
-				'data'  => $this->get_data( $key, $labels )
+				'data'  => $this->get_data($key, $labels)
 			);
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+		return apply_filters('getpaid_earning_graphs_get_datasets', $datasets, $labels);
 	}
 
 	/**
 	 * Retrieves report data.
 	 *
 	 */
-	public function get_data( $key, $labels ) {
+	public function get_data($key, $labels) {
 
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+		$data     = wp_list_pluck($this->stats, $key, 'completed_date');
 		$prepared = array();
 
-		foreach ( $labels as $label ) {
+		foreach ($labels as $label) {
 
 			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+			if (isset($data[$label])) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($data[$label]));
 			}
 
 			$prepared[] = $value;
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+		return apply_filters('getpaid_earning_graphs_get_data', $prepared, $key, $labels);
 
 	}
 
@@ -139,15 +139,15 @@ 
 	 */
 	public function display() {
 
-		$labels     = $this->get_labels( $this->get_range() );
+		$labels     = $this->get_labels($this->get_range());
 		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
+			'labels'   => array_values($labels),
+			'datasets' => $this->get_datasets(array_keys($labels)),
 		);
 
 		?>
 
-			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
+			<?php foreach ($chart_data['datasets'] as $key => $dataset) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
@@ -156,7 +156,7 @@ 
 								<?php $this->display_range_selector(); ?>
 							</div>
 							<div class="card-body">
-								<?php $this->display_graph( $key, $dataset, $chart_data['labels'] ); ?>
+								<?php $this->display_graph($key, $dataset, $chart_data['labels']); ?>
 							</div>
 						</div>
 					</div>
@@ -171,26 +171,26 @@ 
 	 * Displays the actual report.
 	 *
 	 */
-	public function display_graph( $key, $dataset, $labels ) {
+	public function display_graph($key, $dataset, $labels) {
 
 		?>
 
-		<canvas id="getpaid-chartjs-earnings-<?php echo sanitize_key( $key ); ?>"></canvas>
+		<canvas id="getpaid-chartjs-earnings-<?php echo sanitize_key($key); ?>"></canvas>
 
 		<script>
 			window.addEventListener( 'DOMContentLoaded', function() {
 
-				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo sanitize_key( $key ); ?>' ).getContext('2d');
+				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo sanitize_key($key); ?>' ).getContext('2d');
 				new Chart(
 					ctx,
 					{
 						type: 'line',
 						data: {
-							'labels': <?php echo wp_json_encode( $labels ); ?>,
+							'labels': <?php echo wp_json_encode($labels); ?>,
 							'datasets': [
 								{
-									label: '<?php echo esc_attr( $dataset['label'] ); ?>',
-									data: <?php echo wp_json_encode( $dataset['data'] ); ?>,
+									label: '<?php echo esc_attr($dataset['label']); ?>',
+									data: <?php echo wp_json_encode($dataset['data']); ?>,
 									backgroundColor: 'rgba(54, 162, 235, 0.1)',
 									borderColor: 'rgb(54, 162, 235)',
 									borderWidth: 4,

includes/api/class-getpaid-rest-date-based-controller.php

Indentation +573 added lines, -573 removed lines

@@ -16,577 +16,577 @@
  */
 class GetPaid_REST_Date_Based_Controller extends GetPaid_REST_Controller {
 
-	/**
-	 * Group response items by day or month.
-	 *
-	 * @var string
-	 */
-	public $groupby = 'day';
-
-	/**
-	 * Returns an array with arguments to request the previous report.
-	 *
-	 * @var array
-	 */
-	public $previous_range = array();
-
-	/**
-	 * The period interval.
-	 *
-	 * @var int
-	 */
-	public $interval;
-
-	/**
-	 * Retrieves the before and after dates.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_date_range( $request ) {
-
-		// If not supported, assume all time.
-		if ( ! in_array( $request['period'], array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year' ) ) ) {
-			$request['period'] = '7_days';
-		}
-
-		$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
-		$this->prepare_interval( $date_range );
-
-		return $date_range;
-
-	}
-
-	/**
-	 * Groups by month or days.
-	 *
-	 * @param array $range Date range.
-	 * @return array The appropriate date range.
-	 */
-	public function prepare_interval( $range ) {
-
-		$before = strtotime( $range['before'] ) - DAY_IN_SECONDS;
-		$after  = strtotime( $range['after'] ) + DAY_IN_SECONDS;
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
-			return;
-		}
-
-		$this->interval = 0;
-		$min_date       = strtotime( date( 'Y-m-01', $after ) );
-
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
-		}
-
-		$this->interval = max( 1, $this->interval );
-
-	}
-
-	/**
-	 * Retrieves a custom date range.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_custom_date_range( $request ) {
-
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = strtotime( '+1 day', current_time( 'timestamp' ) );
-
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( $before, strtotime( sanitize_text_field( $request['before'] ) ) );
-		}
-
-		// 3 months max for day view
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 3 ) {
-			$this->groupby = 'month';
-		}
-
-		// Set the previous date range.
-		$difference           = $before - $after;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', $before - $difference ),
-			'after'  => date( 'Y-m-d', $after - $difference ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', $before ),
-			'after' => date( 'Y-m-d', $after ),
-		);
-
-	}
-
-	/**
-	 * Retrieves todays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_today_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'yesterday',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves yesterdays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_yesterday_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-3 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-2 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_week_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_week',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) + 8 * DAY_IN_SECONDS ),
-			'after'  => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_week_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - 8 * DAY_IN_SECONDS ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - DAY_IN_SECONDS ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last 7 days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_7_days_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-15 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last 30 days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_30_days_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-31 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last 90 days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_90_days_date_range() {
-
-		$this->groupby = 'month';
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-91 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last 180 days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_180_days_date_range() {
-
-		$this->groupby = 'month';
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-361 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last 60 days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_60_days_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-121 days', current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this month date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_month',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-01', strtotime( 'next month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( 'last month', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last month's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-1', strtotime( 'last month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-3 months", current_time( 'timestamp' ) ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-1', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-2 months", current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The available quarters.
-	 */
-	public function get_quarters() {
-
-		$last_year = (int) date('Y') - 1;
-		$next_year = (int) date('Y') + 1;
-		$year      = (int) date('Y');
-		return array(
-
-			array(
-				'after'  => "$last_year-06-30",
-				'before' => "$last_year-10-01",
-			),
-
-			array(
-				'before' => "$year-01-01",
-				'after'  => "$last_year-09-30",
-			),
-
-			array(
-				'before' => "$year-04-01",
-				'after'  => "$last_year-12-31",
-			),
-
-			array(
-				'before' => "$year-07-01",
-				'after'  => "$year-03-31",
-			),
-
-			array(
-				'after'  => "$year-06-30",
-				'before' => "$year-10-01",
-			),
-
-			array(
-				'before' => "$next_year-01-01",
-				'after'  => "$year-09-30",
-			)
-
-		);
-
-	}
-
-	/**
-	 * Retrieves the current quater.
-	 *
-	 * @return int The current quarter.
-	 */
-	public function get_quarter() {
-
-		$month    = (int) date( 'n', current_time( 'timestamp' ) );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_quarter_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_quarter',
-		);
-
-		// Generate the report.
-		$quarters = $this->get_quarters();
-		return $quarters[ $this->get_quarter() + 1 ];
-
-	}
-
-	/**
-	 * Retrieves last quarter's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_quarter_date_range() {
-
-		$quarters = $this->get_quarters();
-		$quarter  = $this->get_quarter();
-
-		// Set the previous date range.
-		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
-		);
-
-		// Generate the report.
-		return $quarters[ $quarter ];
-
-	}
-
-	/**
-	 * Retrieves this year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_year_date_range() {
-
-		$this->groupby = 'month';
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_year',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => date( 'Y-m-d', strtotime( 'next year January 1st', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'last year December 31st', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_year_date_range() {
-
-		$this->groupby = 'month';
-
-		// Set the previous date range.
-		$year          = (int) date('Y') - 3;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'first day of january last year', current_time( 'timestamp' ) ) ),
-			'after'  => "$year-12-31",
-		);
-
-		// Generate the report.
-		$year          = (int) date('Y') - 2;
-		return array(
-			'after'  => "$year-12-31",
-			'before' => date( 'Y-m-d', strtotime( 'first day of january this year', current_time( 'timestamp' ) ) ),
-		);
-
-	}
-
-	/**
-	 * Prepare a the request date for SQL usage.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_date_range_sql( $request, $date_field ) {
-		global $wpdb;
-
-		$sql = '1=1';
-		$range = $this->get_date_range( $request );
-
-		if ( ! empty( $range['after'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
-				"$date_field > %s",
-				$range['after']
-			);
-		}
-
-		if ( ! empty( $range['before'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
-				"$date_field < %s",
-				$range['before']
-			);
-		}
-
-		return $sql;
-
-	}
-
-	/**
-	 * Prepares a group by query.
-	 *
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_group_by_sql( $date_field ) {
-
-		if ( 'day' === $this->groupby ) {
-			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
-		}
-
-		return "YEAR($date_field), MONTH($date_field)";
-	}
-
-	/**
-	 * Get the query params for collections.
-	 *
-	 * @return array
-	 */
-	public function get_collection_params() {
-		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-			'period' => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
-				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days' , '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => '7_days',
-			),
-			'after' => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'format'            => 'date',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
-			),
-			'before' => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'format'            => 'date',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			),
-		);
-	}
+    /**
+     * Group response items by day or month.
+     *
+     * @var string
+     */
+    public $groupby = 'day';
+
+    /**
+     * Returns an array with arguments to request the previous report.
+     *
+     * @var array
+     */
+    public $previous_range = array();
+
+    /**
+     * The period interval.
+     *
+     * @var int
+     */
+    public $interval;
+
+    /**
+     * Retrieves the before and after dates.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_date_range( $request ) {
+
+        // If not supported, assume all time.
+        if ( ! in_array( $request['period'], array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year' ) ) ) {
+            $request['period'] = '7_days';
+        }
+
+        $date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
+        $this->prepare_interval( $date_range );
+
+        return $date_range;
+
+    }
+
+    /**
+     * Groups by month or days.
+     *
+     * @param array $range Date range.
+     * @return array The appropriate date range.
+     */
+    public function prepare_interval( $range ) {
+
+        $before = strtotime( $range['before'] ) - DAY_IN_SECONDS;
+        $after  = strtotime( $range['after'] ) + DAY_IN_SECONDS;
+        if ( 'day' === $this->groupby ) {
+            $difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
+            $this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+            return;
+        }
+
+        $this->interval = 0;
+        $min_date       = strtotime( date( 'Y-m-01', $after ) );
+
+        while ( $min_date <= $before ) {
+            $this->interval ++;
+            $min_date = strtotime( '+1 MONTH', $min_date );
+        }
+
+        $this->interval = max( 1, $this->interval );
+
+    }
+
+    /**
+     * Retrieves a custom date range.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_custom_date_range( $request ) {
+
+        $after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
+        $before = strtotime( '+1 day', current_time( 'timestamp' ) );
+
+        if ( ! empty( $request['before'] ) ) {
+            $before  = min( $before, strtotime( sanitize_text_field( $request['before'] ) ) );
+        }
+
+        // 3 months max for day view
+        if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 3 ) {
+            $this->groupby = 'month';
+        }
+
+        // Set the previous date range.
+        $difference           = $before - $after;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', $before - $difference ),
+            'after'  => date( 'Y-m-d', $after - $difference ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', $before ),
+            'after' => date( 'Y-m-d', $after ),
+        );
+
+    }
+
+    /**
+     * Retrieves todays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_today_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'yesterday',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves yesterdays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_yesterday_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-3 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-2 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_week_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_week',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) + 8 * DAY_IN_SECONDS ),
+            'after'  => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_week_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) ),
+            'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - 8 * DAY_IN_SECONDS ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' )  ) ),
+            'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - DAY_IN_SECONDS ),
+        );
+
+    }
+
+    /**
+     * Retrieves last 7 days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_7_days_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-15 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last 30 days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_30_days_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-31 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last 90 days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_90_days_date_range() {
+
+        $this->groupby = 'month';
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-91 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last 180 days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_180_days_date_range() {
+
+        $this->groupby = 'month';
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-361 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last 60 days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_60_days_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-121 days', current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this month date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_month',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-01', strtotime( 'next month', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-t', strtotime( 'last month', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last month's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-1', strtotime( 'last month', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-t', strtotime( "-3 months", current_time( 'timestamp' ) ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-1', current_time( 'timestamp' ) ),
+            'after'  => date( 'Y-m-t', strtotime( "-2 months", current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The available quarters.
+     */
+    public function get_quarters() {
+
+        $last_year = (int) date('Y') - 1;
+        $next_year = (int) date('Y') + 1;
+        $year      = (int) date('Y');
+        return array(
+
+            array(
+                'after'  => "$last_year-06-30",
+                'before' => "$last_year-10-01",
+            ),
+
+            array(
+                'before' => "$year-01-01",
+                'after'  => "$last_year-09-30",
+            ),
+
+            array(
+                'before' => "$year-04-01",
+                'after'  => "$last_year-12-31",
+            ),
+
+            array(
+                'before' => "$year-07-01",
+                'after'  => "$year-03-31",
+            ),
+
+            array(
+                'after'  => "$year-06-30",
+                'before' => "$year-10-01",
+            ),
+
+            array(
+                'before' => "$next_year-01-01",
+                'after'  => "$year-09-30",
+            )
+
+        );
+
+    }
+
+    /**
+     * Retrieves the current quater.
+     *
+     * @return int The current quarter.
+     */
+    public function get_quarter() {
+
+        $month    = (int) date( 'n', current_time( 'timestamp' ) );
+        $quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
+        return $quarters[ $month - 1 ];
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_quarter_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_quarter',
+        );
+
+        // Generate the report.
+        $quarters = $this->get_quarters();
+        return $quarters[ $this->get_quarter() + 1 ];
+
+    }
+
+    /**
+     * Retrieves last quarter's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_quarter_date_range() {
+
+        $quarters = $this->get_quarters();
+        $quarter  = $this->get_quarter();
+
+        // Set the previous date range.
+        $this->previous_range = array_merge(
+            $quarters[ $quarter - 1 ],
+            array( 'period' => 'custom' )
+        );
+
+        // Generate the report.
+        return $quarters[ $quarter ];
+
+    }
+
+    /**
+     * Retrieves this year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_year_date_range() {
+
+        $this->groupby = 'month';
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_year',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => date( 'Y-m-d', strtotime( 'next year January 1st', current_time( 'timestamp' ) ) ),
+            'after'  => date( 'Y-m-d', strtotime( 'last year December 31st', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves last year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_year_date_range() {
+
+        $this->groupby = 'month';
+
+        // Set the previous date range.
+        $year          = (int) date('Y') - 3;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => date( 'Y-m-d', strtotime( 'first day of january last year', current_time( 'timestamp' ) ) ),
+            'after'  => "$year-12-31",
+        );
+
+        // Generate the report.
+        $year          = (int) date('Y') - 2;
+        return array(
+            'after'  => "$year-12-31",
+            'before' => date( 'Y-m-d', strtotime( 'first day of january this year', current_time( 'timestamp' ) ) ),
+        );
+
+    }
+
+    /**
+     * Prepare a the request date for SQL usage.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_date_range_sql( $request, $date_field ) {
+        global $wpdb;
+
+        $sql = '1=1';
+        $range = $this->get_date_range( $request );
+
+        if ( ! empty( $range['after'] ) ) {
+            $sql .= ' AND ' .  $wpdb->prepare(
+                "$date_field > %s",
+                $range['after']
+            );
+        }
+
+        if ( ! empty( $range['before'] ) ) {
+            $sql .= ' AND ' .  $wpdb->prepare(
+                "$date_field < %s",
+                $range['before']
+            );
+        }
+
+        return $sql;
+
+    }
+
+    /**
+     * Prepares a group by query.
+     *
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_group_by_sql( $date_field ) {
+
+        if ( 'day' === $this->groupby ) {
+            return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
+        }
+
+        return "YEAR($date_field), MONTH($date_field)";
+    }
+
+    /**
+     * Get the query params for collections.
+     *
+     * @return array
+     */
+    public function get_collection_params() {
+        return array(
+            'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+            'period' => array(
+                'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+                'type'              => 'string',
+                'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days' , '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => '7_days',
+            ),
+            'after' => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'format'            => 'date',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+            ),
+            'before' => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'format'            => 'date',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => date( 'Y-m-d', current_time( 'timestamp' ) ),
+            ),
+        );
+    }
 }

Spacing +91 added lines, -91 removed lines

@@ -7,7 +7,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST date based controller class.
@@ -43,15 +43,15 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_date_range( $request ) {
+	public function get_date_range($request) {
 
 		// If not supported, assume all time.
-		if ( ! in_array( $request['period'], array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year' ) ) ) {
+		if (!in_array($request['period'], array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year'))) {
 			$request['period'] = '7_days';
 		}
 
-		$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
-		$this->prepare_interval( $date_range );
+		$date_range = call_user_func(array($this, 'get_' . $request['period'] . '_date_range'), $request);
+		$this->prepare_interval($date_range);
 
 		return $date_range;
 
@@ -63,25 +63,25 @@ 
 	 * @param array $range Date range.
 	 * @return array The appropriate date range.
 	 */
-	public function prepare_interval( $range ) {
+	public function prepare_interval($range) {
 
-		$before = strtotime( $range['before'] ) - DAY_IN_SECONDS;
-		$after  = strtotime( $range['after'] ) + DAY_IN_SECONDS;
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+		$before = strtotime($range['before']) - DAY_IN_SECONDS;
+		$after  = strtotime($range['after']) + DAY_IN_SECONDS;
+		if ('day' === $this->groupby) {
+			$difference     = max(DAY_IN_SECONDS, (DAY_IN_SECONDS + $before - $after)); // Prevent division by 0;
+			$this->interval = absint(ceil(max(1, $difference / DAY_IN_SECONDS)));
 			return;
 		}
 
 		$this->interval = 0;
-		$min_date       = strtotime( date( 'Y-m-01', $after ) );
+		$min_date       = strtotime(date('Y-m-01', $after));
 
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
+		while ($min_date <= $before) {
+			$this->interval++;
+			$min_date = strtotime('+1 MONTH', $min_date);
 		}
 
-		$this->interval = max( 1, $this->interval );
+		$this->interval = max(1, $this->interval);
 
 	}
 
@@ -91,17 +91,17 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_custom_date_range( $request ) {
+	public function get_custom_date_range($request) {
 
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = strtotime( '+1 day', current_time( 'timestamp' ) );
+		$after  = max(strtotime('-20 years'), strtotime(sanitize_text_field($request['after'])));
+		$before = strtotime('+1 day', current_time('timestamp'));
 
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( $before, strtotime( sanitize_text_field( $request['before'] ) ) );
+		if (!empty($request['before'])) {
+			$before = min($before, strtotime(sanitize_text_field($request['before'])));
 		}
 
 		// 3 months max for day view
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 3 ) {
+		if (floor(($before - $after) / MONTH_IN_SECONDS) > 3) {
 			$this->groupby = 'month';
 		}
 
@@ -109,14 +109,14 @@ 
 		$difference           = $before - $after;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', $before - $difference ),
-			'after'  => date( 'Y-m-d', $after - $difference ),
+			'before' => date('Y-m-d', $before - $difference),
+			'after'  => date('Y-m-d', $after - $difference),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', $before ),
-			'after' => date( 'Y-m-d', $after ),
+			'before' => date('Y-m-d', $before),
+			'after' => date('Y-m-d', $after),
 		);
 
 	}
@@ -135,8 +135,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('+1 day', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-1 day', current_time('timestamp'))),
 		);
 
 	}
@@ -151,14 +151,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-3 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-1 day', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-3 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-2 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-2 days', current_time('timestamp'))),
 		);
 
 	}
@@ -177,8 +177,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) + 8 * DAY_IN_SECONDS ),
-			'after'  => date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' )  ) ),
+			'before' => date('Y-m-d', strtotime('sunday last week', current_time('timestamp')) + 8 * DAY_IN_SECONDS),
+			'after'  => date('Y-m-d', strtotime('sunday last week', current_time('timestamp'))),
 		);
 
 	}
@@ -193,14 +193,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - 8 * DAY_IN_SECONDS ),
+			'before' => date('Y-m-d', strtotime('monday last week', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('monday last week', current_time('timestamp')) - 8 * DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' )  ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' )  ) - DAY_IN_SECONDS ),
+			'before' => date('Y-m-d', strtotime('monday this week', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('monday last week', current_time('timestamp')) - DAY_IN_SECONDS),
 		);
 
 	}
@@ -215,14 +215,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-15 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-7 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-15 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-8 days', current_time('timestamp'))),
 		);
 
 	}
@@ -237,14 +237,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-30 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-61 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-31 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-31 days', current_time('timestamp'))),
 		);
 
 	}
@@ -261,14 +261,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-90 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-181 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-91 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-91 days', current_time('timestamp'))),
 		);
 
 	}
@@ -285,14 +285,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-361 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-180 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-361 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-181 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-181 days', current_time('timestamp'))),
 		);
 
 	}
@@ -307,14 +307,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-121 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('-60 days', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('-121 days', current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-d', strtotime( '-61 days', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', current_time('timestamp')),
+			'after'  => date('Y-m-d', strtotime('-61 days', current_time('timestamp'))),
 		);
 
 	}
@@ -333,8 +333,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-01', strtotime( 'next month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( 'last month', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-01', strtotime('next month', current_time('timestamp'))),
+			'after'  => date('Y-m-t', strtotime('last month', current_time('timestamp'))),
 		);
 
 	}
@@ -349,14 +349,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-1', strtotime( 'last month', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-3 months", current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-1', strtotime('last month', current_time('timestamp'))),
+			'after'  => date('Y-m-t', strtotime("-3 months", current_time('timestamp'))),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-1', current_time( 'timestamp' ) ),
-			'after'  => date( 'Y-m-t', strtotime( "-2 months", current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-1', current_time('timestamp')),
+			'after'  => date('Y-m-t', strtotime("-2 months", current_time('timestamp'))),
 		);
 
 	}
@@ -414,9 +414,9 @@ 
 	 */
 	public function get_quarter() {
 
-		$month    = (int) date( 'n', current_time( 'timestamp' ) );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
+		$month    = (int) date('n', current_time('timestamp'));
+		$quarters = array(1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4);
+		return $quarters[$month - 1];
 
 	}
 
@@ -434,7 +434,7 @@ 
 
 		// Generate the report.
 		$quarters = $this->get_quarters();
-		return $quarters[ $this->get_quarter() + 1 ];
+		return $quarters[$this->get_quarter() + 1];
 
 	}
 
@@ -450,12 +450,12 @@ 
 
 		// Set the previous date range.
 		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
+			$quarters[$quarter - 1],
+			array('period' => 'custom')
 		);
 
 		// Generate the report.
-		return $quarters[ $quarter ];
+		return $quarters[$quarter];
 
 	}
 
@@ -475,8 +475,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => date( 'Y-m-d', strtotime( 'next year January 1st', current_time( 'timestamp' ) ) ),
-			'after'  => date( 'Y-m-d', strtotime( 'last year December 31st', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('next year January 1st', current_time('timestamp'))),
+			'after'  => date('Y-m-d', strtotime('last year December 31st', current_time('timestamp'))),
 		);
 
 	}
@@ -494,15 +494,15 @@ 
 		$year          = (int) date('Y') - 3;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => date( 'Y-m-d', strtotime( 'first day of january last year', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('first day of january last year', current_time('timestamp'))),
 			'after'  => "$year-12-31",
 		);
 
 		// Generate the report.
-		$year          = (int) date('Y') - 2;
+		$year = (int) date('Y') - 2;
 		return array(
 			'after'  => "$year-12-31",
-			'before' => date( 'Y-m-d', strtotime( 'first day of january this year', current_time( 'timestamp' ) ) ),
+			'before' => date('Y-m-d', strtotime('first day of january this year', current_time('timestamp'))),
 		);
 
 	}
@@ -514,21 +514,21 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_date_range_sql( $request, $date_field ) {
+	public function get_date_range_sql($request, $date_field) {
 		global $wpdb;
 
 		$sql = '1=1';
-		$range = $this->get_date_range( $request );
+		$range = $this->get_date_range($request);
 
-		if ( ! empty( $range['after'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
+		if (!empty($range['after'])) {
+			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field > %s",
 				$range['after']
 			);
 		}
 
-		if ( ! empty( $range['before'] ) ) {
-			$sql .= ' AND ' .  $wpdb->prepare(
+		if (!empty($range['before'])) {
+			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field < %s",
 				$range['before']
 			);
@@ -544,9 +544,9 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_group_by_sql( $date_field ) {
+	public function get_group_by_sql($date_field) {
 
-		if ( 'day' === $this->groupby ) {
+		if ('day' === $this->groupby) {
 			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
 		}
 
@@ -560,32 +560,32 @@ 
 	 */
 	public function get_collection_params() {
 		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param(array('default' => 'view')),
 			'period' => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+				'description'       => __('Limit to results of a specific period.', 'invoicing'),
 				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days' , '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+				'enum'              => array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter'),
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
 				'default'           => '7_days',
 			),
 			'after' => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'format'            => 'date',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', strtotime( '-8 days', current_time( 'timestamp' ) ) ),
+				'default'           => date('Y-m-d', strtotime('-8 days', current_time('timestamp'))),
 			),
 			'before' => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'format'            => 'date',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => date( 'Y-m-d', current_time( 'timestamp' ) ),
+				'default'           => date('Y-m-d', current_time('timestamp')),
 			),
 		);
 	}

templates/payment-forms/variations/select.php

Spacing +7 added lines, -7 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the selectable items.
 $selectable = array();
-foreach ( $form->get_items() as $item ) {
-    if ( ! $item->is_required ) {
-        $selectable[$item->get_id()] = strip_tags( $item->get_name() . ' — ' . wpinv_price( $item->get_initial_price() ) );
+foreach ($form->get_items() as $item) {
+    if (!$item->is_required) {
+        $selectable[$item->get_id()] = strip_tags($item->get_name() . ' — ' . wpinv_price($item->get_initial_price()));
     }
 }
 
-if ( empty( $selectable ) ) {
+if (empty($selectable)) {
     return;
 }
 
@@ -27,9 +27,9 @@ 
 echo aui()->select(
     array(
         'name'       => 'getpaid-payment-form-selected-item',
-        'id'         => 'getpaid-payment-form-selected-item' . uniqid( '_' ),
+        'id'         => 'getpaid-payment-form-selected-item' . uniqid('_'),
         'required'   => true,
-        'label'      => __( 'Select Item', 'invoicing' ),
+        'label'      => __('Select Item', 'invoicing'),
         'label_type' => 'vertical',
         'inline'     => false,
         'options'    => $selectable,

templates/invoice/header-right-actions.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -21,43 +21,43 @@ 
             $actions[] = sprintf(
                 '<a href="javascript:void(0)" class="btn btn-sm m-1 d-inline-block btn-secondary invoice-action-print d-none d-lg-inline-block" onclick="window.print();">%s</a>',
                 sprintf(
-                    __( 'Print %s', 'invoicing' ),
-                    ucfirst( $invoice->get_invoice_quote_type() )
+                    __('Print %s', 'invoicing'),
+                    ucfirst($invoice->get_invoice_quote_type())
                 )
             );
 
-            if ( is_user_logged_in() ) {
+            if (is_user_logged_in()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary m-1 d-inline-block invoice-action-history">%s</a>',
-                    esc_url( wpinv_get_history_page_uri( $invoice->get_post_type() ) ),
+                    esc_url(wpinv_get_history_page_uri($invoice->get_post_type())),
                     sprintf(
-                        __( '%s History', 'invoicing' ),
-                        ucfirst( $invoice->get_invoice_quote_type() )
+                        __('%s History', 'invoicing'),
+                        ucfirst($invoice->get_invoice_quote_type())
                     )
                 );
 
             }
 
-            if ( wpinv_current_user_can_manage_invoicing() ) {
+            if (wpinv_current_user_can_manage_invoicing()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary m-1 d-inline-block invoice-action-edit">%s</a>',
-                    esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                    esc_url(get_edit_post_link($invoice->get_id())),
                     sprintf(
-                        __( 'Edit %s', 'invoicing' ),
-                        ucfirst( $invoice->get_invoice_quote_type() )
+                        __('Edit %s', 'invoicing'),
+                        ucfirst($invoice->get_invoice_quote_type())
                     )
                 );
 
             }
 
-            $actions = apply_filters( 'getpaid_invoice_header_right_actions_array', $actions, $invoice );
-            echo implode( '', $actions );
+            $actions = apply_filters('getpaid_invoice_header_right_actions_array', $actions, $invoice);
+            echo implode('', $actions);
 
         ?>
 
-        <?php do_action('wpinv_invoice_display_right_actions', $invoice ); ?>
+        <?php do_action('wpinv_invoice_display_right_actions', $invoice); ?>
     </div>
 
 <?php

templates/invoice/invoice-type.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 <h2 class="h3 text-dark">
-    <?php echo apply_filters( 'getpaid_invoice_type_label', ucfirst( $invoice->get_invoice_quote_type() ), $invoice ); ?>
+    <?php echo apply_filters('getpaid_invoice_type_label', ucfirst($invoice->get_invoice_quote_type()), $invoice); ?>
 </h2>
 
 <?php

templates/emails/wpinv-email-footer.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-$email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
-$email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';
+$email_footer = apply_filters('wpinv_email_footer_text', wpinv_get_option('email_footer_text', get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing')));
+$email_footer = $email_footer ? wpautop(wp_kses_post(wptexturize($email_footer))) : '';
 ?>
                                                             </div>
                                                         </td>

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 $email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
 $email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';

templates/payment-forms/elements/billing_email.php

Spacing +13 added lines, -13 removed lines

@@ -7,35 +7,35 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $value = '';
 $class = '';
 
-if ( ! empty( $form->invoice ) ) {
-    $value   = sanitize_email( $form->invoice->get_email() );
-} else if ( is_user_logged_in() ) {
+if (!empty($form->invoice)) {
+    $value = sanitize_email($form->invoice->get_email());
+} else if (is_user_logged_in()) {
     $user  = wp_get_current_user();
-    $value = sanitize_email( $user->user_email );
+    $value = sanitize_email($user->user_email);
 }
 
-if ( ! empty( $value ) && ! empty( $hide_billing_email ) ) {
+if (!empty($value) && !empty($hide_billing_email)) {
     $class = 'd-none';
 }
 
-do_action( 'getpaid_before_payment_form_billing_email', $form );
+do_action('getpaid_before_payment_form_billing_email', $form);
 
 echo "<span class='$class'>";
 
 echo aui()->input(
     array(
         'name'       => 'billing_email',
-        'id'         => esc_attr( $id ) . uniqid( '_' ),
-        'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-        'required'   => ! empty( $required ),
-        'label'      => empty( $label ) ? '' : wp_kses_post( $label ) . '<span class="text-danger"> *</span>',
+        'id'         => esc_attr($id) . uniqid('_'),
+        'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
+        'required'   => !empty($required),
+        'label'      => empty($label) ? '' : wp_kses_post($label) . '<span class="text-danger"> *</span>',
         'label_type' => 'vertical',
-        'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+        'help_text'  => empty($description) ? '' : wp_kses_post($description),
         'type'       => 'email',
         'value'      => $value,
         'class'      => 'wpinv_billing_email',
@@ -47,4 +47,4 @@ 
 
 echo '</span>';
 
-do_action( 'getpaid_after_payment_form_billing_email', $form );
+do_action('getpaid_after_payment_form_billing_email', $form);

includes/data/vat-number-regexes.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @package Invoicing/data
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(