AyeCode / invoicing

includes/geolocation/class-getpaid-maxmind-database-service.php

Indentation +149 added lines, -149 removed lines

@@ -13,154 +13,154 @@
  */
 class GetPaid_MaxMind_Database_Service {
 
-	/**
-	 * The name of the MaxMind database to utilize.
-	 */
-	const DATABASE = 'GeoLite2-Country';
-
-	/**
-	 * The extension for the MaxMind database.
-	 */
-	const DATABASE_EXTENSION = '.mmdb';
-
-	/**
-	 * A prefix for the MaxMind database filename.
-	 *
-	 * @var string
-	 */
-	private $database_prefix;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param string|null $database_prefix A prefix for the MaxMind database filename.
-	 */
-	public function __construct( $database_prefix ) {
-		$this->database_prefix = $database_prefix;
-	}
-
-	/**
-	 * Fetches the path that the database should be stored.
-	 *
-	 * @return string The local database path.
-	 */
-	public function get_database_path() {
-		$uploads_dir = wp_upload_dir();
-
-		$database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
-		if ( ! empty( $this->database_prefix ) ) {
-			$database_path .= $this->database_prefix . '-';
-		}
-		$database_path .= self::DATABASE . self::DATABASE_EXTENSION;
-
-		// Filter the geolocation database storage path.
-		return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
-	}
-
-	/**
-	 * Fetches the database from the MaxMind service.
-	 *
-	 * @param string $license_key The license key to be used when downloading the database.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	public function download_database( $license_key ) {
-
-		$download_uri = add_query_arg(
-			array(
-				'edition_id'  => self::DATABASE,
-				'license_key' => urlencode( wpinv_clean( $license_key ) ),
-				'suffix'      => 'tar.gz',
-			),
-			'https://download.maxmind.com/app/geoip_download'
-		);
-
-		// Needed for the download_url call right below.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
-
-		$tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
-
-		if ( is_wp_error( $tmp_archive_path ) ) {
-			// Transform the error into something more informative.
-			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
-				return new WP_Error(
-					'getpaid_maxmind_geolocation_database_license_key',
-					__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
-				);
-			}
-
-			return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
-		}
-
-		// Extract the database from the archive.
-		return $this->extract_downloaded_database( $tmp_archive_path );
-
-	}
-
-	/**
-	 * Extracts the downloaded database.
-	 *
-	 * @param string $tmp_archive_path The database archive path.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	protected function extract_downloaded_database( $tmp_archive_path ) {
-
-		// Extract the database from the archive.
-		$tmp_database_path = '';
-
-		try {
-
-			$file              = new PharData( $tmp_archive_path );
-			$tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
-
-			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
-				true
-			);
-
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
-		} finally {
-			// Remove the archive since we only care about a single file in it.
-			unlink( $tmp_archive_path );
-		}
-
-		return $tmp_database_path;
-	}
-
-	/**
-	 * Fetches the ISO country code associated with an IP address.
-	 *
-	 * @param string $ip_address The IP address to find the country code for.
-	 * @return string The country code for the IP address, or empty if not found.
-	 */
-	public function get_iso_country_code_for_ip( $ip_address ) {
-		$country_code = '';
-
-		if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
-			return $country_code;
-		}
-
-		$database_path = $this->get_database_path();
-		if ( ! file_exists( $database_path ) ) {
-			return $country_code;
-		}
-
-		try {
-			$reader = new MaxMind\Db\Reader( $database_path );
-			$data   = $reader->get( $ip_address );
-
-			if ( isset( $data['country']['iso_code'] ) ) {
-				$country_code = $data['country']['iso_code'];
-			}
-
-			$reader->close();
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
-		}
-
-		return $country_code;
-	}
+    /**
+     * The name of the MaxMind database to utilize.
+     */
+    const DATABASE = 'GeoLite2-Country';
+
+    /**
+     * The extension for the MaxMind database.
+     */
+    const DATABASE_EXTENSION = '.mmdb';
+
+    /**
+     * A prefix for the MaxMind database filename.
+     *
+     * @var string
+     */
+    private $database_prefix;
+
+    /**
+     * Class constructor.
+     *
+     * @param string|null $database_prefix A prefix for the MaxMind database filename.
+     */
+    public function __construct( $database_prefix ) {
+        $this->database_prefix = $database_prefix;
+    }
+
+    /**
+     * Fetches the path that the database should be stored.
+     *
+     * @return string The local database path.
+     */
+    public function get_database_path() {
+        $uploads_dir = wp_upload_dir();
+
+        $database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
+        if ( ! empty( $this->database_prefix ) ) {
+            $database_path .= $this->database_prefix . '-';
+        }
+        $database_path .= self::DATABASE . self::DATABASE_EXTENSION;
+
+        // Filter the geolocation database storage path.
+        return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
+    }
+
+    /**
+     * Fetches the database from the MaxMind service.
+     *
+     * @param string $license_key The license key to be used when downloading the database.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    public function download_database( $license_key ) {
+
+        $download_uri = add_query_arg(
+            array(
+                'edition_id'  => self::DATABASE,
+                'license_key' => urlencode( wpinv_clean( $license_key ) ),
+                'suffix'      => 'tar.gz',
+            ),
+            'https://download.maxmind.com/app/geoip_download'
+        );
+
+        // Needed for the download_url call right below.
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+
+        $tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
+
+        if ( is_wp_error( $tmp_archive_path ) ) {
+            // Transform the error into something more informative.
+            $error_data = $tmp_archive_path->get_error_data();
+            if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
+                return new WP_Error(
+                    'getpaid_maxmind_geolocation_database_license_key',
+                    __( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+                );
+            }
+
+            return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+        }
+
+        // Extract the database from the archive.
+        return $this->extract_downloaded_database( $tmp_archive_path );
+
+    }
+
+    /**
+     * Extracts the downloaded database.
+     *
+     * @param string $tmp_archive_path The database archive path.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    protected function extract_downloaded_database( $tmp_archive_path ) {
+
+        // Extract the database from the archive.
+        $tmp_database_path = '';
+
+        try {
+
+            $file              = new PharData( $tmp_archive_path );
+            $tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
+
+            $file->extractTo(
+                dirname( $tmp_archive_path ),
+                trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
+                true
+            );
+
+        } catch ( Exception $exception ) {
+            return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+        } finally {
+            // Remove the archive since we only care about a single file in it.
+            unlink( $tmp_archive_path );
+        }
+
+        return $tmp_database_path;
+    }
+
+    /**
+     * Fetches the ISO country code associated with an IP address.
+     *
+     * @param string $ip_address The IP address to find the country code for.
+     * @return string The country code for the IP address, or empty if not found.
+     */
+    public function get_iso_country_code_for_ip( $ip_address ) {
+        $country_code = '';
+
+        if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
+            return $country_code;
+        }
+
+        $database_path = $this->get_database_path();
+        if ( ! file_exists( $database_path ) ) {
+            return $country_code;
+        }
+
+        try {
+            $reader = new MaxMind\Db\Reader( $database_path );
+            $data   = $reader->get( $ip_address );
+
+            if ( isset( $data['country']['iso_code'] ) ) {
+                $country_code = $data['country']['iso_code'];
+            }
+
+            $reader->close();
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
+        }
+
+        return $country_code;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The service class responsible for interacting with MaxMind databases.
@@ -35,7 +35,7 @@ 
 	 *
 	 * @param string|null $database_prefix A prefix for the MaxMind database filename.
 	 */
-	public function __construct( $database_prefix ) {
+	public function __construct($database_prefix) {
 		$this->database_prefix = $database_prefix;
 	}
 
@@ -47,14 +47,14 @@ 
 	public function get_database_path() {
 		$uploads_dir = wp_upload_dir();
 
-		$database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
-		if ( ! empty( $this->database_prefix ) ) {
+		$database_path = trailingslashit($uploads_dir['basedir']) . 'invoicing/';
+		if (!empty($this->database_prefix)) {
 			$database_path .= $this->database_prefix . '-';
 		}
 		$database_path .= self::DATABASE . self::DATABASE_EXTENSION;
 
 		// Filter the geolocation database storage path.
-		return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
+		return apply_filters('getpaid_maxmind_geolocation_database_path', $database_path);
 	}
 
 	/**
@@ -63,12 +63,12 @@ 
 	 * @param string $license_key The license key to be used when downloading the database.
 	 * @return string|WP_Error The path to the database file or an error if invalid.
 	 */
-	public function download_database( $license_key ) {
+	public function download_database($license_key) {
 
 		$download_uri = add_query_arg(
 			array(
 				'edition_id'  => self::DATABASE,
-				'license_key' => urlencode( wpinv_clean( $license_key ) ),
+				'license_key' => urlencode(wpinv_clean($license_key)),
 				'suffix'      => 'tar.gz',
 			),
 			'https://download.maxmind.com/app/geoip_download'
@@ -77,23 +77,23 @@ 
 		// Needed for the download_url call right below.
 		require_once ABSPATH . 'wp-admin/includes/file.php';
 
-		$tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
+		$tmp_archive_path = download_url(esc_url_raw($download_uri));
 
-		if ( is_wp_error( $tmp_archive_path ) ) {
+		if (is_wp_error($tmp_archive_path)) {
 			// Transform the error into something more informative.
 			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
+			if (isset($error_data['code']) && $error_data['code'] == 401) {
 				return new WP_Error(
 					'getpaid_maxmind_geolocation_database_license_key',
-					__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+					__('The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing')
 				);
 			}
 
-			return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+			return new WP_Error('getpaid_maxmind_geolocation_database_download', __('Failed to download the MaxMind database.', 'invoicing'));
 		}
 
 		// Extract the database from the archive.
-		return $this->extract_downloaded_database( $tmp_archive_path );
+		return $this->extract_downloaded_database($tmp_archive_path);
 
 	}
 
@@ -103,27 +103,27 @@ 
 	 * @param string $tmp_archive_path The database archive path.
 	 * @return string|WP_Error The path to the database file or an error if invalid.
 	 */
-	protected function extract_downloaded_database( $tmp_archive_path ) {
+	protected function extract_downloaded_database($tmp_archive_path) {
 
 		// Extract the database from the archive.
 		$tmp_database_path = '';
 
 		try {
 
-			$file              = new PharData( $tmp_archive_path );
-			$tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
+			$file              = new PharData($tmp_archive_path);
+			$tmp_database_path = trailingslashit(dirname($tmp_archive_path)) . trailingslashit($file->current()->getFilename()) . self::DATABASE . self::DATABASE_EXTENSION;
 
 			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
+				dirname($tmp_archive_path),
+				trailingslashit($file->current()->getFilename()) . self::DATABASE . self::DATABASE_EXTENSION,
 				true
 			);
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+		} catch (Exception $exception) {
+			return new WP_Error('invoicing_maxmind_geolocation_database_archive', $exception->getMessage());
 		} finally {
 			// Remove the archive since we only care about a single file in it.
-			unlink( $tmp_archive_path );
+			unlink($tmp_archive_path);
 		}
 
 		return $tmp_database_path;
@@ -135,29 +135,29 @@ 
 	 * @param string $ip_address The IP address to find the country code for.
 	 * @return string The country code for the IP address, or empty if not found.
 	 */
-	public function get_iso_country_code_for_ip( $ip_address ) {
+	public function get_iso_country_code_for_ip($ip_address) {
 		$country_code = '';
 
-		if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
+		if (!class_exists('MaxMind\Db\Reader')) {
 			return $country_code;
 		}
 
 		$database_path = $this->get_database_path();
-		if ( ! file_exists( $database_path ) ) {
+		if (!file_exists($database_path)) {
 			return $country_code;
 		}
 
 		try {
-			$reader = new MaxMind\Db\Reader( $database_path );
-			$data   = $reader->get( $ip_address );
+			$reader = new MaxMind\Db\Reader($database_path);
+			$data   = $reader->get($ip_address);
 
-			if ( isset( $data['country']['iso_code'] ) ) {
+			if (isset($data['country']['iso_code'])) {
 				$country_code = $data['country']['iso_code'];
 			}
 
 			$reader->close();
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), 'SOURCE: MaxMind GeoLocation');
 		}
 
 		return $country_code;

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

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -16,11 +16,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,
@@ -35,7 +35,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);
 
 	}
 
@@ -45,30 +45,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)),
 				);
 
 			}
@@ -76,11 +76,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'),
 			);
 
 		}
@@ -94,10 +94,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,
@@ -111,7 +111,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'gateway' );
+		return wp_list_pluck($this->stats, 'gateway');
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( $this->get_labels() ); ?>,
-								'datasets': [ <?php echo wp_json_encode( $this->get_data() ); ?> ]
+								'labels': <?php echo wp_json_encode($this->get_labels()); ?>,
+								'datasets': [ <?php echo wp_json_encode($this->get_data()); ?> ]
 							},
 							options: {
 								legend: {

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
-	}
+    }
 
 }

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

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Discounts Class.
@@ -16,11 +16,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,
@@ -36,7 +36,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);
 
 	}
 
@@ -46,30 +46,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),
 				);
 
 			}
@@ -77,11 +77,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'),
 			);
 
 		}
@@ -95,10 +95,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,
@@ -112,7 +112,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
+		return wp_list_pluck($this->stats, 'discount_code');
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( $this->get_labels() ); ?>,
-								'datasets': [ <?php echo wp_json_encode( $this->get_data() ); ?> ]
+								'labels': <?php echo wp_json_encode($this->get_labels()); ?>,
+								'datasets': [ <?php echo wp_json_encode($this->get_data()); ?> ]
 							},
 							options: {
 								legend: {

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
-	}
+    }
 
 }

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

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -16,12 +16,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,
@@ -38,7 +38,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);
 
 	}
 
@@ -48,30 +48,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),
 				);
 
 			}
@@ -79,11 +79,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'),
 			);
 
 		}
@@ -97,10 +97,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,
@@ -114,7 +114,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'item_name' );
+		return wp_list_pluck($this->stats, 'item_name');
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( $this->get_labels() ); ?>,
-								'datasets': [ <?php echo wp_json_encode( $this->get_data() ); ?> ]
+								'labels': <?php echo wp_json_encode($this->get_labels()); ?>,
+								'datasets': [ <?php echo wp_json_encode($this->get_data()); ?> ]
 							},
 							options: {
 								legend: {

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
-	}
+    }
 
 }

includes/reports/class-getpaid-graph-downloader.php

Indentation +205 added lines, -205 removed lines

@@ -12,219 +12,219 @@
  */
 class GetPaid_Graph_Downloader {
 
-	/**
-	 * @var GetPaid_Reports_Report
-	 */
-	public $handler;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		$this->handler = new GetPaid_Reports_Report();
-	}
-
-	/**
-	 * Prepares the datastore handler.
-	 *
-	 * @return GetPaid_Reports_Report_Items|GetPaid_Reports_Report_Gateways|GetPaid_Reports_Report_Discounts
-	 */
-	public function prepare_handler( $graph ) {
-
-		if ( empty( $this->handler->views[ $graph ] ) ) {
-			wp_die( __( 'Invalid Graph', 'invoicing' ), 400 );
-		}
-
-		return new $this->handler->views[ $graph ]['class']();
-
-	}
-
-	/**
-	 * Prepares the output stream.
-	 *
-	 * @return resource
-	 */
-	public function prepare_output() {
-
-		$output  = fopen( 'php://output', 'w' );
-
-		if ( false === $output ) {
-			wp_die( __( 'Unsupported server', 'invoicing' ), 500 );
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Prepares the file type.
-	 *
-	 * @return string
-	 */
-	public function prepare_file_type( $graph ) {
-
-		$file_type = empty( $_REQUEST['file_type'] ) ? 'csv' : sanitize_text_field( $_REQUEST['file_type'] );
-		$file_name = wpinv_sanitize_key( "getpaid-$graph-" . current_time( 'Y-m-d' ) );
-
-		header( "Content-Type:application/$file_type" );
-		header( "Content-Disposition:attachment;filename=$file_name.$file_type" );
-
-		return $file_type;
-	}
-
-	/**
-	 * Handles the actual download.
-	 *
-	 */
-	public function download( $graph ) {
-		global $wpdb;
-
-		$handler   = $this->prepare_handler( $graph );
-		$stream    = $this->prepare_output();
-		$stats     = $wpdb->get_results( $handler->get_sql( $handler->get_range() ) );
-		$headers   = array( $handler->field, 'total', 'total_raw' );
-		$file_type = $this->prepare_file_type( $graph );
-
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $stats, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $stats, $stream, $headers );
-		} else {
-			$this->download_json( $stats, $stream, $headers );
-		}
-
-		fclose( $stream );
-		exit;
-	}
-
-	/**
-	 * Downloads graph as csv
-	 *
-	 * @param array $stats The stats being downloaded.
-	 * @param resource $stream The stream to output to.
-	 * @param array $headers The fields to stream.
-	 * @since       1.0.19
-	 */
-	public function download_csv( $stats, $stream, $headers ) {
-
-		// Output the csv column headers.
-		fputcsv( $stream, $headers );
-
-		// Loop through 
-		foreach ( $stats as $stat ) {
-			$row  = array_values( $this->prepare_row( $stat, $headers ) );
-			$row  = array_map( 'maybe_serialize', $row );
-			fputcsv( $stream, $row );
-		}
-
-	}
-
-	/**
-	 * Downloads graph as json
-	 *
-	 * @param array $stats The stats being downloaded.
-	 * @param resource $stream The stream to output to.
-	 * @param array $headers The fields to stream.
-	 * @since       1.0.19
-	 */
-	public function download_json( $stats, $stream, $headers ) {
-
-		$prepared = array();
-
-		// Loop through 
-		foreach ( $stats as $stat ) {
-			$prepared[] = $this->prepare_row( $stat, $headers );
-		}
-
-		fwrite( $stream, wp_json_encode( $prepared ) );
-
-	}
-
-	/**
-	 * Downloads graph as xml
-	 *
-	 * @param array $stats The stats being downloaded.
-	 * @param resource $stream The stream to output to.
-	 * @param array $headers The fields to stream.
-	 * @since       1.0.19
-	 */
-	public function download_xml( $stats, $stream, $headers ) {
-
-		$prepared = array();
-
-		// Loop through 
-		foreach ( $stats as $stat ) {
-			$prepared[] = $this->prepare_row( $stat, $headers );
-		}
-
-		$xml = new SimpleXMLElement('<?xml version="1.0"?><data></data>');
-		$this->convert_array_xml( $prepared, $xml );
-
-		fwrite( $stream, $xml->asXML() );
-
-	}
-
-	/**
-	 * Converts stats array to xml
-	 *
-	 * @access      public
-	 * @since      1.0.19
-	 */
-	public function convert_array_xml( $data, $xml ) {
-
-		// Loop through 
-		foreach ( $data as $key => $value ) {
-
-			$key = preg_replace( "/[^A-Za-z0-9_\-]/", '', $key );
-
-			if ( is_array( $value ) ) {
-
-				if ( is_numeric( $key ) ){
-					$key = 'item'.$key; //dealing with <0/>..<n/> issues
-				}
-
-				$subnode = $xml->addChild( $key );
-				$this->convert_array_xml( $value, $subnode );
-
-			} else {
-				$xml->addChild( $key, htmlspecialchars( $value ) );
-			}
-
-		}
+    /**
+     * @var GetPaid_Reports_Report
+     */
+    public $handler;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        $this->handler = new GetPaid_Reports_Report();
+    }
+
+    /**
+     * Prepares the datastore handler.
+     *
+     * @return GetPaid_Reports_Report_Items|GetPaid_Reports_Report_Gateways|GetPaid_Reports_Report_Discounts
+     */
+    public function prepare_handler( $graph ) {
+
+        if ( empty( $this->handler->views[ $graph ] ) ) {
+            wp_die( __( 'Invalid Graph', 'invoicing' ), 400 );
+        }
+
+        return new $this->handler->views[ $graph ]['class']();
+
+    }
+
+    /**
+     * Prepares the output stream.
+     *
+     * @return resource
+     */
+    public function prepare_output() {
+
+        $output  = fopen( 'php://output', 'w' );
+
+        if ( false === $output ) {
+            wp_die( __( 'Unsupported server', 'invoicing' ), 500 );
+        }
+
+        return $output;
+    }
+
+    /**
+     * Prepares the file type.
+     *
+     * @return string
+     */
+    public function prepare_file_type( $graph ) {
+
+        $file_type = empty( $_REQUEST['file_type'] ) ? 'csv' : sanitize_text_field( $_REQUEST['file_type'] );
+        $file_name = wpinv_sanitize_key( "getpaid-$graph-" . current_time( 'Y-m-d' ) );
+
+        header( "Content-Type:application/$file_type" );
+        header( "Content-Disposition:attachment;filename=$file_name.$file_type" );
+
+        return $file_type;
+    }
+
+    /**
+     * Handles the actual download.
+     *
+     */
+    public function download( $graph ) {
+        global $wpdb;
+
+        $handler   = $this->prepare_handler( $graph );
+        $stream    = $this->prepare_output();
+        $stats     = $wpdb->get_results( $handler->get_sql( $handler->get_range() ) );
+        $headers   = array( $handler->field, 'total', 'total_raw' );
+        $file_type = $this->prepare_file_type( $graph );
+
+        if ( 'csv' == $file_type ) {
+            $this->download_csv( $stats, $stream, $headers );
+        } else if( 'xml' == $file_type ) {
+            $this->download_xml( $stats, $stream, $headers );
+        } else {
+            $this->download_json( $stats, $stream, $headers );
+        }
+
+        fclose( $stream );
+        exit;
+    }
+
+    /**
+     * Downloads graph as csv
+     *
+     * @param array $stats The stats being downloaded.
+     * @param resource $stream The stream to output to.
+     * @param array $headers The fields to stream.
+     * @since       1.0.19
+     */
+    public function download_csv( $stats, $stream, $headers ) {
+
+        // Output the csv column headers.
+        fputcsv( $stream, $headers );
+
+        // Loop through 
+        foreach ( $stats as $stat ) {
+            $row  = array_values( $this->prepare_row( $stat, $headers ) );
+            $row  = array_map( 'maybe_serialize', $row );
+            fputcsv( $stream, $row );
+        }
+
+    }
+
+    /**
+     * Downloads graph as json
+     *
+     * @param array $stats The stats being downloaded.
+     * @param resource $stream The stream to output to.
+     * @param array $headers The fields to stream.
+     * @since       1.0.19
+     */
+    public function download_json( $stats, $stream, $headers ) {
+
+        $prepared = array();
+
+        // Loop through 
+        foreach ( $stats as $stat ) {
+            $prepared[] = $this->prepare_row( $stat, $headers );
+        }
+
+        fwrite( $stream, wp_json_encode( $prepared ) );
+
+    }
+
+    /**
+     * Downloads graph as xml
+     *
+     * @param array $stats The stats being downloaded.
+     * @param resource $stream The stream to output to.
+     * @param array $headers The fields to stream.
+     * @since       1.0.19
+     */
+    public function download_xml( $stats, $stream, $headers ) {
+
+        $prepared = array();
+
+        // Loop through 
+        foreach ( $stats as $stat ) {
+            $prepared[] = $this->prepare_row( $stat, $headers );
+        }
+
+        $xml = new SimpleXMLElement('<?xml version="1.0"?><data></data>');
+        $this->convert_array_xml( $prepared, $xml );
+
+        fwrite( $stream, $xml->asXML() );
+
+    }
+
+    /**
+     * Converts stats array to xml
+     *
+     * @access      public
+     * @since      1.0.19
+     */
+    public function convert_array_xml( $data, $xml ) {
+
+        // Loop through 
+        foreach ( $data as $key => $value ) {
+
+            $key = preg_replace( "/[^A-Za-z0-9_\-]/", '', $key );
+
+            if ( is_array( $value ) ) {
+
+                if ( is_numeric( $key ) ){
+                    $key = 'item'.$key; //dealing with <0/>..<n/> issues
+                }
+
+                $subnode = $xml->addChild( $key );
+                $this->convert_array_xml( $value, $subnode );
+
+            } else {
+                $xml->addChild( $key, htmlspecialchars( $value ) );
+            }
+
+        }
 
-	}
-
-	/**
-	 * Prepares a single row for download.
-	 *
-	 * @param stdClass|array $row The row to prepare..
-	 * @param array $fields The fields to stream.
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function prepare_row( $row, $fields ) {
+    }
+
+    /**
+     * Prepares a single row for download.
+     *
+     * @param stdClass|array $row The row to prepare..
+     * @param array $fields The fields to stream.
+     * @since       1.0.19
+     * @return array
+     */
+    public function prepare_row( $row, $fields ) {
 
-		$prepared = array();
-		$row      = (array) $row;
+        $prepared = array();
+        $row      = (array) $row;
 
-		foreach ( $fields as $field ) {
+        foreach ( $fields as $field ) {
 
-			if ( $field === 'total' ) {
-				$prepared[ $field ] = html_entity_decode( strip_tags( wpinv_price( $row['total'] ) ), ENT_QUOTES );
-				continue;
-			}
+            if ( $field === 'total' ) {
+                $prepared[ $field ] = html_entity_decode( strip_tags( wpinv_price( $row['total'] ) ), ENT_QUOTES );
+                continue;
+            }
 
-			if ( $field === 'total_raw' ) {
-				$prepared[ $field ] = wpinv_round_amount( wpinv_sanitize_amount( $row['total'] ) );
-				continue;
-			}
+            if ( $field === 'total_raw' ) {
+                $prepared[ $field ] = wpinv_round_amount( wpinv_sanitize_amount( $row['total'] ) );
+                continue;
+            }
 
-			$prepared[ $field ] = strip_tags( $row[ $field ] );
+            $prepared[ $field ] = strip_tags( $row[ $field ] );
 
-		}
+        }
 
-		return $prepared;
-	}
+        return $prepared;
+    }
 
 
 }

Spacing +56 added lines, -56 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Graph_Downloader Class.
@@ -30,13 +30,13 @@ 
 	 *
 	 * @return GetPaid_Reports_Report_Items|GetPaid_Reports_Report_Gateways|GetPaid_Reports_Report_Discounts
 	 */
-	public function prepare_handler( $graph ) {
+	public function prepare_handler($graph) {
 
-		if ( empty( $this->handler->views[ $graph ] ) ) {
-			wp_die( __( 'Invalid Graph', 'invoicing' ), 400 );
+		if (empty($this->handler->views[$graph])) {
+			wp_die(__('Invalid Graph', 'invoicing'), 400);
 		}
 
-		return new $this->handler->views[ $graph ]['class']();
+		return new $this->handler->views[$graph]['class']();
 
 	}
 
@@ -47,10 +47,10 @@ 
 	 */
 	public function prepare_output() {
 
-		$output  = fopen( 'php://output', 'w' );
+		$output = fopen('php://output', 'w');
 
-		if ( false === $output ) {
-			wp_die( __( 'Unsupported server', 'invoicing' ), 500 );
+		if (false === $output) {
+			wp_die(__('Unsupported server', 'invoicing'), 500);
 		}
 
 		return $output;
@@ -61,13 +61,13 @@ 
 	 *
 	 * @return string
 	 */
-	public function prepare_file_type( $graph ) {
+	public function prepare_file_type($graph) {
 
-		$file_type = empty( $_REQUEST['file_type'] ) ? 'csv' : sanitize_text_field( $_REQUEST['file_type'] );
-		$file_name = wpinv_sanitize_key( "getpaid-$graph-" . current_time( 'Y-m-d' ) );
+		$file_type = empty($_REQUEST['file_type']) ? 'csv' : sanitize_text_field($_REQUEST['file_type']);
+		$file_name = wpinv_sanitize_key("getpaid-$graph-" . current_time('Y-m-d'));
 
-		header( "Content-Type:application/$file_type" );
-		header( "Content-Disposition:attachment;filename=$file_name.$file_type" );
+		header("Content-Type:application/$file_type");
+		header("Content-Disposition:attachment;filename=$file_name.$file_type");
 
 		return $file_type;
 	}
@@ -76,24 +76,24 @@ 
 	 * Handles the actual download.
 	 *
 	 */
-	public function download( $graph ) {
+	public function download($graph) {
 		global $wpdb;
 
-		$handler   = $this->prepare_handler( $graph );
+		$handler   = $this->prepare_handler($graph);
 		$stream    = $this->prepare_output();
-		$stats     = $wpdb->get_results( $handler->get_sql( $handler->get_range() ) );
-		$headers   = array( $handler->field, 'total', 'total_raw' );
-		$file_type = $this->prepare_file_type( $graph );
-
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $stats, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $stats, $stream, $headers );
+		$stats     = $wpdb->get_results($handler->get_sql($handler->get_range()));
+		$headers   = array($handler->field, 'total', 'total_raw');
+		$file_type = $this->prepare_file_type($graph);
+
+		if ('csv' == $file_type) {
+			$this->download_csv($stats, $stream, $headers);
+		} else if ('xml' == $file_type) {
+			$this->download_xml($stats, $stream, $headers);
 		} else {
-			$this->download_json( $stats, $stream, $headers );
+			$this->download_json($stats, $stream, $headers);
 		}
 
-		fclose( $stream );
+		fclose($stream);
 		exit;
 	}
 
@@ -105,16 +105,16 @@ 
 	 * @param array $headers The fields to stream.
 	 * @since       1.0.19
 	 */
-	public function download_csv( $stats, $stream, $headers ) {
+	public function download_csv($stats, $stream, $headers) {
 
 		// Output the csv column headers.
-		fputcsv( $stream, $headers );
+		fputcsv($stream, $headers);
 
 		// Loop through 
-		foreach ( $stats as $stat ) {
-			$row  = array_values( $this->prepare_row( $stat, $headers ) );
-			$row  = array_map( 'maybe_serialize', $row );
-			fputcsv( $stream, $row );
+		foreach ($stats as $stat) {
+			$row  = array_values($this->prepare_row($stat, $headers));
+			$row  = array_map('maybe_serialize', $row);
+			fputcsv($stream, $row);
 		}
 
 	}
@@ -127,16 +127,16 @@ 
 	 * @param array $headers The fields to stream.
 	 * @since       1.0.19
 	 */
-	public function download_json( $stats, $stream, $headers ) {
+	public function download_json($stats, $stream, $headers) {
 
 		$prepared = array();
 
 		// Loop through 
-		foreach ( $stats as $stat ) {
-			$prepared[] = $this->prepare_row( $stat, $headers );
+		foreach ($stats as $stat) {
+			$prepared[] = $this->prepare_row($stat, $headers);
 		}
 
-		fwrite( $stream, wp_json_encode( $prepared ) );
+		fwrite($stream, wp_json_encode($prepared));
 
 	}
 
@@ -148,19 +148,19 @@ 
 	 * @param array $headers The fields to stream.
 	 * @since       1.0.19
 	 */
-	public function download_xml( $stats, $stream, $headers ) {
+	public function download_xml($stats, $stream, $headers) {
 
 		$prepared = array();
 
 		// Loop through 
-		foreach ( $stats as $stat ) {
-			$prepared[] = $this->prepare_row( $stat, $headers );
+		foreach ($stats as $stat) {
+			$prepared[] = $this->prepare_row($stat, $headers);
 		}
 
 		$xml = new SimpleXMLElement('<?xml version="1.0"?><data></data>');
-		$this->convert_array_xml( $prepared, $xml );
+		$this->convert_array_xml($prepared, $xml);
 
-		fwrite( $stream, $xml->asXML() );
+		fwrite($stream, $xml->asXML());
 
 	}
 
@@ -170,24 +170,24 @@ 
 	 * @access      public
 	 * @since      1.0.19
 	 */
-	public function convert_array_xml( $data, $xml ) {
+	public function convert_array_xml($data, $xml) {
 
 		// Loop through 
-		foreach ( $data as $key => $value ) {
+		foreach ($data as $key => $value) {
 
-			$key = preg_replace( "/[^A-Za-z0-9_\-]/", '', $key );
+			$key = preg_replace("/[^A-Za-z0-9_\-]/", '', $key);
 
-			if ( is_array( $value ) ) {
+			if (is_array($value)) {
 
-				if ( is_numeric( $key ) ){
-					$key = 'item'.$key; //dealing with <0/>..<n/> issues
+				if (is_numeric($key)) {
+					$key = 'item' . $key; //dealing with <0/>..<n/> issues
 				}
 
-				$subnode = $xml->addChild( $key );
-				$this->convert_array_xml( $value, $subnode );
+				$subnode = $xml->addChild($key);
+				$this->convert_array_xml($value, $subnode);
 
 			} else {
-				$xml->addChild( $key, htmlspecialchars( $value ) );
+				$xml->addChild($key, htmlspecialchars($value));
 			}
 
 		}
@@ -202,24 +202,24 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function prepare_row( $row, $fields ) {
+	public function prepare_row($row, $fields) {
 
 		$prepared = array();
 		$row      = (array) $row;
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
-			if ( $field === 'total' ) {
-				$prepared[ $field ] = html_entity_decode( strip_tags( wpinv_price( $row['total'] ) ), ENT_QUOTES );
+			if ($field === 'total') {
+				$prepared[$field] = html_entity_decode(strip_tags(wpinv_price($row['total'])), ENT_QUOTES);
 				continue;
 			}
 
-			if ( $field === 'total_raw' ) {
-				$prepared[ $field ] = wpinv_round_amount( wpinv_sanitize_amount( $row['total'] ) );
+			if ($field === 'total_raw') {
+				$prepared[$field] = wpinv_round_amount(wpinv_sanitize_amount($row['total']));
 				continue;
 			}
 
-			$prepared[ $field ] = strip_tags( $row[ $field ] );
+			$prepared[$field] = strip_tags($row[$field]);
 
 		}
 

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

Indentation +153 added lines, -153 removed lines

@@ -12,46 +12,46 @@ 
  */
 class GetPaid_Reports_Export {
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-
-		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
-		}
-		echo "</div>";
-
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $post_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
-
-	}
-
-	/**
-	 * Displays a single post type export card.
-	 *
-	 */
-	public function display_post_type_export( $post_type ) {
-
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+
+        echo "<div class='row mt-4' style='max-width: 920px;' >";
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $this->display_post_type_export( $post_type );
+        }
+        echo "</div>";
+
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $post_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'export_invoices',
+                    'post_type'            => urlencode( $post_type ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
+
+    }
+
+    /**
+     * Displays a single post type export card.
+     *
+     */
+    public function display_post_type_export( $post_type ) {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -59,11 +59,11 @@ 
 				<div class="card-header">
 					<strong>
 						<?php
-							printf(
-								__( 'Export %s', 'invoicing' ),
-								sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
-							);
-						?>
+                            printf(
+                                __( 'Export %s', 'invoicing' ),
+                                sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
+                            );
+                        ?>
 					</strong>
 				</div>
 
@@ -72,12 +72,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->display_markup( $this->generate_from_date( $post_type ) );
+                            $this->display_markup( $this->generate_to_date( $post_type ) );
+                            $this->display_markup( $this->generate_post_status_select( $post_type ) );
+                            $this->display_markup( $this->generate_file_type_select( $post_type ) );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -88,107 +88,107 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Generates the from date input field.
-	 *
-	 */
-	public function generate_from_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'name'       => 'from_date',
-				'id'         => esc_attr( "$post_type-from_date" ),
-				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'From Date', 'invoicing' ),
-				'label_type' => 'vertical',
-				'label_class' => 'd-block',
-				'type'       => 'datepicker',
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to date input field.
-	 *
-	 */
-	public function generate_to_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'name'       => 'to_date',
-				'id'         => esc_attr( "$post_type-to_date" ),
-				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'To Date', 'invoicing' ),
-				'label_type' => 'vertical',
-				'label_class' => 'd-block',
-				'type'       => 'datepicker',
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to post status select field.
-	 *
-	 */
-	public function generate_post_status_select( $post_type ) {
-
-		return aui()->select(
-			array(
-				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => wpinv_get_invoice_statuses( true, false, $post_type ),
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to file type select field.
-	 *
-	 */
-	public function generate_file_type_select( $post_type ) {
-
-		return aui()->select(
-			array(
-				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Displays a field's markup.
-	 *
-	 */
-	public function display_markup( $markup ) {
-
-		echo str_replace(
-			array(
-				'form-control',
-				'custom-select'
-			),
-			'regular-text',
-			$markup
-		);
-
-	}
+    }
+
+    /**
+     * Generates the from date input field.
+     *
+     */
+    public function generate_from_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'name'       => 'from_date',
+                'id'         => esc_attr( "$post_type-from_date" ),
+                'placeholder'=> 'yy-mm-dd',
+                'label'      => __( 'From Date', 'invoicing' ),
+                'label_type' => 'vertical',
+                'label_class' => 'd-block',
+                'type'       => 'datepicker',
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to date input field.
+     *
+     */
+    public function generate_to_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'name'       => 'to_date',
+                'id'         => esc_attr( "$post_type-to_date" ),
+                'placeholder'=> 'yy-mm-dd',
+                'label'      => __( 'To Date', 'invoicing' ),
+                'label_type' => 'vertical',
+                'label_class' => 'd-block',
+                'type'       => 'datepicker',
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to post status select field.
+     *
+     */
+    public function generate_post_status_select( $post_type ) {
+
+        return aui()->select(
+            array(
+                'name'        => 'status',
+                'id'          => esc_attr( "$post_type-status" ),
+                'placeholder' => __( 'All Statuses', 'invoicing' ),
+                'label'       => __( 'Status', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => wpinv_get_invoice_statuses( true, false, $post_type ),
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to file type select field.
+     *
+     */
+    public function generate_file_type_select( $post_type ) {
+
+        return aui()->select(
+            array(
+                'name'        => 'file_type',
+                'id'          => esc_attr( "$post_type-file_type" ),
+                'placeholder' => __( 'Select File Type', 'invoicing' ),
+                'label'       => __( 'Export File', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => array(
+                    'csv'  => __( 'CSV', 'invoicing' ),
+                    'xml'  => __( 'XML', 'invoicing' ),
+                    'json' => __( 'JSON', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Displays a field's markup.
+     *
+     */
+    public function display_markup( $markup ) {
+
+        echo str_replace(
+            array(
+                'form-control',
+                'custom-select'
+            ),
+            'regular-text',
+            $markup
+        );
+
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Export Class.
@@ -19,8 +19,8 @@ 
 	public function display() {
 
 		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$this->display_post_type_export($post_type);
 		}
 		echo "</div>";
 
@@ -30,13 +30,13 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $post_type ) {
+	public function get_download_url($post_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
+					'post_type'            => urlencode($post_type),
 				)
 			),
 			'getpaid-nonce',
@@ -49,7 +49,7 @@ 
 	 * Displays a single post type export card.
 	 *
 	 */
-	public function display_post_type_export( $post_type ) {
+	public function display_post_type_export($post_type) {
 
 		?>
 
@@ -60,8 +60,8 @@ 
 					<strong>
 						<?php
 							printf(
-								__( 'Export %s', 'invoicing' ),
-								sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
+								__('Export %s', 'invoicing'),
+								sanitize_text_field(getpaid_get_post_type_label($post_type))
 							);
 						?>
 					</strong>
@@ -69,14 +69,14 @@ 
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url($post_type)); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date($post_type));
+							$this->display_markup($this->generate_to_date($post_type));
+							$this->display_markup($this->generate_post_status_select($post_type));
+							$this->display_markup($this->generate_file_type_select($post_type));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>
@@ -94,14 +94,14 @@ 
 	 * Generates the from date input field.
 	 *
 	 */
-	public function generate_from_date( $post_type ) {
+	public function generate_from_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'from_date',
-				'id'         => esc_attr( "$post_type-from_date" ),
+				'id'         => esc_attr("$post_type-from_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'From Date', 'invoicing' ),
+				'label'      => __('From Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -114,14 +114,14 @@ 
 	 * Generates the to date input field.
 	 *
 	 */
-	public function generate_to_date( $post_type ) {
+	public function generate_to_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'to_date',
-				'id'         => esc_attr( "$post_type-to_date" ),
+				'id'         => esc_attr("$post_type-to_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'To Date', 'invoicing' ),
+				'label'      => __('To Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -134,17 +134,17 @@ 
 	 * Generates the to post status select field.
 	 *
 	 */
-	public function generate_post_status_select( $post_type ) {
+	public function generate_post_status_select($post_type) {
 
 		return aui()->select(
 			array(
 				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
+				'id'          => esc_attr("$post_type-status"),
+				'placeholder' => __('All Statuses', 'invoicing'),
+				'label'       => __('Status', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
-				'options'     => wpinv_get_invoice_statuses( true, false, $post_type ),
+				'options'     => wpinv_get_invoice_statuses(true, false, $post_type),
 			)
 		);
 
@@ -154,20 +154,20 @@ 
 	 * Generates the to file type select field.
 	 *
 	 */
-	public function generate_file_type_select( $post_type ) {
+	public function generate_file_type_select($post_type) {
 
 		return aui()->select(
 			array(
 				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
+				'id'          => esc_attr("$post_type-file_type"),
+				'placeholder' => __('Select File Type', 'invoicing'),
+				'label'       => __('Export File', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
+					'csv'  => __('CSV', 'invoicing'),
+					'xml'  => __('XML', 'invoicing'),
+					'json' => __('JSON', 'invoicing'),
 				),
 			)
 		);
@@ -178,7 +178,7 @@ 
 	 * Displays a field's markup.
 	 *
 	 */
-	public function display_markup( $markup ) {
+	public function display_markup($markup) {
 
 		echo str_replace(
 			array(

templates/payment-forms/elements/pay_button.php

Spacing +9 added lines, -9 removed lines

@@ -7,20 +7,20 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$class = empty( $class ) ? 'btn-primary' : sanitize_html_class( $class );
-$label = empty( $label ) ? esc_attr__( 'Pay %price% »', 'invoicing' ) : esc_attr( $label );
-$free  = empty( $free ) ? esc_attr__( 'Continue »', 'invoicing' ) : esc_attr( $free );
+$class = empty($class) ? 'btn-primary' : sanitize_html_class($class);
+$label = empty($label) ? esc_attr__('Pay %price% »', 'invoicing') : esc_attr($label);
+$free  = empty($free) ? esc_attr__('Continue »', 'invoicing') : esc_attr($free);
 
-do_action( 'getpaid_before_payment_form_pay_button', $form );
+do_action('getpaid_before_payment_form_pay_button', $form);
 
 echo aui()->input(
     array(
-        'name'             => esc_attr( $id ),
-        'id'               => esc_attr( $id ) . uniqid( '_' ),
+        'name'             => esc_attr($id),
+        'id'               => esc_attr($id) . uniqid('_'),
         'value'            => $label,
-        'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
+        'help_text'        => empty($description) ? '' : wp_kses_post($description),
         'type'             => 'submit',
         'class'            => 'getpaid-payment-form-submit btn btn-block submit-button ' . $class,
         'extra_attributes' => array(
@@ -30,4 +30,4 @@ 
     )
 );
 
-do_action( 'getpaid_after_payment_form_pay_button', $form );
\ No newline at end of file
+do_action('getpaid_after_payment_form_pay_button', $form);
\ No newline at end of file

includes/wpinv-tax-functions.php

Braces +3 added lines, -2 removed lines

@@ -256,8 +256,9 @@
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
-        return false;
+    if( !wpinv_is_cart_taxed() ) {
+            return false;
+    }
 
     return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
 }

Indentation +8 added lines, -8 removed lines

@@ -215,16 +215,16 @@ 
 function getpaid_prepare_item_tax( $item, $tax_name, $tax_amount, $recurring_tax_amount ) {
 
     $initial_tax   = $tax_amount;
-	$recurring_tax = 0;
+    $recurring_tax = 0;
 
     if ( $item->is_recurring() ) {
-		$recurring_tax = $recurring_tax_amount;
-	}
+        $recurring_tax = $recurring_tax_amount;
+    }
 
-	return array(
-		'name'          => sanitize_text_field( $tax_name ),
-		'initial_tax'   => $initial_tax,
-		'recurring_tax' => $recurring_tax,
+    return array(
+        'name'          => sanitize_text_field( $tax_name ),
+        'initial_tax'   => $initial_tax,
+        'recurring_tax' => $recurring_tax,
     );
 
 }
@@ -328,7 +328,7 @@ 
  */
 function wpinv_should_validate_vat_number() {
     $validate = wpinv_get_option( 'validate_vat_number' );
-	return ! empty( $validate );
+    return ! empty( $validate );
 }
 
 function wpinv_sales_tax_for_year( $year = null ) {

Spacing +120 added lines, -120 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of eu states.
@@ -12,7 +12,7 @@ 
  * @return array
  */
 function getpaid_get_eu_states() {
-    return wpinv_get_data( 'eu-states' );
+    return wpinv_get_data('eu-states');
 }
 
 /**
@@ -20,8 +20,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_eu_state( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_eu_states() ) ? true : false;
+function getpaid_is_eu_state($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_eu_states()) ? true : false;
 }
 
 /**
@@ -30,7 +30,7 @@ 
  * @return array
  */
 function getpaid_get_gst_states() {
-    return array( 'AU', 'NZ', 'CA', 'CN' );
+    return array('AU', 'NZ', 'CA', 'CN');
 }
 
 /**
@@ -38,8 +38,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_gst_country( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_gst_states() ) ? true : false;
+function getpaid_is_gst_country($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_gst_states()) ? true : false;
 }
 
 /**
@@ -49,8 +49,8 @@ 
  */
 function wpinv_use_taxes() {
 
-    $ret = wpinv_get_option( 'enable_taxes', false );
-    return (bool) apply_filters( 'wpinv_use_taxes', ! empty( $ret ) );
+    $ret = wpinv_get_option('enable_taxes', false);
+    return (bool) apply_filters('wpinv_use_taxes', !empty($ret));
 
 }
 
@@ -60,7 +60,7 @@ 
  * @param WPInv_Invoice $invoice
  * @return bool
  */
-function wpinv_is_invoice_taxable( $invoice ) {
+function wpinv_is_invoice_taxable($invoice) {
     return $invoice->is_taxable();
 }
 
@@ -70,11 +70,11 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_is_country_taxable( $country ) {
-    $is_eu     = getpaid_is_eu_state( $country );
-    $is_exempt = ! $is_eu && wpinv_is_base_country( $country ) && wpinv_same_country_exempt_vat();
+function wpinv_is_country_taxable($country) {
+    $is_eu     = getpaid_is_eu_state($country);
+    $is_exempt = !$is_eu && wpinv_is_base_country($country) && wpinv_same_country_exempt_vat();
 
-    return (bool) apply_filters( 'wpinv_is_country_taxable', ! $is_exempt, $country ); 
+    return (bool) apply_filters('wpinv_is_country_taxable', !$is_exempt, $country); 
 
 }
 
@@ -84,7 +84,7 @@ 
  * @param WPInv_Item|GetPaid_Form_Item $item
  * @return bool
  */
-function wpinv_is_item_taxable( $item ) {
+function wpinv_is_item_taxable($item) {
     return '_exempt' != $item->get_vat_rule();
 }
 
@@ -94,8 +94,8 @@ 
  * @return bool
  */
 function wpinv_use_store_address_as_tax_base() {
-    $use_base = wpinv_get_option( 'tax_base', 'billing' ) == 'base';
-    return (bool) apply_filters( 'wpinv_use_store_address_as_tax_base', $use_base );
+    $use_base = wpinv_get_option('tax_base', 'billing') == 'base';
+    return (bool) apply_filters('wpinv_use_store_address_as_tax_base', $use_base);
 }
 
 /**
@@ -104,8 +104,8 @@ 
  * @return bool
  */
 function wpinv_prices_include_tax() {
-    $is_inclusive = wpinv_get_option( 'prices_include_tax', 'no' ) == 'yes';
-    return (bool) apply_filters( 'wpinv_prices_include_tax', $is_inclusive );
+    $is_inclusive = wpinv_get_option('prices_include_tax', 'no') == 'yes';
+    return (bool) apply_filters('wpinv_prices_include_tax', $is_inclusive);
 }
 
 /**
@@ -114,8 +114,8 @@ 
  * @return bool
  */
 function wpinv_round_tax_per_tax_rate() {
-    $subtotal_rounding = wpinv_get_option( 'tax_subtotal_rounding', 1 );
-    return (bool) apply_filters( 'wpinv_round_tax_per_tax_rate', empty( $subtotal_rounding ) );
+    $subtotal_rounding = wpinv_get_option('tax_subtotal_rounding', 1);
+    return (bool) apply_filters('wpinv_round_tax_per_tax_rate', empty($subtotal_rounding));
 }
 
 /**
@@ -124,8 +124,8 @@ 
  * @return bool
  */
 function wpinv_display_individual_tax_rates() {
-    $individual = wpinv_get_option( 'tax_display_totals', 'single' ) == 'individual';
-    return (bool) apply_filters( 'wpinv_display_individual_tax_rates', $individual );
+    $individual = wpinv_get_option('tax_display_totals', 'single') == 'individual';
+    return (bool) apply_filters('wpinv_display_individual_tax_rates', $individual);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @return float
  */
 function wpinv_get_default_tax_rate() {
-    $rate = wpinv_get_option( 'tax_rate', 0 );
-    return (float) apply_filters( 'wpinv_get_default_tax_rate', floatval( $rate ) );
+    $rate = wpinv_get_option('tax_rate', 0);
+    return (float) apply_filters('wpinv_get_default_tax_rate', floatval($rate));
 }
 
 /**
@@ -144,7 +144,7 @@ 
  * @return bool
  */
 function wpinv_same_country_exempt_vat() {
-    return 'no' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' );
+    return 'no' == wpinv_get_option('vat_same_country_rule', 'vat_too');
 }
 
 /**
@@ -164,28 +164,28 @@ 
  * @param string $state
  * @return array
  */
-function getpaid_get_item_tax_rates( $item, $country = '', $state = '' ) {
+function getpaid_get_item_tax_rates($item, $country = '', $state = '') {
 
     // Abort if the item is not taxable.
-    if ( ! wpinv_is_item_taxable( $item ) ) {
+    if (!wpinv_is_item_taxable($item)) {
         return array();
     }
 
     // Maybe use the store address.
-    if ( wpinv_use_store_address_as_tax_base() ) {
+    if (wpinv_use_store_address_as_tax_base()) {
         $country = wpinv_get_default_country();
         $state   = wpinv_get_default_state();
     }
 
     // Retrieve tax rates.
-    $tax_rates = GetPaid_Tax::get_address_tax_rates( $country, $state );
+    $tax_rates = GetPaid_Tax::get_address_tax_rates($country, $state);
 
     // Fallback to the default tax rates if non were found.
-    if ( empty( $tax_rates ) ) {
+    if (empty($tax_rates)) {
         $tax_rates = GetPaid_Tax::get_default_tax_rates();
     }
 
-    return apply_filters( 'getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state );
+    return apply_filters('getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state);
 }
 
 /**
@@ -195,23 +195,23 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_filter_item_tax_rates( $item, $rates ) {
+function getpaid_filter_item_tax_rates($item, $rates) {
 
     $tax_class = $item->get_vat_class();
 
-    foreach ( $rates as $i => $rate ) {
+    foreach ($rates as $i => $rate) {
 
-        if ( $tax_class == '_reduced' ) {
-            $rates[ $i ]['rate'] = empty( $rate['reduced_rate'] ) ? 0 : $rate['reduced_rate'];
+        if ($tax_class == '_reduced') {
+            $rates[$i]['rate'] = empty($rate['reduced_rate']) ? 0 : $rate['reduced_rate'];
         }
 
-        if ( $tax_class == '_exempt' ) {
-            $rates[ $i ]['rate'] = 0;
+        if ($tax_class == '_exempt') {
+            $rates[$i]['rate'] = 0;
         }
 
     }
 
-    return apply_filters( 'getpaid_filter_item_tax_rates', $rates, $item );
+    return apply_filters('getpaid_filter_item_tax_rates', $rates, $item);
 }
 
 /**
@@ -221,12 +221,12 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_calculate_item_taxes( $amount, $rates ) {
+function getpaid_calculate_item_taxes($amount, $rates) {
 
     $is_inclusive = wpinv_prices_include_tax();
-    $taxes        = GetPaid_Tax::calc_tax( $amount, $rates, $is_inclusive );
+    $taxes        = GetPaid_Tax::calc_tax($amount, $rates, $is_inclusive);
 
-    return apply_filters( 'getpaid_calculate_taxes', $taxes, $amount, $rates );
+    return apply_filters('getpaid_calculate_taxes', $taxes, $amount, $rates);
 }
 
 /**
@@ -238,17 +238,17 @@ 
  * @param float $recurring_tax_amount
  * @return array
  */
-function getpaid_prepare_item_tax( $item, $tax_name, $tax_amount, $recurring_tax_amount ) {
+function getpaid_prepare_item_tax($item, $tax_name, $tax_amount, $recurring_tax_amount) {
 
-    $initial_tax   = $tax_amount;
+    $initial_tax = $tax_amount;
 	$recurring_tax = 0;
 
-    if ( $item->is_recurring() ) {
+    if ($item->is_recurring()) {
 		$recurring_tax = $recurring_tax_amount;
 	}
 
 	return array(
-		'name'          => sanitize_text_field( $tax_name ),
+		'name'          => sanitize_text_field($tax_name),
 		'initial_tax'   => $initial_tax,
 		'recurring_tax' => $recurring_tax,
     );
@@ -261,8 +261,8 @@ 
  * @param string $vat_number
  * @return string
  */
-function wpinv_sanitize_vat_number( $vat_number ) {
-    return str_replace( array(' ', '.', '-', '_', ',' ), '', strtoupper( trim( $vat_number ) ) );
+function wpinv_sanitize_vat_number($vat_number) {
+    return str_replace(array(' ', '.', '-', '_', ','), '', strtoupper(trim($vat_number)));
 }
 
 /**
@@ -271,22 +271,22 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_regex_validate_vat_number( $vat_number ) {
+function wpinv_regex_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
-    $regexes    = wpinv_get_data( 'vat-number-regexes' );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
+    $regexes    = wpinv_get_data('vat-number-regexes');
 
-    if ( isset( $regexes[ $country ] ) ) {
+    if (isset($regexes[$country])) {
 
-        $regex = $regexes[ $country ];
+        $regex = $regexes[$country];
         $regex = '/^(?:' . $regex . ')$/';
-        return 1 === preg_match( $regex, $vatin );
+        return 1 === preg_match($regex, $vatin);
 
     }
 
     // Not an EU state, use filters to validate the number.
-    return apply_filters( 'wpinv_regex_validate_vat_number', true, $vat_number );
+    return apply_filters('wpinv_regex_validate_vat_number', true, $vat_number);
 }
 
 /**
@@ -295,29 +295,29 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_vies_validate_vat_number( $vat_number ) {
+function wpinv_vies_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
 
     $url        = add_query_arg(
         array(
-            'ms'  => urlencode( $country ),
-            'iso' => urlencode( $country ),
-            'vat' => urlencode( $vatin ),
+            'ms'  => urlencode($country),
+            'iso' => urlencode($country),
+            'vat' => urlencode($vatin),
         ),
         'http://ec.europa.eu/taxation_customs/vies/viesquer.do'
     );
 
-    $response   = wp_remote_get( $url );
-    $response   = wp_remote_retrieve_body( $response );
+    $response   = wp_remote_get($url);
+    $response   = wp_remote_retrieve_body($response);
 
     // Fallback gracefully if the VIES website is down.
-    if ( empty( $response ) ) {
+    if (empty($response)) {
         return true;
     }
 
-    return 1 !== preg_match( '/invalid VAT number/i', $response );
+    return 1 !== preg_match('/invalid VAT number/i', $response);
 
 }
 
@@ -328,18 +328,18 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_validate_vat_number( $vat_number, $country ) {
+function wpinv_validate_vat_number($vat_number, $country) {
 
     // In case the vat number does not have a country code...
-    $vat_number = wpinv_sanitize_vat_number( $vat_number );
-    $_country   = substr( $vat_number, 0, 2 );
-    $_country   = $_country == wpinv_country_name( $_country );
+    $vat_number = wpinv_sanitize_vat_number($vat_number);
+    $_country   = substr($vat_number, 0, 2);
+    $_country   = $_country == wpinv_country_name($_country);
 
-    if ( $_country ) {
-        $vat_number = strtoupper( $country ) . $vat_number;
+    if ($_country) {
+        $vat_number = strtoupper($country) . $vat_number;
     }
 
-    return wpinv_regex_validate_vat_number( $vat_number ) && wpinv_vies_validate_vat_number( $vat_number );
+    return wpinv_regex_validate_vat_number($vat_number) && wpinv_vies_validate_vat_number($vat_number);
 }
 
 /**
@@ -348,40 +348,40 @@ 
  * @return bool
  */
 function wpinv_should_validate_vat_number() {
-    $validate = wpinv_get_option( 'validate_vat_number' );
-	return ! empty( $validate );
+    $validate = wpinv_get_option('validate_vat_number');
+	return !empty($validate);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_get_sales_tax_for_year( $year ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(wpinv_get_sales_tax_for_year($year));
 }
 
-function wpinv_get_sales_tax_for_year( $year = null ) {
+function wpinv_get_sales_tax_for_year($year = null) {
     global $wpdb;
 
     // Start at zero
     $tax = 0;
 
-    if ( ! empty( $year ) ) {
+    if (!empty($year)) {
         $args = array(
             'post_type'      => 'wpi_invoice',
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'posts_per_page' => -1,
             'year'           => $year,
             'fields'         => 'ids'
         );
 
-        $payments    = get_posts( $args );
-        $payment_ids = implode( ',', $payments );
+        $payments    = get_posts($args);
+        $payment_ids = implode(',', $payments);
 
-        if ( count( $payments ) > 0 ) {
+        if (count($payments) > 0) {
             $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )";
-            $tax = $wpdb->get_var( $sql );
+            $tax = $wpdb->get_var($sql);
         }
 
     }
 
-    return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year );
+    return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year);
 }
 
 function wpinv_is_cart_taxed() {
@@ -390,33 +390,33 @@ 
 
 function wpinv_prices_show_tax_on_checkout() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret );
+    return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret);
 }
 
 function wpinv_display_tax_rate() {
-    $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false );
+    $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false);
 
-    return apply_filters( 'wpinv_display_tax_rate', $ret );
+    return apply_filters('wpinv_display_tax_rate', $ret);
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
+    if (!wpinv_is_cart_taxed())
         return false;
 
-    return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
+    return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields');
 }
 
-function wpinv_item_is_tax_exclusive( $item_id = 0 ) {
-    $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false );
-    return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id );
+function wpinv_item_is_tax_exclusive($item_id = 0) {
+    $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false);
+    return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id);
 }
 
-function wpinv_currency_decimal_filter( $decimals = 2 ) {
+function wpinv_currency_decimal_filter($decimals = 2) {
     $currency = wpinv_get_currency();
 
-    switch ( $currency ) {
+    switch ($currency) {
         case 'RIAL' :
         case 'JPY' :
         case 'TWD' :
@@ -425,13 +425,13 @@ 
             break;
     }
 
-    return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency );
+    return apply_filters('wpinv_currency_decimal_count', $decimals, $currency);
 }
 
 function wpinv_tax_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_tax_amount', $output );
+    return apply_filters('wpinv_tax_amount', $output);
 }
 
 /**
@@ -439,25 +439,25 @@ 
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_rule( $vat_rule ) {
+function getpaid_filter_vat_rule($vat_rule) {
 
-    if ( empty( $vat_rule ) ) {        
+    if (empty($vat_rule)) {        
         return 'digital';
     }
 
     return $vat_rule;
 }
-add_filter( 'wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule' );
+add_filter('wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule');
 
 /**
  * Filters the VAT class to ensure that each item has a VAT class.
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_class( $vat_class ) {
-    return empty( $vat_class ) ? '_standard' : $vat_class;
+function getpaid_filter_vat_class($vat_class) {
+    return empty($vat_class) ? '_standard' : $vat_class;
 }
-add_filter( 'wpinv_get_item_vat_class', 'getpaid_filter_vat_class' );
+add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class');
 
 /**
  * Returns a list of all tax classes.
@@ -469,9 +469,9 @@ 
     return apply_filters(
         'getpaid_tax_classes',
         array(
-            '_standard' => __( 'Standard Tax Rate', 'invoicing' ),
-            '_reduced'  => __( 'Reduced Tax Rate', 'invoicing' ),
-            '_exempt'   => __( 'Tax Exempt', 'invoicing' ),
+            '_standard' => __('Standard Tax Rate', 'invoicing'),
+            '_reduced'  => __('Reduced Tax Rate', 'invoicing'),
+            '_exempt'   => __('Tax Exempt', 'invoicing'),
         )
     );
 
@@ -487,8 +487,8 @@ 
     return apply_filters(
         'getpaid_tax_rules',
         array(
-            'physical' => __( 'Physical Item', 'invoicing' ),
-            'digital'  => __( 'Digital Item', 'invoicing' ),
+            'physical' => __('Physical Item', 'invoicing'),
+            'digital'  => __('Digital Item', 'invoicing'),
         )
     );
 
@@ -500,15 +500,15 @@ 
  * @param string $tax_class
  * @return string
  */
-function getpaid_get_tax_class_label( $tax_class ) {
+function getpaid_get_tax_class_label($tax_class) {
 
     $classes = getpaid_get_tax_classes();
 
-    if ( isset( $classes[ $tax_class ] ) ) {
-        return sanitize_text_field( $classes[ $tax_class ] );
+    if (isset($classes[$tax_class])) {
+        return sanitize_text_field($classes[$tax_class]);
     }
 
-    return sanitize_text_field( $tax_class );
+    return sanitize_text_field($tax_class);
 
 }
 
@@ -518,15 +518,15 @@ 
  * @param string $tax_rule
  * @return string
  */
-function getpaid_get_tax_rule_label( $tax_rule ) {
+function getpaid_get_tax_rule_label($tax_rule) {
 
     $rules = getpaid_get_tax_rules();
 
-    if ( isset( $rules[ $tax_rule ] ) ) {
-        return sanitize_text_field( $rules[ $tax_rule ] );
+    if (isset($rules[$tax_rule])) {
+        return sanitize_text_field($rules[$tax_rule]);
     }
 
-    return sanitize_text_field( $tax_rule );
+    return sanitize_text_field($tax_rule);
 
 }
 
@@ -537,11 +537,11 @@ 
  * @param string $recurring
  * @return string
  */
-function getpaid_get_taxable_amount( $item, $recurring = false ) {
+function getpaid_get_taxable_amount($item, $recurring = false) {
 
     $taxable_amount  = $recurring ? $item->get_recurring_sub_total() : $item->get_sub_total();
     $taxable_amount -= $recurring ? $item->recurring_item_discount : $item->item_discount;
-    $taxable_amount  = max( 0, $taxable_amount );
-    return apply_filters( 'getpaid_taxable_amount', $taxable_amount, $item, $recurring );
+    $taxable_amount  = max(0, $taxable_amount);
+    return apply_filters('getpaid_taxable_amount', $taxable_amount, $item, $recurring);
 
 }

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

Indentation +189 added lines, -189 removed lines

@@ -12,194 +12,194 @@
  */
 class GetPaid_Invoice_Exporter extends GetPaid_Graph_Downloader {
 
-	/**
-	 * Retrieves invoices query args.
-	 * 
-	 * @param string $post_type post type to retrieve.
-	 * @param array $args Args to search for.
-	 * @return array
-	 */
-	public function get_invoice_query_args( $post_type, $args ) {
-
-		$query_args = array(
-			'post_type'              => $post_type,
-			'post_status'            => array_keys( wpinv_get_invoice_statuses( true, false, $post_type ) ),
-			'posts_per_page'         => -1,
-			'no_found_rows'          => true,
-			'update_post_term_cache' => false,
-			'fields'                 => 'ids',
-		);
-
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], $query_args['post_status'], true ) ) {
-			$query_args['post_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_query'] = array( $date_query );
-		}
-
-		return $query_args;
-	}
-
-	/**
-	 * Retrieves invoices.
-	 * 
-	 * @param array $query_args WP_Query args.
-	 * @return WPInv_Invoice[]
-	 */
-	public function get_invoices( $query_args ) {
-
-		// Get invoices.
-		$invoices = new WP_Query( $query_args );
-
-		// Prepare the results.
-		return array_map( 'wpinv_get_invoice', $invoices->posts );
-
-	}
-
-	/**
-	 * Handles the actual download.
-	 *
-	 */
-	public function export( $post_type, $args ) {
-
-		$invoices  = $this->get_invoices( $this->get_invoice_query_args( $post_type, $args ) );
-		$stream    = $this->prepare_output();
-		$headers   = $this->get_export_fields( $post_type );
-		$file_type = $this->prepare_file_type( strtolower( getpaid_get_post_type_label( $post_type ) ) );
-
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $invoices, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $invoices, $stream, $headers );
-		} else {
-			$this->download_json( $invoices, $stream, $headers );
-		}
-
-		fclose( $stream );
-		exit;
-	}
-
-	/**
-	 * Prepares a single invoice for download.
-	 *
-	 * @param WPInv_Invoice $invoice The invoice to prepare..
-	 * @param array $fields The fields to stream.
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function prepare_row( $invoice, $fields ) {
-
-		$prepared      = array();
-		$amount_fields = $this->get_amount_fields( $invoice->get_post_type() );
-
-		foreach ( $fields as $field ) {
-
-			$value  = '';
-			$method = "get_$field";
-
-			if ( method_exists( $invoice, $method ) ) {
-				$value  = $invoice->$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.
-	 *
-	 * @param string $post_type
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_export_fields( $post_type ) {
-
-		$fields = array(
-			'id',
-			'parent_id',
-			'status',
-			'date_created',
-			'date_modified',
-			'date_due',
-			'date_completed',
-			'number',
-			'key',
-			'description',
-			'post_type',
-			'mode',
-			'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',
-			'subtotal',
-			'total_discount',
-			'total_tax',
-			'total_fees',
-			'fees',
-			'discounts',
-			'taxes',
-			'cart_details',
-			'item_ids',
-			'payment_form',
-			'discount_code',
-			'gateway',
-			'transaction_id',
-			'currency',
-			'disable_taxes',
-			'subscription_id',
-			'remote_subscription_id',
-			'is_viewed',
-			'email_cc',
-			'template',
-			'created_via'
-    	);
-
-		return apply_filters( 'getpaid_invoice_exporter_get_fields', $fields, $post_type );
-	}
-
-	/**
-	 * Retrieves amount fields.
-	 *
-	 * @param string $post_type
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_amount_fields( $post_type ) {
-
-		$fields = array(
-			'subtotal',
-			'total_discount',
-			'total_tax',
-			'total_fees'
-    	);
-
-		return apply_filters( 'getpaid_invoice_exporter_get_amount_fields', $fields, $post_type );
-	}
+    /**
+     * Retrieves invoices query args.
+     * 
+     * @param string $post_type post type to retrieve.
+     * @param array $args Args to search for.
+     * @return array
+     */
+    public function get_invoice_query_args( $post_type, $args ) {
+
+        $query_args = array(
+            'post_type'              => $post_type,
+            'post_status'            => array_keys( wpinv_get_invoice_statuses( true, false, $post_type ) ),
+            'posts_per_page'         => -1,
+            'no_found_rows'          => true,
+            'update_post_term_cache' => false,
+            'fields'                 => 'ids',
+        );
+
+        if ( ! empty( $args['status'] ) && in_array( $args['status'], $query_args['post_status'], true ) ) {
+            $query_args['post_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_query'] = array( $date_query );
+        }
+
+        return $query_args;
+    }
+
+    /**
+     * Retrieves invoices.
+     * 
+     * @param array $query_args WP_Query args.
+     * @return WPInv_Invoice[]
+     */
+    public function get_invoices( $query_args ) {
+
+        // Get invoices.
+        $invoices = new WP_Query( $query_args );
+
+        // Prepare the results.
+        return array_map( 'wpinv_get_invoice', $invoices->posts );
+
+    }
+
+    /**
+     * Handles the actual download.
+     *
+     */
+    public function export( $post_type, $args ) {
+
+        $invoices  = $this->get_invoices( $this->get_invoice_query_args( $post_type, $args ) );
+        $stream    = $this->prepare_output();
+        $headers   = $this->get_export_fields( $post_type );
+        $file_type = $this->prepare_file_type( strtolower( getpaid_get_post_type_label( $post_type ) ) );
+
+        if ( 'csv' == $file_type ) {
+            $this->download_csv( $invoices, $stream, $headers );
+        } else if( 'xml' == $file_type ) {
+            $this->download_xml( $invoices, $stream, $headers );
+        } else {
+            $this->download_json( $invoices, $stream, $headers );
+        }
+
+        fclose( $stream );
+        exit;
+    }
+
+    /**
+     * Prepares a single invoice for download.
+     *
+     * @param WPInv_Invoice $invoice The invoice to prepare..
+     * @param array $fields The fields to stream.
+     * @since       1.0.19
+     * @return array
+     */
+    public function prepare_row( $invoice, $fields ) {
+
+        $prepared      = array();
+        $amount_fields = $this->get_amount_fields( $invoice->get_post_type() );
+
+        foreach ( $fields as $field ) {
+
+            $value  = '';
+            $method = "get_$field";
+
+            if ( method_exists( $invoice, $method ) ) {
+                $value  = $invoice->$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.
+     *
+     * @param string $post_type
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_export_fields( $post_type ) {
+
+        $fields = array(
+            'id',
+            'parent_id',
+            'status',
+            'date_created',
+            'date_modified',
+            'date_due',
+            'date_completed',
+            'number',
+            'key',
+            'description',
+            'post_type',
+            'mode',
+            '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',
+            'subtotal',
+            'total_discount',
+            'total_tax',
+            'total_fees',
+            'fees',
+            'discounts',
+            'taxes',
+            'cart_details',
+            'item_ids',
+            'payment_form',
+            'discount_code',
+            'gateway',
+            'transaction_id',
+            'currency',
+            'disable_taxes',
+            'subscription_id',
+            'remote_subscription_id',
+            'is_viewed',
+            'email_cc',
+            'template',
+            'created_via'
+        );
+
+        return apply_filters( 'getpaid_invoice_exporter_get_fields', $fields, $post_type );
+    }
+
+    /**
+     * Retrieves amount fields.
+     *
+     * @param string $post_type
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_amount_fields( $post_type ) {
+
+        $fields = array(
+            'subtotal',
+            'total_discount',
+            'total_tax',
+            'total_fees'
+        );
+
+        return apply_filters( 'getpaid_invoice_exporter_get_amount_fields', $fields, $post_type );
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Invoice_Exporter Class.
@@ -19,33 +19,33 @@ 
 	 * @param array $args Args to search for.
 	 * @return array
 	 */
-	public function get_invoice_query_args( $post_type, $args ) {
+	public function get_invoice_query_args($post_type, $args) {
 
 		$query_args = array(
 			'post_type'              => $post_type,
-			'post_status'            => array_keys( wpinv_get_invoice_statuses( true, false, $post_type ) ),
+			'post_status'            => array_keys(wpinv_get_invoice_statuses(true, false, $post_type)),
 			'posts_per_page'         => -1,
 			'no_found_rows'          => true,
 			'update_post_term_cache' => false,
 			'fields'                 => 'ids',
 		);
 
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], $query_args['post_status'], true ) ) {
-			$query_args['post_status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+		if (!empty($args['status']) && in_array($args['status'], $query_args['post_status'], true)) {
+			$query_args['post_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_query'] = array( $date_query );
+			$query_args['date_query'] = array($date_query);
 		}
 
 		return $query_args;
@@ -57,13 +57,13 @@ 
 	 * @param array $query_args WP_Query args.
 	 * @return WPInv_Invoice[]
 	 */
-	public function get_invoices( $query_args ) {
+	public function get_invoices($query_args) {
 
 		// Get invoices.
-		$invoices = new WP_Query( $query_args );
+		$invoices = new WP_Query($query_args);
 
 		// Prepare the results.
-		return array_map( 'wpinv_get_invoice', $invoices->posts );
+		return array_map('wpinv_get_invoice', $invoices->posts);
 
 	}
 
@@ -71,22 +71,22 @@ 
 	 * Handles the actual download.
 	 *
 	 */
-	public function export( $post_type, $args ) {
+	public function export($post_type, $args) {
 
-		$invoices  = $this->get_invoices( $this->get_invoice_query_args( $post_type, $args ) );
+		$invoices  = $this->get_invoices($this->get_invoice_query_args($post_type, $args));
 		$stream    = $this->prepare_output();
-		$headers   = $this->get_export_fields( $post_type );
-		$file_type = $this->prepare_file_type( strtolower( getpaid_get_post_type_label( $post_type ) ) );
+		$headers   = $this->get_export_fields($post_type);
+		$file_type = $this->prepare_file_type(strtolower(getpaid_get_post_type_label($post_type)));
 
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $invoices, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $invoices, $stream, $headers );
+		if ('csv' == $file_type) {
+			$this->download_csv($invoices, $stream, $headers);
+		} else if ('xml' == $file_type) {
+			$this->download_xml($invoices, $stream, $headers);
 		} else {
-			$this->download_json( $invoices, $stream, $headers );
+			$this->download_json($invoices, $stream, $headers);
 		}
 
-		fclose( $stream );
+		fclose($stream);
 		exit;
 	}
 
@@ -98,25 +98,25 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function prepare_row( $invoice, $fields ) {
+	public function prepare_row($invoice, $fields) {
 
 		$prepared      = array();
-		$amount_fields = $this->get_amount_fields( $invoice->get_post_type() );
+		$amount_fields = $this->get_amount_fields($invoice->get_post_type());
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			$value  = '';
 			$method = "get_$field";
 
-			if ( method_exists( $invoice, $method ) ) {
-				$value  = $invoice->$method();
+			if (method_exists($invoice, $method)) {
+				$value = $invoice->$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);
 
 		}
 
@@ -130,7 +130,7 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function get_export_fields( $post_type ) {
+	public function get_export_fields($post_type) {
 
 		$fields = array(
 			'id',
@@ -180,7 +180,7 @@ 
 			'created_via'
     	);
 
-		return apply_filters( 'getpaid_invoice_exporter_get_fields', $fields, $post_type );
+		return apply_filters('getpaid_invoice_exporter_get_fields', $fields, $post_type);
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function get_amount_fields( $post_type ) {
+	public function get_amount_fields($post_type) {
 
 		$fields = array(
 			'subtotal',
@@ -199,7 +199,7 @@ 
 			'total_fees'
     	);
 
-		return apply_filters( 'getpaid_invoice_exporter_get_amount_fields', $fields, $post_type );
+		return apply_filters('getpaid_invoice_exporter_get_amount_fields', $fields, $post_type);
 	}
 
 }