AyeCode / invoicing

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetARB.php

Indentation +7 added lines, -7 removed lines

@@ -91,13 +91,13 @@
         return $this->_sendRequest();
     }
     
-     /**
-     *
-     *
-     * @param string $response
-     * 
-     * @return AuthorizeNetARB_Response
-     */
+        /**
+         *
+         *
+         * @param string $response
+         * 
+         * @return AuthorizeNetARB_Response
+         */
     protected function _handleResponse($response)
     {
         return new AuthorizeNetARB_Response($response);

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetCIM.php

Indentation +3 added lines, -3 removed lines

@@ -316,9 +316,9 @@
         return $this->_sendRequest();
     }
     
-     /**
-     * @return string
-     */
+        /**
+         * @return string
+         */
     protected function _getPostUrl()
     {
         return ($this->_sandbox ? self::SANDBOX_URL : self::LIVE_URL);

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetDPM.php

Indentation +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             }
             else
             {
-              echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
+                echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
             }
         }
     }

templates/wpinv-invoice-history.php

Indentation +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( !( $user_id = get_current_user_id() ) ) {
@@ -30,7 +30,7 @@ 
 
 		<tbody>
 			<?php foreach ( $user_invoices->invoices as $invoice ) {
-				?>
+                ?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
 						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
@@ -53,31 +53,31 @@ 
 
 							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
 								<?php
-									$actions = array(
-										'pay'    => array(
-											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+                                    $actions = array(
+                                        'pay'    => array(
+                                            'url'  => $invoice->get_checkout_payment_url(),
+                                            'name' => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
                                         'print'   => array(
-											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+                                            'url'  => $invoice->get_view_url(),
+                                            'name' => __( 'Print', 'invoicing' ),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
-											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                    if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
+                                        foreach ( $actions as $key => $action ) {
+                                            $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
                                             echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-										}
-									}
-								?>
+                                        }
+                                    }
+                                ?>
 							<?php endif; ?>
 						</td>
 					<?php endforeach; ?>
@@ -91,22 +91,22 @@ 
 	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			if (get_query_var('paged'))
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page'))
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
-				'total'   => $user_invoices->max_num_pages,
-			) );
-			?>
+            $big = 999999;
+
+            if (get_query_var('paged'))
+                $current_page = get_query_var('paged');
+            elseif (get_query_var('page'))
+                $current_page = get_query_var('page');
+            else
+                $current_page = 1;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'current' => max( 1, $current_page ),
+                'total'   => $user_invoices->max_num_pages,
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

includes/class-wpinv-db.php

Indentation +232 added lines, -232 removed lines

@@ -5,237 +5,237 @@
 
 abstract class Wpinv_DB {
 
-	/**
-	 * The name of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $table_name;
-
-	/**
-	 * The version of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $version;
-
-	/**
-	 * The name of the primary column
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $primary_key;
-
-	/**
-	 * Get things started
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public function __construct() {}
-
-	/**
-	 * Whitelist of columns
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_columns() {
-		return array();
-	}
-
-	/**
-	 * Default column values
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_column_defaults() {
-		return array();
-	}
-
-	/**
-	 * Retrieve a row by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get( $row_id ) {
-		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a row by a specific column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get_by( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the the specified column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
-		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
-	}
-
-	/**
-	 * Insert a new row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  int
-	 */
-	public function insert( $data, $type = '' ) {
-		global $wpdb;
-
-		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
-
-		do_action( 'wpinv_pre_insert_' . $type, $data );
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		$wpdb->insert( $this->table_name, $data, $column_formats );
-		$wpdb_insert_id = $wpdb->insert_id;
-
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
-
-		return $wpdb_insert_id;
-	}
-
-	/**
-	 * Update a row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if( empty( $where ) ) {
-			$where = $this->primary_key;
-		}
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Delete a row identified by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function delete( $row_id = 0 ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if the given table exists
-	 *
-	 * @since  2.4
-	 * @param  string $table The table name
-	 * @return bool          If the table name exists
-	 */
-	public function table_exists( $table ) {
-		global $wpdb;
-		$table = sanitize_text_field( $table );
-
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
-	}
-
-	/**
-	 * Check if the table was ever installed
-	 *
-	 * @since  2.4
-	 * @return bool Returns if the customers table was installed and upgrade routine run
-	 */
-	public function installed() {
-		return $this->table_exists( $this->table_name );
-	}
+    /**
+     * The name of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $table_name;
+
+    /**
+     * The version of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $version;
+
+    /**
+     * The name of the primary column
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $primary_key;
+
+    /**
+     * Get things started
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public function __construct() {}
+
+    /**
+     * Whitelist of columns
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_columns() {
+        return array();
+    }
+
+    /**
+     * Default column values
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_column_defaults() {
+        return array();
+    }
+
+    /**
+     * Retrieve a row by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get( $row_id ) {
+        global $wpdb;
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a row by a specific column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get_by( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the the specified column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column_by( $column, $column_where, $column_value ) {
+        global $wpdb;
+        $column_where = esc_sql( $column_where );
+        $column       = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+    }
+
+    /**
+     * Insert a new row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  int
+     */
+    public function insert( $data, $type = '' ) {
+        global $wpdb;
+
+        // Set default values
+        $data = wp_parse_args( $data, $this->get_column_defaults() );
+
+        do_action( 'wpinv_pre_insert_' . $type, $data );
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        $wpdb->insert( $this->table_name, $data, $column_formats );
+        $wpdb_insert_id = $wpdb->insert_id;
+
+        do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+
+        return $wpdb_insert_id;
+    }
+
+    /**
+     * Update a row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function update( $row_id, $data = array(), $where = '' ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if( empty( $where ) ) {
+            $where = $this->primary_key;
+        }
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete a row identified by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function delete( $row_id = 0 ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the given table exists
+     *
+     * @since  2.4
+     * @param  string $table The table name
+     * @return bool          If the table name exists
+     */
+    public function table_exists( $table ) {
+        global $wpdb;
+        $table = sanitize_text_field( $table );
+
+        return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+    }
+
+    /**
+     * Check if the table was ever installed
+     *
+     * @since  2.4
+     * @return bool Returns if the customers table was installed and upgrade routine run
+     */
+    public function installed() {
+        return $this->table_exists( $this->table_name );
+    }
 
 }

includes/gateways/paypal.php

Indentation +255 added lines, -255 removed lines

@@ -218,262 +218,262 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+    wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -661,34 +661,34 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+    do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+        do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
 
-		return; // This is a partial refund
-	}
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+    do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

includes/wpinv-subscription.php

Indentation +454 added lines, -454 removed lines

@@ -2,7 +2,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 
@@ -13,183 +13,183 @@ 
  */
 class WPInv_Subscription {
 
-	private $subs_db;
+    private $subs_db;
+
+    public $id                = 0;
+    public $customer_id       = 0;
+    public $period            = '';
+    public $initial_amount    = '';
+    public $recurring_amount  = '';
+    public $bill_times        = 0;
+    public $transaction_id    = '';
+    public $parent_payment_id = 0;
+    public $product_id        = 0;
+    public $created           = '0000-00-00 00:00:00';
+    public $expiration        = '0000-00-00 00:00:00';
+    public $trial_period      = '';
+    public $status            = 'pending';
+    public $profile_id        = '';
+    public $gateway           = '';
+    public $customer;
 
-	public $id                = 0;
-	public $customer_id       = 0;
-	public $period            = '';
-	public $initial_amount    = '';
-	public $recurring_amount  = '';
-	public $bill_times        = 0;
-	public $transaction_id    = '';
-	public $parent_payment_id = 0;
-	public $product_id        = 0;
-	public $created           = '0000-00-00 00:00:00';
-	public $expiration        = '0000-00-00 00:00:00';
-	public $trial_period      = '';
-	public $status            = 'pending';
-	public $profile_id        = '';
-	public $gateway           = '';
-	public $customer;
-
-	/**
-	 * Get us started
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+    /**
+     * Get us started
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
 
-		$this->subs_db = new WPInv_Subscriptions_DB;
+        $this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+        if( $_by_profile_id ) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+            $_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
 
-			if( empty( $_sub ) ) {
-				return false;
-			}
+            if( empty( $_sub ) ) {
+                return false;
+            }
 
-			$_id_or_object = $_sub;
+            $_id_or_object = $_sub;
 
-		}
+        }
 
-		return $this->setup_subscription( $_id_or_object );
-	}
+        return $this->setup_subscription( $_id_or_object );
+    }
 
-	/**
-	 * Setup the subscription object
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+    /**
+     * Setup the subscription object
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    private function setup_subscription( $id_or_object = 0 ) {
 
-		if( empty( $id_or_object ) ) {
-			return false;
-		}
+        if( empty( $id_or_object ) ) {
+            return false;
+        }
 
-		if( is_numeric( $id_or_object ) ) {
+        if( is_numeric( $id_or_object ) ) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+            $sub = $this->subs_db->get( $id_or_object );
 
-		} elseif( is_object( $id_or_object ) ) {
+        } elseif( is_object( $id_or_object ) ) {
 
-			$sub = $id_or_object;
+            $sub = $id_or_object;
 
-		}
+        }
 
-		if( empty( $sub ) ) {
-			return false;
-		}
+        if( empty( $sub ) ) {
+            return false;
+        }
 
-		foreach( $sub as $key => $value ) {
-			$this->$key = $value;
-		}
+        foreach( $sub as $key => $value ) {
+            $this->$key = $value;
+        }
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+        $this->customer = get_userdata( $this->customer_id );
+        $this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+        do_action( 'wpinv_recurring_setup_subscription', $this );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Magic __get function to dispatch a call to retrieve a private property
-	 *
-	 * @since 1.0.0
-	 */
-	public function __get( $key ) {
+    /**
+     * Magic __get function to dispatch a call to retrieve a private property
+     *
+     * @since 1.0.0
+     */
+    public function __get( $key ) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+        if( method_exists( $this, 'get_' . $key ) ) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func( array( $this, 'get_' . $key ) );
 
-		} else {
+        } else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Creates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array  $data Array of attributes for a subscription
-	 * @return mixed  false if data isn't passed and class not instantiated for creation
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Creates a subscription
+     *
+     * @since  1.0.0
+     * @param  array  $data Array of attributes for a subscription
+     * @return mixed  false if data isn't passed and class not instantiated for creation
+     */
+    public function create( $data = array() ) {
 
-		if ( $this->id != 0 ) {
-			return false;
-		}
+        if ( $this->id != 0 ) {
+            return false;
+        }
 
-		$defaults = array(
-			'customer_id'       => 0,
-			'frequency'         => '',
-			'period'            => '',
-			'initial_amount'    => '',
-			'recurring_amount'  => '',
-			'bill_times'        => 0,
-			'parent_payment_id' => 0,
-			'product_id'        => 0,
-			'created'           => '',
-			'expiration'        => '',
-			'status'            => '',
-			'profile_id'        => '',
-		);
+        $defaults = array(
+            'customer_id'       => 0,
+            'frequency'         => '',
+            'period'            => '',
+            'initial_amount'    => '',
+            'recurring_amount'  => '',
+            'bill_times'        => 0,
+            'parent_payment_id' => 0,
+            'product_id'        => 0,
+            'created'           => '',
+            'expiration'        => '',
+            'status'            => '',
+            'profile_id'        => '',
+        );
 
-		$args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args( $data, $defaults );
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+        if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+            if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
 
-				// Force an active subscription to expired if expiration date is in the past
-				$args['status'] = 'expired';
+                // Force an active subscription to expired if expiration date is in the past
+                $args['status'] = 'expired';
 
-			}
-		}
+            }
+        }
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+        do_action( 'wpinv_subscription_pre_create', $args );
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+        $id = $this->subs_db->insert( $args, 'subscription' );
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+        do_action( 'wpinv_subscription_post_create', $id, $args );
 
-		return $this->setup_subscription( $id );
+        return $this->setup_subscription( $id );
 
-	}
+    }
 
-	/**
-	 * Updates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array $args Array of fields to update
-	 * @return bool
-	 */
-	public function update( $args = array() ) {
+    /**
+     * Updates a subscription
+     *
+     * @since  1.0.0
+     * @param  array $args Array of fields to update
+     * @return bool
+     */
+    public function update( $args = array() ) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+        $ret = $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+        do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
 
-		return $ret;
+        return $ret;
 
-	}
+    }
 
-	/**
-	 * Delete the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function delete() {
-		return $this->subs_db->delete( $this->id );
-	}
+    /**
+     * Delete the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function delete() {
+        return $this->subs_db->delete( $this->id );
+    }
 
     /**
      * Retrieves the parent payment ID
@@ -366,185 +366,185 @@ 
         return false;
     }
 
-	/**
-	 * Retrieves the transaction ID from the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function get_transaction_id() {
+    /**
+     * Retrieves the transaction ID from the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+        if( empty( $this->transaction_id ) ) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+            $txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
-			}
+            if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
+                $this->set_transaction_id( $txn_id );
+            }
 
-		}
+        }
 
-		return $this->transaction_id;
+        return $this->transaction_id;
 
-	}
+    }
 
-	/**
-	 * Stores the transaction ID for the subscription purchase
-	 *
-	 * @since  1.0.0.4
-	 * @return bool
-	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
-		$this->transaction_id = $txn_id;
-	}
+    /**
+     * Stores the transaction ID for the subscription purchase
+     *
+     * @since  1.0.0.4
+     * @return bool
+     */
+    public function set_transaction_id( $txn_id = '' ) {
+        $this->update( array( 'transaction_id' => $txn_id ) );
+        $this->transaction_id = $txn_id;
+    }
 
-	/**
-	 * Renews a subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function renew() {
+    /**
+     * Renews a subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function renew() {
 
-		$expires = $this->get_expiration_time();
+        $expires = $this->get_expiration_time();
 
 
-		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+        // Determine what date to use as the start for the new expiration calculation
+        if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
 
-			$base_date  = $expires;
+            $base_date  = $expires;
 
-		} else {
+        } else {
 
-			$base_date  = current_time( 'timestamp' );
+            $base_date  = current_time( 'timestamp' );
 
-		}
+        }
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+        $last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
 
 
-		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+        $frequency = isset($this->frequency) ? $this->frequency : 1;
+        $expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
-		}
+        if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
+            $expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+        }
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+        $expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
 
-		$this->status = 'active';
-		$times_billed = $this->get_times_billed();
+        $this->status = 'active';
+        $times_billed = $this->get_times_billed();
 
-		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
-			$this->complete();
-			$this->status = 'completed';
-		}
+        // Complete subscription if applicable
+        if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+            $this->complete();
+            $this->status = 'completed';
+        }
 
-		$args = array(
-			'expiration' => $expiration,
-			'status'     => $this->status,
-		);
+        $args = array(
+            'expiration' => $expiration,
+            'status'     => $this->status,
+        );
 
         $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+        do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function complete() {
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function complete() {
 
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
-			return;
-		}
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( 'cancelled' === $this->status ) {
+            return;
+        }
 
-		$args = array(
-			'status' => 'completed'
-		);
+        $args = array(
+            'status' => 'completed'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'completed';
+            $this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+            do_action( 'wpinv_subscription_completed', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * Subscription is completed when the billing times is reached
-	 *
-	 * @since  1.0.0
-	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
-	 */
-	public function expire( $check_expiration = false ) {
+    /**
+     * Marks a subscription as expired
+     *
+     * Subscription is completed when the billing times is reached
+     *
+     * @since  1.0.0
+     * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
+     * @return void
+     */
+    public function expire( $check_expiration = false ) {
 
-		$expiration = $this->expiration;
+        $expiration = $this->expiration;
 
-		if( $check_expiration ) {
+        if( $check_expiration ) {
 
-			// check_expiration() updates $this->expiration so compare to $expiration above
+            // check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+            if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
 
-				return false; // Do not mark as expired since real expiration date is in the future
-			}
+                return false; // Do not mark as expired since real expiration date is in the future
+            }
 
-		}
+        }
 
-		$args = array(
-			'status' => 'expired'
-		);
+        $args = array(
+            'status' => 'expired'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'expired';
+            $this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+            do_action( 'wpinv_subscription_expired', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return void
-	 */
-	public function failing() {
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return void
+     */
+    public function failing() {
 
-		$args = array(
-			'status' => 'failing'
-		);
+        $args = array(
+            'status' => 'failing'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'failing';
+            $this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+            do_action( 'wpinv_subscription_failing', $this->id, $this );
 
 
-		}
+        }
 
-	}
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -578,22 +578,22 @@ 
         }
     }
 
-	/**
-	 * Determines if subscription can be cancelled
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be cancelled with a profile ID through the merchant processor
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
+    /**
+     * Determines if subscription can be cancelled
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be cancelled with a profile ID through the merchant processor
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+        if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
-	}
+        return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -606,197 +606,197 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
 
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
-
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function get_update_url() {
-
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
-
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription is active
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_active() {
-
-		$ret = false;
-
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
-			$ret = true;
-		}
-
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Determines if subscription is expired
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_expired() {
-
-		$ret = false;
-
-		if ( $this->status == 'expired' ) {
-
-			$ret = true;
-
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
-
-			$ret        = false;
-			$expiration = $this->get_expiration_time();
-
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
-				$ret = true;
-
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
-					$this->expire();
-				}
-			}
-
-		}
-
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Retrieves the expiration date
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_expiration() {
-		return $this->expiration;
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Retrieves the subscription status
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status() {
-
-		// Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
-		$this->is_expired();
-		return $this->status;
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status_label() {
-
-		switch( $this->get_status() ) {
-			case 'active' :
-				$status = __( 'Active', 'invoicing' );
-				break;
-
-			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
-				break;
-
-			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
-				break;
-
-			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
-				break;
-
-			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
-				break;
-
-			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
-				break;
-
-			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
-				break;
-
-			default:
-				$status = ucfirst( $this->get_status() );
-				break;
-		}
-
-		return $status;
-	}
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function get_update_url() {
+
+        $url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription is active
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_active() {
+
+        $ret = false;
+
+        if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+            $ret = true;
+        }
+
+        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Determines if subscription is expired
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_expired() {
+
+        $ret = false;
+
+        if ( $this->status == 'expired' ) {
+
+            $ret = true;
+
+        } elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+
+            $ret        = false;
+            $expiration = $this->get_expiration_time();
+
+            if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+                $ret = true;
+
+                if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+                    $this->expire();
+                }
+            }
+
+        }
+
+        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Retrieves the expiration date
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_expiration() {
+        return $this->expiration;
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        return strtotime( $this->expiration, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Retrieves the subscription status
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status() {
+
+        // Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
+        $this->is_expired();
+        return $this->status;
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status_label() {
+
+        switch( $this->get_status() ) {
+            case 'active' :
+                $status = __( 'Active', 'invoicing' );
+                break;
+
+            case 'cancelled' :
+                $status = __( 'Cancelled', 'invoicing' );
+                break;
+
+            case 'expired' :
+                $status = __( 'Expired', 'invoicing' );
+                break;
+
+            case 'pending' :
+                $status = __( 'Pending', 'invoicing' );
+                break;
+
+            case 'failing' :
+                $status = __( 'Failing', 'invoicing' );
+                break;
+
+            case 'trialling' :
+                $status = __( 'Trialling', 'invoicing' );
+                break;
+
+            case 'completed' :
+                $status = __( 'Completed', 'invoicing' );
+                break;
+
+            default:
+                $status = ucfirst( $this->get_status() );
+                break;
+        }
+
+        return $status;
+    }
 
     /**
      * Retrieves the subscription status label

includes/admin/class-wpinv-subscriptions-list-table.php

Indentation +349 added lines, -349 removed lines

@@ -13,7 +13,7 @@ 
 
 // Load WP_List_Table if not loaded
 if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,102 +23,102 @@ 
  */
 class WPInv_Subscription_Reports_Table extends WP_List_Table {
 
-	/**
-	 * Number of results to show per page
-	 *
-	 * @since       1.0.0
-	 */
-
-	public $per_page        = 20;
-	public $total_count     = 0;
-	public $active_count    = 0;
-	public $pending_count   = 0;
-	public $expired_count   = 0;
-	public $completed_count = 0;
-	public $trialling_count  = 0;
-	public $cancelled_count = 0;
-	public $failing_count   = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	function __construct(){
-		global $status, $page;
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular'  => 'subscription',
-			'plural'    => 'subscriptions',
-			'ajax'      => false
-		) );
-
-		$this->get_subscription_counts();
-
-	}
-
-	/**
-	 * Retrieve the view types
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return array $views All the views available
-	 */
-	public function get_views() {
-
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
-		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
-		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
-
-		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
-		);
-
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
-	}
-
-	/**
-	 * Show the search field
-	 *
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $text Label for the search box
-	 * @param string $input_id ID of the search box
-	 *
-	 * @return void
-	 */
-	public function search_box( $text, $input_id ) {
-
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-			return;
-		}
-
-		$input_id = $input_id . '-search-input';
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		}
+    /**
+     * Number of results to show per page
+     *
+     * @since       1.0.0
+     */
+
+    public $per_page        = 20;
+    public $total_count     = 0;
+    public $active_count    = 0;
+    public $pending_count   = 0;
+    public $expired_count   = 0;
+    public $completed_count = 0;
+    public $trialling_count  = 0;
+    public $cancelled_count = 0;
+    public $failing_count   = 0;
+
+    /**
+     * Get things started
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      void
+     */
+    function __construct(){
+        global $status, $page;
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular'  => 'subscription',
+            'plural'    => 'subscriptions',
+            'ajax'      => false
+        ) );
+
+        $this->get_subscription_counts();
+
+    }
+
+    /**
+     * Retrieve the view types
+     *
+     * @access public
+     * @since 1.0.0
+     * @return array $views All the views available
+     */
+    public function get_views() {
+
+        $current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
+        $total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+        $active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
+        $pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
+        $expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+        $completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
+        $trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
+        $cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
+        $failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+
+        $views = array(
+            'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
+            'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
+            'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
+            'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
+            'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
+            'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
+            'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
+            'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+        );
+
+        return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+    }
+
+    /**
+     * Show the search field
+     *
+     * @since 2.5
+     * @access public
+     *
+     * @param string $text Label for the search box
+     * @param string $input_id ID of the search box
+     *
+     * @return void
+     */
+    public function search_box( $text, $input_id ) {
+
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
 ?>
 		<p class="search-box">
 			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
@@ -127,18 +127,18 @@ 
 			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
 		</p>
 <?php
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_default( $item, $column_name ) {
-		return $item->$column_name;
-	}
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_default( $item, $column_name ) {
+        return $item->$column_name;
+    }
 
     /**
      * Subscription id column
@@ -151,244 +151,244 @@ 
         return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
     }
 
-	/**
-	 * Customer column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
-
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_status( $item ) {
-		return $item->get_status_label();
-	}
-
-	/**
-	 * Period column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_period( $item ) {
-
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
-
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
-	}
-
-	/**
-	 * Initial Amount column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
-	}
-
-	/**
-	 * Payment column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
-	}
-
-	/**
-	 * Render the edit column
-	 *
-	 * @access      private
-	 * @since       2.0
-	 * @return      string
-	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
-	}
-
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      array
-	 */
-
-	function get_columns(){
-		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      int
-	 */
-	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Retrieve the subscription counts
-	 *
-	 * @access public
-	 * @since 1.4
-	 * @return void
-	 */
-	public function get_subscription_counts() {
-
-		global $wp_query;
-
-		$db = new WPInv_Subscriptions_DB;
-
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-
-		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @uses        $this->_column_headers
-	 * @uses        $this->items
-	 * @uses        $this->get_columns()
-	 * @uses        $this->get_sortable_columns()
-	 * @uses        $this->get_pagenum()
-	 * @uses        $this->set_pagination_args()
-	 * @return      array
-	 */
-	function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$current_page = $this->get_pagenum();
-
-		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$args   = array(
-			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
-			'search' => $search
-		);
-
-		if ( 'any' !== $status ) {
-			$args['status'] = $status;
-		}
-
-		$this->items = $db->get_subscriptions( $args );
-
-		switch ( $status ) {
-			case 'active':
-				$total_items = $this->active_count;
-				break;
-			case 'pending':
-				$total_items = $this->pending_count;
-				break;
-			case 'expired':
-				$total_items = $this->expired_count;
-				break;
-			case 'cancelled':
-				$total_items = $this->cancelled_count;
-				break;
-			case 'failing':
-				$total_items = $this->failing_count;
-				break;
-			case 'trialling':
-				$total_items = $this->trialling_count;
-				break;
-			case 'completed':
-				$total_items = $this->completed_count;
-				break;
-			case 'any':
-			default:
-				$total_items = $this->total_count;
-				break;
-		}
-
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
-	}
+    /**
+     * Customer column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_customer_id( $item ) {
+        $subscriber = get_userdata( $item->customer_id );
+        $customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+
+        return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+    }
+
+    /**
+     * Status column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_status( $item ) {
+        return $item->get_status_label();
+    }
+
+    /**
+     * Period column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_period( $item ) {
+
+        $period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+
+        return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_bill_times( $item ) {
+        return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+    }
+
+    /**
+     * Initial Amount column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_initial_amount( $item ) {
+        return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_renewal_date( $item ) {
+        return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+    }
+
+    /**
+     * Payment column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_parent_payment_id( $item ) {
+        return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+    }
+
+    /**
+     * Product ID column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_product_id( $item ) {
+        return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+    }
+
+    /**
+     * Render the edit column
+     *
+     * @access      private
+     * @since       2.0
+     * @return      string
+     */
+    function column_actions( $item ) {
+        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+    }
+
+
+    /**
+     * Retrieve the table columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      array
+     */
+
+    function get_columns(){
+        $columns = array(
+            'sub_id'            => __( 'ID', 'invoicing' ),
+            'customer_id'       => __( 'Customer', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'period'            => __( 'Billing Cycle', 'invoicing' ),
+            'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
+            'bill_times'        => __( 'Times Billed', 'invoicing' ),
+            'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
+            'parent_payment_id' => __( 'Invoice', 'invoicing' ),
+            'product_id'        => __( 'Item', 'invoicing' ),
+            'actions'           => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpinv_report_subscription_columns', $columns );
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      int
+     */
+    function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Retrieve the subscription counts
+     *
+     * @access public
+     * @since 1.4
+     * @return void
+     */
+    public function get_subscription_counts() {
+
+        global $wp_query;
+
+        $db = new WPInv_Subscriptions_DB;
+
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+
+        $this->total_count     = $db->count();
+        $this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
+        $this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
+        $this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
+        $this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
+        $this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
+        $this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
+        $this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @access      private
+     * @since       1.0.0
+     * @uses        $this->_column_headers
+     * @uses        $this->items
+     * @uses        $this->get_columns()
+     * @uses        $this->get_sortable_columns()
+     * @uses        $this->get_pagenum()
+     * @uses        $this->set_pagination_args()
+     * @return      array
+     */
+    function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array(); // No hidden columns
+        $status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $current_page = $this->get_pagenum();
+
+        $db     = new WPInv_Subscriptions_DB;
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+        $args   = array(
+            'number' => $this->per_page,
+            'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+            'search' => $search
+        );
+
+        if ( 'any' !== $status ) {
+            $args['status'] = $status;
+        }
+
+        $this->items = $db->get_subscriptions( $args );
+
+        switch ( $status ) {
+            case 'active':
+                $total_items = $this->active_count;
+                break;
+            case 'pending':
+                $total_items = $this->pending_count;
+                break;
+            case 'expired':
+                $total_items = $this->expired_count;
+                break;
+            case 'cancelled':
+                $total_items = $this->cancelled_count;
+                break;
+            case 'failing':
+                $total_items = $this->failing_count;
+                break;
+            case 'trialling':
+                $total_items = $this->trialling_count;
+                break;
+            case 'completed':
+                $total_items = $this->completed_count;
+                break;
+            case 'any':
+            default:
+                $total_items = $this->total_count;
+                break;
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $total_items / $this->per_page )
+        ) );
+    }
 }

includes/admin/wpinv-admin-functions.php

Indentation +42 added lines, -42 removed lines

@@ -176,69 +176,69 @@ 
 }
 
 function wpinv_admin_messages() {
-	global $wpinv_options, $pagenow, $post;
+    global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+    if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
     }
     
     if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
     }
 
     if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
         add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+    }
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+    if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
+        $message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
-		}
-	}
+        if ( !empty( $message ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+        }
+    }
 
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 
@@ -301,7 +301,7 @@ 
         break;
         case 'id' :
            echo $post->ID;
-           echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
+            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
                     <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
                     if ( $wpinv_euvat->allow_vat_rules() ) {
                         echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';