AyeCode / invoicing

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/wpinv-helper-functions.php

Indentation +53 added lines, -53 removed lines

@@ -97,13 +97,13 @@ 
  */
 function wpinv_get_invoice_statuses( $draft = false, $trashed = false, $invoice = false ) {
 
-	$invoice_statuses = array(
-		'wpi-pending'    => _x( 'Pending payment', 'Invoice status', 'invoicing' ),
+    $invoice_statuses = array(
+        'wpi-pending'    => _x( 'Pending payment', 'Invoice status', 'invoicing' ),
         'publish'        => _x( 'Paid', 'Invoice status', 'invoicing' ),
         'wpi-processing' => _x( 'Processing', 'Invoice status', 'invoicing' ),
-		'wpi-onhold'     => _x( 'On hold', 'Invoice status', 'invoicing' ),
-		'wpi-cancelled'  => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-		'wpi-refunded'   => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'wpi-onhold'     => _x( 'On hold', 'Invoice status', 'invoicing' ),
+        'wpi-cancelled'  => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'wpi-refunded'   => _x( 'Refunded', 'Invoice status', 'invoicing' ),
         'wpi-failed'     => _x( 'Failed', 'Invoice status', 'invoicing' ),
         'wpi-renewal'    => _x( 'Renewal Payment', 'Invoice status', 'invoicing' ),
     );
@@ -120,7 +120,7 @@ 
         $invoice = $invoice->get_post_type();
     }
 
-	return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
+    return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
 }
 
 /**
@@ -238,25 +238,25 @@ 
  * @return string
  */
 function getpaid_get_price_format() {
-	$currency_pos = wpinv_currency_position();
-	$format       = '%1$s%2$s';
-
-	switch ( $currency_pos ) {
-		case 'left':
-			$format = '%1$s%2$s';
-			break;
-		case 'right':
-			$format = '%2$s%1$s';
-			break;
-		case 'left_space':
-			$format = '%1$s %2$s';
-			break;
-		case 'right_space':
-			$format = '%2$s %1$s';
-			break;
-	}
-
-	return apply_filters( 'getpaid_price_format', $format, $currency_pos );
+    $currency_pos = wpinv_currency_position();
+    $format       = '%1$s%2$s';
+
+    switch ( $currency_pos ) {
+        case 'left':
+            $format = '%1$s%2$s';
+            break;
+        case 'right':
+            $format = '%2$s%1$s';
+            break;
+        case 'left_space':
+            $format = '%1$s %2$s';
+            break;
+        case 'right_space':
+            $format = '%2$s %1$s';
+            break;
+    }
+
+    return apply_filters( 'getpaid_price_format', $format, $currency_pos );
 }
 
 /**
@@ -359,13 +359,13 @@ 
  * @param mixed  $value Value.
  */
 function getpaid_maybe_define_constant( $name, $value ) {
-	if ( ! defined( $name ) ) {
-		define( $name, $value );
-	}
+    if ( ! defined( $name ) ) {
+        define( $name, $value );
+    }
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -716,11 +716,11 @@ 
         $list = array();
     }
 
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
 
 /**
@@ -740,9 +740,9 @@ 
     }
 
     $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-data-$key", $data, 'wpinv' );
+    wp_cache_set( "wpinv-data-$key", $data, 'wpinv' );
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -771,17 +771,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
     
     return is_string( $var ) ? sanitize_text_field( $var ) : $var;
 }
@@ -794,7 +794,7 @@ 
  */
 function getpaid_convert_price_string_to_options( $str ) {
 
-	$raw_options = array_map( 'trim', explode( ',', $str ) );
+    $raw_options = array_map( 'trim', explode( ',', $str ) );
     $options     = array();
 
     foreach ( $raw_options as $option ) {
@@ -872,7 +872,7 @@ 
  * @return string
  */
 function getpaid_date_format() {
-	return apply_filters( 'getpaid_date_format', get_option( 'date_format' ) );
+    return apply_filters( 'getpaid_date_format', get_option( 'date_format' ) );
 }
 
 /**
@@ -881,7 +881,7 @@ 
  * @return string
  */
 function getpaid_time_format() {
-	return apply_filters( 'getpaid_time_format', get_option( 'time_format' ) );
+    return apply_filters( 'getpaid_time_format', get_option( 'time_format' ) );
 }
 
 /**
@@ -894,15 +894,15 @@ 
 function getpaid_limit_length( $string, $limit ) {
     $str_limit = $limit - 3;
 
-	if ( function_exists( 'mb_strimwidth' ) ) {
-		if ( mb_strlen( $string ) > $limit ) {
-			$string = mb_strimwidth( $string, 0, $str_limit ) . '...';
-		}
-	} else {
-		if ( strlen( $string ) > $limit ) {
-			$string = substr( $string, 0, $str_limit ) . '...';
-		}
-	}
+    if ( function_exists( 'mb_strimwidth' ) ) {
+        if ( mb_strlen( $string ) > $limit ) {
+            $string = mb_strimwidth( $string, 0, $str_limit ) . '...';
+        }
+    } else {
+        if ( strlen( $string ) > $limit ) {
+            $string = substr( $string, 0, $str_limit ) . '...';
+        }
+    }
     return $string;
 
 }

Spacing +259 added lines, -259 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Are we supporting item quantities?
@@ -20,35 +20,35 @@ 
  */
 function wpinv_get_ip() {
 
-    if ( isset( $_SERVER['HTTP_X_REAL_IP'] ) ) {
-        return sanitize_text_field( wp_unslash( $_SERVER['HTTP_X_REAL_IP'] ) );
+    if (isset($_SERVER['HTTP_X_REAL_IP'])) {
+        return sanitize_text_field(wp_unslash($_SERVER['HTTP_X_REAL_IP']));
     }
 
-    if ( isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         // Proxy servers can send through this header like this: X-Forwarded-For: client1, proxy1, proxy2
         // Make sure we always only send through the first IP in the list which should always be the client IP.
-        return (string) rest_is_ip_address( trim( current( preg_split( '/,/', sanitize_text_field( wp_unslash( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) ) ) ) );
+        return (string) rest_is_ip_address(trim(current(preg_split('/,/', sanitize_text_field(wp_unslash($_SERVER['HTTP_X_FORWARDED_FOR']))))));
     }
 
-    if ( isset( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        return sanitize_text_field( wp_unslash( $_SERVER['HTTP_CLIENT_IP'] ) );
+    if (isset($_SERVER['HTTP_CLIENT_IP'])) {
+        return sanitize_text_field(wp_unslash($_SERVER['HTTP_CLIENT_IP']));
     }
 
-    if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-        return sanitize_text_field( wp_unslash( $_SERVER['REMOTE_ADDR'] ) );
+    if (isset($_SERVER['REMOTE_ADDR'])) {
+        return sanitize_text_field(wp_unslash($_SERVER['REMOTE_ADDR']));
     }
 
     return '';
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
 
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
 /**
@@ -56,23 +56,23 @@ 
  * 
  * @param string $amount The amount to sanitize.
  */
-function wpinv_sanitize_amount( $amount ) {
+function wpinv_sanitize_amount($amount) {
 
-    if ( is_numeric( $amount ) ) {
-        return floatval( $amount );
+    if (is_numeric($amount)) {
+        return floatval($amount);
     }
 
     // Separate the decimals and thousands.
-    $amount    = explode( wpinv_decimal_separator(), $amount );
+    $amount    = explode(wpinv_decimal_separator(), $amount);
 
     // Remove thousands.
-    $amount[0] = str_replace( wpinv_thousands_separator(), '', $amount[0] );
+    $amount[0] = str_replace(wpinv_thousands_separator(), '', $amount[0]);
 
     // Convert back to string.
-    $amount = count( $amount ) > 1 ? "{$amount[0]}.{$amount[1]}" : $amount[0];
+    $amount = count($amount) > 1 ? "{$amount[0]}.{$amount[1]}" : $amount[0];
 
     // Cast the remaining to a float.
-    return (float) preg_replace( '/[^0-9\.\-]/', '', $amount );
+    return (float) preg_replace('/[^0-9\.\-]/', '', $amount);
 
 }
 
@@ -82,19 +82,19 @@ 
  * @param float $amount
  * @param float|string|int|null $decimals
  */
-function wpinv_round_amount( $amount, $decimals = null, $use_sprintf = false ) {
+function wpinv_round_amount($amount, $decimals = null, $use_sprintf = false) {
 
-    if ( $decimals === null ) {
+    if ($decimals === null) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $use_sprintf ) {
-        $amount = sprintf( "%.{$decimals}f", (float) $amount );
+    if ($use_sprintf) {
+        $amount = sprintf("%.{$decimals}f", (float) $amount);
     } else {
-        $amount = round( (float) $amount, absint( $decimals ) );
+        $amount = round((float) $amount, absint($decimals));
     }
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
 /**
@@ -106,32 +106,32 @@ 
  * @param string|WPInv_Invoice $invoice The invoice object|post type|type
  * @return array
  */
-function wpinv_get_invoice_statuses( $draft = false, $trashed = false, $invoice = false ) {
+function wpinv_get_invoice_statuses($draft = false, $trashed = false, $invoice = false) {
 
 	$invoice_statuses = array(
-		'wpi-pending'    => _x( 'Pending payment', 'Invoice status', 'invoicing' ),
-        'publish'        => _x( 'Paid', 'Invoice status', 'invoicing' ),
-        'wpi-processing' => _x( 'Processing', 'Invoice status', 'invoicing' ),
-		'wpi-onhold'     => _x( 'On hold', 'Invoice status', 'invoicing' ),
-		'wpi-cancelled'  => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-		'wpi-refunded'   => _x( 'Refunded', 'Invoice status', 'invoicing' ),
-        'wpi-failed'     => _x( 'Failed', 'Invoice status', 'invoicing' ),
-        'wpi-renewal'    => _x( 'Renewal Payment', 'Invoice status', 'invoicing' ),
+		'wpi-pending'    => _x('Pending payment', 'Invoice status', 'invoicing'),
+        'publish'        => _x('Paid', 'Invoice status', 'invoicing'),
+        'wpi-processing' => _x('Processing', 'Invoice status', 'invoicing'),
+		'wpi-onhold'     => _x('On hold', 'Invoice status', 'invoicing'),
+		'wpi-cancelled'  => _x('Cancelled', 'Invoice status', 'invoicing'),
+		'wpi-refunded'   => _x('Refunded', 'Invoice status', 'invoicing'),
+        'wpi-failed'     => _x('Failed', 'Invoice status', 'invoicing'),
+        'wpi-renewal'    => _x('Renewal Payment', 'Invoice status', 'invoicing'),
     );
 
-    if ( $draft ) {
-        $invoice_statuses['draft'] = __( 'Draft', 'invoicing' );
+    if ($draft) {
+        $invoice_statuses['draft'] = __('Draft', 'invoicing');
     }
 
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    if ( $invoice instanceof WPInv_Invoice ) {
+    if ($invoice instanceof WPInv_Invoice) {
         $invoice = $invoice->get_post_type();
     }
 
-	return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
+	return apply_filters('wpinv_statuses', $invoice_statuses, $invoice);
 }
 
 /**
@@ -140,11 +140,11 @@ 
  * @param string $status The raw status
  * @param string|WPInv_Invoice $invoice The invoice object|post type|type
  */
-function wpinv_status_nicename( $status, $invoice = false ) {
-    $statuses = wpinv_get_invoice_statuses( true, true, $invoice );
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : $status;
+function wpinv_status_nicename($status, $invoice = false) {
+    $statuses = wpinv_get_invoice_statuses(true, true, $invoice);
+    $status   = isset($statuses[$status]) ? $statuses[$status] : $status;
 
-    return sanitize_text_field( $status );
+    return sanitize_text_field($status);
 }
 
 /**
@@ -152,13 +152,13 @@ 
  * 
  * @param string $current
  */
-function wpinv_get_currency( $current = '' ) {
+function wpinv_get_currency($current = '') {
 
-    if ( empty( $current ) ) {
-        $current = apply_filters( 'wpinv_currency', wpinv_get_option( 'currency', 'USD' ) );
+    if (empty($current)) {
+        $current = apply_filters('wpinv_currency', wpinv_get_option('currency', 'USD'));
     }
 
-    return trim( strtoupper( $current ) );
+    return trim(strtoupper($current));
 }
 
 /**
@@ -166,25 +166,25 @@ 
  * 
  * @param string|null $currency The currency code. Defaults to the default currency.
  */
-function wpinv_currency_symbol( $currency = null ) {
+function wpinv_currency_symbol($currency = null) {
 
     // Prepare the currency.
-    $currency = empty( $currency ) ? wpinv_get_currency() : wpinv_clean( $currency );
+    $currency = empty($currency) ? wpinv_get_currency() : wpinv_clean($currency);
 
     // Fetch all symbols.
     $symbols = wpinv_get_currency_symbols();
 
     // Fetch this currencies symbol.
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : $currency;
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : $currency;
 
     // Filter the symbol.
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 /**
@@ -192,13 +192,13 @@ 
  * 
  * @param $string|null $current
  */
-function wpinv_thousands_separator( $current = null ) {
+function wpinv_thousands_separator($current = null) {
 
-    if ( null == $current ) {
-        $current = wpinv_get_option( 'thousands_separator', ',' );
+    if (null == $current) {
+        $current = wpinv_get_option('thousands_separator', ',');
     }
 
-    return trim( $current );
+    return trim($current);
 }
 
 /**
@@ -206,13 +206,13 @@ 
  * 
  * @param $string|null $current
  */
-function wpinv_decimal_separator( $current = null ) {
+function wpinv_decimal_separator($current = null) {
 
-    if ( null == $current ) {
-        $current = wpinv_get_option( 'decimal_separator', '.' );
+    if (null == $current) {
+        $current = wpinv_get_option('decimal_separator', '.');
     }
     
-    return trim( $current );
+    return trim($current);
 }
 
 /**
@@ -220,27 +220,27 @@ 
  * 
  * @param $string|null $current
  */
-function wpinv_decimals( $current = null ) {
+function wpinv_decimals($current = null) {
 
-    if ( null == $current ) {
-        $current = wpinv_get_option( 'decimals', 2 );
+    if (null == $current) {
+        $current = wpinv_get_option('decimals', 2);
     }
     
-    return absint( $current );
+    return absint($current);
 }
 
 /**
  * Retrieves a list of all supported currencies.
  */
 function wpinv_get_currencies() {
-    return apply_filters( 'wpinv_currencies', wpinv_get_data( 'currencies' ) );
+    return apply_filters('wpinv_currencies', wpinv_get_data('currencies'));
 }
 
 /**
  * Retrieves a list of all currency symbols.
  */
 function wpinv_get_currency_symbols() {
-    return apply_filters( 'wpinv_currency_symbols', wpinv_get_data( 'currency-symbols' ) );
+    return apply_filters('wpinv_currency_symbols', wpinv_get_data('currency-symbols'));
 }
 
 /**
@@ -252,7 +252,7 @@ 
 	$currency_pos = wpinv_currency_position();
 	$format       = '%1$s%2$s';
 
-	switch ( $currency_pos ) {
+	switch ($currency_pos) {
 		case 'left':
 			$format = '%1$s%2$s';
 			break;
@@ -267,7 +267,7 @@ 
 			break;
 	}
 
-	return apply_filters( 'getpaid_price_format', $format, $currency_pos );
+	return apply_filters('getpaid_price_format', $format, $currency_pos);
 }
 
 /**
@@ -277,25 +277,25 @@ 
  * @param  string $currency Currency.
  * @return string
  */
-function wpinv_price( $amount = 0, $currency = '' ) {
+function wpinv_price($amount = 0, $currency = '') {
 
     // Backwards compatibility.
-    $amount             = wpinv_sanitize_amount( $amount );
+    $amount             = wpinv_sanitize_amount($amount);
 
     // Prepare variables.
-    $currency           = wpinv_get_currency( $currency );
+    $currency           = wpinv_get_currency($currency);
     $amount             = (float) $amount;
     $unformatted_amount = $amount;
     $negative           = $amount < 0;
-    $amount             = apply_filters( 'getpaid_raw_amount', floatval( $negative ? $amount * -1 : $amount ) );
-    $amount             = wpinv_format_amount( $amount );
+    $amount             = apply_filters('getpaid_raw_amount', floatval($negative ? $amount * -1 : $amount));
+    $amount             = wpinv_format_amount($amount);
 
     // Format the amount.
     $format             = getpaid_get_price_format();
-    $formatted_amount   = ( $negative ? '-' : '' ) . sprintf( $format, '<span class="getpaid-currency__symbol">' . wpinv_currency_symbol( $currency ) . '</span>', $amount );
+    $formatted_amount   = ($negative ? '-' : '') . sprintf($format, '<span class="getpaid-currency__symbol">' . wpinv_currency_symbol($currency) . '</span>', $amount);
 
     // Filter the formatting.
-    return apply_filters( 'wpinv_price', $formatted_amount, $amount, $currency, $unformatted_amount );
+    return apply_filters('wpinv_price', $formatted_amount, $amount, $currency, $unformatted_amount);
 }
 
 /**
@@ -306,25 +306,25 @@ 
  * @param  bool     $calculate Whether or not to apply separators.
  * @return string
  */
-function wpinv_format_amount( $amount, $decimals = null, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = null, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    $decimals      = wpinv_decimals( $decimals );
-    $amount        = wpinv_sanitize_amount( $amount );
+    $decimals      = wpinv_decimals($decimals);
+    $amount        = wpinv_sanitize_amount($amount);
 
-    if ( $calculate ) {
+    if ($calculate) {
         return $amount;
     }
 
     // Fomart the amount.
-    return number_format( $amount, $decimals, $decimal_sep, $thousands_sep );
+    return number_format($amount, $decimals, $decimal_sep, $thousands_sep);
 }
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -332,8 +332,8 @@ 
  * 
  * @param $str the file whose extension should be retrieved.
  */
-function wpinv_get_file_extension( $str ) {
-    $filetype = wp_check_filetype( $str );
+function wpinv_get_file_extension($str) {
+    $filetype = wp_check_filetype($str);
     return $filetype['ext'];
 }
 
@@ -342,16 +342,16 @@ 
  * 
  * @param string $string
  */
-function wpinv_string_is_image_url( $string ) {
-    $extension = strtolower( wpinv_get_file_extension( $string ) );
-    return in_array( $extension, array( 'jpeg', 'jpg', 'png', 'gif', 'ico' ), true );
+function wpinv_string_is_image_url($string) {
+    $extension = strtolower(wpinv_get_file_extension($string));
+    return in_array($extension, array('jpeg', 'jpg', 'png', 'gif', 'ico'), true);
 }
 
 /**
  * Returns the current URL.
  */
 function wpinv_get_current_page_url() {
-    return ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    return (is_ssl() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 }
 
 /**
@@ -361,46 +361,46 @@ 
  * @param string $name  Constant name.
  * @param mixed  $value Value.
  */
-function getpaid_maybe_define_constant( $name, $value ) {
-	if ( ! defined( $name ) ) {
-		define( $name, $value );
+function getpaid_maybe_define_constant($name, $value) {
+	if (!defined($name)) {
+		define($name, $value);
 	}
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
 
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
-    if ( empty( $color ) ) {
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
+    if (empty($color)) {
         return NULL;
     }
 
-    $color = str_split( $color );
+    $color = str_split($color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color[0] . $color[1] );
-    $rgb['G'] = hexdec( $color[2] . $color[3] );
-    $rgb['B'] = hexdec( $color[4] . $color[5] );
+    $rgb['R'] = hexdec($color[0] . $color[1]);
+    $rgb['G'] = hexdec($color[2] . $color[3]);
+    $rgb['B'] = hexdec($color[4] . $color[5]);
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -409,18 +409,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -429,22 +429,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -464,12 +464,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -481,28 +481,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
     
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
     
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -516,12 +516,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -535,12 +535,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -555,16 +555,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -576,48 +576,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
     
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
     
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
     
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
     
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }
@@ -625,14 +625,14 @@ 
     return $period;
 }
 
-function wpinv_cal_days_in_month( $calendar, $month, $year ) {
-    if ( function_exists( 'cal_days_in_month' ) ) {
-        return cal_days_in_month( $calendar, $month, $year );
+function wpinv_cal_days_in_month($calendar, $month, $year) {
+    if (function_exists('cal_days_in_month')) {
+        return cal_days_in_month($calendar, $month, $year);
     }
 
     // Fallback in case the calendar extension is not loaded in PHP
     // Only supports Gregorian calendar
-    return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+    return date('t', mktime(0, 0, 0, $month, 1, $year));
 }
 
 /**
@@ -643,12 +643,12 @@ 
  *
  * @return string
  */
-function wpi_help_tip( $tip, $allow_html = false ) {
+function wpi_help_tip($tip, $allow_html = false) {
 
-    if ( $allow_html ) {
-        $tip = wpi_sanitize_tooltip( $tip );
+    if ($allow_html) {
+        $tip = wpi_sanitize_tooltip($tip);
     } else {
-        $tip = esc_attr( $tip );
+        $tip = esc_attr($tip);
     }
 
     return '<span class="wpi-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -662,8 +662,8 @@ 
  * @param string $var
  * @return string
  */
-function wpi_sanitize_tooltip( $var ) {
-    return wp_kses( html_entity_decode( $var ), array(
+function wpi_sanitize_tooltip($var) {
+    return wp_kses(html_entity_decode($var), array(
         'br'     => array(),
         'em'     => array(),
         'strong' => array(),
@@ -674,7 +674,7 @@ 
         'li'     => array(),
         'ol'     => array(),
         'p'      => array(),
-    ) );
+    ));
 }
 
 /**
@@ -684,7 +684,7 @@ 
  */
 function wpinv_get_screen_ids() {
 
-    $screen_id = sanitize_title( __( 'Invoicing', 'invoicing' ) );
+    $screen_id = sanitize_title(__('Invoicing', 'invoicing'));
 
     $screen_ids = array(
         'toplevel_page_' . $screen_id,
@@ -705,7 +705,7 @@ 
         'getpaid_page_wpinv-customers',
     );
 
-    return apply_filters( 'wpinv_screen_ids', $screen_ids );
+    return apply_filters('wpinv_screen_ids', $screen_ids);
 }
 
 /**
@@ -716,14 +716,14 @@ 
  * @param array|string $list List of values.
  * @return array Sanitized array of values.
  */
-function wpinv_parse_list( $list ) {
+function wpinv_parse_list($list) {
 
-    if ( empty( $list ) ) {
+    if (empty($list)) {
         $list = array();
     }
 
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+	if (!is_array($list)) {
+		return preg_split('/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY);
 	}
 
 	return $list;
@@ -737,16 +737,16 @@ 
  * @param string $key Type of data to fetch.
  * @return mixed Fetched data.
  */
-function wpinv_get_data( $key ) {
+function wpinv_get_data($key) {
 
     // Try fetching it from the cache.
-    $data = wp_cache_get( "wpinv-data-$key", 'wpinv' );
-    if( $data ) {
+    $data = wp_cache_get("wpinv-data-$key", 'wpinv');
+    if ($data) {
         return $data;
     }
 
-    $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-data-$key", $data, 'wpinv' );
+    $data = apply_filters("wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php");
+	wp_cache_set("wpinv-data-$key", $data, 'wpinv');
 
 	return $data;
 }
@@ -760,10 +760,10 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return mixed Fetched data.
  */
-function wpinv_maybe_add_empty_option( $options, $first_empty ) {
+function wpinv_maybe_add_empty_option($options, $first_empty) {
 
-    if ( ! empty( $options ) && $first_empty ) {
-        return array_merge( array( '' => '' ), $options );
+    if (!empty($options) && $first_empty) {
+        return array_merge(array('' => ''), $options);
     }
     return $options;
 
@@ -775,21 +775,21 @@ 
  * @param mixed $var Data to sanitize.
  * @return string|array
  */
-function wpinv_clean( $var ) {
+function wpinv_clean($var) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+	if (is_array($var)) {
+		return array_map('wpinv_clean', $var);
     }
 
-    if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+    if (is_object($var)) {
+		$object_vars = get_object_vars($var);
+		foreach ($object_vars as $property_name => $property_value) {
+			$var->$property_name = wpinv_clean($property_value);
         }
         return $var;
 	}
     
-    return is_string( $var ) ? sanitize_text_field( $var ) : $var;
+    return is_string($var) ? sanitize_text_field($var) : $var;
 }
 
 /**
@@ -798,43 +798,43 @@ 
  * @param string $str Data to convert.
  * @return string|array
  */
-function getpaid_convert_price_string_to_options( $str ) {
+function getpaid_convert_price_string_to_options($str) {
 
-	$raw_options = array_map( 'trim', explode( ',', $str ) );
-    $options     = array();
+	$raw_options = array_map('trim', explode(',', $str));
+    $options = array();
 
-    foreach ( $raw_options as $option ) {
+    foreach ($raw_options as $option) {
 
-        if ( '' == $option ) {
+        if ('' == $option) {
             continue;
         }
 
-        $option = array_map( 'trim', explode( '|', $option ) );
+        $option = array_map('trim', explode('|', $option));
 
         $price = null;
         $label = null;
 
-        if ( isset( $option[0] ) && '' !=  $option[0] ) {
-            $label  = $option[0];
+        if (isset($option[0]) && '' != $option[0]) {
+            $label = $option[0];
         }
 
-        if ( isset( $option[1] ) && '' !=  $option[1] ) {
+        if (isset($option[1]) && '' != $option[1]) {
             $price = $option[1];
         }
 
-        if ( ! isset( $price ) ) {
+        if (!isset($price)) {
             $price = $label;
         }
 
-        if ( ! isset( $price ) || ! is_numeric( $price ) ) {
+        if (!isset($price) || !is_numeric($price)) {
             continue;
         }
 
-        if ( ! isset( $label ) ) {
+        if (!isset($label)) {
             $label = $price;
         }
 
-        $options[ $price ] = $label;
+        $options[$price] = $label;
     }
 
     return $options;
@@ -843,27 +843,27 @@ 
 /**
  * Returns the help tip.
  */
-function getpaid_get_help_tip( $tip, $additional_classes = '' ) {
-    $additional_classes = sanitize_html_class( $additional_classes );
-    $tip                = esc_attr__( $tip );
+function getpaid_get_help_tip($tip, $additional_classes = '') {
+    $additional_classes = sanitize_html_class($additional_classes);
+    $tip                = esc_attr__($tip);
     return "<span class='wpi-help-tip dashicons dashicons-editor-help $additional_classes' title='$tip'></span>";
 }
 
 /**
  * Formats a date
  */
-function getpaid_format_date( $date, $with_time = false ) {
+function getpaid_format_date($date, $with_time = false) {
 
-    if ( empty( $date ) || $date == '0000-00-00 00:00:00' ) {
+    if (empty($date) || $date == '0000-00-00 00:00:00') {
         return '';
     }
 
     $format = getpaid_date_format();
 
-    if ( $with_time ) {
+    if ($with_time) {
         $format .= ' ' . getpaid_time_format();
     }
-    return date_i18n( $format, strtotime( $date ) );
+    return date_i18n($format, strtotime($date));
 
 }
 
@@ -872,9 +872,9 @@ 
  *
  * @return string
  */
-function getpaid_format_date_value( $date, $default = "&mdash;", $with_time = false ) {
-    $date = getpaid_format_date( $date, $with_time );
-    return empty( $date ) ? $default : $date;
+function getpaid_format_date_value($date, $default = "&mdash;", $with_time = false) {
+    $date = getpaid_format_date($date, $with_time);
+    return empty($date) ? $default : $date;
 }
 
 /**
@@ -883,7 +883,7 @@ 
  * @return string
  */
 function getpaid_date_format() {
-	return apply_filters( 'getpaid_date_format', get_option( 'date_format' ) );
+	return apply_filters('getpaid_date_format', get_option('date_format'));
 }
 
 /**
@@ -892,7 +892,7 @@ 
  * @return string
  */
 function getpaid_time_format() {
-	return apply_filters( 'getpaid_time_format', get_option( 'time_format' ) );
+	return apply_filters('getpaid_time_format', get_option('time_format'));
 }
 
 /**
@@ -902,16 +902,16 @@ 
  * @param  integer $limit Limit size in characters.
  * @return string
  */
-function getpaid_limit_length( $string, $limit ) {
+function getpaid_limit_length($string, $limit) {
     $str_limit = $limit - 3;
 
-	if ( function_exists( 'mb_strimwidth' ) ) {
-		if ( mb_strlen( $string ) > $limit ) {
-			$string = mb_strimwidth( $string, 0, $str_limit ) . '...';
+	if (function_exists('mb_strimwidth')) {
+		if (mb_strlen($string) > $limit) {
+			$string = mb_strimwidth($string, 0, $str_limit) . '...';
 		}
 	} else {
-		if ( strlen( $string ) > $limit ) {
-			$string = substr( $string, 0, $str_limit ) . '...';
+		if (strlen($string) > $limit) {
+			$string = substr($string, 0, $str_limit) . '...';
 		}
 	}
     return $string;
@@ -925,7 +925,7 @@ 
  * @since 1.0.19
  */
 function getpaid_api() {
-    return getpaid()->get( 'api' );
+    return getpaid()->get('api');
 }
 
 /**
@@ -935,7 +935,7 @@ 
  * @since 1.0.19
  */
 function getpaid_post_types() {
-    return getpaid()->get( 'post_types' );
+    return getpaid()->get('post_types');
 }
 
 /**
@@ -945,7 +945,7 @@ 
  * @since 1.0.19
  */
 function getpaid_session() {
-    return getpaid()->get( 'session' );
+    return getpaid()->get('session');
 }
 
 /**
@@ -955,7 +955,7 @@ 
  * @since 1.0.19
  */
 function getpaid_notes() {
-    return getpaid()->get( 'notes' );
+    return getpaid()->get('notes');
 }
 
 /**
@@ -964,7 +964,7 @@ 
  * @return GetPaid_Admin
  */
 function getpaid_admin() {
-    return getpaid()->get( 'admin' );
+    return getpaid()->get('admin');
 }
 
 /**
@@ -974,8 +974,8 @@ 
  * @param string $base the base url
  * @return string
  */
-function getpaid_get_authenticated_action_url( $action, $base = false ) {
-    return wp_nonce_url( add_query_arg( 'getpaid-action', $action, $base ), 'getpaid-nonce', 'getpaid-nonce' );
+function getpaid_get_authenticated_action_url($action, $base = false) {
+    return wp_nonce_url(add_query_arg('getpaid-action', $action, $base), 'getpaid-nonce', 'getpaid-nonce');
 }
 
 /**
@@ -983,11 +983,11 @@ 
  *
  * @return string
  */
-function getpaid_get_post_type_label( $post_type, $plural = true ) {
+function getpaid_get_post_type_label($post_type, $plural = true) {
 
-    $post_type = get_post_type_object( $post_type );
+    $post_type = get_post_type_object($post_type);
 
-    if ( ! is_object( $post_type ) ) {
+    if (!is_object($post_type)) {
         return null;
     }
 
@@ -1000,18 +1000,18 @@ 
  *
  * @return mixed|null
  */
-function getpaid_get_array_field( $array, $key, $secondary_key = null ) {
+function getpaid_get_array_field($array, $key, $secondary_key = null) {
 
-    if ( ! is_array( $array ) ) {
+    if (!is_array($array)) {
         return null;
     }
 
-    if ( ! empty( $secondary_key ) ) {
-        $array = isset( $array[ $secondary_key ] ) ? $array[ $secondary_key ] : array();
-        return getpaid_get_array_field( $array, $key );
+    if (!empty($secondary_key)) {
+        $array = isset($array[$secondary_key]) ? $array[$secondary_key] : array();
+        return getpaid_get_array_field($array, $key);
     }
 
-    return isset( $array[ $key ] ) ? $array[ $key ] : null;
+    return isset($array[$key]) ? $array[$key] : null;
 
 }
 
@@ -1020,12 +1020,12 @@ 
  *
  * @return array
  */
-function getpaid_array_merge_if_empty( $args, $defaults ) {
+function getpaid_array_merge_if_empty($args, $defaults) {
 
-    foreach ( $defaults as $key => $value ) {
+    foreach ($defaults as $key => $value) {
 
-        if ( array_key_exists( $key, $args ) && empty( $args[ $key ] ) ) {
-            $args[ $key ] = $value;
+        if (array_key_exists($key, $args) && empty($args[$key])) {
+            $args[$key] = $value;
         }
 
     }

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

includes/admin/views/html-tax-rates-edit.php

Spacing +20 added lines, -20 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $tax_rates  = GetPaid_Tax::get_all_tax_rates();
 $dummy_rate = array(
@@ -13,12 +13,12 @@ 
     'global'       => true,
     'rate'         => wpinv_get_default_tax_rate(),
     'reduced_rate' => 5,
-    'name'         => __( 'VAT', 'invoicing' ),
+    'name'         => __('VAT', 'invoicing'),
 );
 
 $reset_url = esc_url(
     wp_nonce_url(
-        add_query_arg( 'getpaid-admin-action', 'reset_tax_rates' ),
+        add_query_arg('getpaid-admin-action', 'reset_tax_rates'),
         'getpaid-nonce',
         'getpaid-nonce'
     )
@@ -27,34 +27,34 @@ 
 ?>
 <div class="table-responsive">
     <table id="wpinv_tax_rates" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'Enter tax rates for specific regions.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('Enter tax rates for specific regions.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Country', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Optionally limit this tax rate to a specific country.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Country', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Optionally limit this tax rate to a specific country.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'State', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Separate state codes using a comma or leave blank to apply country wide.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('State', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Separate state codes using a comma or leave blank to apply country wide.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Standard Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Standard Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Reduced Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Reduced Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Tax Name', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The name of this tax, e.g VAT.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Tax Name', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The name of this tax, e.g VAT.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -63,19 +63,19 @@ 
         </thead>
 
         <tbody>
-            <?php array_walk( $tax_rates, 'wpinv_tax_rate_callback' ); ?>
+            <?php array_walk($tax_rates, 'wpinv_tax_rate_callback'); ?>
         </tbody>
 
         <tfoot>
             <tr class="table-light">
                 <td colspan="6" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e( 'Add Tax Rate', 'invoicing' ); ?>">
-                        <span><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e('Add Tax Rate', 'invoicing'); ?>">
+                        <span><?php _e('Add Tax Rate', 'invoicing'); ?></span>
                     </button>
 
-                    <a href="<?php echo $reset_url; ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e( 'Reset Tax Rates', 'invoicing' ); ?>">
-                        <span><?php _e( 'Reset Tax Rates', 'invoicing' ); ?></span>
+                    <a href="<?php echo $reset_url; ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e('Reset Tax Rates', 'invoicing'); ?>">
+                        <span><?php _e('Reset Tax Rates', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>
@@ -84,6 +84,6 @@ 
 </div>
 
 <script type="text/html" id="tmpl-wpinv-tax-rate-row">
-    <?php echo wpinv_tax_rate_callback( $dummy_rate, 0, false ); ?>
+    <?php echo wpinv_tax_rate_callback($dummy_rate, 0, false); ?>
 </script>
 

includes/admin/views/html-tax-rate-edit.php

Spacing +15 added lines, -15 removed lines

@@ -6,7 +6,7 @@ 
  * @var array $tax_rate
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -18,54 +18,54 @@ 
             $country = aui()->select(
                 array(
                     'options'     => array_merge(
-                        array( '' => __( 'All Countries', 'invoicing' ) ),
+                        array('' => __('All Countries', 'invoicing')),
                         wpinv_get_country_list()
                     ),
                     'name'        => "tax_rates[$key][country]",
-                    'id'          => uniqid( 'tax_rate_country' ),
-                    'value'       => sanitize_text_field( $tax_rate['country'] ),
-                    'label'       => __( 'Country', 'invoicing' ),
+                    'id'          => uniqid('tax_rate_country'),
+                    'value'       => sanitize_text_field($tax_rate['country']),
+                    'label'       => __('Country', 'invoicing'),
                     'class'       => 'wpinv_country',
                     'no_wrap'     => true,
                 )
             );
 
-            echo str_replace( 'custom-select', '', $country );
+            echo str_replace('custom-select', '', $country);
         ?>
     </td>
 
     <td class="wpinv_tax_state">
 
         <label class="w-100">
-            <span class="screen-reader-text"><?php _e( 'States', 'invoicing' ); ?></span>
-            <input type="text" placeholder="<?php esc_attr_e( 'Apply to whole country', 'invoicing' ); ?>" name="tax_rates[<?php echo $key ?>][state]" value="<?php echo empty( $tax_rate['global'] ) ? sanitize_text_field( $tax_rate['state'] ) : ''; ?>"/>
+            <span class="screen-reader-text"><?php _e('States', 'invoicing'); ?></span>
+            <input type="text" placeholder="<?php esc_attr_e('Apply to whole country', 'invoicing'); ?>" name="tax_rates[<?php echo $key ?>][state]" value="<?php echo empty($tax_rate['global']) ? sanitize_text_field($tax_rate['state']) : ''; ?>"/>
         </label>
 
     </td>
 
     <td class="wpinv_standard_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php _e( 'Standard Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo $key ?>][rate]" value="<?php echo wpinv_sanitize_amount( $tax_rate['rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php _e('Standard Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo $key ?>][rate]" value="<?php echo wpinv_sanitize_amount($tax_rate['rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_reduced_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php _e( 'Reduced Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo $key ?>][reduced_rate]" value="<?php echo wpinv_sanitize_amount( $tax_rate['reduced_rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php _e('Reduced Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo $key ?>][reduced_rate]" value="<?php echo wpinv_sanitize_amount($tax_rate['reduced_rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_name">
         <label class="w-100">
-            <span class="screen-reader-text"><?php _e( 'Tax Name', 'invoicing' ); ?></span>
-            <input type="text" name="tax_rates[<?php echo $key ?>][name]" value="<?php echo sanitize_text_field( $tax_rate['name'] ); ?>"/>
+            <span class="screen-reader-text"><?php _e('Tax Name', 'invoicing'); ?></span>
+            <input type="text" name="tax_rates[<?php echo $key ?>][name]" value="<?php echo sanitize_text_field($tax_rate['name']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_remove">
-        <button type="button" class="close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>" title="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>">
+        <button type="button" class="close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e('Delete', 'invoicing'); ?>" title="<?php esc_attr_e('Delete', 'invoicing'); ?>">
             <span aria-hidden="true">&times;</span>
         </button>
     </td>

includes/class-wpinv-subscriptions-db.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscriptions DB Class
@@ -72,8 +72,8 @@ 
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -86,8 +86,8 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
-        return getpaid_get_subscriptions( $args );
+    public function get_subscriptions($args = array()) {
+        return getpaid_get_subscriptions($args);
     }
 
     /**
@@ -96,8 +96,8 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
-        return getpaid_get_subscriptions( $args, 'count' );
+    public function count($args = array()) {
+        return getpaid_get_subscriptions($args, 'count');
     }
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function create_table() {
 
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
         $sql = "CREATE TABLE " . $this->table_name . " (
         id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -133,9 +133,9 @@ 
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }
\ No newline at end of file