AyeCode / invoicing

includes/api/class-getpaid-rest-report-top-earners-controller.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST top earners controller class.

includes/class-wpinv-api.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @since    1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main API class
@@ -96,7 +96,7 @@ 
         $this->invoice_counts = new GetPaid_REST_Report_Invoice_Counts_Controller();
 
         // Fires after loading the rest api.
-        do_action( 'getpaid_rest_api_loaded', $this );
+        do_action('getpaid_rest_api_loaded', $this);
     }
 
 }

includes/api/class-getpaid-rest-report-invoice-counts-controller.php

Spacing +18 added lines, -18 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST invoice counts controller class.
@@ -32,25 +32,25 @@ 
 	 * @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) $report;
-		$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 = rest_ensure_response($data);
 
 		$response->add_links(
 			array(
 				'about' => array(
-					'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+					'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 				),
 			)
 		);
 
-		return apply_filters( 'getpaid_rest_prepare_report_invoices_count', $response, $report, $request );
+		return apply_filters('getpaid_rest_prepare_report_invoices_count', $response, $report, $request);
 	}
 
 	/**
@@ -61,12 +61,12 @@ 
 	 */
 	protected function get_reports() {
 
-		$counts = wp_count_posts( 'wpi_invoice' );
+		$counts = wp_count_posts('wpi_invoice');
 		$data   = array();
 
-		foreach ( wpinv_get_invoice_statuses() as $slug => $name ) {
+		foreach (wpinv_get_invoice_statuses() as $slug => $name) {
 
-			if ( ! isset( $counts->$slug ) ) {
+			if (!isset($counts->$slug)) {
 				continue;
 			}
 
@@ -94,26 +94,26 @@ 
 			'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,
 				),
 				'name'  => array(
-					'description' => __( 'Invoice status name.', 'invoicing' ),
+					'description' => __('Invoice status name.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'count' => array(
-					'description' => __( 'Number of invoices.', 'invoicing' ),
+					'description' => __('Number of invoices.', '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);
 	}
 }

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

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

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-report-sales-controller.php

Spacing +150 added lines, -150 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST reports controller class.
@@ -46,7 +46,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// Get sales report.
 		register_rest_route(
@@ -55,11 +55,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'),
 			)
 		);
 
@@ -72,10 +72,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;
@@ -87,12 +87,12 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
+		$item   = $this->prepare_item_for_response(null, $request);
+		$data[] = $this->prepare_response_for_collection($item);
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 	}
 
 	/**
@@ -102,139 +102,139 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $_, $request ) {
+	public function prepare_item_for_response($_, $request) {
 
 		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 
 		$report_data     = $this->get_report_data();
 		$period_totals   = array();
 
 		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS;
+		$start_date      = strtotime($this->report_range['after']) + DAY_IN_SECONDS;
 
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( date( 'Y-m-01', $start_date ) );
+		if ('month' === $this->groupby) {
+			$start_date = strtotime(date('Y-m-01', $start_date));
 		}
 
-		for ( $i = 0; $i < $this->interval; $i++ ) {
+		for ($i = 0; $i < $this->interval; $i++) {
 
-			switch ( $this->groupby ) {
+			switch ($this->groupby) {
 				case 'day' :
-					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+					$time = date('Y-m-d', strtotime("+{$i} DAY", $start_date));
 					break;
 				default :
-					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+					$time = date('Y-m', strtotime("+{$i} MONTH", $start_date));
 					break;
 			}
 
 			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
-				'sales'             => wpinv_round_amount( 0.00 ),
+			$period_totals[$time] = array(
+				'sales'             => wpinv_round_amount(0.00),
 				'invoices'          => 0,
-				'refunds'           => wpinv_round_amount( 0.00 ),
+				'refunds'           => wpinv_round_amount(0.00),
 				'items'             => 0,
 				'refunded_items'    => 0,
-				'tax'               => wpinv_round_amount( 0.00 ),
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'fees'              => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
+				'tax'               => wpinv_round_amount(0.00),
+				'refunded_tax'      => wpinv_round_amount(0.00),
+				'subtotal'          => wpinv_round_amount(0.00),
+				'refunded_subtotal' => wpinv_round_amount(0.00),
+				'fees'              => wpinv_round_amount(0.00),
+				'refunded_fees'     => wpinv_round_amount(0.00),
+				'discount'          => wpinv_round_amount(0.00),
 			);
 
 		}
 
 		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		$date_format = ('day' === $this->groupby) ? 'Y-m-d' : 'Y-m';
+		foreach ($report_data->invoices as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['sales']    = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->refunds as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['refunds']           = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['refunded_tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['refunded_subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['refunded_fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->invoice_counts as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['invoices'] = (int) $invoice->count;
 			}
 
 		}
 
 		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : date( 'Y-m', strtotime( $invoice_item->post_date ) );
+		foreach ($report_data->invoice_items as $invoice_item) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($invoice_item->post_date)) : date('Y-m', strtotime($invoice_item->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['items'] = (int) $invoice_item->invoice_item_count;
 			}
 
 		}
 
 		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
+		foreach ($report_data->coupons as $discount) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($discount->post_date)) : date('Y-m', strtotime($discount->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['discount'] = wpinv_round_amount($discount->discount_amount);
 			}
 
 		}
 
 		$report_data->totals            = $period_totals;
 		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
+		$report_data->interval          = max($this->interval, 1);
 		$report_data->currency          = wpinv_get_currency();
 		$report_data->currency_symbol   = wpinv_currency_symbol();
 		$report_data->currency_position = wpinv_currency_position();
 		$report_data->decimal_places    = wpinv_decimals();
 		$report_data->thousands_sep     = wpinv_thousands_separator();
 		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS );
-		$report_data->end_date          = date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS );
-		$report_data->start_date_locale = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS ) );
-		$report_data->end_date_locale   = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS ) );
+		$report_data->start_date        = date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS);
+		$report_data->end_date          = date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS);
+		$report_data->start_date_locale = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS));
+		$report_data->end_date_locale   = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS));
 		$report_data->decimals_sep      = wpinv_decimal_separator();
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = !empty($request['context']) ? $request['context'] : 'view';
 		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		unset($data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items);
+		$data    = $this->add_additional_fields_to_object((array) $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(
 			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+				'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 			),
-		) );
+		));
 
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+		return apply_filters('getpaid_rest_prepare_report_sales', $response, $report_data, $request);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @return stdClass
 	 */
 	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
+		if (empty($this->report_data)) {
 			$this->query_report_data();
 		}
 		return $this->report_data;
@@ -256,7 +256,7 @@ 
 
 		// Prepare reports.
 		$this->report_data = (object) array(
-			'invoice_counts' => $this->query_invoice_counts(),//count, post_date
+			'invoice_counts' => $this->query_invoice_counts(), //count, post_date
 			'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
 			'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
 			'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
@@ -266,32 +266,32 @@ 
 		);
 
 		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+		$this->report_data->total_tax          = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_tax')));
+		$this->report_data->total_sales        = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_sales')));
+		$this->report_data->total_discount     = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_discount')));
+		$this->report_data->total_fees         = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_fees')));
+		$this->report_data->subtotal           = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'subtotal')));
+		$this->report_data->net_sales          = wpinv_round_amount($this->report_data->total_sales - max(0, $this->report_data->total_tax));
+		$this->report_data->total_refunded_tax = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_tax')));
+		$this->report_data->total_refunds      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_sales')));
+		$this->report_data->refunded_discount  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_discount')));
+		$this->report_data->refunded_fees      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_fees')));
+		$this->report_data->refunded_subtotal  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'subtotal')));
+		$this->report_data->net_refunds        = wpinv_round_amount($this->report_data->total_refunds + max(0, $this->report_data->total_refunded_tax));
 
 
 		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+		$this->report_data->average_sales       = wpinv_round_amount($this->report_data->net_sales / max($this->interval, 1), 2);
+		$this->report_data->average_total_sales = wpinv_round_amount($this->report_data->total_sales / max($this->interval, 1), 2);
 
 		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+		$this->report_data->total_invoices = absint(array_sum(wp_list_pluck($this->report_data->invoice_counts, 'count')));
 
 		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+		$this->report_data->total_items = absint(array_sum(wp_list_pluck($this->report_data->invoice_items, 'invoice_item_count')));
 
 		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data );
+		$this->report_data = apply_filters('getpaid_rest_api_filter_report_data', $this->report_data);
 	}
 
 	/**
@@ -316,11 +316,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -347,11 +347,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -378,11 +378,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -406,7 +406,7 @@ 
 				),
 				'query_type'     => 'get_var',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -453,11 +453,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal'),
 			)
 		);
 
@@ -504,11 +504,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -527,154 +527,154 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'total_sales' => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
+					'description' => __('Gross sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_sales' => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
+					'description' => __('Net sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_sales' => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
+					'description' => __('Average net daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
+					'description' => __('Average gross daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_invoices'  => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
+					'description' => __('Number of paid invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_items' => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
+					'description' => __('Number of items purchased.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'refunded_items' => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
+					'description' => __('Number of items refunded.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_tax' => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
+					'description' => __('Total charged for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunded_tax' => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+					'description' => __('Total refunded for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_fees' => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
+					'description' => __('Total fees charged.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunds' => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+					'description' => __('Total of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_refunds' => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+					'description' => __('Net of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_discount' => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
+					'description' => __('Total of discounts used.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'totals' => array(
-					'description' => __( 'Totals.', 'invoicing' ),
+					'description' => __('Totals.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'array',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'interval' => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+					'description' => __('Number of months/days in the report period.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'previous_range'  => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
+					'description' => __('The previous report period.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'string',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'grouped_by' => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
+					'description' => __('The period used to group the totals.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
+					'context'     => array('view'),
+					'enum'        => array('day', 'month'),
 					'readonly'    => true,
 				),
 				'currency' => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
+					'description' => __('The default store currency.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_symbol' => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
+					'description' => __('The default store currency symbol.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_position' => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
+					'description' => __('The default store currency position.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimal_places' => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
+					'description' => __('The default store decimal places.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'thousands_sep' => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
+					'description' => __('The default store thousands separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimals_sep' => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
+					'description' => __('The default store decimals separator.', '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);
 
 	}
 

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

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')),
 			),
 		);
 	}

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

Spacing +81 added lines, -81 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report Class.
@@ -23,26 +23,26 @@ 
 	 */
 	public function __construct() {
 
-		$this->views        = array(
+		$this->views = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
+				'label' => __('Items', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Items',
 			),
 
 			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
+				'label' => __('Payment Methods', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Gateways',
 			),
 
 			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
+				'label' => __('Discount Codes', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Discounts',
 			),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
+		$this->views = apply_filters('wpinv_report_views', $this->views);
 
 	}
 
@@ -53,8 +53,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -68,22 +68,22 @@ 
 	public function get_periods() {
 
 		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
+			'today'        => __('Today', 'invoicing'),
+			'yesterday'    => __('Yesterday', 'invoicing'),
+			'week'         => __('This week', 'invoicing'),
+			'last_week'    => __('Last week', 'invoicing'),
+			'7_days'       => __('Last 7 days', 'invoicing'),
+			'month'        => __('This month', 'invoicing'),
+			'last_month'   => __('Last month', 'invoicing'),
+			'30_days'      => __('Last 30 days', 'invoicing'),
+			'quarter'      => __('This Quarter', 'invoicing'),
+			'last_quarter' => __('Last Quarter', 'invoicing'),
+			'year'         => __('This year', 'invoicing'),
+			'last_year'    => __('Last Year', 'invoicing'),
+			'custom'       => __('Custom Date Range', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
@@ -96,21 +96,21 @@ 
 		?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
-				<?php getpaid_hidden_field( 'page', 'wpinv-reports' );  ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' );  ?>
+				<?php getpaid_hidden_field('page', 'wpinv-reports'); ?>
+				<?php getpaid_hidden_field('tab', 'reports'); ?>
 				<select name='date_range'>
-					<?php foreach( $this->get_periods() as $key => $label ) :?>
-						<option value="<?php echo sanitize_key( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo sanitize_text_field( $label ); ?></option>
-					<?php endforeach;?>
+					<?php foreach ($this->get_periods() as $key => $label) :?>
+						<option value="<?php echo sanitize_key($key); ?>" <?php selected($key, $range); ?>><?php echo sanitize_text_field($label); ?></option>
+					<?php endforeach; ?>
 				</select>
 				<span class="getpaid-date-range-picker <?php echo 'custom' == $range ? '' : 'd-none'; ?>">
 					<input type="text" name="from" class="getpaid-from align-middle" />
-						<?php _e( 'to', 'invoicing' ); ?>
+						<?php _e('to', 'invoicing'); ?>
 					<input type="text" name="to" class="getpaid-to align-middle" />
 				</span>
 				<button type="submit" class="button button-primary">
 					<i class="fa fa-chevron-right fa-lg"></i>
-					<span class="screen-reader-text"><?php _e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php _e('View Reports', 'invoicing'); ?></span>
 				</button>
 			</form>
 
@@ -159,17 +159,17 @@ 
 
 				<div class="col-12 col-md-4">
 					<div class="row getpaid-report-cards">
-						<?php foreach( $this->get_cards() as $key => $card ) : ?>
+						<?php foreach ($this->get_cards() as $key => $card) : ?>
 							<div class="col-12 mb-4">
 
-								<!-- <?php echo sanitize_text_field(  $card['label']  ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class( $key ); ?>">
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo sanitize_text_field( $card['label']  ); ?></strong>
-											<span title="<?php echo esc_attr( $card['description'] ); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
+											<strong><?php echo sanitize_text_field($card['label']); ?></strong>
+											<span title="<?php echo esc_attr($card['description']); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
 										</p>
 										<h5 class="font-weight-bold mb-0">
 											<span class="getpaid-report-card-value">
@@ -180,7 +180,7 @@ 
 
 										<hr>
 
-										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e('Previous Period', 'invoicing'); ?></strong></p>
 										<h5 class="getpaid-report-card-previous-value font-weight-bold text-muted mb-0">
 											<span class="spinner is-active float-none"></span>
 										</h5>
@@ -188,7 +188,7 @@ 
 									</div>
 
 								</div>
-								<!-- <?php echo sanitize_text_field( $card['label'] ); ?> Card -->
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -210,26 +210,26 @@ 
 	 */
 	public function display_left() {
 		$graphs = array(
-			'sales'    => __( 'Earnings', 'invoicing' ),
-			'refunds'  => __( 'Refunds', 'invoicing' ),
-			'tax'      => __( 'Taxes', 'invoicing' ),
-			'fees'     => __( 'Fees', 'invoicing' ),
-			'discount' => __( 'Discounts', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'items'    => __( 'Purchased Items', 'invoicing' ),
+			'sales'    => __('Earnings', 'invoicing'),
+			'refunds'  => __('Refunds', 'invoicing'),
+			'tax'      => __('Taxes', 'invoicing'),
+			'fees'     => __('Fees', 'invoicing'),
+			'discount' => __('Discounts', 'invoicing'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'items'    => __('Purchased Items', 'invoicing'),
 		);
 
 		?>
 
-			<?php foreach ( $graphs as $key => $graph ) : ?>
+			<?php foreach ($graphs as $key => $graph) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0 single-report-card" style="max-width:100%">
 							<div class="card-header">
-								<strong><?php echo wpinv_clean( $graph ); ?></strong>
+								<strong><?php echo wpinv_clean($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo sanitize_key( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo sanitize_key($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -244,14 +244,14 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $graph, $file_type ) {
+	public function get_download_url($graph, $file_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
+					'file_type'            => urlencode($file_type),
+					'graph'                => urlencode($graph),
 				)
 			),
 			'getpaid-nonce',
@@ -268,7 +268,7 @@ 
 
 		?>
 
-			<?php foreach ( $this->views as $key => $view ) : ?>
+			<?php foreach ($this->views as $key => $view) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
@@ -278,17 +278,17 @@ 
 										<strong><?php echo $view['label']; ?></strong>
 									</div>
 									<div class="col-3">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+										<a title="<?php esc_attr_e('Download JSON', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'json')); ?>">
 											<i class="fa fa-download text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download JSON', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download CSV', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'csv' ) ); ?>">
+										<a title="<?php esc_attr_e('Download CSV', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'csv')); ?>">
 											<i class="fa fa-file-csv text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download CSV', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download XML', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'xml' ) ); ?>">
+										<a title="<?php esc_attr_e('Download XML', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'xml')); ?>">
 											<i class="fa fa-file-code text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -317,56 +317,56 @@ 
 
 		$cards = array(
 			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
+				'description' => __('Gross sales in the period.', 'invoicing'),
+				'label'       => __('Gross Revenue', 'invoicing'),
 			),
 			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
+				'description' => __('Net sales in the period.', 'invoicing'),
+				'label'       => __('Net Revenue', 'invoicing'),
 			),
 			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+				'description' => __('Average net daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Net Sales', 'invoicing'),
 			),
 			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+				'description' => __('Average gross daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Gross Sales', 'invoicing'),
 			),
 			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
+				'description' => __('Number of paid invoices.', 'invoicing'),
+				'label'       => __('Paid Invoices', 'invoicing'),
 			),
 			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
+				'description' => __('Number of items purchased.', 'invoicing'),
+				'label'       => __('Purchased Items', 'invoicing'),
 			),
 			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
+				'description' => __('Number of items refunded.', 'invoicing'),
+				'label'       => __('Refunded Items', 'invoicing'),
 			),
 			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
+				'description' => __('Total charged for taxes.', 'invoicing'),
+				'label'       => __('Tax', 'invoicing'),
 			),
 			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
+				'description' => __('Total refunded for taxes.', 'invoicing'),
+				'label'       => __('Refunded Tax', 'invoicing'),
 			),
 			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
+				'description' => __('Total fees charged.', 'invoicing'),
+				'label'       => __('Fees', 'invoicing'),
 			),
 			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
+				'description' => __('Total of refunded invoices.', 'invoicing'),
+				'label'       => __('Refunded', 'invoicing'),
 			),
 			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
+				'description' => __('Total of discounts used.', 'invoicing'),
+				'label'       => __('Discounted', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'wpinv_report_cards', $cards );
+		return apply_filters('wpinv_report_cards', $cards);
 	}
 
 	

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,