AyeCode / invoicing

includes/admin/class-wpinv-gateways-report-table.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {

Indentation +166 added lines, -166 removed lines

@@ -9,7 +9,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';
 }
 
 /**
@@ -21,148 +21,148 @@ 
  */
 class WPInv_Gateways_Report_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 300;
-
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular' => 'id',
-			'plural'   => 'ids',
-			'ajax'     => false,
-		) );
-
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'gateway';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $item Contains all the data of the gateways
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		return array(
-			'gateway'  => __( 'Gateway', 'invoicing' ),
-			'sales'    => __( 'Total Sales', 'invoicing' ),
-			'total'    => __( 'Total Earnings', 'invoicing' ),
-			'discount' => __( 'Total Discounts', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
-			'fees'     => __( 'Total Fees', 'invoicing' ),
-		);
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Outputs the reporting views
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 * Build all the reports data
-	 *
-	 * @since 1.0.19
-	 * @return array $reports_data All the data for gateway reports
-	 */
-	public function reports_data() {
-
-		$reports_data = $this->revenue_reports_data();
-		$gateways     = wpinv_get_payment_gateways();
-
-		foreach ( $gateways as $gateway_id => $gateway ) {
-
-			if ( ! empty( $reports_data[ $gateway_id ] ) ) {
-				continue;
-			}
-
-			$reports_data[] = array(
-				'gateway'  => $gateway_id,
-				'sales'    => 0,
-				'total'    => 0,
-				'discount' => 0,
-				'tax'      => 0,
-				'fees'     => 0,
-			);
-		}
-
-		$prepared = array();
-		foreach ( $reports_data as $report_data ) {
-			$prepared[] = array(
-				'gateway'  => wpinv_get_gateway_admin_label( $report_data['gateway'] ),
-				'sales'    => $report_data['sales'],
-				'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
-				'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
-				'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
-				'fees'     => wpinv_price( wpinv_format_amount( $report_data['fees'] ) ),
-			);
-		}
-
-		return $prepared;
-	}
-
-	/**
-	 * Retrieves report data.
-	 *
-	 * @since 1.0.19
-	 */
-	public function revenue_reports_data() {
-		global $wpdb;
-
-		$table =  $wpdb->prefix . 'getpaid_invoices';
-		$data  = $wpdb->get_results(
-			"SELECT
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 300;
+
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular' => 'id',
+            'plural'   => 'ids',
+            'ajax'     => false,
+        ) );
+
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'gateway';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param array $item Contains all the data of the gateways
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        return wp_kses_post( $item[ $column_name ] );
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        return array(
+            'gateway'  => __( 'Gateway', 'invoicing' ),
+            'sales'    => __( 'Total Sales', 'invoicing' ),
+            'total'    => __( 'Total Earnings', 'invoicing' ),
+            'discount' => __( 'Total Discounts', 'invoicing' ),
+            'tax'      => __( 'Total Taxes', 'invoicing' ),
+            'fees'     => __( 'Total Fees', 'invoicing' ),
+        );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Outputs the reporting views
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     * Build all the reports data
+     *
+     * @since 1.0.19
+     * @return array $reports_data All the data for gateway reports
+     */
+    public function reports_data() {
+
+        $reports_data = $this->revenue_reports_data();
+        $gateways     = wpinv_get_payment_gateways();
+
+        foreach ( $gateways as $gateway_id => $gateway ) {
+
+            if ( ! empty( $reports_data[ $gateway_id ] ) ) {
+                continue;
+            }
+
+            $reports_data[] = array(
+                'gateway'  => $gateway_id,
+                'sales'    => 0,
+                'total'    => 0,
+                'discount' => 0,
+                'tax'      => 0,
+                'fees'     => 0,
+            );
+        }
+
+        $prepared = array();
+        foreach ( $reports_data as $report_data ) {
+            $prepared[] = array(
+                'gateway'  => wpinv_get_gateway_admin_label( $report_data['gateway'] ),
+                'sales'    => $report_data['sales'],
+                'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
+                'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
+                'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
+                'fees'     => wpinv_price( wpinv_format_amount( $report_data['fees'] ) ),
+            );
+        }
+
+        return $prepared;
+    }
+
+    /**
+     * Retrieves report data.
+     *
+     * @since 1.0.19
+     */
+    public function revenue_reports_data() {
+        global $wpdb;
+
+        $table =  $wpdb->prefix . 'getpaid_invoices';
+        $data  = $wpdb->get_results(
+            "SELECT
 				COUNT(posts.ID) as sales,
 				meta.gateway as gateway,
 				SUM(meta.total) as total,
@@ -177,27 +177,27 @@ 
                 AND ( posts.post_status = 'publish' OR posts.post_status = 'renewal' )
 			GROUP BY meta.gateway", ARRAY_A);
 		
-		$return = array();
-
-		foreach ( $data as $gateway ) {
-			$return[ $gateway ['gateway']] = $gateway;
-		}
-
-		return $return;
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $this->reports_data();
-	}
+        $return = array();
+
+        foreach ( $data as $gateway ) {
+            $return[ $gateway ['gateway']] = $gateway;
+        }
+
+        return $return;
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->items           = $this->reports_data();
+    }
 }

Spacing +26 added lines, -26 removed lines

@@ -5,10 +5,10 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -37,11 +37,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular' => 'id',
 			'plural'   => 'ids',
 			'ajax'     => false,
-		) );
+		));
 
 	}
 
@@ -67,8 +67,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
+	public function column_default($item, $column_name) {
+		return wp_kses_post($item[$column_name]);
 	}
 
 	/**
@@ -80,12 +80,12 @@ 
 	public function get_columns() {
 
 		return array(
-			'gateway'  => __( 'Gateway', 'invoicing' ),
-			'sales'    => __( 'Total Sales', 'invoicing' ),
-			'total'    => __( 'Total Earnings', 'invoicing' ),
-			'discount' => __( 'Total Discounts', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
-			'fees'     => __( 'Total Fees', 'invoicing' ),
+			'gateway'  => __('Gateway', 'invoicing'),
+			'sales'    => __('Total Sales', 'invoicing'),
+			'total'    => __('Total Earnings', 'invoicing'),
+			'discount' => __('Total Discounts', 'invoicing'),
+			'tax'      => __('Total Taxes', 'invoicing'),
+			'fees'     => __('Total Fees', 'invoicing'),
 		);
 
 	}
@@ -97,7 +97,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -121,9 +121,9 @@ 
 		$reports_data = $this->revenue_reports_data();
 		$gateways     = wpinv_get_payment_gateways();
 
-		foreach ( $gateways as $gateway_id => $gateway ) {
+		foreach ($gateways as $gateway_id => $gateway) {
 
-			if ( ! empty( $reports_data[ $gateway_id ] ) ) {
+			if (!empty($reports_data[$gateway_id])) {
 				continue;
 			}
 
@@ -138,14 +138,14 @@ 
 		}
 
 		$prepared = array();
-		foreach ( $reports_data as $report_data ) {
+		foreach ($reports_data as $report_data) {
 			$prepared[] = array(
-				'gateway'  => wpinv_get_gateway_admin_label( $report_data['gateway'] ),
+				'gateway'  => wpinv_get_gateway_admin_label($report_data['gateway']),
 				'sales'    => $report_data['sales'],
-				'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
-				'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
-				'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
-				'fees'     => wpinv_price( wpinv_format_amount( $report_data['fees'] ) ),
+				'total'    => wpinv_price(wpinv_format_amount($report_data['total'])),
+				'discount' => wpinv_price(wpinv_format_amount($report_data['discount'])),
+				'tax'      => wpinv_price(wpinv_format_amount($report_data['tax'])),
+				'fees'     => wpinv_price(wpinv_format_amount($report_data['fees'])),
 			);
 		}
 
@@ -160,7 +160,7 @@ 
 	public function revenue_reports_data() {
 		global $wpdb;
 
-		$table =  $wpdb->prefix . 'getpaid_invoices';
+		$table = $wpdb->prefix . 'getpaid_invoices';
 		$data  = $wpdb->get_results(
 			"SELECT
 				COUNT(posts.ID) as sales,
@@ -179,8 +179,8 @@ 
 		
 		$return = array();
 
-		foreach ( $data as $gateway ) {
-			$return[ $gateway ['gateway']] = $gateway;
+		foreach ($data as $gateway) {
+			$return[$gateway ['gateway']] = $gateway;
 		}
 
 		return $return;
@@ -197,7 +197,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 	}
 }

includes/class-wpinv-reports.php

Braces +3 added lines, -2 removed lines

@@ -112,8 +112,9 @@
         $views   = apply_filters( 'wpinv_report_views', $views );
         $current = 'earnings';
 
-        if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) )
-		$current = $_GET['view'];
+        if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+        		$current = $_GET['view'];
+        }
 
         ?>
 	        <form id="wpinv-reports-filter" method="get" class="tablenav">

Indentation +13 added lines, -13 removed lines

@@ -116,7 +116,7 @@ 
         $current = 'earnings';
 
         if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) )
-		$current = $_GET['view'];
+        $current = $_GET['view'];
 
         ?>
 	        <form id="wpinv-reports-filter" method="get" class="tablenav">
@@ -134,7 +134,7 @@ 
 	        </form>
         <?php
 
-	    do_action( 'wpinv_reports_view_' . $current );
+        do_action( 'wpinv_reports_view_' . $current );
 
     }
 
@@ -224,13 +224,13 @@ 
             $is_writeable   = $is_dir && is_writeable( $this->export_dir );
 
             if ( $is_dir && $is_writeable ) {
-               return true;
+                return true;
             } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
-               }
+                if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
+                    return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+                }
 
-               return true;
+                return true;
             } else {
                 if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
                     return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
@@ -325,12 +325,12 @@ 
         $output  = fopen( 'php://output', 'w' ) or die( 'Unsupported server' );
 
         // Let the browser know what content we're streaming and how it should save the content.
-		$name = time();
-		header( "Content-Type:application/csv" );
+        $name = time();
+        header( "Content-Type:application/csv" );
         header( "Content-Disposition:attachment;filename=getpaid-discounts-$name.csv" );
 
         // Output the csv column headers.
-		fputcsv(
+        fputcsv(
             $output,
             array(
                 __( 'Discount Id', 'invoicing' ),
@@ -698,12 +698,12 @@ 
         $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
         $first_day_month  	  = date( 'Y-m-1', current_time( 'timestamp' ) );
         $last_day_month  	  = date( 'Y-m-t', current_time( 'timestamp' ) );
-		$first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
+        $first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
         $last_day_last_month  = date( 'Y-m-d', strtotime( 'last day of last month', current_time( 'timestamp' ) ) );
         $first_day_year  	  = date( 'Y-1-1', current_time( 'timestamp' ) );
         $last_day_year  	  = date( 'Y-12-31', current_time( 'timestamp' ) );
-		$first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
-		$last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
+        $first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
+        $last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 

Spacing +335 added lines, -335 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
 
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
 
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
 
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
 
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 20 );
-            add_action( 'wpinv_reports_tab_reports', array( $this, 'reports' ) );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_discount_use_export', array( $this, 'discount_use_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 20);
+            add_action('wpinv_reports_tab_reports', array($this, 'reports'));
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
+            add_action('wp_ajax_wpinv_ajax_discount_use_export', array($this, 'discount_use_export'));
 
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
 
             // Reports.
-            add_action( 'wpinv_reports_view_earnings', array( $this, 'earnings_report' ) );
-            add_action( 'wpinv_reports_view_gateways', array( $this, 'gateways_report' ) );
-            add_action( 'wpinv_reports_view_items', array( $this, 'items_report' ) );
-            add_action( 'wpinv_reports_view_taxes', array( $this, 'tax_report' ) );
+            add_action('wpinv_reports_view_earnings', array($this, 'earnings_report'));
+            add_action('wpinv_reports_view_gateways', array($this, 'gateways_report'));
+            add_action('wpinv_reports_view_items', array($this, 'items_report'));
+            add_action('wpinv_reports_view_taxes', array($this, 'tax_report'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
 
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), wpinv_get_capability(), 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), wpinv_get_capability(), 'wpinv-reports', array($this, 'reports_page'));
     }
 
     public function reports_page() {
 
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
 
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'reports', 'settings-updated' => false ), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'invoicing' ); ?></a>
-                <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo esc_url(add_query_arg(array('tab' => 'reports', 'settings-updated' => false), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'invoicing'); ?></a>
+                <a href="<?php echo esc_url(add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
-            <div class="wpi-reports-content wpi-reports-<?php echo esc_attr( $active_tab ); ?>">
+            <div class="wpi-reports-content wpi-reports-<?php echo esc_attr($active_tab); ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
             </div>
         </div>
@@ -106,139 +106,139 @@ 
     public function reports() {
 
         $views = array(
-            'earnings'   => __( 'Earnings', 'invoicing' ),
-            'items'      => __( 'Items', 'invoicing' ),
-            'gateways'   => __( 'Payment Methods', 'invoicing' ),
-            'taxes'      => __( 'Taxes', 'invoicing' ),
+            'earnings'   => __('Earnings', 'invoicing'),
+            'items'      => __('Items', 'invoicing'),
+            'gateways'   => __('Payment Methods', 'invoicing'),
+            'taxes'      => __('Taxes', 'invoicing'),
         );
 
-        $views   = apply_filters( 'wpinv_report_views', $views );
+        $views   = apply_filters('wpinv_report_views', $views);
         $current = 'earnings';
 
-        if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) )
+        if (isset($_GET['view']) && array_key_exists($_GET['view'], $views))
 		$current = $_GET['view'];
 
         ?>
 	        <form id="wpinv-reports-filter" method="get" class="tablenav">
 		        <select id="wpinv-reports-view" name="view">
-			        <option value="-1" disabled><?php _e( 'Report Type', 'invoicing' ); ?></option>
-			            <?php foreach ( $views as $view_id => $label ) : ?>
-				            <option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current ); ?>><?php echo $label; ?></option>
+			        <option value="-1" disabled><?php _e('Report Type', 'invoicing'); ?></option>
+			            <?php foreach ($views as $view_id => $label) : ?>
+				            <option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current); ?>><?php echo $label; ?></option>
 			            <?php endforeach; ?>
 		        </select>
 
-		        <?php do_action( 'wpinv_report_view_actions' ); ?>
+		        <?php do_action('wpinv_report_view_actions'); ?>
 
 		        <input type="hidden" name="page" value="wpinv-reports"/>
-		        <?php submit_button( __( 'Show', 'invoicing' ), 'secondary', 'submit', false ); ?>
+		        <?php submit_button(__('Show', 'invoicing'), 'secondary', 'submit', false); ?>
 	        </form>
         <?php
 
-	    do_action( 'wpinv_reports_view_' . $current );
+	    do_action('wpinv_reports_view_' . $current);
 
     }
 
     public function export() {
-        $statuses = wpinv_get_invoice_statuses( true );
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = wpinv_get_invoice_statuses(true);
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
 
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array(
+                                <?php echo wpinv_html_date_field(array(
                                     'id' => 'wpi_export_from_date',
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array(
+                                <?php echo wpinv_html_date_field(array(
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => 'wpi_select2',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
 
                     <div class="postbox wpi-export-discount-uses">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Discount Use','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Discount Use', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of discount uses.', 'invoicing' ); ?></p>
-                            <a class="button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-ajax.php?action=wpinv_ajax_discount_use_export' ), 'wpi_discount_ajax_export', 'wpi_discount_ajax_export' ) ); ?>"><?php _e( 'Generate CSV', 'invoicing' ); ?></a>
+                            <p><?php _e('Download a CSV of discount uses.', 'invoicing'); ?></p>
+                            <a class="button-primary" href="<?php echo esc_url(wp_nonce_url(admin_url('admin-ajax.php?action=wpinv_ajax_discount_use_export'), 'wpi_discount_ajax_export', 'wpi_discount_ajax_export')); ?>"><?php _e('Generate CSV', 'invoicing'); ?></a>
                         </div>
                     </div>
 
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
 
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
 
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
 
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
 
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
 
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
 
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -246,59 +246,59 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
 
-        if ( empty( $_POST['data'] ) || ! wpinv_current_user_can_manage_invoicing() ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !wpinv_current_user_can_manage_invoicing()) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
 
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
-        $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        $_REQUEST = (array) $data;
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
 
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
 
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
 
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
 
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
 
             $response['success']    = true;
             $response['msg']        = '';
 
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
 
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     /**
@@ -306,7 +306,7 @@ 
      */
     public function discount_use_export() {
 
-        if ( ! wp_verify_nonce( $_GET['wpi_discount_ajax_export'], 'wpi_discount_ajax_export' ) || ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wp_verify_nonce($_GET['wpi_discount_ajax_export'], 'wpi_discount_ajax_export') || !wpinv_current_user_can_manage_invoicing()) {
             wp_die( -1, 403 );
         }
 
@@ -316,115 +316,115 @@ 
             'posts_per_page' => -1,
         );
 
-        $discounts = get_posts( $args );
+        $discounts = get_posts($args);
 
-        if ( empty( $discounts ) ) {
-            die ( __( 'You have not set up any discounts', 'invoicing' ) );
+        if (empty($discounts)) {
+            die (__('You have not set up any discounts', 'invoicing'));
         }
 
-        $output  = fopen( 'php://output', 'w' ) or die( 'Unsupported server' );
+        $output = fopen('php://output', 'w') or die('Unsupported server');
 
         // Let the browser know what content we're streaming and how it should save the content.
 		$name = time();
-		header( "Content-Type:application/csv" );
-        header( "Content-Disposition:attachment;filename=getpaid-discounts-$name.csv" );
+		header("Content-Type:application/csv");
+        header("Content-Disposition:attachment;filename=getpaid-discounts-$name.csv");
 
         // Output the csv column headers.
 		fputcsv(
             $output,
             array(
-                __( 'Discount Id', 'invoicing' ),
-                __( 'Discount Code', 'invoicing' ),
-                __( 'Discount Type', 'invoicing' ),
-                __( 'Discount Amount', 'invoicing' ),
-                __( 'Uses', 'invoicing' ),
+                __('Discount Id', 'invoicing'),
+                __('Discount Code', 'invoicing'),
+                __('Discount Type', 'invoicing'),
+                __('Discount Amount', 'invoicing'),
+                __('Uses', 'invoicing'),
             )
         );
 
-        foreach ( $discounts as $discount ) {
+        foreach ($discounts as $discount) {
 
             $discount = (int) $discount;
             $row      = array(
                 $discount,
-                get_post_meta( $discount, '_wpi_discount_code', true ),
-                get_post_meta( $discount, '_wpi_discount_type', true ),
-                get_post_meta( $discount, '_wpi_discount_amount', true ),
-                (int) get_post_meta( $discount, '_wpi_discount_uses', true )
+                get_post_meta($discount, '_wpi_discount_code', true),
+                get_post_meta($discount, '_wpi_discount_type', true),
+                get_post_meta($discount, '_wpi_discount_amount', true),
+                (int) get_post_meta($discount, '_wpi_discount_uses', true)
             );
-            fputcsv( $output, $row );
+            fputcsv($output, $row);
         }
 
-        fclose( $output );
+        fclose($output);
         exit;
 
     }
 
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
 
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
 
     public function get_columns() {
         $columns = array();
 
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
 
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
 
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
 
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
 
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
 
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            /** @scrutinizer ignore-unhandled */ @unlink( $this->file );
+        if ($this->step < 2) {
+            /** @scrutinizer ignore-unhandled */ @unlink($this->file);
             $this->print_columns();
         }
 
         $return = $this->print_rows();
 
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -433,14 +433,14 @@ 
 
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
 
     public function get_export_data() {
         $data = array();
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -450,20 +450,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -472,48 +472,48 @@ 
     }
 
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publish';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publish';
     }
 
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
-            'completed_date'=> __( 'Payment Done Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'items'        => __( 'Items', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
+            'completed_date'=> __('Payment Done Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'items'        => __('Items', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
         );
 
         return $columns;
     }
 
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -521,42 +521,42 @@ 
             'orderby'  => 'date',
         );
 
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         } else {
-            $args['status'] = array_keys( wpinv_get_invoice_statuses( true ) );
+            $args['status'] = array_keys(wpinv_get_invoice_statuses(true));
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
 
         $data = array();
 
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $items = $this->get_invoice_items($invoice);
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'due_date'      => $invoice->get_due_date( false ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'due_date'      => $invoice->get_due_date(false),
                     'completed_date'=> $invoice->get_completed_date(),
-                    'amount'        => wpinv_round_amount( $invoice->get_total() ),
+                    'amount'        => wpinv_round_amount($invoice->get_total()),
                     'currency'      => $invoice->get_currency(),
                     'items'         => $items,
-                    'status_nicename' => $invoice->get_status( true ),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount( $invoice->get_tax() ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount( $invoice->get_discount() ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount($invoice->get_tax()) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount($invoice->get_discount()) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -575,7 +575,7 @@ 
                     'transaction_id'=> $invoice->gateway ? $invoice->get_transaction_id() : '',
                 );
 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -591,44 +591,44 @@ 
             'return'   => 'ids',
         );
 
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         } else {
-            $args['status'] = array_keys( wpinv_get_invoice_statuses( true ) );
+            $args['status'] = array_keys(wpinv_get_invoice_statuses(true));
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 
         return $status;
     }
 
-    public function get_invoice_items($invoice){
-        if(!$invoice){
+    public function get_invoice_items($invoice) {
+        if (!$invoice) {
             return '';
         }
 
         $cart_details = $invoice->get_cart_details();
-        if(!empty($cart_details)){
+        if (!empty($cart_details)) {
             $cart_details = maybe_serialize($cart_details);
         } else {
             $cart_details = '';
@@ -640,14 +640,14 @@ 
     /**
      * Returns the periods filter.
      */
-    public function period_filter( $args = array() ) {
+    public function period_filter($args = array()) {
 
         ob_start();
 
         echo '<form id="wpinv-graphs-filter" method="get" style="margin-bottom: 10px;" class="tablenav">';
         echo '<input type="hidden" name="page" value="wpinv-reports">';
 
-        foreach ( $args as $key => $val ) {
+        foreach ($args as $key => $val) {
             $key = esc_attr($key);
             $val = esc_attr($val);
             echo "<input type='hidden' name='$key' value='$val'>";
@@ -656,21 +656,21 @@ 
         echo '<select id="wpinv-graphs-date-options" name="range" style="min-width: 200px;" onChange="this.form.submit()">';
 
         $ranges = array(
-            'today'        => __( 'Today', 'invoicing' ),
-            'yesterday'    => __( 'Yesterday', 'invoicing' ),
-            'this_week'    => __( 'This Week', 'invoicing' ),
-            'last_week'    => __( 'Last Week', 'invoicing' ),
-            '7_days_ago'   => __( 'Last 7 Days', 'invoicing' ),
-            '30_days_ago'  => __( 'Last 30 Days', 'invoicing' ),
-            'this_month'   => __( 'This Month', 'invoicing' ),
-            'this_year'    => __( 'This Year', 'invoicing' ),
-            'last_year'    => __( 'Last Year', 'invoicing' ),
+            'today'        => __('Today', 'invoicing'),
+            'yesterday'    => __('Yesterday', 'invoicing'),
+            'this_week'    => __('This Week', 'invoicing'),
+            'last_week'    => __('Last Week', 'invoicing'),
+            '7_days_ago'   => __('Last 7 Days', 'invoicing'),
+            '30_days_ago'  => __('Last 30 Days', 'invoicing'),
+            'this_month'   => __('This Month', 'invoicing'),
+            'this_year'    => __('This Year', 'invoicing'),
+            'last_year'    => __('Last Year', 'invoicing'),
         );
 
-        $range = isset( $_GET['range'] ) && isset( $ranges[ $_GET['range'] ] ) ? $_GET['range'] : '7_days_ago';
+        $range = isset($_GET['range']) && isset($ranges[$_GET['range']]) ? $_GET['range'] : '7_days_ago';
 
-        foreach ( $ranges as $val => $label ) {
-            $selected = selected( $range, $val, false );
+        foreach ($ranges as $val => $label) {
+            $selected = selected($range, $val, false);
             echo "<option value='$val' $selected>$label</option>";
         }
 
@@ -682,28 +682,28 @@ 
     /**
      * Returns the the current date range.
      */
-    public function get_sql_clauses( $range ) {
+    public function get_sql_clauses($range) {
 
         $date     = 'CAST(meta.completed_date AS DATE)';
         $datetime = 'meta.completed_date';
 
         // Prepare durations.
-        $today                = current_time( 'Y-m-d' );
-        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-        $sunday               = date( 'Y-m-d', strtotime( 'sunday this week', current_time( 'timestamp' ) ) );
-        $monday               = date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' ) ) );
-        $last_sunday          = date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' ) ) );
-        $last_monday          = date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' ) ) );
-        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-        $first_day_month  	  = date( 'Y-m-1', current_time( 'timestamp' ) );
-        $last_day_month  	  = date( 'Y-m-t', current_time( 'timestamp' ) );
-		$first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
-        $last_day_last_month  = date( 'Y-m-d', strtotime( 'last day of last month', current_time( 'timestamp' ) ) );
-        $first_day_year  	  = date( 'Y-1-1', current_time( 'timestamp' ) );
-        $last_day_year  	  = date( 'Y-12-31', current_time( 'timestamp' ) );
-		$first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
-		$last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
+        $today                = current_time('Y-m-d');
+        $yesterday            = date('Y-m-d', strtotime('-1 day', current_time('timestamp')));
+        $sunday               = date('Y-m-d', strtotime('sunday this week', current_time('timestamp')));
+        $monday               = date('Y-m-d', strtotime('monday this week', current_time('timestamp')));
+        $last_sunday          = date('Y-m-d', strtotime('sunday last week', current_time('timestamp')));
+        $last_monday          = date('Y-m-d', strtotime('monday last week', current_time('timestamp')));
+        $seven_days_ago       = date('Y-m-d', strtotime('-7 days', current_time('timestamp')));
+        $thirty_days_ago      = date('Y-m-d', strtotime('-30 days', current_time('timestamp')));
+        $first_day_month = date('Y-m-1', current_time('timestamp'));
+        $last_day_month  	  = date('Y-m-t', current_time('timestamp'));
+		$first_day_last_month = date('Y-m-d', strtotime('first day of last month', current_time('timestamp')));
+        $last_day_last_month = date('Y-m-d', strtotime('last day of last month', current_time('timestamp')));
+        $first_day_year  	  = date('Y-1-1', current_time('timestamp'));
+        $last_day_year = date('Y-12-31', current_time('timestamp'));
+		$first_day_last_year  = date('Y-m-d', strtotime('first day of last year', current_time('timestamp')));
+		$last_day_last_year   = date('Y-m-d', strtotime('last day of last year', current_time('timestamp')));
 
         $ranges = array(
 
@@ -759,21 +759,21 @@ 
 
         );
 
-        if ( ! isset( $ranges[ $range ] ) ) {
+        if (!isset($ranges[$range])) {
             return $ranges['7_days_ago'];
         }
-        return $ranges[ $range ];
+        return $ranges[$range];
 
     }
 
     /**
      * Returns the the current date ranges results.
      */
-    public function get_report_results( $range ) {
+    public function get_report_results($range) {
         global $wpdb;
 
         $table   = $wpdb->prefix . 'getpaid_invoices';
-        $clauses = $this->get_sql_clauses( $range );
+        $clauses = $this->get_sql_clauses($range);
         $sql     = "SELECT
                 {$clauses[0]} AS completed_date,
                 SUM( meta.total ) AS total,
@@ -789,30 +789,30 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-        return $wpdb->get_results( $sql );
+        return $wpdb->get_results($sql);
     }
 
     /**
      * Fill nulls.
      */
-    public function fill_nulls( $data, $range ) {
+    public function fill_nulls($data, $range) {
 
         $return = array();
         $time   = current_time('timestamp');
 
-        switch ( $range ) {
+        switch ($range) {
             case 'today' :
             case 'yesterday' :
-                $hour  = 0;
+                $hour = 0;
 
-                while ( $hour < 23 ) {
+                while ($hour < 23) {
                     $amount = 0;
-                    if ( isset( $data[$hour] ) ) {
-                        $amount = floatval( $data[$hour] );
+                    if (isset($data[$hour])) {
+                        $amount = floatval($data[$hour]);
                     }
 
-                    $time = strtotime( "$range $hour:00:00" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$range $hour:00:00") * 1000;
+                    $return[] = array($time, $amount);
                     $hour++;
                 }
 
@@ -820,24 +820,24 @@ 
 
             case 'this_month' :
             case 'last_month' :
-                $_range = str_replace( '_', ' ', $range );
-                $month  = date( 'n', strtotime( $_range, $time ) );
-                $year   = date( 'Y', strtotime( $_range, $time ) );
+                $_range = str_replace('_', ' ', $range);
+                $month  = date('n', strtotime($_range, $time));
+                $year   = date('Y', strtotime($_range, $time));
                 $days   = cal_days_in_month(
-                    defined( 'CAL_GREGORIAN' ) ? CAL_GREGORIAN : 1,
+                    defined('CAL_GREGORIAN') ? CAL_GREGORIAN : 1,
                     $month,
                     $year
                 );
 
                 $day = 1;
-                while ( $days != $day ) {
+                while ($days != $day) {
                     $amount = 0;
-                    if ( isset( $data[$day] ) ) {
-                        $amount = floatval( $data[$day] );
+                    if (isset($data[$day])) {
+                        $amount = floatval($data[$day]);
                     }
 
-                    $time = strtotime( "$year-$month-$day" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$year-$month-$day") * 1000;
+                    $return[] = array($time, $amount);
                     $day++;
                 }
 
@@ -845,52 +845,52 @@ 
 
             case 'this_week' :
             case 'last_week' :
-                $_range = str_replace( '_', ' ', $range );
-                $days   = array( 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday' );
+                $_range = str_replace('_', ' ', $range);
+                $days   = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
 
-                foreach ( $days as $day ) {
+                foreach ($days as $day) {
 
                     $amount = 0;
-                    if ( isset( $data[ ucfirst( $day ) ] ) ) {
-                        $amount = floatval( $data[ ucfirst( $day ) ] );
+                    if (isset($data[ucfirst($day)])) {
+                        $amount = floatval($data[ucfirst($day)]);
                     }
 
-                    $time = strtotime( "$_range $day" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$_range $day") * 1000;
+                    $return[] = array($time, $amount);
                 }
 
                 break;
 
             case 'this_year' :
             case 'last_year' :
-                $_range = str_replace( '_', ' ', $range );
-                $year   = date( 'Y', strtotime( $_range, $time ) );
-                $months = array( '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' );
+                $_range = str_replace('_', ' ', $range);
+                $year   = date('Y', strtotime($_range, $time));
+                $months = array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12');
 
-                foreach ( $months as $month ) {
+                foreach ($months as $month) {
 
                     $amount = 0;
-                    if ( isset( $data[$month] ) ) {
-                        $amount = floatval( $data[$month] );
+                    if (isset($data[$month])) {
+                        $amount = floatval($data[$month]);
                     }
 
-                    $_time     = strtotime("$year-$month-01") * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("$year-$month-01") * 1000;
+                    $return[] = array($_time, $amount);
                 }
 
                 break;
             case '30_days_ago' :
                 $days = 30;
 
-                while ( $days > 1 ) {
+                while ($days > 1) {
                     $amount = 0;
-                    $date   = date( 'j', strtotime( "-$days days", $time ) );
-                    if ( isset( $data[$date] ) ) {
-                        $amount = floatval( $data[$date] );
+                    $date   = date('j', strtotime("-$days days", $time));
+                    if (isset($data[$date])) {
+                        $amount = floatval($data[$date]);
                     }
 
-                    $_time = strtotime( "-$days days", $time ) * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("-$days days", $time) * 1000;
+                    $return[] = array($_time, $amount);
                     $days--;
                 }
 
@@ -899,15 +899,15 @@ 
             default:
                 $days = 7;
 
-                while ( $days > 1 ) {
+                while ($days > 1) {
                     $amount = 0;
-                    $date   = date( 'j', strtotime( "-$days days", $time ) );
-                    if ( isset( $data[$date] ) ) {
-                        $amount = floatval( $data[$date] );
+                    $date   = date('j', strtotime("-$days days", $time));
+                    if (isset($data[$date])) {
+                        $amount = floatval($data[$date]);
                     }
 
-                    $_time = strtotime( "-$days days", $time ) * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("-$days days", $time) * 1000;
+                    $return[] = array($_time, $amount);
                     $days--;
                 }
 
@@ -922,33 +922,33 @@ 
      * Retrieves the stats.
      */
     public function get_stats() {
-        $range     = isset( $_GET['range'] ) ? $_GET['range'] : '7_days_ago';
-        $results   = $this->get_report_results( $range );
-        $earnings  = wp_list_pluck( $results, 'total', 'completed_date' );
-        $taxes     = wp_list_pluck( $results, 'tax', 'completed_date' );
-        $discounts = wp_list_pluck( $results, 'discount', 'completed_date' );
-        $fees      = wp_list_pluck( $results, 'fees_total', 'completed_date' );
+        $range     = isset($_GET['range']) ? $_GET['range'] : '7_days_ago';
+        $results   = $this->get_report_results($range);
+        $earnings  = wp_list_pluck($results, 'total', 'completed_date');
+        $taxes     = wp_list_pluck($results, 'tax', 'completed_date');
+        $discounts = wp_list_pluck($results, 'discount', 'completed_date');
+        $fees      = wp_list_pluck($results, 'fees_total', 'completed_date');
 
         return array(
 
             array(
-                'label' => __( 'Earnings', 'invoicing' ),
-                'data'  => $this->fill_nulls( $earnings, $range ),
+                'label' => __('Earnings', 'invoicing'),
+                'data'  => $this->fill_nulls($earnings, $range),
             ),
 
             array(
-                'label' => __( 'Taxes', 'invoicing' ),
-                'data'  => $this->fill_nulls( $taxes, $range ),
+                'label' => __('Taxes', 'invoicing'),
+                'data'  => $this->fill_nulls($taxes, $range),
             ),
 
             array(
-                'label' => __( 'Discounts', 'invoicing' ),
-                'data'  => $this->fill_nulls( $discounts, $range ),
+                'label' => __('Discounts', 'invoicing'),
+                'data'  => $this->fill_nulls($discounts, $range),
             ),
 
             array(
-                'label' => __( 'Fees', 'invoicing' ),
-                'data'  => $this->fill_nulls( $fees, $range ),
+                'label' => __('Fees', 'invoicing'),
+                'data'  => $this->fill_nulls($fees, $range),
             )
         );
 
@@ -958,34 +958,34 @@ 
      * Retrieves the time format for stats.
      */
     public function get_time_format() {
-        $range    = isset( $_GET['range'] ) ? $_GET['range'] : '7_days_ago';
+        $range = isset($_GET['range']) ? $_GET['range'] : '7_days_ago';
 
-        switch ( $range ) {
+        switch ($range) {
             case 'today' :
             case 'yesterday' :
-                return array( 'hour', '%h %p' );
+                return array('hour', '%h %p');
                 break;
 
             case 'this_month' :
             case 'last_month' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             case 'this_week' :
             case 'last_week' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             case 'this_year' :
             case 'last_year' :
-                return array( 'month', '%b' );
+                return array('month', '%b');
                 break;
             case '30_days_ago' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             default:
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
         }
@@ -996,11 +996,11 @@ 
      */
     public function earnings_report() {
 
-        $data        = wp_json_encode( $this->get_stats() );
+        $data        = wp_json_encode($this->get_stats());
         $time_format = $this->get_time_format();
         echo '
             <div class="wpinv-report-container">
-                <h3><span>' . __( 'Earnings Over Time', 'invoicing' ) .'</span></h3>
+                <h3><span>' . __('Earnings Over Time', 'invoicing') . '</span></h3>
                 ' . $this->period_filter() . '
                 <div id="wpinv_report_graph" style="height: 450px;"></div>
             </div>
@@ -1009,12 +1009,12 @@ 
                 jQuery(document).ready( function() {
                     jQuery.plot(
                         jQuery("#wpinv_report_graph"),
-                        ' . $data .',
+                        ' . $data . ',
                         {
                             xaxis:{
                                 mode: "time",
-                                timeformat: "' . $time_format[1] .'",
-                                minTickSize: [0.5, "' . $time_format[0] .'"]
+                                timeformat: "' . $time_format[1] . '",
+                                minTickSize: [0.5, "' . $time_format[0] . '"]
                             },
 
                             yaxis: {
@@ -1042,7 +1042,7 @@ 
      * Displays the gateways report.
      */
     public function gateways_report() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-gateways-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-gateways-report-table.php');
 
         $table = new WPInv_Gateways_Report_Table();
         $table->prepare_items();
@@ -1053,12 +1053,12 @@ 
      * Displays the items report.
      */
     public function items_report() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-items-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-items-report-table.php');
 
         $table = new WPInv_Items_Report_Table();
         $table->prepare_items();
         $table->display();
-        echo __( '* Items with no sales not shown.', 'invoicing' );
+        echo __('* Items with no sales not shown.', 'invoicing');
     }
 
     /**
@@ -1068,27 +1068,27 @@ 
      */
     public function tax_report() {
 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-taxes-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-taxes-report-table.php');
         $table = new WPInv_Taxes_Reports_Table();
         $table->prepare_items();
-        $year = isset( $_GET['year'] ) ? absint( $_GET['year'] ) : date( 'Y' );
+        $year = isset($_GET['year']) ? absint($_GET['year']) : date('Y');
         ?>
 
         <div class="metabox-holder" style="padding-top: 0;">
             <div class="postbox">
-                <h3><span><?php _e('Tax Report','invoicing' ); ?></span></h3>
+                <h3><span><?php _e('Tax Report', 'invoicing'); ?></span></h3>
                 <div class="inside">
-                    <p><?php _e( 'This report shows the total amount collected in sales tax for the given year.', 'invoicing' ); ?></p>
+                    <p><?php _e('This report shows the total amount collected in sales tax for the given year.', 'invoicing'); ?></p>
                     <form method="get">
-                        <span><?php echo $year; ?></span>: <strong><?php echo wpinv_sales_tax_for_year( $year ); ?></strong>&nbsp;&mdash;&nbsp;
+                        <span><?php echo $year; ?></span>: <strong><?php echo wpinv_sales_tax_for_year($year); ?></strong>&nbsp;&mdash;&nbsp;
                         <select name="year">
-                            <?php for ( $i = 2014; $i <= date( 'Y' ); $i++ ) : ?>
-                            <option value="<?php echo $i; ?>"<?php selected( $year, $i ); ?>><?php echo $i; ?></option>
+                            <?php for ($i = 2014; $i <= date('Y'); $i++) : ?>
+                            <option value="<?php echo $i; ?>"<?php selected($year, $i); ?>><?php echo $i; ?></option>
                             <?php endfor; ?>
                         </select>
                         <input type="hidden" name="view" value="taxes" />
                         <input type="hidden" name="page" value="wpinv-reports"/>
-                        <?php submit_button( __( 'Submit', 'invoicing' ), 'secondary', 'submit', false ); ?>
+                        <?php submit_button(__('Submit', 'invoicing'), 'secondary', 'submit', false); ?>
                     </form>
                 </div><!-- .inside -->
             </div><!-- .postbox -->

widgets/checkout.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,15 +23,15 @@ 
             'block-keywords'=> "['invoicing','checkout']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_checkout',
-            'name'          => __('GetPaid > Checkout','invoicing'),
+            'name'          => __('GetPaid > Checkout', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'getpaid-checkout bsui',
-                'description' => esc_html__('Displays a checkout form.','invoicing'),
+                'description' => esc_html__('Displays a checkout form.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -42,7 +42,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -54,7 +54,7 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 	    return wpinv_checkout_form();
     }
 

Indentation +10 added lines, -10 removed lines

@@ -45,17 +45,17 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
-	    return wpinv_checkout_form();
+        return wpinv_checkout_form();
     }
 
 }

includes/class-wpinv-legacy-invoice.php

Indentation +4 added lines, -4 removed lines

@@ -1355,10 +1355,10 @@
                         $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
                     }
 
-	                $total = $data['subtotal'] - $data['discount'] + $data['tax'];
-	                if ( $total < 0 ) {
-		                $total = 0;
-	                }
+                    $total = $data['subtotal'] - $data['discount'] + $data['tax'];
+                    if ( $total < 0 ) {
+                        $total = 0;
+                    }
 
                     $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
                     $data['discount'] = wpinv_round_amount( $cart_discount );

Braces +3 added lines, -2 removed lines

@@ -974,8 +974,9 @@
             return false;
         }
 
-        if ( empty( $this->ID ) )
-            return false;
+        if ( empty( $this->ID ) ) {
+                    return false;
+        }
         
         if ( ( ( is_user_logged_in() && wpinv_current_user_can_manage_invoicing() ) || $added_by_user ) && !$system ) {
             $user                 = get_user_by( 'id', get_current_user_id() );

Spacing +626 added lines, -626 removed lines

@@ -7,8 +7,8 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 final class WPInv_Legacy_Invoice {
@@ -16,7 +16,7 @@ 
     /**
      * Invoice id.
      */
-    public $ID  = 0;
+    public $ID = 0;
 
     /**
      * The title of the invoice. Usually the invoice number.
@@ -132,7 +132,7 @@ 
     /**
      * The invoice status.
      */
-    public $status      = 'wpi-pending';
+    public $status = 'wpi-pending';
 
     /**
      * Same as self::$status.
@@ -259,17 +259,17 @@ 
      */
     public $parent_invoice = 0;
     
-    public function __construct( $invoice_id = false ) {
-        if( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -277,51 +277,51 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if( !$invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( !('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
 
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
 
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -331,14 +331,14 @@ 
         $this->completed_date  = $this->setup_completed_date();
         $this->status          = $invoice->post_status;
 
-        if ( 'future' == $this->status ) {
+        if ('future' == $this->status) {
             $this->status = 'publish';
         }
 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
+        $this->post_name       = $this->setup_post_name($invoice);
         $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
@@ -361,8 +361,8 @@ 
         
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = !empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
 
         $this->user_info       = $this->setup_user_info();
 
@@ -371,7 +371,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -386,39 +386,39 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = !empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
         
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
         
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
 
-    private function setup_status_nicename( $status ) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses( true, true, $this );
+    private function setup_status_nicename($status) {
+        $all_invoice_statuses = wpinv_get_invoice_statuses(true, true, $this);
 
-        if ( $this->is_quote() && class_exists( 'Wpinv_Quotes_Shared' ) ) {
-            $all_invoice_statuses  = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
+        if ($this->is_quote() && class_exists('Wpinv_Quotes_Shared')) {
+            $all_invoice_statuses = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
         }
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
 
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
         
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
-                $post_name = wpinv_generate_post_name( $post->ID );
+            } else if (!empty($post->ID)) {
+                $post_name = wpinv_generate_post_name($post->ID);
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
             }
         }
 
@@ -426,12 +426,12 @@ 
     }
     
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
         
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days' ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } else if ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days')));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } else if ($due_date == 'none') {
             $due_date = '';
         }
         
@@ -439,67 +439,67 @@ 
     }
     
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
     
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
     
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
         
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
     
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float) $this->subtotal - ((float) $this->total - (float) $this->tax - (float) $this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
         
         return $discount;
     }
     
     private function setup_discount_code() {
-        $discount_code = !empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
     
     private function setup_tax() {
 
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {            
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {            
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
         
-        if ( $tax < 0 || ! $this->is_taxable() ) {
+        if ($tax < 0 || !$this->is_taxable()) {
             $tax = 0;
         }
 
@@ -510,16 +510,16 @@ 
      * If taxes are enabled, allow users to enable/disable taxes per invoice.
      */
     private function setup_is_taxable() {
-        return (int) $this->get_meta( '_wpinv_disable_taxes', true );
+        return (int) $this->get_meta('_wpinv_disable_taxes', true);
     }
 
     private function setup_subtotal() {
         $subtotal     = 0;
         $cart_details = $this->cart_details;
 
-        if ( is_array( $cart_details ) ) {
-            foreach ( $cart_details as $item ) {
-                if ( isset( $item['subtotal'] ) ) {
+        if (is_array($cart_details)) {
+            foreach ($cart_details as $item) {
+                if (isset($item['subtotal'])) {
                     $subtotal += $item['subtotal'];
                 }
             }
@@ -533,23 +533,23 @@ 
     }
 
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
     
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if($amount < 0){
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -557,13 +557,13 @@ 
     }
     
     private function setup_mode() {
-        return $this->get_meta( '_wpinv_mode' );
+        return $this->get_meta('_wpinv_mode');
     }
 
     private function setup_gateway() {
-        $gateway = $this->get_meta( '_wpinv_gateway' );
+        $gateway = $this->get_meta('_wpinv_gateway');
         
-        if ( empty( $gateway ) && 'publish' === $this->status ) {
+        if (empty($gateway) && 'publish' === $this->status) {
             $gateway = 'manual';
         }
         
@@ -571,23 +571,23 @@ 
     }
 
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
 
     private function setup_transaction_id() {
-        $transaction_id = $this->get_meta( '_wpinv_transaction_id' );
+        $transaction_id = $this->get_meta('_wpinv_transaction_id');
 
-        if ( empty( $transaction_id ) || (int) $transaction_id === (int) $this->ID ) {
+        if (empty($transaction_id) || (int) $transaction_id === (int) $this->ID) {
             $gateway        = $this->gateway;
-            $transaction_id = apply_filters( 'wpinv_get_invoice_transaction_id-' . $gateway, $this->ID );
+            $transaction_id = apply_filters('wpinv_get_invoice_transaction_id-' . $gateway, $this->ID);
         }
 
         return $transaction_id;
     }
 
     private function setup_ip() {
-        $ip = $this->get_meta( '_wpinv_user_ip' );
+        $ip = $this->get_meta('_wpinv_user_ip');
         return $ip;
     }
 
@@ -597,62 +597,62 @@ 
     ///}
         
     private function setup_first_name() {
-        $first_name = $this->get_meta( '_wpinv_first_name' );
+        $first_name = $this->get_meta('_wpinv_first_name');
         return $first_name;
     }
     
     private function setup_last_name() {
-        $last_name = $this->get_meta( '_wpinv_last_name' );
+        $last_name = $this->get_meta('_wpinv_last_name');
         return $last_name;
     }
     
     private function setup_company() {
-        $company = $this->get_meta( '_wpinv_company' );
+        $company = $this->get_meta('_wpinv_company');
         return $company;
     }
     
     private function setup_vat_number() {
-        $vat_number = $this->get_meta( '_wpinv_vat_number' );
+        $vat_number = $this->get_meta('_wpinv_vat_number');
         return $vat_number;
     }
     
     private function setup_vat_rate() {
-        $vat_rate = $this->get_meta( '_wpinv_vat_rate' );
+        $vat_rate = $this->get_meta('_wpinv_vat_rate');
         return $vat_rate;
     }
     
     private function setup_adddress_confirmed() {
-        $adddress_confirmed = $this->get_meta( '_wpinv_adddress_confirmed' );
+        $adddress_confirmed = $this->get_meta('_wpinv_adddress_confirmed');
         return $adddress_confirmed;
     }
     
     private function setup_phone() {
-        $phone = $this->get_meta( '_wpinv_phone' );
+        $phone = $this->get_meta('_wpinv_phone');
         return $phone;
     }
     
     private function setup_address() {
-        $address = $this->get_meta( '_wpinv_address', true );
+        $address = $this->get_meta('_wpinv_address', true);
         return $address;
     }
     
     private function setup_city() {
-        $city = $this->get_meta( '_wpinv_city', true );
+        $city = $this->get_meta('_wpinv_city', true);
         return $city;
     }
     
     private function setup_country() {
-        $country = $this->get_meta( '_wpinv_country', true );
+        $country = $this->get_meta('_wpinv_country', true);
         return $country;
     }
     
     private function setup_state() {
-        $state = $this->get_meta( '_wpinv_state', true );
+        $state = $this->get_meta('_wpinv_state', true);
         return $state;
     }
     
     private function setup_zip() {
-        $zip = $this->get_meta( '_wpinv_zip', true );
+        $zip = $this->get_meta('_wpinv_zip', true);
         return $zip;
     }
 
@@ -661,7 +661,7 @@ 
             'user_id'        => $this->user_id,
             'first_name'     => $this->first_name,
             'last_name'      => $this->last_name,
-            'email'          => get_the_author_meta( 'email', $this->user_id ),
+            'email'          => get_the_author_meta('email', $this->user_id),
             'phone'          => $this->phone,
             'address'        => $this->address,
             'city'           => $this->city,
@@ -676,12 +676,12 @@ 
         );
         
         $user_info = array();
-        if ( isset( $this->payment_meta['user_info'] ) ) {
-            $user_info = maybe_unserialize( $this->payment_meta['user_info'] );
+        if (isset($this->payment_meta['user_info'])) {
+            $user_info = maybe_unserialize($this->payment_meta['user_info']);
             
-            if ( !empty( $user_info ) && isset( $user_info['user_id'] ) && $post = get_post( $this->ID ) ) {
+            if (!empty($user_info) && isset($user_info['user_id']) && $post = get_post($this->ID)) {
                 $this->user_id = $post->post_author;
-                $this->email = get_the_author_meta( 'email', $this->user_id );
+                $this->email = get_the_author_meta('email', $this->user_id);
                 
                 $user_info['user_id'] = $this->user_id;
                 $user_info['email'] = $this->email;
@@ -690,13 +690,13 @@ 
             }
         }
         
-        $user_info    = wp_parse_args( $user_info, $defaults );
+        $user_info = wp_parse_args($user_info, $defaults);
         
         // Get the user, but only if it's been created
-        $user = get_userdata( $this->user_id );
+        $user = get_userdata($this->user_id);
         
-        if ( !empty( $user ) && $user->ID > 0 ) {
-            if ( empty( $user_info ) ) {
+        if (!empty($user) && $user->ID > 0) {
+            if (empty($user_info)) {
                 $user_info = array(
                     'user_id'    => $user->ID,
                     'first_name' => $user->first_name,
@@ -705,23 +705,23 @@ 
                     'discount'   => '',
                 );
             } else {
-                foreach ( $user_info as $key => $value ) {
-                    if ( ! empty( $value ) ) {
+                foreach ($user_info as $key => $value) {
+                    if (!empty($value)) {
                         continue;
                     }
 
-                    switch( $key ) {
+                    switch ($key) {
                         case 'user_id':
-                            $user_info[ $key ] = $user->ID;
+                            $user_info[$key] = $user->ID;
                             break;
                         case 'first_name':
-                            $user_info[ $key ] = $user->first_name;
+                            $user_info[$key] = $user->first_name;
                             break;
                         case 'last_name':
-                            $user_info[ $key ] = $user->last_name;
+                            $user_info[$key] = $user->last_name;
                             break;
                         case 'email':
-                            $user_info[ $key ] = $user->user_email;
+                            $user_info[$key] = $user->user_email;
                             break;
                     }
                 }
@@ -732,25 +732,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
         
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( !$number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_sequential_number_active( $this->post_type ) ) {
-                    $next_number = wpinv_get_next_invoice_number( $this->post_type );
+            if ($this->status == 'auto-draft') {
+                if (wpinv_sequential_number_active($this->post_type)) {
+                    $next_number = wpinv_get_next_invoice_number($this->post_type);
                     $number      = $next_number;
                 }
             }
             
-            $number = wpinv_format_invoice_number( $number, $this->post_type );
+            $number = wpinv_format_invoice_number($number, $this->post_type);
         }
 
         return $number;
@@ -759,10 +759,10 @@ 
     private function insert_invoice() {
         global $wpdb;
 
-        if ( empty( $this->post_type ) ) {
-            if ( !empty( $this->ID ) && $post_type = get_post_type( $this->ID ) ) {
+        if (empty($this->post_type)) {
+            if (!empty($this->ID) && $post_type = get_post_type($this->ID)) {
                 $this->post_type = $post_type;
-            } else if ( !empty( $this->parent_invoice ) && $post_type = get_post_type( $this->parent_invoice ) ) {
+            } else if (!empty($this->parent_invoice) && $post_type = get_post_type($this->parent_invoice)) {
                 $this->post_type = $post_type;
             } else {
                 $this->post_type = 'wpi_invoice';
@@ -770,16 +770,16 @@ 
         }
 
         $invoice_number = $this->ID;
-        if ( $number = $this->get_meta( '_wpinv_number', true ) ) {
+        if ($number = $this->get_meta('_wpinv_number', true)) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -816,60 +816,60 @@ 
                         'post_status'   => $this->status,
                         'post_author'   => $this->user_id,
                         'post_type'     => $this->post_type,
-                        'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-                        'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+                        'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+                        'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
                         'post_parent'   => $this->parent_invoice,
                     );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
 
-            $invoice_id = wp_update_post( $args, true );
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( !empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = apply_filters( 'wpinv_payment_meta', $this->payment_meta, $payment_data );
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            $this->payment_meta = apply_filters('wpinv_payment_meta', $this->payment_meta, $payment_data);
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
-            $this->update_meta( '_wpinv_payment_meta', $this->payment_meta );    
+            $this->update_meta('_wpinv_payment_meta', $this->payment_meta);    
             $this->new = true;
         }
 
         return $this->ID;
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved; // Don't save empty invoice.
         }
         
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
         
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -877,27 +877,27 @@ 
         }
 
         // If we have something pending, let's save it
-        if ( !empty( $this->pending ) ) {
+        if (!empty($this->pending)) {
             $total_increase = 0;
             $total_decrease = 0;
 
-            foreach ( $this->pending as $key => $value ) {
-                switch( $key ) {
+            foreach ($this->pending as $key => $value) {
+                switch ($key) {
                     case 'items':
                         // Update totals for pending items
-                        foreach ( $this->pending[ $key ] as $item ) {
-                            switch( $item['action'] ) {
+                        foreach ($this->pending[$key] as $item) {
+                            switch ($item['action']) {
                                 case 'add':
                                     $price = $item['price'];
                                     $taxes = $item['tax'];
 
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_increase += $price;
                                     }
                                     break;
 
                                 case 'remove':
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_decrease += $item['price'];
                                     }
                                     break;
@@ -905,16 +905,16 @@ 
                         }
                         break;
                     case 'fees':
-                        if ( 'publish' !== $this->status ) {
+                        if ('publish' !== $this->status) {
                             break;
                         }
 
-                        if ( empty( $this->pending[ $key ] ) ) {
+                        if (empty($this->pending[$key])) {
                             break;
                         }
 
-                        foreach ( $this->pending[ $key ] as $fee ) {
-                            switch( $fee['action'] ) {
+                        foreach ($this->pending[$key] as $fee) {
+                            switch ($fee['action']) {
                                 case 'add':
                                     $total_increase += $fee['amount'];
                                     break;
@@ -926,86 +926,86 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'gateway':
-                        $this->update_meta( '_wpinv_gateway', $this->gateway );
+                        $this->update_meta('_wpinv_gateway', $this->gateway);
                         break;
                     case 'mode':
-                        $this->update_meta( '_wpinv_mode', $this->mode );
+                        $this->update_meta('_wpinv_mode', $this->mode);
                         break;
                     case 'transaction_id':
-                        $this->update_meta( '_wpinv_transaction_id', $this->transaction_id );
+                        $this->update_meta('_wpinv_transaction_id', $this->transaction_id);
                         break;
                     case 'ip':
-                        $this->update_meta( '_wpinv_user_ip', $this->ip );
+                        $this->update_meta('_wpinv_user_ip', $this->ip);
                         break;
                     ///case 'user_id':
                         ///$this->update_meta( '_wpinv_user_id', $this->user_id );
                         ///$this->user_info['user_id'] = $this->user_id;
                         ///break;
                     case 'first_name':
-                        $this->update_meta( '_wpinv_first_name', $this->first_name );
+                        $this->update_meta('_wpinv_first_name', $this->first_name);
                         $this->user_info['first_name'] = $this->first_name;
                         break;
                     case 'last_name':
-                        $this->update_meta( '_wpinv_last_name', $this->last_name );
+                        $this->update_meta('_wpinv_last_name', $this->last_name);
                         $this->user_info['last_name'] = $this->last_name;
                         break;
                     case 'phone':
-                        $this->update_meta( '_wpinv_phone', $this->phone );
+                        $this->update_meta('_wpinv_phone', $this->phone);
                         $this->user_info['phone'] = $this->phone;
                         break;
                     case 'address':
-                        $this->update_meta( '_wpinv_address', $this->address );
+                        $this->update_meta('_wpinv_address', $this->address);
                         $this->user_info['address'] = $this->address;
                         break;
                     case 'city':
-                        $this->update_meta( '_wpinv_city', $this->city );
+                        $this->update_meta('_wpinv_city', $this->city);
                         $this->user_info['city'] = $this->city;
                         break;
                     case 'country':
-                        $this->update_meta( '_wpinv_country', $this->country );
+                        $this->update_meta('_wpinv_country', $this->country);
                         $this->user_info['country'] = $this->country;
                         break;
                     case 'state':
-                        $this->update_meta( '_wpinv_state', $this->state );
+                        $this->update_meta('_wpinv_state', $this->state);
                         $this->user_info['state'] = $this->state;
                         break;
                     case 'zip':
-                        $this->update_meta( '_wpinv_zip', $this->zip );
+                        $this->update_meta('_wpinv_zip', $this->zip);
                         $this->user_info['zip'] = $this->zip;
                         break;
                     case 'company':
-                        $this->update_meta( '_wpinv_company', $this->company );
+                        $this->update_meta('_wpinv_company', $this->company);
                         $this->user_info['company'] = $this->company;
                         break;
                     case 'vat_number':
-                        $this->update_meta( '_wpinv_vat_number', $this->vat_number );
+                        $this->update_meta('_wpinv_vat_number', $this->vat_number);
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = getpaid_session()->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
-                            $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
+                        $vat_info = getpaid_session()->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool) $adddress_confirmed);
+                            $this->user_info['adddress_confirmed'] = (bool) $adddress_confirmed;
                         }
     
                         break;
                     case 'vat_rate':
-                        $this->update_meta( '_wpinv_vat_rate', $this->vat_rate );
+                        $this->update_meta('_wpinv_vat_rate', $this->vat_rate);
                         $this->user_info['vat_rate'] = $this->vat_rate;
                         break;
                     case 'adddress_confirmed':
-                        $this->update_meta( '_wpinv_adddress_confirmed', $this->adddress_confirmed );
+                        $this->update_meta('_wpinv_adddress_confirmed', $this->adddress_confirmed);
                         $this->user_info['adddress_confirmed'] = $this->adddress_confirmed;
                         break;
                     
                     case 'key':
-                        $this->update_meta( '_wpinv_key', $this->key );
+                        $this->update_meta('_wpinv_key', $this->key);
                         break;
                     case 'disable_taxes':
-                        $this->update_meta( '_wpinv_disable_taxes', $this->disable_taxes );
+                        $this->update_meta('_wpinv_disable_taxes', $this->disable_taxes);
                         break;
                     case 'date':
                         $args = array(
@@ -1014,49 +1014,49 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         
-                        $this->update_meta( '_wpinv_due_date', $this->due_date );
+                        $this->update_meta('_wpinv_due_date', $this->due_date);
                         break;
                     case 'completed_date':
-                        $this->update_meta( '_wpinv_completed_date', $this->completed_date );
+                        $this->update_meta('_wpinv_completed_date', $this->completed_date);
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'discount':
-                        $this->update_meta( '_wpinv_discount', wpinv_round_amount( $this->discount ) );
+                        $this->update_meta('_wpinv_discount', wpinv_round_amount($this->discount));
                         break;
                     case 'discount_code':
-                        $this->update_meta( '_wpinv_discount_code', $this->discount_code );
+                        $this->update_meta('_wpinv_discount_code', $this->discount_code);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
             
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
             
             $new_meta = array(
                 'items'         => $this->items,
@@ -1067,12 +1067,12 @@ 
             );
             
             $meta        = $this->get_meta();
-            $merged_meta = array_merge( $meta, $new_meta );
+            $merged_meta = array_merge($meta, $new_meta);
 
             // Only save the payment meta if it's changed
-            if ( md5( serialize( $meta ) ) !== md5( serialize( $merged_meta) ) ) {
-                $updated     = $this->update_meta( '_wpinv_payment_meta', $merged_meta );
-                if ( false !== $updated ) {
+            if (md5(serialize($meta)) !== md5(serialize($merged_meta))) {
+                $updated = $this->update_meta('_wpinv_payment_meta', $merged_meta);
+                if (false !== $updated) {
                     $saved = true;
                 }
             }
@@ -1080,15 +1080,15 @@ 
             $this->pending = array();
             $saved         = true;
         } else {
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
         }
         
-        do_action( 'wpinv_invoice_save', $this, $saved );
+        do_action('wpinv_invoice_save', $this, $saved);
 
-        if ( true === $saved || $setup ) {
-            $this->setup_invoice( $this->ID );
+        if (true === $saved || $setup) {
+            $this->setup_invoice($this->ID);
         }
         
         $this->refresh_item_ids();
@@ -1096,7 +1096,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -1106,75 +1106,75 @@ 
             'item_id'     => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
         
-        if ( empty( $fee['label'] ) ) {
+        if (empty($fee['label'])) {
             return false;
         }
         
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
         
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
         
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
-        $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
+    public function remove_fee_by($key, $value, $global = false) {
+        $allowed_fee_keys = apply_filters('wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
-        ) );
+        ));
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } else if ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } else if ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -1182,35 +1182,35 @@ 
 
     
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if( !$note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) )
+        if (empty($this->ID))
             return false;
         
-        if ( ( ( is_user_logged_in() && wpinv_current_user_can_manage_invoicing() ) || $added_by_user ) && !$system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && wpinv_current_user_can_manage_invoicing()) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
             $comment_author       = 'System';
             $comment_author_email = 'system@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
-        $note_id = wp_insert_comment( wp_filter_comment( array(
+        $note_id = wp_insert_comment(wp_filter_comment(array(
             'comment_post_ID'      => $this->ID,
             'comment_content'      => $note,
             'comment_agent'        => 'WPInvoicing',
             'user_id'              => is_admin() ? get_current_user_id() : 0,
-            'comment_date'         => current_time( 'mysql' ),
-            'comment_date_gmt'     => current_time( 'mysql', 1 ),
+            'comment_date'         => current_time('mysql'),
+            'comment_date_gmt'     => current_time('mysql', 1),
             'comment_approved'     => 1,
             'comment_parent'       => 0,
             'comment_author'       => $comment_author,
@@ -1218,53 +1218,53 @@ 
             'comment_author_url'   => '',
             'comment_author_email' => $comment_author_email,
             'comment_type'         => 'wpinv_note'
-        ) ) );
+        )));
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
         
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
-            do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $this->ID, 'user_note' => $note ) );
+            do_action('wpinv_new_customer_note', array('invoice_id' => $this->ID, 'user_note' => $note));
         }
 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
+    private function increase_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
+    private function decrease_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
-        $amount            = (float)$amount;
+    private function increase_fees($amount = 0.00) {
+        $amount            = (float) $amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
+    private function decrease_fees($amount = 0.00) {
         $amount            = (float) $amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -1275,54 +1275,54 @@ 
         global $wpi_nosave;
         
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
         
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
     
-    public function increase_tax( $amount = 0.00 ) {
+    public function increase_tax($amount = 0.00) {
         $amount       = (float) $amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
+    public function decrease_tax($amount = 0.00) {
         $amount     = (float) $amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
 
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses( true ) ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses(true)))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
             
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );     
+            $updated = wp_update_post($update_post_data);     
            
             // Process any specific status functions
-            switch( $new_status ) {
+            switch ($new_status) {
                 case 'wpi-refunded':
                     $this->process_refund();
                     break;
@@ -1335,9 +1335,9 @@ 
             }
             
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -1351,20 +1351,20 @@ 
         $this->save();
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
 
-        if ( $meta_key == 'key' || $meta_key == 'date' ) {
+        if ($meta_key == 'key' || $meta_key == 'date') {
             $current_meta = $this->get_meta();
-            $current_meta[ $meta_key ] = $meta_value;
+            $current_meta[$meta_key] = $meta_value;
 
             $meta_key     = '_wpinv_payment_meta';
             $meta_value   = $current_meta;
         }
 
-        $meta_value = apply_filters( 'wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID);
         
         // Do not update created date on invoice marked as paid.
         /*if ( $meta_key == '_wpinv_completed_date' && !empty( $meta_value ) ) {
@@ -1379,45 +1379,45 @@ 
             wp_update_post( $args );
         }*/
         
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
 
     private function process_refund() {
         $process_refund = true;
 
         // If the payment was not in publish, don't decrement stats as they were never incremented
-        if ( 'publish' != $this->old_status || 'wpi-refunded' != $this->status ) {
+        if ('publish' != $this->old_status || 'wpi-refunded' != $this->status) {
             $process_refund = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_refund = apply_filters( 'wpinv_should_process_refund', $process_refund, $this );
+        $process_refund = apply_filters('wpinv_should_process_refund', $process_refund, $this);
 
-        if ( false === $process_refund ) {
+        if (false === $process_refund) {
             return;
         }
 
-        do_action( 'wpinv_pre_refund_invoice', $this );
+        do_action('wpinv_pre_refund_invoice', $this);
         
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_refund', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_refund', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_refund', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_refund', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_refund', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_refund', true, $this);
         
-        do_action( 'wpinv_post_refund_invoice', $this );
+        do_action('wpinv_post_refund_invoice', $this);
     }
 
     private function process_failure() {
         $discounts = $this->discounts;
-        if ( empty( $discounts ) ) {
+        if (empty($discounts)) {
             return;
         }
 
-        if ( ! is_array( $discounts ) ) {
-            $discounts = array_map( 'trim', explode( ',', $discounts ) );
+        if (!is_array($discounts)) {
+            $discounts = array_map('trim', explode(',', $discounts));
         }
 
-        foreach ( $discounts as $discount ) {
-            wpinv_decrease_discount_usage( $discount );
+        foreach ($discounts as $discount) {
+            wpinv_decrease_discount_usage($discount);
         }
     }
     
@@ -1425,92 +1425,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1518,119 +1518,119 @@ 
         $data['tax']          = $this->get_tax();
         $data['total']        = $this->get_total();
     
-        if ( !empty( $this->cart_details ) && ( $this->is_parent() || $this->is_renewal() ) ) {
+        if (!empty($this->cart_details) && ($this->is_parent() || $this->is_renewal())) {
             $is_free_trial = $this->is_free_trial();
-            $discounts = $this->get_discounts( true );
+            $discounts = $this->get_discounts(true);
             
-            if ( $is_free_trial || !empty( $discounts ) ) {
+            if ($is_free_trial || !empty($discounts)) {
                 $first_use_only = false;
                 
-                if ( !empty( $discounts ) ) {
-                    foreach ( $discounts as $key => $code ) {
-                        if ( wpinv_discount_is_recurring( $code, true ) && !$this->is_renewal() ) {
+                if (!empty($discounts)) {
+                    foreach ($discounts as $key => $code) {
+                        if (wpinv_discount_is_recurring($code, true) && !$this->is_renewal()) {
                             $first_use_only = true;
                             break;
                         }
                     }
                 }
                     
-                if ( !$first_use_only ) {
-                    $data['subtotal'] = wpinv_round_amount( $this->subtotal );
-                    $data['discount'] = wpinv_round_amount( $this->discount );
-                    $data['tax']      = wpinv_round_amount( $this->tax );
-                    $data['total']    = wpinv_round_amount( $this->total );
+                if (!$first_use_only) {
+                    $data['subtotal'] = wpinv_round_amount($this->subtotal);
+                    $data['discount'] = wpinv_round_amount($this->discount);
+                    $data['tax']      = wpinv_round_amount($this->tax);
+                    $data['total']    = wpinv_round_amount($this->total);
                 } else {
                     $cart_subtotal   = 0;
                     $cart_discount   = $this->discount;
                     $cart_tax        = 0;
 
-                    foreach ( $this->cart_details as $key => $item ) {
-                        $item_quantity  = $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                        $item_subtotal  = !empty( $item['subtotal'] ) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
+                    foreach ($this->cart_details as $key => $item) {
+                        $item_quantity  = $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                        $item_subtotal  = !empty($item['subtotal']) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
                         $item_discount  = 0;
-                        $item_tax       = $item_subtotal > 0 && !empty( $item['vat_rate'] ) ? ( $item_subtotal * 0.01 * (float)$item['vat_rate'] ) : 0;
+                        $item_tax       = $item_subtotal > 0 && !empty($item['vat_rate']) ? ($item_subtotal * 0.01 * (float) $item['vat_rate']) : 0;
                         
-                        if ( wpinv_prices_include_tax() ) {
-                            $item_subtotal -= wpinv_round_amount( $item_tax );
+                        if (wpinv_prices_include_tax()) {
+                            $item_subtotal -= wpinv_round_amount($item_tax);
                         }
                         
                         $item_total     = $item_subtotal - $item_discount + $item_tax;
                         // Do not allow totals to go negative
-                        if ( $item_total < 0 ) {
+                        if ($item_total < 0) {
                             $item_total = 0;
                         }
                         
-                        $cart_subtotal  += (float)($item_subtotal);
-                        $cart_discount  += (float)($item_discount);
-                        $cart_tax       += (float)($item_tax);
+                        $cart_subtotal  += (float) ($item_subtotal);
+                        $cart_discount  += (float) ($item_discount);
+                        $cart_tax       += (float) ($item_tax);
                         
-                        $data['cart_details'][$key]['discount']   = wpinv_round_amount( $item_discount );
-                        $data['cart_details'][$key]['tax']        = wpinv_round_amount( $item_tax );
-                        $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
+                        $data['cart_details'][$key]['discount']   = wpinv_round_amount($item_discount);
+                        $data['cart_details'][$key]['tax']        = wpinv_round_amount($item_tax);
+                        $data['cart_details'][$key]['price']      = wpinv_round_amount($item_total);
                     }
 
 	                $total = $data['subtotal'] - $data['discount'] + $data['tax'];
-	                if ( $total < 0 ) {
+	                if ($total < 0) {
 		                $total = 0;
 	                }
 
-                    $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
-                    $data['discount'] = wpinv_round_amount( $cart_discount );
-                    $data['tax']      = wpinv_round_amount( $cart_tax );
-                    $data['total']    = wpinv_round_amount( $total );
+                    $data['subtotal'] = wpinv_round_amount($cart_subtotal);
+                    $data['discount'] = wpinv_round_amount($cart_discount);
+                    $data['tax']      = wpinv_round_amount($cart_tax);
+                    $data['total']    = wpinv_round_amount($total);
                 }
             }
         }
         
-        $data = apply_filters( 'wpinv_get_invoice_recurring_details', $data, $this, $field, $currency );
+        $data = apply_filters('wpinv_get_invoice_recurring_details', $data, $this, $field, $currency);
 
-        if ( isset( $data[$field] ) ) {
-            return ( $currency ? wpinv_price( $data[$field], $this->get_currency() ) : $data[$field] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
         
         return $data;
     }
     
-    public function get_final_tax( $currency = false ) {        
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, NULL, !$currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {        
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
     
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
     
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( !empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
             
-            if ( !empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items , $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
         
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, NULL, !$currency), $this->get_currency());
         }
         
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
         
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
     
     public function get_discount_code() {
@@ -1642,49 +1642,49 @@ 
         return (int) $this->disable_taxes === 0;
     }
 
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
 
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, NULL, !$currency), $this->get_currency());
         }
 
-        if ( ! $this->is_taxable() ) {
-            $tax = wpinv_round_amount( 0.00 );
+        if (!$this->is_taxable()) {
+            $tax = wpinv_round_amount(0.00);
         }
 
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
     
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
     
-    public function get_fees_total( $type = 'all' ) {
+    public function get_fees_total($type = 'all') {
         $fees_total = (float) 0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
                 $fees_total += (float) $fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
         /*
         $fees = $this->get_fees( $type );
 
@@ -1704,116 +1704,116 @@ 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
     
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
     
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
     
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
     
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
     
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
     
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
     
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
     
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
     
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
     
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
     
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
     
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
     
     public function get_gateway_title() {
-        $this->gateway_title = !empty( $this->gateway_title ) ? $this->gateway_title : wpinv_get_gateway_checkout_label( $this->gateway );
+        $this->gateway_title = !empty($this->gateway_title) ? $this->gateway_title : wpinv_get_gateway_checkout_label($this->gateway);
         
-        return apply_filters( 'wpinv_gateway_title', $this->gateway_title, $this->ID, $this );
+        return apply_filters('wpinv_gateway_title', $this->gateway_title, $this->ID, $this);
     }
     
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
     
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
     
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
 
-        if ( ! $display ) {
+        if (!$display) {
             return $due_date;
         }
         
-        return getpaid_format_date( $this->due_date );
+        return getpaid_format_date($this->due_date);
     }
     
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
     
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
         
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
         
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = getpaid_format_date( $invoice_date );
+        if ($formatted && $invoice_date) {
+            $invoice_date = getpaid_format_date($invoice_date);
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
     
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
         
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
     
-    public function add_item( $item_id = 0, $args = array() ) {
+    public function add_item($item_id = 0, $args = array()) {
         global $wpi_current_id, $wpi_item_id;
         
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         // Bail if this post isn't a item
-        if( !$item || $item->post_type !== 'wpi_item' ) {
+        if (!$item || $item->post_type !== 'wpi_item') {
             return false;
         }
         
@@ -1832,8 +1832,8 @@ 
             'fees'          => array()
         );
 
-        $args = wp_parse_args( apply_filters( 'wpinv_add_item_args', $args, $item->ID ), $defaults );
-        $args['quantity']   = $has_quantities && $args['quantity'] > 0 ? absint( $args['quantity'] ) : 1;
+        $args = wp_parse_args(apply_filters('wpinv_add_item_args', $args, $item->ID), $defaults);
+        $args['quantity'] = $has_quantities && $args['quantity'] > 0 ? absint($args['quantity']) : 1;
 
         $wpi_current_id         = $this->ID;
         $wpi_item_id            = $item->ID;
@@ -1845,19 +1845,19 @@ 
         $found_cart_key         = false;
         
         if ($has_quantities) {
-            $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+            $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
             
-            foreach ( $this->items as $key => $cart_item ) {
-                if ( (int)$item_id !== (int)$cart_item['id'] ) {
+            foreach ($this->items as $key => $cart_item) {
+                if ((int) $item_id !== (int) $cart_item['id']) {
                     continue;
                 }
 
-                $this->items[ $key ]['quantity'] += $args['quantity'];
+                $this->items[$key]['quantity'] += $args['quantity'];
                 break;
             }
             
-            foreach ( $this->cart_details as $cart_key => $cart_item ) {
-                if ( $item_id != $cart_item['id'] ) {
+            foreach ($this->cart_details as $cart_key => $cart_item) {
+                if ($item_id != $cart_item['id']) {
                     continue;
                 }
 
@@ -1869,29 +1869,29 @@ 
         if ($has_quantities && $found_cart_key !== false) {
             $cart_item          = $this->cart_details[$found_cart_key];
             $item_price         = $cart_item['item_price'];
-            $quantity           = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $quantity           = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
             $new_quantity       = $quantity + $args['quantity'];
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float)$cart_item['discount'] ? $discount - (float)$cart_item['discount'] : 0;
-            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float)$cart_item['tax'] ? $tax - (float)$cart_item['tax'] : 0;
+            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float) $cart_item['discount'] ? $discount - (float) $cart_item['discount'] : 0;
+            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float) $cart_item['tax'] ? $tax - (float) $cart_item['tax'] : 0;
             // The total increase equals the number removed * the item_price
-            $total_increased    = wpinv_round_amount( $item_price );
+            $total_increased    = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1907,25 +1907,25 @@ 
             $this->cart_details[$found_cart_key] = $cart_item;
         } else {
             // Set custom price.
-            if ( $args['custom_price'] !== '' ) {
+            if ($args['custom_price'] !== '') {
                 $item_price = $args['custom_price'];
             } else {
                 // Allow overriding the price
-                if ( false !== $args['item_price'] ) {
+                if (false !== $args['item_price']) {
                     $item_price = $args['item_price'];
                 } else {
-                    $item_price = wpinv_get_item_price( $item->ID );
+                    $item_price = wpinv_get_item_price($item->ID);
                 }
             }
 
             // Sanitizing the price here so we don't have a dozen calls later
-            $item_price = wpinv_sanitize_amount( $item_price );
-            $subtotal   = wpinv_round_amount( $item_price * $args['quantity'] );
+            $item_price = wpinv_sanitize_amount($item_price);
+            $subtotal   = wpinv_round_amount($item_price * $args['quantity']);
         
-            $discount   = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax_class  = !empty( $args['vat_class'] ) ? $args['vat_class'] : '';
-            $tax_rate   = !empty( $args['vat_rate'] ) ? $args['vat_rate'] : 0;
-            $tax        = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount   = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax_class  = !empty($args['vat_class']) ? $args['vat_class'] : '';
+            $tax_rate   = !empty($args['vat_rate']) ? $args['vat_rate'] : 0;
+            $tax        = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
             // Setup the items meta item
             $new_item = array(
@@ -1933,29 +1933,29 @@ 
                 'quantity' => $args['quantity'],
             );
 
-            $this->items[]  = $new_item;
+            $this->items[] = $new_item;
 
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total      = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
         
             $this->cart_details[] = array(
                 'name'          => !empty($args['name']) ? $args['name'] : $item->get_name(),
                 'id'            => $item->ID,
-                'item_price'    => wpinv_round_amount( $item_price ),
-                'custom_price'  => ( $args['custom_price'] !== '' ? wpinv_round_amount( $args['custom_price'] ) : '' ),
+                'item_price'    => wpinv_round_amount($item_price),
+                'custom_price'  => ($args['custom_price'] !== '' ? wpinv_round_amount($args['custom_price']) : ''),
                 'quantity'      => $args['quantity'],
                 'discount'      => $discount,
-                'subtotal'      => wpinv_round_amount( $subtotal ),
-                'tax'           => wpinv_round_amount( $tax ),
-                'price'         => wpinv_round_amount( $total ),
+                'subtotal'      => wpinv_round_amount($subtotal),
+                'tax'           => wpinv_round_amount($tax),
+                'price'         => wpinv_round_amount($total),
                 'vat_rate'      => $tax_rate,
                 'vat_class'     => $tax_class,
                 'meta'          => $args['meta'],
@@ -1965,18 +1965,18 @@ 
             $subtotal = $subtotal - $discount;
         }
         
-        $added_item = end( $this->cart_details );
-        $added_item['action']  = 'add';
+        $added_item = end($this->cart_details);
+        $added_item['action'] = 'add';
         
         $this->pending['items'][] = $added_item;
         
-        $this->increase_subtotal( $subtotal );
-        $this->increase_tax( $tax );
+        $this->increase_subtotal($subtotal);
+        $this->increase_tax($tax);
 
         return true;
     }
     
-    public function remove_item( $item_id, $args = array() ) {
+    public function remove_item($item_id, $args = array()) {
         // Set some defaults
         $defaults = array(
             'quantity'      => 1,
@@ -1984,51 +1984,51 @@ 
             'custom_price'  => '',
             'cart_index'    => false,
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
         // Bail if this post isn't a item
-        if ( get_post_type( $item_id ) !== 'wpi_item' ) {
+        if (get_post_type($item_id) !== 'wpi_item') {
             return false;
         }
         
-        $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+        $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
 
-        foreach ( $this->items as $key => $item ) {
-            if ( !empty($item['id']) && (int)$item_id !== (int)$item['id'] ) {
+        foreach ($this->items as $key => $item) {
+            if (!empty($item['id']) && (int) $item_id !== (int) $item['id']) {
                 continue;
             }
 
-            if ( false !== $args['cart_index'] ) {
-                $cart_index = absint( $args['cart_index'] );
-                $cart_item  = ! empty( $this->cart_details[ $cart_index ] ) ? $this->cart_details[ $cart_index ] : false;
+            if (false !== $args['cart_index']) {
+                $cart_index = absint($args['cart_index']);
+                $cart_item  = !empty($this->cart_details[$cart_index]) ? $this->cart_details[$cart_index] : false;
 
-                if ( ! empty( $cart_item ) ) {
+                if (!empty($cart_item)) {
                     // If the cart index item isn't the same item ID, don't remove it
-                    if ( !empty($cart_item['id']) && $cart_item['id'] != $item['id'] ) {
+                    if (!empty($cart_item['id']) && $cart_item['id'] != $item['id']) {
                         continue;
                     }
                 }
             }
 
-            $item_quantity = $this->items[ $key ]['quantity'];
-            if ( $item_quantity > $args['quantity'] ) {
-                $this->items[ $key ]['quantity'] -= $args['quantity'];
+            $item_quantity = $this->items[$key]['quantity'];
+            if ($item_quantity > $args['quantity']) {
+                $this->items[$key]['quantity'] -= $args['quantity'];
                 break;
             } else {
-                unset( $this->items[ $key ] );
+                unset($this->items[$key]);
                 break;
             }
         }
 
         $found_cart_key = false;
-        if ( false === $args['cart_index'] ) {
-            foreach ( $this->cart_details as $cart_key => $item ) {
-                if ( $item_id != $item['id'] ) {
+        if (false === $args['cart_index']) {
+            foreach ($this->cart_details as $cart_key => $item) {
+                if ($item_id != $item['id']) {
                     continue;
                 }
 
-                if ( false !== $args['item_price'] ) {
-                    if ( isset( $item['item_price'] ) && (float) $args['item_price'] != (float) $item['item_price'] ) {
+                if (false !== $args['item_price']) {
+                    if (isset($item['item_price']) && (float) $args['item_price'] != (float) $item['item_price']) {
                         continue;
                     }
                 }
@@ -2037,13 +2037,13 @@ 
                 break;
             }
         } else {
-            $cart_index = absint( $args['cart_index'] );
+            $cart_index = absint($args['cart_index']);
 
-            if ( ! array_key_exists( $cart_index, $this->cart_details ) ) {
+            if (!array_key_exists($cart_index, $this->cart_details)) {
                 return false; // Invalid cart index passed.
             }
 
-            if ( (int) $this->cart_details[ $cart_index ]['id'] > 0 && (int) $this->cart_details[ $cart_index ]['id'] !== (int) $item_id ) {
+            if ((int) $this->cart_details[$cart_index]['id'] > 0 && (int) $this->cart_details[$cart_index]['id'] !== (int) $item_id) {
                 return false; // We still need the proper Item ID to be sure.
             }
 
@@ -2051,41 +2051,41 @@ 
         }
         
         $cart_item  = $this->cart_details[$found_cart_key];
-        $quantity   = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
+        $quantity   = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
         
-        if ( count( $this->cart_details ) == 1 && ( $quantity - $args['quantity'] ) < 1 ) {
+        if (count($this->cart_details) == 1 && ($quantity - $args['quantity']) < 1) {
             //return false; // Invoice must contain at least one item.
         }
         
-        $discounts  = $this->get_discounts();
+        $discounts = $this->get_discounts();
         
-        if ( $quantity > $args['quantity'] ) {
+        if ($quantity > $args['quantity']) {
             $item_price         = $cart_item['item_price'];
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
-            $new_quantity       = max( $quantity - $args['quantity'], 1);
+            $new_quantity       = max($quantity - $args['quantity'], 1);
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['discount'] / $quantity ) ) : 0;
-            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float)$cart_item['discount'] > $discount ? (float)$cart_item['discount'] - $discount : $discount_decrease; 
-            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['tax'] / $quantity ) ) : 0;
-            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float)$cart_item['tax'] > $tax ? (float)$cart_item['tax'] - $tax : $tax_decrease;
+            $discount_decrease  = (float) $cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['discount'] / $quantity)) : 0;
+            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float) $cart_item['discount'] > $discount ? (float) $cart_item['discount'] - $discount : $discount_decrease; 
+            $tax_decrease       = (float) $cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['tax'] / $quantity)) : 0;
+            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float) $cart_item['tax'] > $tax ? (float) $cart_item['tax'] - $tax : $tax_decrease;
             
             // The total increase equals the number removed * the item_price
-            $total_decrease     = wpinv_round_amount( $item_price );
+            $total_decrease     = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -2104,16 +2104,16 @@ 
             
             $this->cart_details[$found_cart_key] = $cart_item;
             
-            $remove_item = end( $this->cart_details );
+            $remove_item = end($this->cart_details);
         } else {
             $item_price     = $cart_item['item_price'];
-            $discount       = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax            = !empty( $cart_item['tax'] ) ? $cart_item['tax'] : 0;
+            $discount       = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax            = !empty($cart_item['tax']) ? $cart_item['tax'] : 0;
         
-            $subtotal_decrease  = ( $item_price * $quantity ) - $discount;
+            $subtotal_decrease  = ($item_price * $quantity) - $discount;
             $tax_decrease       = $tax;
 
-            unset( $this->cart_details[$found_cart_key] );
+            unset($this->cart_details[$found_cart_key]);
             
             $remove_item             = $args;
             $remove_item['id']       = $item_id;
@@ -2124,8 +2124,8 @@ 
         $remove_item['action']      = 'remove';
         $this->pending['items'][]   = $remove_item;
                
-        $this->decrease_subtotal( $subtotal_decrease );
-        $this->decrease_tax( $tax_decrease );
+        $this->decrease_subtotal($subtotal_decrease);
+        $this->decrease_tax($tax_decrease);
         
         return true;
     }
@@ -2133,7 +2133,7 @@ 
     public function update_items($temp = false) {
         global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpi_nosave;
         
-        if ( !empty( $this->cart_details ) ) {
+        if (!empty($this->cart_details)) {
             $wpi_nosave             = $temp;
             $cart_subtotal          = 0;
             $cart_discount          = 0;
@@ -2143,65 +2143,65 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
 
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
                 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
                 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
                 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
-                if ( ! $this->is_taxable() ) {
+                if (!$this->is_taxable()) {
                     $tax = 0;
                 }
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
                     'fees'        => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $cart_subtotal  += (float)($subtotal - $discount); // TODO
-                $cart_discount  += (float)($discount);
-                $cart_tax       += (float)($tax);
+                $cart_subtotal  += (float) ($subtotal - $discount); // TODO
+                $cart_discount  += (float) ($discount);
+                $cart_tax       += (float) ($tax);
             }
-            if ( $cart_subtotal < 0 ) {
+            if ($cart_subtotal < 0) {
                 $cart_subtotal = 0;
             }
-            if ( $cart_tax < 0 ) {
+            if ($cart_tax < 0) {
                 $cart_tax = 0;
             }
-            $this->subtotal = wpinv_round_amount( $cart_subtotal );
-            $this->tax      = wpinv_round_amount( $cart_tax );
-            $this->discount = wpinv_round_amount( $cart_discount );
+            $this->subtotal = wpinv_round_amount($cart_subtotal);
+            $this->tax      = wpinv_round_amount($cart_tax);
+            $this->discount = wpinv_round_amount($cart_discount);
             
             $this->recalculate_total();
             
@@ -2213,177 +2213,177 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
 
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this);
     }
 
     public function is_initial_free() {
         $is_initial_free = false;
         
-        if ( ! ( (float)wpinv_round_amount( $this->get_total() ) > 0 ) && $this->is_parent() && $this->is_recurring() && ! $this->is_free_trial() && ! $this->is_free() ) {
+        if (!((float) wpinv_round_amount($this->get_total()) > 0) && $this->is_parent() && $this->is_recurring() && !$this->is_free_trial() && !$this->is_free()) {
             $is_initial_free = true;
         }
 
-        return apply_filters( 'wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
         
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
         
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
 
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
 
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
 
     public function get_subscription_id() {
-        $subscription_id = $this->get_meta( '_wpinv_subscr_profile_id', true );
+        $subscription_id = $this->get_meta('_wpinv_subscr_profile_id', true);
 
-        if ( empty( $subscription_id ) && !empty( $this->parent_invoice ) ) {
-            $parent_invoice = wpinv_get_invoice( $this->parent_invoice );
+        if (empty($subscription_id) && !empty($this->parent_invoice)) {
+            $parent_invoice = wpinv_get_invoice($this->parent_invoice);
 
-            $subscription_id = $parent_invoice->get_meta( '_wpinv_subscr_profile_id', true );
+            $subscription_id = $parent_invoice->get_meta('_wpinv_subscr_profile_id', true);
         }
         
         return $subscription_id;
     }
     
     public function is_parent() {
-        $is_parent = empty( $this->parent_invoice ) ? true : false;
+        $is_parent = empty($this->parent_invoice) ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_parent', $is_parent, $this );
+        return apply_filters('wpinv_invoice_is_parent', $is_parent, $this);
     }
     
     public function is_renewal() {
         $is_renewal = $this->parent_invoice && $this->parent_invoice != $this->ID ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_renewal', $is_renewal, $this );
+        return apply_filters('wpinv_invoice_is_renewal', $is_renewal, $this);
     }
     
     public function get_parent_payment() {
         $parent_payment = NULL;
         
-        if ( $this->is_renewal() ) {
-            $parent_payment = wpinv_get_invoice( $this->parent_invoice );
+        if ($this->is_renewal()) {
+            $parent_payment = wpinv_get_invoice($this->parent_invoice);
         }
         
         return $parent_payment;
     }
     
     public function is_paid() {
-        $is_paid = $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) );
+        $is_paid = $this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'));
 
-        return apply_filters( 'wpinv_invoice_is_paid', $is_paid, $this );
+        return apply_filters('wpinv_invoice_is_paid', $is_paid, $this);
     }
 
     /**
@@ -2396,23 +2396,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float) wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float) wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2420,41 +2420,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
     
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( !empty( $this->cart_details ) ) {
-            foreach ( $this->cart_details as $key => $item ) {
-                if ( !empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach ($this->cart_details as $key => $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/admin/class-wpinv-items-report-table.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {

Indentation +139 added lines, -139 removed lines

@@ -9,7 +9,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';
 }
 
 /**
@@ -21,129 +21,129 @@ 
  */
 class WPInv_Items_Report_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 300;
-
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular' => 'id',
-			'plural'   => 'ids',
-			'ajax'     => false,
-		) );
-
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'item';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $item Contains all the data of the gateways
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		return array(
-			'item'     => __( 'Item', 'invoicing' ),
-			'sales'    => __( 'Quantity Sold', 'invoicing' ),
-			'total'    => __( 'Total Earnings', 'invoicing' ),
-			'discount' => __( 'Total Discounts', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
-		);
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Outputs the reporting views
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 * Build all the reports data
-	 *
-	 * @since 1.0.19
-	 * @return array $reports_data All the data for gateway reports
-	 */
-	public function reports_data() {
-
-		$reports_data = $this->revenue_reports_data();
-
-		$prepared = array();
-		foreach ( $reports_data as $report_data ) {
-			$prepared[] = array(
-				'item'     => $report_data['item_name'],
-				'sales'    => $report_data['sales'],
-				'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
-				'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
-				'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
-			);
-		}
-
-		return $prepared;
-	}
-
-	/**
-	 * Retrieves report data.
-	 *
-	 * @since 1.0.19
-	 */
-	public function revenue_reports_data() {
-		global $wpdb;
-
-		$table =  $wpdb->prefix . 'getpaid_invoice_items';
-		return $wpdb->get_results(
-			"SELECT
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 300;
+
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular' => 'id',
+            'plural'   => 'ids',
+            'ajax'     => false,
+        ) );
+
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'item';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param array $item Contains all the data of the gateways
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        return wp_kses_post( $item[ $column_name ] );
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        return array(
+            'item'     => __( 'Item', 'invoicing' ),
+            'sales'    => __( 'Quantity Sold', 'invoicing' ),
+            'total'    => __( 'Total Earnings', 'invoicing' ),
+            'discount' => __( 'Total Discounts', 'invoicing' ),
+            'tax'      => __( 'Total Taxes', 'invoicing' ),
+        );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Outputs the reporting views
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     * Build all the reports data
+     *
+     * @since 1.0.19
+     * @return array $reports_data All the data for gateway reports
+     */
+    public function reports_data() {
+
+        $reports_data = $this->revenue_reports_data();
+
+        $prepared = array();
+        foreach ( $reports_data as $report_data ) {
+            $prepared[] = array(
+                'item'     => $report_data['item_name'],
+                'sales'    => $report_data['sales'],
+                'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
+                'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
+                'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
+            );
+        }
+
+        return $prepared;
+    }
+
+    /**
+     * Retrieves report data.
+     *
+     * @since 1.0.19
+     */
+    public function revenue_reports_data() {
+        global $wpdb;
+
+        $table =  $wpdb->prefix . 'getpaid_invoice_items';
+        return $wpdb->get_results(
+            "SELECT
 				SUM(quantity) as sales,
 				item_name,
 				SUM(tax) as tax,
@@ -157,19 +157,19 @@ 
 			GROUP BY item_id
 			ORDER BY item_name ASC", ARRAY_A);
 
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $this->reports_data();
-	}
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->items           = $this->reports_data();
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -5,10 +5,10 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -37,11 +37,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular' => 'id',
 			'plural'   => 'ids',
 			'ajax'     => false,
-		) );
+		));
 
 	}
 
@@ -67,8 +67,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
+	public function column_default($item, $column_name) {
+		return wp_kses_post($item[$column_name]);
 	}
 
 	/**
@@ -80,11 +80,11 @@ 
 	public function get_columns() {
 
 		return array(
-			'item'     => __( 'Item', 'invoicing' ),
-			'sales'    => __( 'Quantity Sold', 'invoicing' ),
-			'total'    => __( 'Total Earnings', 'invoicing' ),
-			'discount' => __( 'Total Discounts', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
+			'item'     => __('Item', 'invoicing'),
+			'sales'    => __('Quantity Sold', 'invoicing'),
+			'total'    => __('Total Earnings', 'invoicing'),
+			'discount' => __('Total Discounts', 'invoicing'),
+			'tax'      => __('Total Taxes', 'invoicing'),
 		);
 
 	}
@@ -96,7 +96,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -120,13 +120,13 @@ 
 		$reports_data = $this->revenue_reports_data();
 
 		$prepared = array();
-		foreach ( $reports_data as $report_data ) {
+		foreach ($reports_data as $report_data) {
 			$prepared[] = array(
 				'item'     => $report_data['item_name'],
 				'sales'    => $report_data['sales'],
-				'total'    => wpinv_price( wpinv_format_amount( $report_data['total'] ) ),
-				'discount' => wpinv_price( wpinv_format_amount( $report_data['discount'] ) ),
-				'tax'      => wpinv_price( wpinv_format_amount( $report_data['tax'] ) ),
+				'total'    => wpinv_price(wpinv_format_amount($report_data['total'])),
+				'discount' => wpinv_price(wpinv_format_amount($report_data['discount'])),
+				'tax'      => wpinv_price(wpinv_format_amount($report_data['tax'])),
 			);
 		}
 
@@ -141,7 +141,7 @@ 
 	public function revenue_reports_data() {
 		global $wpdb;
 
-		$table =  $wpdb->prefix . 'getpaid_invoice_items';
+		$table = $wpdb->prefix . 'getpaid_invoice_items';
 		return $wpdb->get_results(
 			"SELECT
 				SUM(quantity) as sales,
@@ -169,7 +169,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 	}
 }

includes/admin/class-wpinv-taxes-report-table.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {

Indentation +157 added lines, -157 removed lines

@@ -9,7 +9,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';
 }
 
 /**
@@ -21,145 +21,145 @@ 
  */
 class WPInv_Taxes_Reports_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 300;
-
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular' => 'id',
-			'plural'   => 'ids',
-			'ajax'     => false,
-		) );
-
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'month';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $item Contains all the data of the gateways
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		return array(
-			'month'    => __( 'Month', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
-		);
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Outputs the reporting views
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 * Build all the reports data
-	 *
-	 * @since 1.0.19
-	 * @return array $reports_data All the data for taxes reports
-	 */
-	public function reports_data() {
-
-		$reports_data = $this->taxes_reports_data();
-		$months       = array(
-			'1' => __( 'January', 'invoicing' ),
-			'2' => __( 'February', 'invoicing' ),
-			'3' => __( 'March', 'invoicing' ),
-			'4' => __( 'April', 'invoicing' ),
-			'5' => __( 'May', 'invoicing' ),
-			'6' => __( 'June', 'invoicing' ),
-			'7' => __( 'July', 'invoicing' ),
-			'8' => __( 'August', 'invoicing' ),
-			'9' => __( 'September', 'invoicing' ),
-			'10' => __( 'October', 'invoicing' ),
-			'11' => __( 'November', 'invoicing' ),
-			'12' => __( 'December', 'invoicing' ),
-		);
-
-		$prepared = array();
-		foreach ( $months as $month => $label ) {
-
-			$tax = wpinv_price( 0 );
-			if ( ! empty( $reports_data[ $month ] ) ) {
-				$tax = wpinv_price( wpinv_format_amount( $reports_data[ $month ] ) );
-			}
-
-			$prepared[] = array(
-				'month'    => $label,
-				'tax'      => $tax,
-			);
-
-		}
-
-		return $prepared;
-	}
-
-	/**
-	 * Retrieves taxes data.
-	 *
-	 * @since 1.0.19
-	 */
-	public function taxes_reports_data() {
-		global $wpdb;
-
-		$table =  $wpdb->prefix . 'getpaid_invoices';
-		$year  = isset( $_GET['year'] ) ? absint( $_GET['year'] ) : date( 'Y' );
-		$data  = $wpdb->get_results(
-			"SELECT
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 300;
+
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular' => 'id',
+            'plural'   => 'ids',
+            'ajax'     => false,
+        ) );
+
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'month';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param array $item Contains all the data of the gateways
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        return wp_kses_post( $item[ $column_name ] );
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        return array(
+            'month'    => __( 'Month', 'invoicing' ),
+            'tax'      => __( 'Total Taxes', 'invoicing' ),
+        );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Outputs the reporting views
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     * Build all the reports data
+     *
+     * @since 1.0.19
+     * @return array $reports_data All the data for taxes reports
+     */
+    public function reports_data() {
+
+        $reports_data = $this->taxes_reports_data();
+        $months       = array(
+            '1' => __( 'January', 'invoicing' ),
+            '2' => __( 'February', 'invoicing' ),
+            '3' => __( 'March', 'invoicing' ),
+            '4' => __( 'April', 'invoicing' ),
+            '5' => __( 'May', 'invoicing' ),
+            '6' => __( 'June', 'invoicing' ),
+            '7' => __( 'July', 'invoicing' ),
+            '8' => __( 'August', 'invoicing' ),
+            '9' => __( 'September', 'invoicing' ),
+            '10' => __( 'October', 'invoicing' ),
+            '11' => __( 'November', 'invoicing' ),
+            '12' => __( 'December', 'invoicing' ),
+        );
+
+        $prepared = array();
+        foreach ( $months as $month => $label ) {
+
+            $tax = wpinv_price( 0 );
+            if ( ! empty( $reports_data[ $month ] ) ) {
+                $tax = wpinv_price( wpinv_format_amount( $reports_data[ $month ] ) );
+            }
+
+            $prepared[] = array(
+                'month'    => $label,
+                'tax'      => $tax,
+            );
+
+        }
+
+        return $prepared;
+    }
+
+    /**
+     * Retrieves taxes data.
+     *
+     * @since 1.0.19
+     */
+    public function taxes_reports_data() {
+        global $wpdb;
+
+        $table =  $wpdb->prefix . 'getpaid_invoices';
+        $year  = isset( $_GET['year'] ) ? absint( $_GET['year'] ) : date( 'Y' );
+        $data  = $wpdb->get_results(
+            "SELECT
 				MONTH(meta.completed_date) as _month,
 				SUM(meta.tax) as tax
 			FROM $wpdb->posts as posts
@@ -171,21 +171,21 @@ 
 				AND ( YEAR(meta.completed_date) = '$year' )
 			GROUP BY MONTH(meta.completed_date)");
 
-		return wp_list_pluck( $data, 'tax', '_month' );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $this->reports_data();
-	}
+        return wp_list_pluck( $data, 'tax', '_month' );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->items           = $this->reports_data();
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -5,10 +5,10 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -37,11 +37,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular' => 'id',
 			'plural'   => 'ids',
 			'ajax'     => false,
-		) );
+		));
 
 	}
 
@@ -67,8 +67,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		return wp_kses_post( $item[ $column_name ] );
+	public function column_default($item, $column_name) {
+		return wp_kses_post($item[$column_name]);
 	}
 
 	/**
@@ -80,8 +80,8 @@ 
 	public function get_columns() {
 
 		return array(
-			'month'    => __( 'Month', 'invoicing' ),
-			'tax'      => __( 'Total Taxes', 'invoicing' ),
+			'month'    => __('Month', 'invoicing'),
+			'tax'      => __('Total Taxes', 'invoicing'),
 		);
 
 	}
@@ -93,7 +93,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -116,26 +116,26 @@ 
 
 		$reports_data = $this->taxes_reports_data();
 		$months       = array(
-			'1' => __( 'January', 'invoicing' ),
-			'2' => __( 'February', 'invoicing' ),
-			'3' => __( 'March', 'invoicing' ),
-			'4' => __( 'April', 'invoicing' ),
-			'5' => __( 'May', 'invoicing' ),
-			'6' => __( 'June', 'invoicing' ),
-			'7' => __( 'July', 'invoicing' ),
-			'8' => __( 'August', 'invoicing' ),
-			'9' => __( 'September', 'invoicing' ),
-			'10' => __( 'October', 'invoicing' ),
-			'11' => __( 'November', 'invoicing' ),
-			'12' => __( 'December', 'invoicing' ),
+			'1' => __('January', 'invoicing'),
+			'2' => __('February', 'invoicing'),
+			'3' => __('March', 'invoicing'),
+			'4' => __('April', 'invoicing'),
+			'5' => __('May', 'invoicing'),
+			'6' => __('June', 'invoicing'),
+			'7' => __('July', 'invoicing'),
+			'8' => __('August', 'invoicing'),
+			'9' => __('September', 'invoicing'),
+			'10' => __('October', 'invoicing'),
+			'11' => __('November', 'invoicing'),
+			'12' => __('December', 'invoicing'),
 		);
 
 		$prepared = array();
-		foreach ( $months as $month => $label ) {
+		foreach ($months as $month => $label) {
 
-			$tax = wpinv_price( 0 );
-			if ( ! empty( $reports_data[ $month ] ) ) {
-				$tax = wpinv_price( wpinv_format_amount( $reports_data[ $month ] ) );
+			$tax = wpinv_price(0);
+			if (!empty($reports_data[$month])) {
+				$tax = wpinv_price(wpinv_format_amount($reports_data[$month]));
 			}
 
 			$prepared[] = array(
@@ -156,8 +156,8 @@ 
 	public function taxes_reports_data() {
 		global $wpdb;
 
-		$table =  $wpdb->prefix . 'getpaid_invoices';
-		$year  = isset( $_GET['year'] ) ? absint( $_GET['year'] ) : date( 'Y' );
+		$table = $wpdb->prefix . 'getpaid_invoices';
+		$year  = isset($_GET['year']) ? absint($_GET['year']) : date('Y');
 		$data  = $wpdb->get_results(
 			"SELECT
 				MONTH(meta.completed_date) as _month,
@@ -171,7 +171,7 @@ 
 				AND ( YEAR(meta.completed_date) = '$year' )
 			GROUP BY MONTH(meta.completed_date)");
 
-		return wp_list_pluck( $data, 'tax', '_month' );
+		return wp_list_pluck($data, 'tax', '_month');
 
 	}
 
@@ -185,7 +185,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 	}
 }

includes/class-wpinv-session-handler.php

Spacing +54 added lines, -54 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 
 	}
 
@@ -68,8 +68,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'));
 		}
 	}
 
@@ -81,7 +81,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -89,17 +89,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -117,25 +117,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -146,8 +146,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -156,15 +156,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -174,8 +174,8 @@ 
 	 */
 	public function generate_customer_id() {
 		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
+		$hasher = new PasswordHash(8, false);
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -186,27 +186,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -215,15 +215,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -231,9 +231,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -243,7 +243,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -251,7 +251,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -266,7 +266,7 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 	}
 
@@ -277,20 +277,20 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -311,9 +311,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

Indentation +268 added lines, -268 removed lines

@@ -12,125 +12,125 @@ 
  */
 class WPInv_Session_Handler extends WPInv_Session {
 
-	/**
-	 * Cookie name used for the session.
-	 *
-	 * @var string cookie name
-	 */
-	protected $_cookie;
-
-	/**
-	 * Stores session expiry.
-	 *
-	 * @var int session due to expire timestamp
-	 */
-	protected $_session_expiring;
-
-	/**
-	 * Stores session due to expire timestamp.
-	 *
-	 * @var string session expiration timestamp
-	 */
-	protected $_session_expiration;
-
-	/**
-	 * True when the cookie exists.
-	 *
-	 * @var bool Based on whether a cookie exists.
-	 */
-	protected $_has_cookie = false;
-
-	/**
-	 * Table name for session data.
-	 *
-	 * @var string Custom session table name
-	 */
-	protected $_table;
-
-	/**
-	 * Constructor for the session class.
-	 */
-	public function __construct() {
-
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
+    /**
+     * Cookie name used for the session.
+     *
+     * @var string cookie name
+     */
+    protected $_cookie;
+
+    /**
+     * Stores session expiry.
+     *
+     * @var int session due to expire timestamp
+     */
+    protected $_session_expiring;
+
+    /**
+     * Stores session due to expire timestamp.
+     *
+     * @var string session expiration timestamp
+     */
+    protected $_session_expiration;
+
+    /**
+     * True when the cookie exists.
+     *
+     * @var bool Based on whether a cookie exists.
+     */
+    protected $_has_cookie = false;
+
+    /**
+     * Table name for session data.
+     *
+     * @var string Custom session table name
+     */
+    protected $_table;
+
+    /**
+     * Constructor for the session class.
+     */
+    public function __construct() {
+
+        $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
         add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-
-	}
-
-	/**
-	 * Init hooks and session data.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {
-		$this->init_session_cookie();
-
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
-		}
-	}
-
-	/**
-	 * Setup cookie and customer ID.
-	 *
-	 * @since 3.6.0
-	 */
-	public function init_session_cookie() {
-		$cookie = $this->get_session_cookie();
-
-		if ( $cookie ) {
-			$this->_customer_id        = $cookie[0];
-			$this->_session_expiration = $cookie[1];
-			$this->_session_expiring   = $cookie[2];
-			$this->_has_cookie         = true;
-			$this->_data               = $this->get_session_data();
-
-			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
-				$this->_customer_id = get_current_user_id();
-				$this->_dirty       = true;
-				$this->save_data();
-				$this->set_customer_session_cookie( true );
-			}
-
-			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
-				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
-			}
-		} else {
-			$this->set_session_expiration();
-			$this->_customer_id = $this->generate_customer_id();
-			$this->_data        = $this->get_session_data();
-		}
-	}
-
-	/**
-	 * Sets the session cookie on-demand (usually after adding an item to the cart).
-	 *
-	 * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
-	 *
-	 * Warning: Cookies will only be set if this is called before the headers are sent.
-	 *
-	 * @param bool $set Should the session cookie be set.
-	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
-			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
-			$this->_has_cookie = true;
-
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
-			}
-		}
-	}
-
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
+        add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+        add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
+        add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+
+    }
+
+    /**
+     * Init hooks and session data.
+     *
+     * @since 3.3.0
+     */
+    public function init() {
+        $this->init_session_cookie();
+
+        if ( ! is_user_logged_in() ) {
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+        }
+    }
+
+    /**
+     * Setup cookie and customer ID.
+     *
+     * @since 3.6.0
+     */
+    public function init_session_cookie() {
+        $cookie = $this->get_session_cookie();
+
+        if ( $cookie ) {
+            $this->_customer_id        = $cookie[0];
+            $this->_session_expiration = $cookie[1];
+            $this->_session_expiring   = $cookie[2];
+            $this->_has_cookie         = true;
+            $this->_data               = $this->get_session_data();
+
+            // If the user logs in, update session.
+            if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+                $this->_customer_id = get_current_user_id();
+                $this->_dirty       = true;
+                $this->save_data();
+                $this->set_customer_session_cookie( true );
+            }
+
+            // Update session if its close to expiring.
+            if ( time() > $this->_session_expiring ) {
+                $this->set_session_expiration();
+                $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+            }
+        } else {
+            $this->set_session_expiration();
+            $this->_customer_id = $this->generate_customer_id();
+            $this->_data        = $this->get_session_data();
+        }
+    }
+
+    /**
+     * Sets the session cookie on-demand (usually after adding an item to the cart).
+     *
+     * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
+     *
+     * Warning: Cookies will only be set if this is called before the headers are sent.
+     *
+     * @param bool $set Should the session cookie be set.
+     */
+    public function set_customer_session_cookie( $set ) {
+        if ( $set ) {
+            $to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
+            $cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+            $cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
+            $this->_has_cookie = true;
+
+            if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
+                $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+            }
+        }
+    }
+
+    public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
         } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
@@ -139,86 +139,86 @@ 
         }
     }
 
-	/**
-	 * Should the session cookie be secure?
-	 *
-	 * @since 3.6.0
-	 * @return bool
-	 */
-	protected function use_secure_cookie() {
+    /**
+     * Should the session cookie be secure?
+     *
+     * @since 3.6.0
+     * @return bool
+     */
+    protected function use_secure_cookie() {
         $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
-	}
-
-	/**
-	 * Return true if the current user has an active session, i.e. a cookie to retrieve values.
-	 *
-	 * @return bool
-	 */
-	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
-	}
-
-	/**
-	 * Set session expiration.
-	 */
-	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
-	}
-
-	/**
-	 * Generates session ids.
-	 *
-	 * @return string
-	 */
-	public function generate_customer_id() {
-		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
-	}
-
-	/**
-	 * Get the session cookie, if set. Otherwise return false.
-	 *
-	 * Session cookies without a customer ID are invalid.
-	 *
-	 * @return bool|array
-	 */
-	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
-
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
-			return false;
-		}
-
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
-
-		if ( empty( $customer_id ) ) {
-			return false;
-		}
-
-		// Validate hash.
-		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
-			return false;
-		}
-
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
-	}
-
-	/**
-	 * Get session data.
-	 *
-	 * @return array
-	 */
-	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
-	}
-
-	public function generate_key($customer_id){
+        return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+    }
+
+    /**
+     * Return true if the current user has an active session, i.e. a cookie to retrieve values.
+     *
+     * @return bool
+     */
+    public function has_session() {
+        return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+    }
+
+    /**
+     * Set session expiration.
+     */
+    public function set_session_expiration() {
+        $this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
+        $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+    }
+
+    /**
+     * Generates session ids.
+     *
+     * @return string
+     */
+    public function generate_customer_id() {
+        require_once ABSPATH . 'wp-includes/class-phpass.php';
+        $hasher      = new PasswordHash( 8, false );
+        return md5( $hasher->get_random_bytes( 32 ) );
+    }
+
+    /**
+     * Get the session cookie, if set. Otherwise return false.
+     *
+     * Session cookies without a customer ID are invalid.
+     *
+     * @return bool|array
+     */
+    public function get_session_cookie() {
+        $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+
+        if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+            return false;
+        }
+
+        list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+
+        if ( empty( $customer_id ) ) {
+            return false;
+        }
+
+        // Validate hash.
+        $to_hash = $customer_id . '|' . $session_expiration;
+        $hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+
+        if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+            return false;
+        }
+
+        return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+    }
+
+    /**
+     * Get session data.
+     *
+     * @return array
+     */
+    public function get_session_data() {
+        return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+    }
+
+    public function generate_key($customer_id){
         if(!$customer_id){
             return;
         }
@@ -226,62 +226,62 @@ 
         return 'wpi_trans_'.$customer_id;
     }
 
-	/**
-	 * Save data.
-	 */
-	public function save_data() {
-		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+    /**
+     * Save data.
+     */
+    public function save_data() {
+        // Dirty if something changed - prevents saving nothing new.
+        if ( $this->_dirty && $this->has_session() ) {
 
             set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
-			$this->_dirty = false;
-		}
-	}
-
-	/**
-	 * Destroy all session data.
-	 */
-	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
-		$this->forget_session();
-	}
-
-	/**
-	 * Forget all session data without destroying it.
-	 */
-	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
-
-		wpinv_empty_cart();
-
-		$this->_data        = array();
-		$this->_dirty       = false;
-		$this->_customer_id = $this->generate_customer_id();
-	}
-
-	/**
-	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
-	 *
-	 * @param int $uid User ID.
-	 * @return string
-	 */
-	public function nonce_user_logged_out( $uid ) {
-		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
-	}
-
-	/**
-	 * Returns the session.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param mixed  $default Default session value.
-	 * @return string|array
-	 */
-	public function get_session( $customer_id, $default = false ) {
-
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
-			return array();
-		}
+            $this->_dirty = false;
+        }
+    }
+
+    /**
+     * Destroy all session data.
+     */
+    public function destroy_session() {
+        $this->delete_session( $this->_customer_id );
+        $this->forget_session();
+    }
+
+    /**
+     * Forget all session data without destroying it.
+     */
+    public function forget_session() {
+        $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+
+        wpinv_empty_cart();
+
+        $this->_data        = array();
+        $this->_dirty       = false;
+        $this->_customer_id = $this->generate_customer_id();
+    }
+
+    /**
+     * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
+     *
+     * @param int $uid User ID.
+     * @return string
+     */
+    public function nonce_user_logged_out( $uid ) {
+        return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
+    }
+
+    /**
+     * Returns the session.
+     *
+     * @param string $customer_id Customer ID.
+     * @param mixed  $default Default session value.
+     * @return string|array
+     */
+    public function get_session( $customer_id, $default = false ) {
+
+        if ( defined( 'WP_SETUP_CONFIG' ) ) {
+            return array();
+        }
 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
@@ -290,30 +290,30 @@ 
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
-	}
+        return maybe_unserialize( $value );
+    }
 
-	/**
-	 * Delete the session from the cache and database.
-	 *
-	 * @param int $customer_id Customer ID.
-	 */
-	public function delete_session( $customer_id ) {
+    /**
+     * Delete the session from the cache and database.
+     *
+     * @param int $customer_id Customer ID.
+     */
+    public function delete_session( $customer_id ) {
 
         $key = $this->generate_key($customer_id);
 
-		delete_transient($key);
-	}
+        delete_transient($key);
+    }
 
-	/**
-	 * Update the session expiry timestamp.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param int    $timestamp Timestamp to expire the cookie.
-	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+    /**
+     * Update the session expiry timestamp.
+     *
+     * @param string $customer_id Customer ID.
+     * @param int    $timestamp Timestamp to expire the cookie.
+     */
+    public function update_session_timestamp( $customer_id, $timestamp ) {
 
         set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
 
-	}
+    }
 }

vendor/ayecode/wp-super-duper/hello-world.php

Indentation +102 added lines, -102 removed lines

@@ -3,102 +3,102 @@ 
 class SD_Hello_World extends WP_Super_Duper {
 
 
-	public $arguments;
-
-	/**
-	 * Sets up the widgets name etc
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'     => 'super-duper',
-			// textdomain of the plugin/theme (used to prefix the Gutenberg block)
-			'block-icon'     => 'fas fa-globe-americas',
-			// Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
-			// OR font-awesome 5 class name: fas fa-globe-americas
-			'block-category' => 'widgets',
-			// the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
-			'block-keywords' => "['hello','world']",
-			// used in the block search, MAX 3
-			'block-output'   => array( // the block visual output elements as an array
-				array(
-					'element' => 'p',
-					'title'   => __( 'Placeholder', 'hello-world' ),
-					'class'   => '[%className%]',
-					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
-				)
-			),
-			'block-wrap'    => '', // You can specify the type of element to wrap the block `div` or `span` etc.. Or blank for no wrap at all.
-			'class_name'     => __CLASS__,
-			// The calling class name
-			'base_id'        => 'hello_world',
-			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Hello World', 'hello-world' ),
-			// the name of the widget/block
-			'widget_ops'     => array(
-				'classname'   => 'hello-world-class',
-				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
-				// widget description
-			),
-			'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
-			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
-				'after_text' => array( // this is the input name=''
-					'title'       => __( 'Text after hello:', 'hello-world' ),
-					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
-					// input description
-					'type'        => 'text',
-					// the type of input, test, select, checkbox etc.
-					'placeholder' => 'World',
-					// the input placeholder text.
-					'desc_tip'    => true,
-					// if the input should show the widget description text as a tooltip.
-					'default'     => 'World',
-					// the input default value.
-					'advanced'    => false
-					// not yet implemented
-				),
-			)
-		);
-
-		parent::__construct( $options );
-	}
-
-
-	/**
-	 * This is the output function for the widget, shortcode and block (front end).
-	 *
-	 * @param array $args The arguments values.
-	 * @param array $widget_args The widget arguments when used.
-	 * @param string $content The shortcode content argument
-	 *
-	 * @return string
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		/**
-		 * @var string $after_text
-		 * @var string $another_input This is added by filter below.
-		 */
-		extract( $args, EXTR_SKIP );
-
-		/*
+    public $arguments;
+
+    /**
+     * Sets up the widgets name etc
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'     => 'super-duper',
+            // textdomain of the plugin/theme (used to prefix the Gutenberg block)
+            'block-icon'     => 'fas fa-globe-americas',
+            // Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
+            // OR font-awesome 5 class name: fas fa-globe-americas
+            'block-category' => 'widgets',
+            // the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
+            'block-keywords' => "['hello','world']",
+            // used in the block search, MAX 3
+            'block-output'   => array( // the block visual output elements as an array
+                array(
+                    'element' => 'p',
+                    'title'   => __( 'Placeholder', 'hello-world' ),
+                    'class'   => '[%className%]',
+                    'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
+                )
+            ),
+            'block-wrap'    => '', // You can specify the type of element to wrap the block `div` or `span` etc.. Or blank for no wrap at all.
+            'class_name'     => __CLASS__,
+            // The calling class name
+            'base_id'        => 'hello_world',
+            // this is used as the widget id and the shortcode id.
+            'name'           => __( 'Hello World', 'hello-world' ),
+            // the name of the widget/block
+            'widget_ops'     => array(
+                'classname'   => 'hello-world-class',
+                // widget class
+                'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
+                // widget description
+            ),
+            'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
+            'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
+                'after_text' => array( // this is the input name=''
+                    'title'       => __( 'Text after hello:', 'hello-world' ),
+                    // input title
+                    'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
+                    // input description
+                    'type'        => 'text',
+                    // the type of input, test, select, checkbox etc.
+                    'placeholder' => 'World',
+                    // the input placeholder text.
+                    'desc_tip'    => true,
+                    // if the input should show the widget description text as a tooltip.
+                    'default'     => 'World',
+                    // the input default value.
+                    'advanced'    => false
+                    // not yet implemented
+                ),
+            )
+        );
+
+        parent::__construct( $options );
+    }
+
+
+    /**
+     * This is the output function for the widget, shortcode and block (front end).
+     *
+     * @param array $args The arguments values.
+     * @param array $widget_args The widget arguments when used.
+     * @param string $content The shortcode content argument
+     *
+     * @return string
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        /**
+         * @var string $after_text
+         * @var string $another_input This is added by filter below.
+         */
+        extract( $args, EXTR_SKIP );
+
+        /*
 		 * This value is added by filter so might not exist if filter is removed so we check.
 		 */
-		if ( ! isset( $another_input ) ) {
-			$another_input = '';
-		}
+        if ( ! isset( $another_input ) ) {
+            $another_input = '';
+        }
 
-		return "Hello: " . $after_text . "" . $another_input;
+        return "Hello: " . $after_text . "" . $another_input;
 
-	}
+    }
 
 }
 
 // register it.
 add_action( 'widgets_init', function () {
-	register_widget( 'SD_Hello_World' );
+    register_widget( 'SD_Hello_World' );
 } );
 
 
@@ -111,26 +111,26 @@ 
  */
 function _my_extra_arguments( $options ) {
 
-	/*
+    /*
 	 * Add a new input option.
 	 */
-	$options['arguments']['another_input'] = array(
-		'name'        => 'another_input', // this is the input name=''
-		'title'       => __( 'Another input:', 'hello-world' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // input description
-		'type'        => 'text', // the type of input, test, select, checkbox etc.
-		'placeholder' => 'Placeholder text', // the input placeholder text.
-		'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
-		'default'     => '', // the input default value.
-		'advanced'    => false // not yet implemented
-	);
-
-	/*
+    $options['arguments']['another_input'] = array(
+        'name'        => 'another_input', // this is the input name=''
+        'title'       => __( 'Another input:', 'hello-world' ), // input title
+        'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // input description
+        'type'        => 'text', // the type of input, test, select, checkbox etc.
+        'placeholder' => 'Placeholder text', // the input placeholder text.
+        'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
+        'default'     => '', // the input default value.
+        'advanced'    => false // not yet implemented
+    );
+
+    /*
 	 * Output the new option in the block output also.
 	 */
-	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
+    $options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
 
-	return $options;
+    return $options;
 }
 
 //add_filter( 'wp_super_duper_options_hello_world', '_my_extra_arguments' );
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -23,7 +23,7 @@ 
 			'block-output'   => array( // the block visual output elements as an array
 				array(
 					'element' => 'p',
-					'title'   => __( 'Placeholder', 'hello-world' ),
+					'title'   => __('Placeholder', 'hello-world'),
 					'class'   => '[%className%]',
 					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
 				)
@@ -33,20 +33,20 @@ 
 			// The calling class name
 			'base_id'        => 'hello_world',
 			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Hello World', 'hello-world' ),
+			'name'           => __('Hello World', 'hello-world'),
 			// the name of the widget/block
 			'widget_ops'     => array(
 				'classname'   => 'hello-world-class',
 				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
+				'description' => esc_html__('This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world'),
 				// widget description
 			),
 			'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
 			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
 				'after_text' => array( // this is the input name=''
-					'title'       => __( 'Text after hello:', 'hello-world' ),
+					'title'       => __('Text after hello:', 'hello-world'),
 					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
+					'desc'        => __('This is the text that will appear after `Hello:`.', 'hello-world'),
 					// input description
 					'type'        => 'text',
 					// the type of input, test, select, checkbox etc.
@@ -62,7 +62,7 @@ 
 			)
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -75,18 +75,18 @@ 
 	 *
 	 * @return string
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		/**
 		 * @var string $after_text
 		 * @var string $another_input This is added by filter below.
 		 */
-		extract( $args, EXTR_SKIP );
+		extract($args, EXTR_SKIP);
 
 		/*
 		 * This value is added by filter so might not exist if filter is removed so we check.
 		 */
-		if ( ! isset( $another_input ) ) {
+		if (!isset($another_input)) {
 			$another_input = '';
 		}
 
@@ -97,8 +97,8 @@ 
 }
 
 // register it.
-add_action( 'widgets_init', function () {
-	register_widget( 'SD_Hello_World' );
+add_action('widgets_init', function() {
+	register_widget('SD_Hello_World');
 } );
 
 
@@ -109,15 +109,15 @@ 
  *
  * @return mixed
  */
-function _my_extra_arguments( $options ) {
+function _my_extra_arguments($options) {
 
 	/*
 	 * Add a new input option.
 	 */
 	$options['arguments']['another_input'] = array(
 		'name'        => 'another_input', // this is the input name=''
-		'title'       => __( 'Another input:', 'hello-world' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // input description
+		'title'       => __('Another input:', 'hello-world'), // input title
+		'desc'        => __('This is an input added via filter.', 'hello-world'), // input description
 		'type'        => 'text', // the type of input, test, select, checkbox etc.
 		'placeholder' => 'Placeholder text', // the input placeholder text.
 		'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
@@ -128,7 +128,7 @@ 
 	/*
 	 * Output the new option in the block output also.
 	 */
-	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
+	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]"; ;
 
 	return $options;
 }

vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
     public function getLocations()
     {
         if ($this->matchesCakeVersion('>=', '3.0.0')) {
-            $this->locations['plugin'] =  $this->composer->getConfig()->get('vendor-dir') . '/{$vendor}/{$name}/';
+            $this->locations['plugin'] = $this->composer->getConfig()->get('vendor-dir') . '/{$vendor}/{$name}/';
         }
         return $this->locations;
     }
@@ -58,7 +58,7 @@ 
         }
 
         $repositoryManager = $this->composer->getRepositoryManager();
-        if (! $repositoryManager) {
+        if (!$repositoryManager) {
             return false;
         }