AyeCode / invoicing

includes/payments/class-getpaid-payment-form-submission-fees.php

Indentation +104 added lines, -104 removed lines

@@ -12,113 +12,113 @@
  */
 class GetPaid_Payment_Form_Submission_Fees {
 
-	/**
-	 * The fee validation error.
-	 * @var string
-	 */
-	public $fee_error;
-
-	/**
-	 * Submission fees.
-	 * @var array
-	 */
-	public $fees = array();
+    /**
+     * The fee validation error.
+     * @var string
+     */
+    public $fee_error;
+
+    /**
+     * Submission fees.
+     * @var array
+     */
+    public $fees = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
-			$this->fees = $submission->get_invoice()->get_fees();
-		}
-
-		// Process price fields.
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
-
-		foreach ( $payment_form->get_elements() as $element ) {
-
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
-			}
-
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
-			}
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Process any existing invoice fees.
+        if ( $submission->has_invoice() ) {
+            $this->fees = $submission->get_invoice()->get_fees();
+        }
+
+        // Process price fields.
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
+
+        foreach ( $payment_form->get_elements() as $element ) {
+
+            if ( 'price_input' == $element['type'] ) {
+                $this->process_price_input( $element, $data, $submission );
+            }
+
+            if ( 'price_select' == $element['type'] ) {
+                $this->process_price_select( $element, $data );
+            }
 }
 
-	}
-
-	/**
-	 * Process a price input field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_price_input( $element, $data, $submission ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
-
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $amount,
-			'recurring_fee' => 0,
-		);
-
-	}
-
-	/**
-	 * Process a price select field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 */
-	public function process_price_select( $element, $data ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
-		$total      = 0;
-		$sub_labels = array();
-
-		foreach ( $selected as $price ) {
-
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
-			}
-
-			$price = explode( '|', $price );
-
-			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $total,
-			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
-		);
-
-	}
+    }
+
+    /**
+     * Process a price input field.
+     *
+     * @param array $element
+     * @param array $data
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_price_input( $element, $data, $submission ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
+        $minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+
+        if ( $amount < $minimum ) {
+            throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $amount,
+            'recurring_fee' => 0,
+        );
+
+    }
+
+    /**
+     * Process a price select field.
+     *
+     * @param array $element
+     * @param array $data
+     */
+    public function process_price_select( $element, $data ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $options    = getpaid_convert_price_string_to_options( $element['options'] );
+        $selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+        $total      = 0;
+        $sub_labels = array();
+
+        foreach ( $selected as $price ) {
+
+            if ( ! isset( $options[ $price ] ) ) {
+                throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+            }
+
+            $price = explode( '|', $price );
+
+            $sub_labels[] = $price[0];
+            $total += (float) wpinv_sanitize_amount( $price[1] );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $total,
+            'recurring_fee' => 0,
+            'description'   => implode( ', ', $sub_labels ),
+        );
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission fees class
@@ -29,10 +29,10 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->fees = $submission->get_invoice()->get_fees();
 		}
 
@@ -40,14 +40,14 @@ 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
-		foreach ( $payment_form->get_elements() as $element ) {
+		foreach ($payment_form->get_elements() as $element) {
 
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
+			if ('price_input' == $element['type']) {
+				$this->process_price_input($element, $data, $submission);
 			}
 
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
+			if ('price_select' == $element['type']) {
+				$this->process_price_select($element, $data);
 			}
 }
 
@@ -60,21 +60,21 @@ 
 	 * @param array $data
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_price_input( $element, $data, $submission ) {
+	public function process_price_input($element, $data, $submission) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+		$amount  = (float) wpinv_sanitize_amount($data[$element['id']]);
+		$minimum = empty($element['minimum']) ? 0 : (float) wpinv_sanitize_amount($element['minimum']);
 
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+		if ($amount < $minimum) {
+			throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), getpaid_unstandardize_amount($minimum, $submission->get_currency())));
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $amount,
 			'recurring_fee' => 0,
@@ -88,35 +88,35 @@ 
 	 * @param array $element
 	 * @param array $data
 	 */
-	public function process_price_select( $element, $data ) {
+	public function process_price_select($element, $data) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+		$options    = getpaid_convert_price_string_to_options($element['options']);
+		$selected   = array_filter(array_map('trim', explode(',', $data[$element['id']])));
 		$total      = 0;
 		$sub_labels = array();
 
-		foreach ( $selected as $price ) {
+		foreach ($selected as $price) {
 
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+			if (!isset($options[$price])) {
+				throw new Exception(__('You have selected an invalid amount', 'invoicing'));
 			}
 
-			$price = explode( '|', $price );
+			$price = explode('|', $price);
 
 			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
+			$total += (float) wpinv_sanitize_amount($price[1]);
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $total,
 			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
+			'description'   => implode(', ', $sub_labels),
 		);
 
 	}

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

Indentation +177 added lines, -177 removed lines

@@ -12,69 +12,69 @@ 
  */
 abstract class GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var array
-	 */
-	public $stats;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		$this->prepare_stats();
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	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'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
+    /**
+     * @var array
+     */
+    public $stats;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        $this->prepare_stats();
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    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'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
             'today'     => __( 'Today', 'invoicing' ),
             'yesterday' => __( 'Yesterday', 'invoicing' ),
             '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Retrieves the current range's sql.
-	 *
-	 */
-	public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
+            '30_days'   => __( 'Last 30 days', 'invoicing' ),
+            '60_days'   => __( 'Last 60 days', 'invoicing' ),
+            '90_days'   => __( 'Last 90 days', 'invoicing' ),
+            '180_days'  => __( 'Last 180 days', 'invoicing' ),
+            '360_days'  => __( 'Last 360 days', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Retrieves the current range's sql.
+     *
+     */
+    public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
 
         // Prepare durations.
         $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
+        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
+        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
+        $ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
+        $sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
+        $one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
+        $three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 
@@ -91,130 +91,130 @@ 
             '7_days'    => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$seven_days_ago' AND '$today'",
-			),
+            ),
 
-			'30_days'   => array(
+            '30_days'   => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$thirty_days_ago' AND '$today'",
-			),
+            ),
 
-			'60_days'   => array(
+            '60_days'   => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$sixty_days_ago' AND '$today'",
-			),
+            ),
 
-			'90_days'   => array(
+            '90_days'   => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$ninety_days_ago' AND '$today'",
-			),
+            ),
 
-			'180_days'  => array(
+            '180_days'  => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$one_eighty_days_ago' AND '$today'",
-			),
+            ),
 
-			'360_days'  => array(
+            '360_days'  => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$three_sixty_days_ago' AND '$today'",
             ),
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Retrieves the hours in a day
-	 *
-	 */
-	public function get_hours_in_a_day() {
-
-		return array(
-			'12AM' => __( '12 AM', 'invoicing' ),
-			'1AM'  => __( '1 AM', 'invoicing' ),
-			'2AM'  => __( '2 AM', 'invoicing' ),
-			'3AM'  => __( '3 AM', 'invoicing' ),
-			'4AM'  => __( '4 AM', 'invoicing' ),
-			'5AM'  => __( '5 AM', 'invoicing' ),
-			'6AM'  => __( '6 AM', 'invoicing' ),
-			'7AM'  => __( '7 AM', 'invoicing' ),
-			'8AM'  => __( '8 AM', 'invoicing' ),
-			'9AM'  => __( '9 AM', 'invoicing' ),
-			'10AM' => __( '10 AM', 'invoicing' ),
-			'11AM' => __( '11 AM', 'invoicing' ),
-			'12pm' => __( '12 PM', 'invoicing' ),
-			'1PM'  => __( '1 PM', 'invoicing' ),
-			'2PM'  => __( '2 PM', 'invoicing' ),
-			'3PM'  => __( '3 PM', 'invoicing' ),
-			'4PM'  => __( '4 PM', 'invoicing' ),
-			'5PM'  => __( '5 PM', 'invoicing' ),
-			'6PM'  => __( '6 PM', 'invoicing' ),
-			'7PM'  => __( '7 PM', 'invoicing' ),
-			'8PM'  => __( '8 PM', 'invoicing' ),
-			'9PM'  => __( '9 PM', 'invoicing' ),
-			'10PM' => __( '10 PM', 'invoicing' ),
-			'11PM' => __( '11 PM', 'invoicing' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves the days in a period
-	 *
-	 */
-	public function get_days_in_period( $days ) {
-
-		$return = array();
-		$format = 'Y-m-d';
-
-		if ( $days < 8 ) {
-			$format = 'D';
-		}
-
-		if ( $days < 32 ) {
-			$format = 'M j';
-		}
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Retrieves the weeks in a period
-	 *
-	 */
-	public function get_weeks_in_period( $days ) {
-
-		$return = array();
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-		?>
+        $sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
+        return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+
+    }
+
+    /**
+     * Retrieves the hours in a day
+     *
+     */
+    public function get_hours_in_a_day() {
+
+        return array(
+            '12AM' => __( '12 AM', 'invoicing' ),
+            '1AM'  => __( '1 AM', 'invoicing' ),
+            '2AM'  => __( '2 AM', 'invoicing' ),
+            '3AM'  => __( '3 AM', 'invoicing' ),
+            '4AM'  => __( '4 AM', 'invoicing' ),
+            '5AM'  => __( '5 AM', 'invoicing' ),
+            '6AM'  => __( '6 AM', 'invoicing' ),
+            '7AM'  => __( '7 AM', 'invoicing' ),
+            '8AM'  => __( '8 AM', 'invoicing' ),
+            '9AM'  => __( '9 AM', 'invoicing' ),
+            '10AM' => __( '10 AM', 'invoicing' ),
+            '11AM' => __( '11 AM', 'invoicing' ),
+            '12pm' => __( '12 PM', 'invoicing' ),
+            '1PM'  => __( '1 PM', 'invoicing' ),
+            '2PM'  => __( '2 PM', 'invoicing' ),
+            '3PM'  => __( '3 PM', 'invoicing' ),
+            '4PM'  => __( '4 PM', 'invoicing' ),
+            '5PM'  => __( '5 PM', 'invoicing' ),
+            '6PM'  => __( '6 PM', 'invoicing' ),
+            '7PM'  => __( '7 PM', 'invoicing' ),
+            '8PM'  => __( '8 PM', 'invoicing' ),
+            '9PM'  => __( '9 PM', 'invoicing' ),
+            '10PM' => __( '10 PM', 'invoicing' ),
+            '11PM' => __( '11 PM', 'invoicing' ),
+        );
+
+    }
+
+    /**
+     * Retrieves the days in a period
+     *
+     */
+    public function get_days_in_period( $days ) {
+
+        $return = array();
+        $format = 'Y-m-d';
+
+        if ( $days < 8 ) {
+            $format = 'D';
+        }
+
+        if ( $days < 32 ) {
+            $format = 'M j';
+        }
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Retrieves the weeks in a period
+     *
+     */
+    public function get_weeks_in_period( $days ) {
+
+        $return = array();
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+        ?>
 
 			<div class="row">
 				<div class="col-12">
@@ -228,20 +228,20 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function prepare_stats();
-
-	/**
-	 * Displays the actual report.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function display_stats();
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function prepare_stats();
+
+    /**
+     * Displays the actual report.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function display_stats();
 
 }

Spacing +59 added lines, -59 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Abstract_Report Class.
@@ -32,8 +32,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';
@@ -47,34 +47,34 @@ 
 	public function get_periods() {
 
 		$periods = array(
-            'today'     => __( 'Today', 'invoicing' ),
-            'yesterday' => __( 'Yesterday', 'invoicing' ),
-            '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
+            'today'     => __('Today', 'invoicing'),
+            'yesterday' => __('Yesterday', 'invoicing'),
+            '7_days'    => __('Last 7 days', 'invoicing'),
+			'30_days'   => __('Last 30 days', 'invoicing'),
+			'60_days'   => __('Last 60 days', 'invoicing'),
+			'90_days'   => __('Last 90 days', 'invoicing'),
+			'180_days'  => __('Last 180 days', 'invoicing'),
+			'360_days'  => __('Last 360 days', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
 	 * Retrieves the current range's sql.
 	 *
 	 */
-	public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
+	public function get_range_sql($range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date') {
 
         // Prepare durations.
-        $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $today = current_time('Y-m-d');
+		$yesterday            = date('Y-m-d', strtotime('-1 day', current_time('timestamp')));
+		$seven_days_ago       = date('Y-m-d', strtotime('-7 days', current_time('timestamp')));
+		$thirty_days_ago      = date('Y-m-d', strtotime('-30 days', current_time('timestamp')));
+		$ninety_days_ago      = date('Y-m-d', strtotime('-90 days', current_time('timestamp')));
+		$sixty_days_ago       = date('Y-m-d', strtotime('-60 days', current_time('timestamp')));
+		$one_eighty_days_ago  = date('Y-m-d', strtotime('-180 days', current_time('timestamp')));
+		$three_sixty_days_ago = date('Y-m-d', strtotime('-360 days', current_time('timestamp')));
 
         $ranges = array(
 
@@ -120,8 +120,8 @@ 
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+		$sql = isset($ranges[$range]) ? $ranges[$range] : $ranges['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_range_sql', $sql, $range);
 
 	}
 
@@ -132,30 +132,30 @@ 
 	public function get_hours_in_a_day() {
 
 		return array(
-			'12AM' => __( '12 AM', 'invoicing' ),
-			'1AM'  => __( '1 AM', 'invoicing' ),
-			'2AM'  => __( '2 AM', 'invoicing' ),
-			'3AM'  => __( '3 AM', 'invoicing' ),
-			'4AM'  => __( '4 AM', 'invoicing' ),
-			'5AM'  => __( '5 AM', 'invoicing' ),
-			'6AM'  => __( '6 AM', 'invoicing' ),
-			'7AM'  => __( '7 AM', 'invoicing' ),
-			'8AM'  => __( '8 AM', 'invoicing' ),
-			'9AM'  => __( '9 AM', 'invoicing' ),
-			'10AM' => __( '10 AM', 'invoicing' ),
-			'11AM' => __( '11 AM', 'invoicing' ),
-			'12pm' => __( '12 PM', 'invoicing' ),
-			'1PM'  => __( '1 PM', 'invoicing' ),
-			'2PM'  => __( '2 PM', 'invoicing' ),
-			'3PM'  => __( '3 PM', 'invoicing' ),
-			'4PM'  => __( '4 PM', 'invoicing' ),
-			'5PM'  => __( '5 PM', 'invoicing' ),
-			'6PM'  => __( '6 PM', 'invoicing' ),
-			'7PM'  => __( '7 PM', 'invoicing' ),
-			'8PM'  => __( '8 PM', 'invoicing' ),
-			'9PM'  => __( '9 PM', 'invoicing' ),
-			'10PM' => __( '10 PM', 'invoicing' ),
-			'11PM' => __( '11 PM', 'invoicing' ),
+			'12AM' => __('12 AM', 'invoicing'),
+			'1AM'  => __('1 AM', 'invoicing'),
+			'2AM'  => __('2 AM', 'invoicing'),
+			'3AM'  => __('3 AM', 'invoicing'),
+			'4AM'  => __('4 AM', 'invoicing'),
+			'5AM'  => __('5 AM', 'invoicing'),
+			'6AM'  => __('6 AM', 'invoicing'),
+			'7AM'  => __('7 AM', 'invoicing'),
+			'8AM'  => __('8 AM', 'invoicing'),
+			'9AM'  => __('9 AM', 'invoicing'),
+			'10AM' => __('10 AM', 'invoicing'),
+			'11AM' => __('11 AM', 'invoicing'),
+			'12pm' => __('12 PM', 'invoicing'),
+			'1PM'  => __('1 PM', 'invoicing'),
+			'2PM'  => __('2 PM', 'invoicing'),
+			'3PM'  => __('3 PM', 'invoicing'),
+			'4PM'  => __('4 PM', 'invoicing'),
+			'5PM'  => __('5 PM', 'invoicing'),
+			'6PM'  => __('6 PM', 'invoicing'),
+			'7PM'  => __('7 PM', 'invoicing'),
+			'8PM'  => __('8 PM', 'invoicing'),
+			'9PM'  => __('9 PM', 'invoicing'),
+			'10PM' => __('10 PM', 'invoicing'),
+			'11PM' => __('11 PM', 'invoicing'),
 		);
 
 	}
@@ -164,24 +164,24 @@ 
 	 * Retrieves the days in a period
 	 *
 	 */
-	public function get_days_in_period( $days ) {
+	public function get_days_in_period($days) {
 
 		$return = array();
 		$format = 'Y-m-d';
 
-		if ( $days < 8 ) {
+		if ($days < 8) {
 			$format = 'D';
 		}
 
-		if ( $days < 32 ) {
+		if ($days < 32) {
 			$format = 'M j';
 		}
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n($format, strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}
@@ -193,15 +193,15 @@ 
 	 * Retrieves the weeks in a period
 	 *
 	 */
-	public function get_weeks_in_period( $days ) {
+	public function get_weeks_in_period($days) {
 
 		$return = array();
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('W', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}

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

Indentation +82 added lines, -82 removed lines

@@ -12,23 +12,23 @@ 
  */
 class GetPaid_Reports_Report_Items extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'item_name';
-
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$table2     = $wpdb->prefix . 'getpaid_invoice_items';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'item_name';
+
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $table2     = $wpdb->prefix . 'getpaid_invoice_items';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				item.item_name AS item_name,
 				item.item_id AS item_id,
 				SUM(price) as total
@@ -43,91 +43,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_items_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_items_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() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'item_name' => strip_tags( $stat->item_name ),
-				);
+                $normalized[] = array(
+                    'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'item_name' => strip_tags( $stat->item_name ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'item_name' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'item_name' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'item_name' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'item_name' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-items"></canvas>
 
@@ -156,6 +156,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -21,12 +21,12 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
 		$table2     = $wpdb->prefix . 'getpaid_invoice_items';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				item.item_name AS item_name,
@@ -43,7 +43,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_items_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_items_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -53,30 +53,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'item_name' => strip_tags( $stat->item_name ),
+					'total'     => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'item_name' => strip_tags($stat->item_name),
 				);
 
 			}
@@ -84,11 +84,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'item_name' => esc_html__( 'Others', 'invoicing' ),
+				'total'     => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'item_name' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -102,10 +102,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -119,7 +119,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'item_name' );
+		return wp_list_pluck($this->stats, 'item_name');
 	}
 
 	/**
@@ -140,8 +140,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( wp_kses_post_deep( $this->get_labels() ) ); ?>,
-								'datasets': [ <?php echo wp_json_encode( wp_kses_post_deep( $this->get_data() ) ); ?> ]
+								'labels': <?php echo wp_json_encode(wp_kses_post_deep($this->get_labels())); ?>,
+								'datasets': [ <?php echo wp_json_encode(wp_kses_post_deep($this->get_data())); ?> ]
 							},
 							options: {
 								legend: {

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 esc_attr( $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 +45 added lines, -45 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,24 +139,24 @@ 
 	 */
 	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%">
 							<div class="card-header d-flex align-items-center">
-								<strong class="flex-grow-1"><?php echo esc_html( $dataset['label'] ); ?></strong>
+								<strong class="flex-grow-1"><?php echo esc_html($dataset['label']); ?></strong>
 								<?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 esc_attr( $key ); ?>"></canvas>
+		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>"></canvas>
 
 		<script>
 			window.addEventListener( 'DOMContentLoaded', function() {
 
-				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>' ).getContext('2d');
+				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>' ).getContext('2d');
 				new Chart(
 					ctx,
 					{
 						type: 'line',
 						data: {
-							'labels': <?php echo wp_json_encode( wpinv_clean( $labels ) ); ?>,
+							'labels': <?php echo wp_json_encode(wpinv_clean($labels)); ?>,
 							'datasets': [
 								{
-									label: '<?php echo esc_attr( $dataset['label'] ); ?>',
-									data: <?php echo wp_json_encode( wpinv_clean( $dataset['data'] ) ); ?>,
+									label: '<?php echo esc_attr($dataset['label']); ?>',
+									data: <?php echo wp_json_encode(wpinv_clean($dataset['data'])); ?>,
 									backgroundColor: 'rgba(54, 162, 235, 0.1)',
 									borderColor: 'rgb(54, 162, 235)',
 									borderWidth: 4,

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

Indentation +81 added lines, -81 removed lines

@@ -12,22 +12,22 @@ 
  */
 class GetPaid_Reports_Report_Discounts extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'discount_code';
-
-	/**
-	 * Retrieves the discounts sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'discount_code';
+
+    /**
+     * Retrieves the discounts sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				meta.discount_code AS discount_code,
 				SUM(total) as total
             FROM $wpdb->posts
@@ -41,91 +41,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_discounts_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() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
-				);
+                $normalized[] = array(
+                    'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'discount_code' => strip_tags( $stat->discount_code ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'discount_code' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'discount_code' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-discount_code"></canvas>
 
@@ -154,6 +154,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Discounts Class.
@@ -21,11 +21,11 @@ 
 	 * Retrieves the discounts sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				meta.discount_code AS discount_code,
@@ -41,7 +41,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_discounts_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -51,30 +51,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
+					'total'         => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'discount_code' => strip_tags($stat->discount_code),
 				);
 
 			}
@@ -82,11 +82,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
+				'total'         => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'discount_code' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -100,10 +100,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -117,7 +117,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
+		return wp_list_pluck($this->stats, 'discount_code');
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( wpinv_clean( $this->get_labels() ) ); ?>,
-								'datasets': [ <?php echo wp_json_encode( wpinv_clean( $this->get_data() ) ); ?> ]
+								'labels': <?php echo wp_json_encode(wpinv_clean($this->get_labels())); ?>,
+								'datasets': [ <?php echo wp_json_encode(wpinv_clean($this->get_data())); ?> ]
 							},
 							options: {
 								legend: {

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

Indentation +180 added lines, -180 removed lines

@@ -12,88 +12,88 @@ 
  */
 class GetPaid_Reports_Report {
 
-	/**
-	 * @var array
-	 */
-	public $views;
+    /**
+     * @var array
+     */
+    public $views;
 
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
 
-		$this->views        = array(
+        $this->views        = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Items',
-			),
+                'label' => __( 'Items', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Items',
+            ),
 
-			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Gateways',
-			),
+            'gateways'  => array(
+                'label' => __( 'Payment Methods', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Gateways',
+            ),
 
-			'discounts' => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Discounts',
-			),
+            'discounts' => array(
+                'label' => __( 'Discount Codes', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Discounts',
+            ),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
-
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	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'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	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' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
-
-		$range = $this->get_range();
-		?>
+        $this->views        = apply_filters( 'wpinv_report_views', $this->views );
+
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    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'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    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' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
+
+        $range = $this->get_range();
+        ?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
 				<?php getpaid_hidden_field( 'page', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' ); ?>
@@ -115,14 +115,14 @@ 
 			</form>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+        ?>
 
 		<div class="mt-4">
 
@@ -202,16 +202,16 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the left side.
-	 *
-	 */
-	public function display_left() {
-		$graphs = wpinv_get_report_graphs();
+    /**
+     * Displays the left side.
+     *
+     */
+    public function display_left() {
+        $graphs = wpinv_get_report_graphs();
 
-		?>
+        ?>
 
 			<?php foreach ( $graphs as $key => $graph ) : ?>
 				<div class="row mb-4">
@@ -230,35 +230,35 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	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 ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    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 ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
 
-	}
+    }
 
-	/**
-	 * Displays the right side.
-	 *
-	 */
-	public function display_right() {
+    /**
+     * Displays the right side.
+     *
+     */
+    public function display_right() {
 
-		?>
+        ?>
 
 			<?php foreach ( $this->views as $key => $view ) : ?>
 				<div class="row mb-4">
@@ -287,10 +287,10 @@ 
 							</div>
 							<div class="card-body">
 								<?php
-									$class = $view['class'];
-									$class = new $class();
-									$class->display_stats();
-								?>
+                                    $class = $view['class'];
+                                    $class = new $class();
+                                    $class->display_stats();
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -299,68 +299,68 @@ 
 
 		<?php
 
-		do_action( 'getpaid_reports_display_right', $this );
-	}
-
-	/**
-	 * Returns a list of report cards.
-	 *
-	 */
-	public function get_cards() {
-
-		$cards = array(
-			'total_sales'         => array(
-				'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' ),
-			),
-			'average_sales'       => array(
-				'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' ),
-			),
-			'total_invoices'      => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
-			),
-			'total_items'         => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
-			),
-			'refunded_items'      => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
-			),
-			'total_tax'           => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
-			),
-			'total_refunded_tax'  => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
-			),
-			'total_fees'          => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
-			),
-			'total_refunds'       => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
-			),
-			'total_discount'      => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
-			),
-		);
-
-		return apply_filters( 'wpinv_report_cards', $cards );
-	}
+        do_action( 'getpaid_reports_display_right', $this );
+    }
+
+    /**
+     * Returns a list of report cards.
+     *
+     */
+    public function get_cards() {
+
+        $cards = array(
+            'total_sales'         => array(
+                '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' ),
+            ),
+            'average_sales'       => array(
+                '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' ),
+            ),
+            'total_invoices'      => array(
+                'description' => __( 'Number of paid invoices.', 'invoicing' ),
+                'label'       => __( 'Paid Invoices', 'invoicing' ),
+            ),
+            'total_items'         => array(
+                'description' => __( 'Number of items purchased.', 'invoicing' ),
+                'label'       => __( 'Purchased Items', 'invoicing' ),
+            ),
+            'refunded_items'      => array(
+                'description' => __( 'Number of items refunded.', 'invoicing' ),
+                'label'       => __( 'Refunded Items', 'invoicing' ),
+            ),
+            'total_tax'           => array(
+                'description' => __( 'Total charged for taxes.', 'invoicing' ),
+                'label'       => __( 'Tax', 'invoicing' ),
+            ),
+            'total_refunded_tax'  => array(
+                'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+                'label'       => __( 'Refunded Tax', 'invoicing' ),
+            ),
+            'total_fees'          => array(
+                'description' => __( 'Total fees charged.', 'invoicing' ),
+                'label'       => __( 'Fees', 'invoicing' ),
+            ),
+            'total_refunds'       => array(
+                'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+                'label'       => __( 'Refunded', 'invoicing' ),
+            ),
+            'total_discount'      => array(
+                'description' => __( 'Total of discounts used.', 'invoicing' ),
+                'label'       => __( 'Discounted', 'invoicing' ),
+            ),
+        );
+
+        return apply_filters( 'wpinv_report_cards', $cards );
+    }
 
 
 

Spacing +77 added lines, -77 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', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' ); ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' ); ?>
+				<?php getpaid_hidden_field('page', isset($_GET['page']) ? sanitize_text_field($_GET['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 esc_attr( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo esc_html( $label ); ?></option>
+					<?php foreach ($this->get_periods() as $key => $label) : ?>
+						<option value="<?php echo esc_attr($key); ?>" <?php selected($key, $range); ?>><?php echo esc_html($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 esc_html_e( 'to', 'invoicing' ); ?>
+						<?php esc_html_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 esc_html_e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php esc_html_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 esc_html( $card['label'] ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo esc_attr( $key ); ?>">
+								<!-- <?php echo esc_html($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo esc_attr($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo esc_html( $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 esc_html($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 esc_html_e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php esc_html_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 esc_html( $card['label'] ); ?> Card -->
+								<!-- <?php echo esc_html($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -213,15 +213,15 @@ 
 
 		?>
 
-			<?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 esc_html( $graph ); ?></strong>
+								<strong><?php echo esc_html($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo esc_attr( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo esc_attr($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -236,14 +236,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',
@@ -260,27 +260,27 @@ 
 
 		?>
 
-			<?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%">
 							<div class="card-header">
 								<div class="row">
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-9' : 'col-12'; ?>">
-										<strong><?php echo esc_html( $view['label'] ); ?></strong>
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-9' : 'col-12'; ?>">
+										<strong><?php echo esc_html($view['label']); ?></strong>
 									</div>
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-3' : 'd-none'; ?>">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-3' : 'd-none'; ?>">
+										<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 esc_html_e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_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 esc_html_e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_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 esc_html_e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -299,7 +299,7 @@ 
 
 		<?php
 
-		do_action( 'getpaid_reports_display_right', $this );
+		do_action('getpaid_reports_display_right', $this);
 	}
 
 	/**
@@ -310,56 +310,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);
 	}
 
 

includes/reports/class-getpaid-subscription-exporter.php

Indentation +170 added lines, -170 removed lines

@@ -12,176 +12,176 @@
  */
 class GetPaid_Subscription_Exporter extends GetPaid_Graph_Downloader {
 
-	/**
-	 * Retrieves subscription query args.
-	 *
-	 * @param array $args Args to search for.
-	 * @return array
-	 */
-	public function get_subscription_query_args( $args ) {
-
-		$query_args = array(
-			'status'      => 'all',
-			'number'      => -1,
-			'count_total' => false,
-			'fields'      => 'all',
-		);
-
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
-			$query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
-		}
-
-		$date_query = array();
-		if ( ! empty( $args['to_date'] ) ) {
-			$date_query['before'] = wpinv_clean( $args['to_date'] );
-		}
-
-		if ( ! empty( $args['from_date'] ) ) {
-			$date_query['after'] = wpinv_clean( $args['from_date'] );
-		}
-
-		if ( ! empty( $date_query ) ) {
-			$date_query['inclusive']          = true;
-			$query_args['date_created_query'] = array( $date_query );
-		}
-
-		return $query_args;
-	}
-
-	/**
-	 * Retrieves subscriptions.
-	 *
-	 * @param array $query_args GetPaid_Subscriptions_Query args.
-	 * @return WPInv_Subscription[]
-	 */
-	public function get_subscriptions( $query_args ) {
-
-		// Get subscriptions.
-		$subscriptions = new GetPaid_Subscriptions_Query( $query_args );
-
-		// Prepare the results.
-		return $subscriptions->get_results();
-
-	}
-
-	/**
-	 * Handles the actual download.
-	 *
-	 */
-	public function export( $post_type, $args ) {
-
-		$subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
-		$stream        = $this->prepare_output();
-		$headers       = $this->get_export_fields();
-		$file_type     = $this->prepare_file_type( 'subscriptions' );
-
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $subscriptions, $stream, $headers );
-		} elseif ( 'xml' == $file_type ) {
-			$this->download_xml( $subscriptions, $stream, $headers );
-		} else {
-			$this->download_json( $subscriptions, $stream, $headers );
-		}
-
-		fclose( $stream );
-		exit;
-	}
-
-	/**
-	 * Prepares a single subscription for download.
-	 *
-	 * @param WPInv_Subscription $subscription The subscription to prepare..
-	 * @param array $fields The fields to stream.
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function prepare_row( $subscription, $fields ) {
-
-		$prepared      = array();
-		$amount_fields = $this->get_amount_fields();
-		$invoice       = $subscription->get_parent_payment();
-
-		foreach ( $fields as $field ) {
-
-			$value  = '';
-			$method = "get_$field";
-
-			if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
-
-				if ( method_exists( $invoice, $method ) ) {
-					$value  = $invoice->$method();
-				}
+    /**
+     * Retrieves subscription query args.
+     *
+     * @param array $args Args to search for.
+     * @return array
+     */
+    public function get_subscription_query_args( $args ) {
+
+        $query_args = array(
+            'status'      => 'all',
+            'number'      => -1,
+            'count_total' => false,
+            'fields'      => 'all',
+        );
+
+        if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
+            $query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+        }
+
+        $date_query = array();
+        if ( ! empty( $args['to_date'] ) ) {
+            $date_query['before'] = wpinv_clean( $args['to_date'] );
+        }
+
+        if ( ! empty( $args['from_date'] ) ) {
+            $date_query['after'] = wpinv_clean( $args['from_date'] );
+        }
+
+        if ( ! empty( $date_query ) ) {
+            $date_query['inclusive']          = true;
+            $query_args['date_created_query'] = array( $date_query );
+        }
+
+        return $query_args;
+    }
+
+    /**
+     * Retrieves subscriptions.
+     *
+     * @param array $query_args GetPaid_Subscriptions_Query args.
+     * @return WPInv_Subscription[]
+     */
+    public function get_subscriptions( $query_args ) {
+
+        // Get subscriptions.
+        $subscriptions = new GetPaid_Subscriptions_Query( $query_args );
+
+        // Prepare the results.
+        return $subscriptions->get_results();
+
+    }
+
+    /**
+     * Handles the actual download.
+     *
+     */
+    public function export( $post_type, $args ) {
+
+        $subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
+        $stream        = $this->prepare_output();
+        $headers       = $this->get_export_fields();
+        $file_type     = $this->prepare_file_type( 'subscriptions' );
+
+        if ( 'csv' == $file_type ) {
+            $this->download_csv( $subscriptions, $stream, $headers );
+        } elseif ( 'xml' == $file_type ) {
+            $this->download_xml( $subscriptions, $stream, $headers );
+        } else {
+            $this->download_json( $subscriptions, $stream, $headers );
+        }
+
+        fclose( $stream );
+        exit;
+    }
+
+    /**
+     * Prepares a single subscription for download.
+     *
+     * @param WPInv_Subscription $subscription The subscription to prepare..
+     * @param array $fields The fields to stream.
+     * @since       1.0.19
+     * @return array
+     */
+    public function prepare_row( $subscription, $fields ) {
+
+        $prepared      = array();
+        $amount_fields = $this->get_amount_fields();
+        $invoice       = $subscription->get_parent_payment();
+
+        foreach ( $fields as $field ) {
+
+            $value  = '';
+            $method = "get_$field";
+
+            if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
+
+                if ( method_exists( $invoice, $method ) ) {
+                    $value  = $invoice->$method();
+                }
 } elseif ( method_exists( $subscription, $method ) ) {
-				$value  = $subscription->$method();
-			}
-
-			if ( in_array( $field, $amount_fields ) ) {
-				$value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
-			}
-
-			$prepared[ $field ] = wpinv_clean( $value );
-
-		}
-
-		return $prepared;
-	}
-
-	/**
-	 * Retrieves export fields.
-	 *
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_export_fields() {
-
-		$fields = array(
-			'id',
-			'currency',
-			'initial_amount',
-			'recurring_amount',
-			'trial_period',
-			'frequency',
-			'period',
-			'bill_times',
-			'parent_payment_id',
-			'profile_id',
-			'product_id',
-			'status',
-			'date_created',
-			'date_expires',
-
-			'customer_id',
-			'customer_first_name',
-			'customer_last_name',
-			'customer_phone',
-			'customer_email',
-			'customer_country',
-			'customer_city',
-			'customer_state',
-			'customer_zip',
-			'customer_company',
-			'customer_vat_number',
-			'customer_address',
-
-    	);
-
-		return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
-	}
-
-	/**
-	 * Retrieves amount fields.
-	 *
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_amount_fields() {
-
-		$fields = array(
-			'initial_amount',
-			'recurring_amount',
-    	);
-
-		return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
-	}
+                $value  = $subscription->$method();
+            }
+
+            if ( in_array( $field, $amount_fields ) ) {
+                $value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
+            }
+
+            $prepared[ $field ] = wpinv_clean( $value );
+
+        }
+
+        return $prepared;
+    }
+
+    /**
+     * Retrieves export fields.
+     *
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_export_fields() {
+
+        $fields = array(
+            'id',
+            'currency',
+            'initial_amount',
+            'recurring_amount',
+            'trial_period',
+            'frequency',
+            'period',
+            'bill_times',
+            'parent_payment_id',
+            'profile_id',
+            'product_id',
+            'status',
+            'date_created',
+            'date_expires',
+
+            'customer_id',
+            'customer_first_name',
+            'customer_last_name',
+            'customer_phone',
+            'customer_email',
+            'customer_country',
+            'customer_city',
+            'customer_state',
+            'customer_zip',
+            'customer_company',
+            'customer_vat_number',
+            'customer_address',
+
+        );
+
+        return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
+    }
+
+    /**
+     * Retrieves amount fields.
+     *
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_amount_fields() {
+
+        $fields = array(
+            'initial_amount',
+            'recurring_amount',
+        );
+
+        return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Subscription_Exporter Class.
@@ -18,7 +18,7 @@ 
 	 * @param array $args Args to search for.
 	 * @return array
 	 */
-	public function get_subscription_query_args( $args ) {
+	public function get_subscription_query_args($args) {
 
 		$query_args = array(
 			'status'      => 'all',
@@ -27,22 +27,22 @@ 
 			'fields'      => 'all',
 		);
 
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
-			$query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+		if (!empty($args['status']) && in_array($args['status'], array_keys(getpaid_get_subscription_statuses()), true)) {
+			$query_args['status'] = wpinv_clean(wpinv_parse_list($args['status']));
 		}
 
 		$date_query = array();
-		if ( ! empty( $args['to_date'] ) ) {
-			$date_query['before'] = wpinv_clean( $args['to_date'] );
+		if (!empty($args['to_date'])) {
+			$date_query['before'] = wpinv_clean($args['to_date']);
 		}
 
-		if ( ! empty( $args['from_date'] ) ) {
-			$date_query['after'] = wpinv_clean( $args['from_date'] );
+		if (!empty($args['from_date'])) {
+			$date_query['after'] = wpinv_clean($args['from_date']);
 		}
 
-		if ( ! empty( $date_query ) ) {
+		if (!empty($date_query)) {
 			$date_query['inclusive']          = true;
-			$query_args['date_created_query'] = array( $date_query );
+			$query_args['date_created_query'] = array($date_query);
 		}
 
 		return $query_args;
@@ -54,10 +54,10 @@ 
 	 * @param array $query_args GetPaid_Subscriptions_Query args.
 	 * @return WPInv_Subscription[]
 	 */
-	public function get_subscriptions( $query_args ) {
+	public function get_subscriptions($query_args) {
 
 		// Get subscriptions.
-		$subscriptions = new GetPaid_Subscriptions_Query( $query_args );
+		$subscriptions = new GetPaid_Subscriptions_Query($query_args);
 
 		// Prepare the results.
 		return $subscriptions->get_results();
@@ -68,22 +68,22 @@ 
 	 * Handles the actual download.
 	 *
 	 */
-	public function export( $post_type, $args ) {
+	public function export($post_type, $args) {
 
-		$subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
+		$subscriptions = $this->get_subscriptions($this->get_subscription_query_args($args));
 		$stream        = $this->prepare_output();
 		$headers       = $this->get_export_fields();
-		$file_type     = $this->prepare_file_type( 'subscriptions' );
+		$file_type     = $this->prepare_file_type('subscriptions');
 
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $subscriptions, $stream, $headers );
-		} elseif ( 'xml' == $file_type ) {
-			$this->download_xml( $subscriptions, $stream, $headers );
+		if ('csv' == $file_type) {
+			$this->download_csv($subscriptions, $stream, $headers);
+		} elseif ('xml' == $file_type) {
+			$this->download_xml($subscriptions, $stream, $headers);
 		} else {
-			$this->download_json( $subscriptions, $stream, $headers );
+			$this->download_json($subscriptions, $stream, $headers);
 		}
 
-		fclose( $stream );
+		fclose($stream);
 		exit;
 	}
 
@@ -95,31 +95,31 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function prepare_row( $subscription, $fields ) {
+	public function prepare_row($subscription, $fields) {
 
 		$prepared      = array();
 		$amount_fields = $this->get_amount_fields();
 		$invoice       = $subscription->get_parent_payment();
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			$value  = '';
 			$method = "get_$field";
 
-			if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
+			if (0 === stripos($field, 'customer') || 'currency' === $field) {
 
-				if ( method_exists( $invoice, $method ) ) {
-					$value  = $invoice->$method();
+				if (method_exists($invoice, $method)) {
+					$value = $invoice->$method();
 				}
-} elseif ( method_exists( $subscription, $method ) ) {
-				$value  = $subscription->$method();
+} elseif (method_exists($subscription, $method)) {
+				$value = $subscription->$method();
 			}
 
-			if ( in_array( $field, $amount_fields ) ) {
-				$value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
+			if (in_array($field, $amount_fields)) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($value));
 			}
 
-			$prepared[ $field ] = wpinv_clean( $value );
+			$prepared[$field] = wpinv_clean($value);
 
 		}
 
@@ -165,7 +165,7 @@ 
 
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_fields', $fields);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 			'recurring_amount',
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_amount_fields', $fields);
 	}
 
 }

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

Indentation +81 added lines, -81 removed lines

@@ -12,22 +12,22 @@ 
  */
 class GetPaid_Reports_Report_Gateways extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'gateway';
-
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'gateway';
+
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				meta.gateway AS gateway,
 				SUM(total) as total
             FROM $wpdb->posts
@@ -40,91 +40,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_gateways_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_gateways_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() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'   => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'gateway' => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
-				);
+                $normalized[] = array(
+                    'total'   => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'gateway' => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'   => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'gateway' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'   => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'gateway' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'gateway' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'gateway' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-gateways"></canvas>
 
@@ -153,6 +153,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -21,11 +21,11 @@ 
 	 * 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 );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				meta.gateway AS gateway,
@@ -40,7 +40,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_gateways_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_gateways_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -50,30 +50,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'   => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'gateway' => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
+					'total'   => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'gateway' => strip_tags(wpinv_get_gateway_admin_label($stat->gateway)),
 				);
 
 			}
@@ -81,11 +81,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'   => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'gateway' => esc_html__( 'Others', 'invoicing' ),
+				'total'   => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'gateway' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -99,10 +99,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -116,7 +116,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'gateway' );
+		return wp_list_pluck($this->stats, 'gateway');
 	}
 
 	/**
@@ -137,8 +137,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( wp_kses_post_deep( $this->get_labels() ) ); ?>,
-								'datasets': [ <?php echo wp_json_encode( wp_kses_post_deep( $this->get_data() ) ); ?> ]
+								'labels': <?php echo wp_json_encode(wp_kses_post_deep($this->get_labels())); ?>,
+								'datasets': [ <?php echo wp_json_encode(wp_kses_post_deep($this->get_data())); ?> ]
 							},
 							options: {
 								legend: {

includes/geolocation/class-getpaid-geolocation.php

Indentation +243 added lines, -243 removed lines

@@ -13,261 +13,261 @@
  */
 class GetPaid_Geolocation {
 
-	/**
-	 * Holds the current user's IP Address.
-	 *
-	 * @var string
-	 */
-	public static $current_user_ip;
-
-	/**
-	 * API endpoints for looking up a user IP address.
-	 *
-	 * For example, in case a user is on localhost.
-	 *
-	 * @var array
-	 */
-	protected static $ip_lookup_apis = array(
-		'ipify'             => 'http://api.ipify.org/',
-		'ipecho'            => 'http://ipecho.net/plain',
-		'ident'             => 'http://ident.me',
-		'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
-	);
-
-	/**
-	 * API endpoints for geolocating an IP address
-	 *
-	 * @var array
-	 */
-	protected static $geoip_apis = array(
-		'ip-api.com' => 'http://ip-api.com/json/%s',
-		'ipinfo.io'  => 'https://ipinfo.io/%s/json',
-	);
-
-	/**
-	 * Get current user IP Address.
-	 *
-	 * @return string
-	 */
-	public static function get_ip_address() {
-		return wpinv_get_ip();
-	}
-
-	/**
-	 * Get user IP Address using an external service.
-	 * This can be used as a fallback for users on localhost where
-	 * get_ip_address() will be a local IP and non-geolocatable.
-	 *
-	 * @return string
-	 */
-	public static function get_external_ip_address() {
-
-		$transient_name = 'external_ip_address_0.0.0.0';
-
-		if ( '' !== self::get_ip_address() ) {
-			$transient_name      = 'external_ip_address_' . self::get_ip_address();
-		}
-
-		// Try retrieving from cache.
-		$external_ip_address = get_transient( $transient_name );
-
-		if ( false === $external_ip_address ) {
-			$external_ip_address     = '0.0.0.0';
-			$ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
-			$ip_lookup_services_keys = array_keys( $ip_lookup_services );
-			shuffle( $ip_lookup_services_keys );
-
-			foreach ( $ip_lookup_services_keys as $service_name ) {
-				$service_endpoint = $ip_lookup_services[ $service_name ];
-				$response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
-
-				if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
-					$external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
-					break;
-				}
+    /**
+     * Holds the current user's IP Address.
+     *
+     * @var string
+     */
+    public static $current_user_ip;
+
+    /**
+     * API endpoints for looking up a user IP address.
+     *
+     * For example, in case a user is on localhost.
+     *
+     * @var array
+     */
+    protected static $ip_lookup_apis = array(
+        'ipify'             => 'http://api.ipify.org/',
+        'ipecho'            => 'http://ipecho.net/plain',
+        'ident'             => 'http://ident.me',
+        'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
+    );
+
+    /**
+     * API endpoints for geolocating an IP address
+     *
+     * @var array
+     */
+    protected static $geoip_apis = array(
+        'ip-api.com' => 'http://ip-api.com/json/%s',
+        'ipinfo.io'  => 'https://ipinfo.io/%s/json',
+    );
+
+    /**
+     * Get current user IP Address.
+     *
+     * @return string
+     */
+    public static function get_ip_address() {
+        return wpinv_get_ip();
+    }
+
+    /**
+     * Get user IP Address using an external service.
+     * This can be used as a fallback for users on localhost where
+     * get_ip_address() will be a local IP and non-geolocatable.
+     *
+     * @return string
+     */
+    public static function get_external_ip_address() {
+
+        $transient_name = 'external_ip_address_0.0.0.0';
+
+        if ( '' !== self::get_ip_address() ) {
+            $transient_name      = 'external_ip_address_' . self::get_ip_address();
+        }
+
+        // Try retrieving from cache.
+        $external_ip_address = get_transient( $transient_name );
+
+        if ( false === $external_ip_address ) {
+            $external_ip_address     = '0.0.0.0';
+            $ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
+            $ip_lookup_services_keys = array_keys( $ip_lookup_services );
+            shuffle( $ip_lookup_services_keys );
+
+            foreach ( $ip_lookup_services_keys as $service_name ) {
+                $service_endpoint = $ip_lookup_services[ $service_name ];
+                $response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
+
+                if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
+                    $external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
+                    break;
+                }
 }
 
-			set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
-		}
-
-		return $external_ip_address;
-	}
-
-	/**
-	 * Geolocate an IP address.
-	 *
-	 * @param  string $ip_address   IP Address.
-	 * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
-	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
-	 * @return array
-	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
-
-		if ( empty( $ip_address ) ) {
-			$ip_address = self::get_ip_address();
-		}
-
-		// Update the current user's IP Address.
-		self::$current_user_ip = $ip_address;
-
-		// Filter to allow custom geolocation of the IP address.
-		$country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
-
-		if ( false !== $country_code ) {
-
-			return array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			);
-
-		}
-
-		$country_code = self::get_country_code_from_headers();
-
-		/**
-		 * Get geolocation filter.
-		 *
-		 * @since 1.0.19
-		 * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
-		 * @param string $ip_address  IP Address.
-		 */
-		$geolocation  = apply_filters(
-			'getpaid_get_geolocation',
-			array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			),
-			$ip_address
-		);
-
-		// If we still haven't found a country code, let's consider doing an API lookup.
-		if ( '' === $geolocation['country'] && $api_fallback ) {
-			$geolocation['country'] = self::geolocate_via_api( $ip_address );
-		}
-
-		// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
-		// external address.
-		if ( '' === $geolocation['country'] && $fallback ) {
-			$external_ip_address = self::get_external_ip_address();
-
-			// Only bother with this if the external IP differs.
-			if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
-				return self::geolocate_ip( $external_ip_address, false, $api_fallback );
-			}
+            set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
+        }
+
+        return $external_ip_address;
+    }
+
+    /**
+     * Geolocate an IP address.
+     *
+     * @param  string $ip_address   IP Address.
+     * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
+     * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
+     * @return array
+     */
+    public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
+
+        if ( empty( $ip_address ) ) {
+            $ip_address = self::get_ip_address();
+        }
+
+        // Update the current user's IP Address.
+        self::$current_user_ip = $ip_address;
+
+        // Filter to allow custom geolocation of the IP address.
+        $country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
+
+        if ( false !== $country_code ) {
+
+            return array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            );
+
+        }
+
+        $country_code = self::get_country_code_from_headers();
+
+        /**
+         * Get geolocation filter.
+         *
+         * @since 1.0.19
+         * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
+         * @param string $ip_address  IP Address.
+         */
+        $geolocation  = apply_filters(
+            'getpaid_get_geolocation',
+            array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            ),
+            $ip_address
+        );
+
+        // If we still haven't found a country code, let's consider doing an API lookup.
+        if ( '' === $geolocation['country'] && $api_fallback ) {
+            $geolocation['country'] = self::geolocate_via_api( $ip_address );
+        }
+
+        // It's possible that we're in a local environment, in which case the geolocation needs to be done from the
+        // external address.
+        if ( '' === $geolocation['country'] && $fallback ) {
+            $external_ip_address = self::get_external_ip_address();
+
+            // Only bother with this if the external IP differs.
+            if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
+                return self::geolocate_ip( $external_ip_address, false, $api_fallback );
+            }
 }
 
-		return array(
-			'country'  => $geolocation['country'],
-			'state'    => $geolocation['state'],
-			'city'     => $geolocation['city'],
-			'postcode' => $geolocation['postcode'],
-		);
-
-	}
-
-	/**
-	 * Fetches the country code from the request headers, if one is available.
-	 *
-	 * @since 1.0.19
-	 * @return string The country code pulled from the headers, or empty string if one was not found.
-	 */
-	protected static function get_country_code_from_headers() {
-		$country_code = '';
-
-		$headers = array(
-			'MM_COUNTRY_CODE',
-			'GEOIP_COUNTRY_CODE',
-			'HTTP_CF_IPCOUNTRY',
-			'HTTP_X_COUNTRY_CODE',
-		);
-
-		foreach ( $headers as $header ) {
-			if ( empty( $_SERVER[ $header ] ) ) {
-				continue;
-			}
-
-			$country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
-			break;
-		}
-
-		return $country_code;
-	}
-
-	/**
-	 * Use APIs to Geolocate the user.
-	 *
-	 * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
-	 * Provide a name=>value pair for service-slug=>endpoint.
-	 *
-	 * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
-	 * will be cached in a transient.
-	 *
-	 * @param  string $ip_address IP address.
-	 * @return string
-	 */
-	protected static function geolocate_via_api( $ip_address ) {
-
-		// Retrieve from cache...
-		$country_code = get_transient( 'geoip_' . $ip_address );
-
-		// If missing, retrieve from the API.
-		if ( false === $country_code ) {
-			$geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
-
-			if ( empty( $geoip_services ) ) {
-				return '';
-			}
-
-			$geoip_services_keys = array_keys( $geoip_services );
-
-			shuffle( $geoip_services_keys );
-
-			foreach ( $geoip_services_keys as $service_name ) {
-
-				$service_endpoint = $geoip_services[ $service_name ];
-				$response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
-				$country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
-
-				if ( ! empty( $country_code ) ) {
-					break;
-				}
+        return array(
+            'country'  => $geolocation['country'],
+            'state'    => $geolocation['state'],
+            'city'     => $geolocation['city'],
+            'postcode' => $geolocation['postcode'],
+        );
+
+    }
+
+    /**
+     * Fetches the country code from the request headers, if one is available.
+     *
+     * @since 1.0.19
+     * @return string The country code pulled from the headers, or empty string if one was not found.
+     */
+    protected static function get_country_code_from_headers() {
+        $country_code = '';
+
+        $headers = array(
+            'MM_COUNTRY_CODE',
+            'GEOIP_COUNTRY_CODE',
+            'HTTP_CF_IPCOUNTRY',
+            'HTTP_X_COUNTRY_CODE',
+        );
+
+        foreach ( $headers as $header ) {
+            if ( empty( $_SERVER[ $header ] ) ) {
+                continue;
+            }
+
+            $country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
+            break;
+        }
+
+        return $country_code;
+    }
+
+    /**
+     * Use APIs to Geolocate the user.
+     *
+     * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
+     * Provide a name=>value pair for service-slug=>endpoint.
+     *
+     * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
+     * will be cached in a transient.
+     *
+     * @param  string $ip_address IP address.
+     * @return string
+     */
+    protected static function geolocate_via_api( $ip_address ) {
+
+        // Retrieve from cache...
+        $country_code = get_transient( 'geoip_' . $ip_address );
+
+        // If missing, retrieve from the API.
+        if ( false === $country_code ) {
+            $geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
+
+            if ( empty( $geoip_services ) ) {
+                return '';
+            }
+
+            $geoip_services_keys = array_keys( $geoip_services );
+
+            shuffle( $geoip_services_keys );
+
+            foreach ( $geoip_services_keys as $service_name ) {
+
+                $service_endpoint = $geoip_services[ $service_name ];
+                $response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
+                $country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
+
+                if ( ! empty( $country_code ) ) {
+                    break;
+                }
 }
 
-			set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
-		}
+            set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
+        }
 
-		return $country_code;
-	}
+        return $country_code;
+    }
 
-	/**
-	 * Handles geolocation response
-	 *
-	 * @param  WP_Error|String $geolocation_response
-	 * @param  String $geolocation_service
-	 * @return string Country code
-	 */
-	protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
+    /**
+     * Handles geolocation response
+     *
+     * @param  WP_Error|String $geolocation_response
+     * @param  String $geolocation_service
+     * @return string Country code
+     */
+    protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
 
-		if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
-			return '';
-		}
+        if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
+            return '';
+        }
 
-		if ( $geolocation_service === 'ipinfo.io' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->country ) ? '' : $data->country;
-		}
+        if ( $geolocation_service === 'ipinfo.io' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) || empty( $data->country ) ? '' : $data->country;
+        }
 
-		if ( $geolocation_service === 'ip-api.com' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
-		}
+        if ( $geolocation_service === 'ip-api.com' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
+        }
 
-		return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
+        return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
 
-	}
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Geolocation Class.
@@ -64,30 +64,30 @@ 
 
 		$transient_name = 'external_ip_address_0.0.0.0';
 
-		if ( '' !== self::get_ip_address() ) {
-			$transient_name      = 'external_ip_address_' . self::get_ip_address();
+		if ('' !== self::get_ip_address()) {
+			$transient_name = 'external_ip_address_' . self::get_ip_address();
 		}
 
 		// Try retrieving from cache.
-		$external_ip_address = get_transient( $transient_name );
+		$external_ip_address = get_transient($transient_name);
 
-		if ( false === $external_ip_address ) {
+		if (false === $external_ip_address) {
 			$external_ip_address     = '0.0.0.0';
-			$ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
-			$ip_lookup_services_keys = array_keys( $ip_lookup_services );
-			shuffle( $ip_lookup_services_keys );
+			$ip_lookup_services      = apply_filters('getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis);
+			$ip_lookup_services_keys = array_keys($ip_lookup_services);
+			shuffle($ip_lookup_services_keys);
 
-			foreach ( $ip_lookup_services_keys as $service_name ) {
-				$service_endpoint = $ip_lookup_services[ $service_name ];
-				$response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
+			foreach ($ip_lookup_services_keys as $service_name) {
+				$service_endpoint = $ip_lookup_services[$service_name];
+				$response         = wp_safe_remote_get($service_endpoint, array('timeout' => 2));
 
-				if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
-					$external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
+				if (!is_wp_error($response) && rest_is_ip_address($response['body'])) {
+					$external_ip_address = apply_filters('getpaid_geolocation_ip_lookup_api_response', wpinv_clean($response['body']), $service_name);
 					break;
 				}
 }
 
-			set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
+			set_transient($transient_name, $external_ip_address, WEEK_IN_SECONDS);
 		}
 
 		return $external_ip_address;
@@ -101,9 +101,9 @@ 
 	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
 	 * @return array
 	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
+	public static function geolocate_ip($ip_address = '', $fallback = false, $api_fallback = true) {
 
-		if ( empty( $ip_address ) ) {
+		if (empty($ip_address)) {
 			$ip_address = self::get_ip_address();
 		}
 
@@ -111,9 +111,9 @@ 
 		self::$current_user_ip = $ip_address;
 
 		// Filter to allow custom geolocation of the IP address.
-		$country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
+		$country_code = apply_filters('getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback);
 
-		if ( false !== $country_code ) {
+		if (false !== $country_code) {
 
 			return array(
 				'country'  => $country_code,
@@ -133,7 +133,7 @@ 
 		 * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
 		 * @param string $ip_address  IP Address.
 		 */
-		$geolocation  = apply_filters(
+		$geolocation = apply_filters(
 			'getpaid_get_geolocation',
 			array(
 				'country'  => $country_code,
@@ -145,18 +145,18 @@ 
 		);
 
 		// If we still haven't found a country code, let's consider doing an API lookup.
-		if ( '' === $geolocation['country'] && $api_fallback ) {
-			$geolocation['country'] = self::geolocate_via_api( $ip_address );
+		if ('' === $geolocation['country'] && $api_fallback) {
+			$geolocation['country'] = self::geolocate_via_api($ip_address);
 		}
 
 		// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
 		// external address.
-		if ( '' === $geolocation['country'] && $fallback ) {
+		if ('' === $geolocation['country'] && $fallback) {
 			$external_ip_address = self::get_external_ip_address();
 
 			// Only bother with this if the external IP differs.
-			if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
-				return self::geolocate_ip( $external_ip_address, false, $api_fallback );
+			if ('0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address) {
+				return self::geolocate_ip($external_ip_address, false, $api_fallback);
 			}
 }
 
@@ -185,12 +185,12 @@ 
 			'HTTP_X_COUNTRY_CODE',
 		);
 
-		foreach ( $headers as $header ) {
-			if ( empty( $_SERVER[ $header ] ) ) {
+		foreach ($headers as $header) {
+			if (empty($_SERVER[$header])) {
 				continue;
 			}
 
-			$country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
+			$country_code = strtoupper(sanitize_text_field(wp_unslash($_SERVER[$header])));
 			break;
 		}
 
@@ -209,35 +209,35 @@ 
 	 * @param  string $ip_address IP address.
 	 * @return string
 	 */
-	protected static function geolocate_via_api( $ip_address ) {
+	protected static function geolocate_via_api($ip_address) {
 
 		// Retrieve from cache...
-		$country_code = get_transient( 'geoip_' . $ip_address );
+		$country_code = get_transient('geoip_' . $ip_address);
 
 		// If missing, retrieve from the API.
-		if ( false === $country_code ) {
-			$geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
+		if (false === $country_code) {
+			$geoip_services = apply_filters('getpaid_geolocation_geoip_apis', self::$geoip_apis);
 
-			if ( empty( $geoip_services ) ) {
+			if (empty($geoip_services)) {
 				return '';
 			}
 
-			$geoip_services_keys = array_keys( $geoip_services );
+			$geoip_services_keys = array_keys($geoip_services);
 
-			shuffle( $geoip_services_keys );
+			shuffle($geoip_services_keys);
 
-			foreach ( $geoip_services_keys as $service_name ) {
+			foreach ($geoip_services_keys as $service_name) {
 
-				$service_endpoint = $geoip_services[ $service_name ];
-				$response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
-				$country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
+				$service_endpoint = $geoip_services[$service_name];
+				$response         = wp_safe_remote_get(sprintf($service_endpoint, $ip_address), array('timeout' => 2));
+				$country_code     = sanitize_text_field(strtoupper(self::handle_geolocation_response($response, $service_name)));
 
-				if ( ! empty( $country_code ) ) {
+				if (!empty($country_code)) {
 					break;
 				}
 }
 
-			set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
+			set_transient('geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS);
 		}
 
 		return $country_code;
@@ -250,23 +250,23 @@ 
 	 * @param  String $geolocation_service
 	 * @return string Country code
 	 */
-	protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
+	protected static function handle_geolocation_response($geolocation_response, $geolocation_service) {
 
-		if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
+		if (is_wp_error($geolocation_response) || empty($geolocation_response['body'])) {
 			return '';
 		}
 
-		if ( $geolocation_service === 'ipinfo.io' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->country ) ? '' : $data->country;
+		if ($geolocation_service === 'ipinfo.io') {
+			$data = json_decode($geolocation_response['body']);
+			return empty($data) || empty($data->country) ? '' : $data->country;
 		}
 
-		if ( $geolocation_service === 'ip-api.com' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
+		if ($geolocation_service === 'ip-api.com') {
+			$data = json_decode($geolocation_response['body']);
+			return empty($data) || empty($data->countryCode) ? '' : $data->countryCode;
 		}
 
-		return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
+		return apply_filters('getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body']);
 
 	}