AyeCode / invoicing

includes/class-getpaid-customers-query.php

Indentation +497 added lines, -497 removed lines

@@ -16,502 +16,502 @@
  */
 class GetPaid_Customers_Query {
 
-	/**
-	 * Query vars, after parsing
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	public $query_vars = array();
-
-	/**
-	 * List of found customers.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	private $results;
-
-	/**
-	 * Total number of found customers for the current query
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	private $total_customers = 0;
-
-	/**
-	 * The SQL query used to fetch matching customers.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $request;
-
-	// SQL clauses
-
-	/**
-	 * Contains the 'FIELDS' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_fields;
-
-	/**
-	 * Contains the 'FROM' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_from;
-
-	/**
-	 * Contains the 'WHERE' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_where;
-
-	/**
-	 * Contains the 'ORDER BY' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_orderby;
-
-	/**
-	 * Contains the 'LIMIT' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_limit;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param null|string|array $query Optional. The query variables.
-	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
-			$this->query();
-		}
-	}
-
-	/**
-	 * Fills in missing query variables with default values.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
-	 * @return array Complete query variables with undefined ones filled in with defaults.
-	 */
-	public static function fill_query_vars( $args ) {
-		$defaults = array(
-			'include'     => array(),
-			'exclude'     => array(),
-			'orderby'     => 'id',
-			'order'       => 'DESC',
-			'offset'      => '',
-			'number'      => 10,
-			'paged'       => 1,
-			'count_total' => true,
-			'fields'      => 'all',
-			's'           => '',
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
-
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
-			}
-		}
-
-		return wp_parse_args( $args, $defaults );
-	}
-
-	/**
-	 * Prepare the query variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @see self::fill_query_vars() For allowede args and their defaults.
-	 */
-	public function prepare_query( $query = array() ) {
-		global $wpdb;
-
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
-			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
-		}
-
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
-		}
-
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
-
-		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
-		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
-		$table             = $wpdb->prefix . 'getpaid_customers';
-		$this->query_from  = "FROM $table";
-
-		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
-
-		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
-
-		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
-
-		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
-			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
-			}
-		}
-
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
-	}
-
-	/**
-	 * Prepares the query fields.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_fields( &$qv, $table ) {
-
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
-
-			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
-					continue;
-				}
-
-				$field          = sanitize_key( $field );
-				$query_fields[] = "$table.`$field`";
-			}
-			$this->query_fields = implode( ',', $query_fields );
-		} else {
-			$this->query_fields = "$table.*";
-		}
-
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
-		}
-
-	}
-
-	/**
-	 * Prepares the query where.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_where( &$qv, $table ) {
-		global $wpdb;
-		$this->query_where = 'WHERE 1=1';
-
-		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
-
-				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
-				}
-			}
-
-			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
-				}
-
-				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
-				}
-			}
-		}
-
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
-			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
-			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
-		}
-
-		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
-			$this->query_where .= $date_created_query->get_sql();
-		}
-
-		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
-		}
-	}
-
-	/**
-	 * Used internally to generate an SQL string for searching across multiple columns
-	 *
-	 * @since 1.2.7
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param string $string The string to search for.
-	 * @return string
-	 */
-	protected function get_search_sql( $string ) {
-		global $wpdb;
-
-		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
-
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			}
-		}
-
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
-	}
-
-	/**
-	 * Prepares the query order.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_order( &$qv, $table ) {
-
-		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
-
-		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
-		}
-
-		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
-
-		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-
-			if ( is_int( $_key ) ) {
-				// Integer key means this is a flat array of 'orderby' fields.
-				$_orderby = $_value;
-				$_order   = $order;
-			} else {
-				// Non-integer key means that the key is the field and the value is ASC/DESC.
-				$_orderby = $_key;
-				$_order   = $_value;
-			}
-
-			$parsed = $this->parse_orderby( $_orderby, $table );
-
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
-			}
-		}
-
-		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
-			$orderby_array[] = "id $order";
-		}
-
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
-
-	}
-
-	/**
-	 * Execute the query, with the current variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 */
-	public function query() {
-		global $wpdb;
-
-		$qv =& $this->query_vars;
-
-		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
-		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
-
-		if ( null === $this->results ) {
-			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
-
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
-			} else {
-				$this->results = $wpdb->get_col( $this->request );
-			}
-
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
-			}
-		}
-
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
-			}
-		}
-
-	}
-
-	/**
-	 * Set cache
-	 *
-	 * @param string  $id
-	 * @param mixed   $data
-	 * @param string  $group
-	 * @param integer $expire
-	 * @return boolean
-	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
-
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		wp_cache_set( $key, $data, $group, $expire );
-	}
-
-	/**
-	 * Retrieve query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @return mixed
-	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
-	}
-
-	/**
-	 * Return the list of customers.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return GetPaid_Customer[]|array Found customers.
-	 */
-	public function get_results() {
-		return $this->results;
-	}
-
-	/**
-	 * Return the total number of customers for the current query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return int Number of total customers.
-	 */
-	public function get_total() {
-		return $this->total_customers;
-	}
-
-	/**
-	 * Parse and sanitize 'orderby' keys passed to the customers query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $orderby Alias for the field to order by.
-	 *  @param string $table The current table.
-	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
-	 */
-	protected function parse_orderby( $orderby, $table ) {
-
-		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
-			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
-			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
-			$_orderby    = "FIELD( $table.id, $include_sql )";
-		}
-
-		return $_orderby;
-	}
-
-	/**
-	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $order The 'order' query variable.
-	 * @return string The sanitized 'order' query variable.
-	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
-			return 'DESC';
-		}
-
-		if ( 'ASC' === strtoupper( $order ) ) {
-			return 'ASC';
-		} else {
-			return 'DESC';
-		}
-	}
+    /**
+     * Query vars, after parsing
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    public $query_vars = array();
+
+    /**
+     * List of found customers.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    private $results;
+
+    /**
+     * Total number of found customers for the current query
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    private $total_customers = 0;
+
+    /**
+     * The SQL query used to fetch matching customers.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $request;
+
+    // SQL clauses
+
+    /**
+     * Contains the 'FIELDS' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_fields;
+
+    /**
+     * Contains the 'FROM' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_from;
+
+    /**
+     * Contains the 'WHERE' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_where;
+
+    /**
+     * Contains the 'ORDER BY' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_orderby;
+
+    /**
+     * Contains the 'LIMIT' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_limit;
+
+    /**
+     * Class constructor.
+     *
+     * @since 1.0.19
+     *
+     * @param null|string|array $query Optional. The query variables.
+     */
+    public function __construct( $query = null ) {
+        if ( ! is_null( $query ) ) {
+            $this->prepare_query( $query );
+            $this->query();
+        }
+    }
+
+    /**
+     * Fills in missing query variables with default values.
+     *
+     * @since 1.0.19
+     *
+     * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
+     * @return array Complete query variables with undefined ones filled in with defaults.
+     */
+    public static function fill_query_vars( $args ) {
+        $defaults = array(
+            'include'     => array(),
+            'exclude'     => array(),
+            'orderby'     => 'id',
+            'order'       => 'DESC',
+            'offset'      => '',
+            'number'      => 10,
+            'paged'       => 1,
+            'count_total' => true,
+            'fields'      => 'all',
+            's'           => '',
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $defaults[ $field ] = 'any';
+
+            if ( '%f' === $type || '%d' === $type ) {
+                $defaults[ $field . '_min' ] = '';
+                $defaults[ $field . '_max' ] = '';
+            }
+        }
+
+        return wp_parse_args( $args, $defaults );
+    }
+
+    /**
+     * Prepare the query variables.
+     *
+     * @since 1.0.19
+     *
+     * @see self::fill_query_vars() For allowede args and their defaults.
+     */
+    public function prepare_query( $query = array() ) {
+        global $wpdb;
+
+        if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+            $this->query_limit = null;
+            $this->query_vars  = $this->fill_query_vars( $query );
+        }
+
+        if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
+            $this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+        }
+
+        do_action( 'getpaid_pre_get_customers', array( &$this ) );
+
+        // Ensure that query vars are filled after 'getpaid_pre_get_customers'.
+        $qv                = & $this->query_vars;
+        $qv                = $this->fill_query_vars( $qv );
+        $table             = $wpdb->prefix . 'getpaid_customers';
+        $this->query_from  = "FROM $table";
+
+        // Prepare query fields.
+        $this->prepare_query_fields( $qv, $table );
+
+        // Prepare query where.
+        $this->prepare_query_where( $qv, $table );
+
+        // Prepare query order.
+        $this->prepare_query_order( $qv, $table );
+
+        // limit
+        if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
+            if ( $qv['offset'] ) {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+            } else {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+            }
+        }
+
+        do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+    }
+
+    /**
+     * Prepares the query fields.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_fields( &$qv, $table ) {
+
+        if ( is_array( $qv['fields'] ) ) {
+            $qv['fields']   = array_unique( $qv['fields'] );
+            $allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+
+            $query_fields = array();
+            foreach ( $qv['fields'] as $field ) {
+                if ( ! in_array( $field, $allowed_fields ) ) {
+                    continue;
+                }
+
+                $field          = sanitize_key( $field );
+                $query_fields[] = "$table.`$field`";
+            }
+            $this->query_fields = implode( ',', $query_fields );
+        } else {
+            $this->query_fields = "$table.*";
+        }
+
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+            $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+        }
+
+    }
+
+    /**
+     * Prepares the query where.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_where( &$qv, $table ) {
+        global $wpdb;
+        $this->query_where = 'WHERE 1=1';
+
+        // Fields.
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            if ( 'any' !== $qv[ $field ] ) {
+
+                // In.
+                if ( is_array( $qv[ $field ] ) ) {
+                    $in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
+                    $this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
+                } elseif ( ! empty( $qv[ $field ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+                }
+            }
+
+            // Min/Max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                // Min.
+                if ( is_numeric( $qv[ $field . '_min' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+                }
+
+                // Max.
+                if ( is_numeric( $qv[ $field . '_max' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+                }
+            }
+        }
+
+        if ( ! empty( $qv['include'] ) ) {
+            $include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+            $this->query_where .= " AND $table.`id` IN ($include)";
+        } elseif ( ! empty( $qv['exclude'] ) ) {
+            $exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+            $this->query_where .= " AND $table.`id` NOT IN ($exclude)";
+        }
+
+        // Date queries are allowed for the customer creation date.
+        if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
+            $date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+            $this->query_where .= $date_created_query->get_sql();
+        }
+
+        // Search.
+        if ( ! empty( $qv['s'] ) ) {
+            $this->query_where .= $this->get_search_sql( $qv['s'] );
+        }
+    }
+
+    /**
+     * Used internally to generate an SQL string for searching across multiple columns
+     *
+     * @since 1.2.7
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
+     * @param string $string The string to search for.
+     * @return string
+     */
+    protected function get_search_sql( $string ) {
+        global $wpdb;
+
+        $searches = array();
+        $string   = trim( $string, '%' );
+        $like     = '%' . $wpdb->esc_like( $string ) . '%';
+
+        foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
+            if ( 'id' === $col || 'user_id' === $col ) {
+                $searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            } else {
+                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            }
+        }
+
+        return ' AND (' . implode( ' OR ', $searches ) . ')';
+    }
+
+    /**
+     * Prepares the query order.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_order( &$qv, $table ) {
+
+        // sorting.
+        $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
+        $order       = $this->parse_order( $qv['order'] );
+
+        // Default order is by 'id' (latest customers).
+        if ( empty( $qv['orderby'] ) ) {
+            $qv['orderby'] = array( 'id' );
+        }
+
+        // 'orderby' values may be an array, comma- or space-separated list.
+        $ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+
+        $orderby_array = array();
+        foreach ( $ordersby as $_key => $_value ) {
+
+            if ( is_int( $_key ) ) {
+                // Integer key means this is a flat array of 'orderby' fields.
+                $_orderby = $_value;
+                $_order   = $order;
+            } else {
+                // Non-integer key means that the key is the field and the value is ASC/DESC.
+                $_orderby = $_key;
+                $_order   = $_value;
+            }
+
+            $parsed = $this->parse_orderby( $_orderby, $table );
+
+            if ( $parsed ) {
+                $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+            }
+        }
+
+        // If no valid clauses were found, order by id.
+        if ( empty( $orderby_array ) ) {
+            $orderby_array[] = "id $order";
+        }
+
+        $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+
+    }
+
+    /**
+     * Execute the query, with the current variables.
+     *
+     * @since 1.0.19
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     */
+    public function query() {
+        global $wpdb;
+
+        $qv =& $this->query_vars;
+
+        // Return a non-null value to bypass the default GetPaid customers query and remember to set the
+        // total_customers property.
+        $this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+
+        if ( null === $this->results ) {
+            $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
+
+            if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
+                $this->results = $wpdb->get_results( $this->request );
+            } else {
+                $this->results = $wpdb->get_col( $this->request );
+            }
+
+            if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+                $found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
+                $this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+            }
+        }
+
+        if ( 'all' === $qv['fields'] ) {
+            foreach ( $this->results as $key => $customer ) {
+                $this->set_cache( $customer->id, $customer, 'getpaid_customers' );
+                $this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
+                $this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
+                $this->results[ $key ] = new GetPaid_Customer( $customer );
+            }
+        }
+
+    }
+
+    /**
+     * Set cache
+     *
+     * @param string  $id
+     * @param mixed   $data
+     * @param string  $group
+     * @param integer $expire
+     * @return boolean
+     */
+    public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        wp_cache_set( $key, $data, $group, $expire );
+    }
+
+    /**
+     * Retrieve query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @return mixed
+     */
+    public function get( $query_var ) {
+        if ( isset( $this->query_vars[ $query_var ] ) ) {
+            return $this->query_vars[ $query_var ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Set query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @param mixed $value Query variable value.
+     */
+    public function set( $query_var, $value ) {
+        $this->query_vars[ $query_var ] = $value;
+    }
+
+    /**
+     * Return the list of customers.
+     *
+     * @since 1.0.19
+     *
+     * @return GetPaid_Customer[]|array Found customers.
+     */
+    public function get_results() {
+        return $this->results;
+    }
+
+    /**
+     * Return the total number of customers for the current query.
+     *
+     * @since 1.0.19
+     *
+     * @return int Number of total customers.
+     */
+    public function get_total() {
+        return $this->total_customers;
+    }
+
+    /**
+     * Parse and sanitize 'orderby' keys passed to the customers query.
+     *
+     * @since 1.0.19
+     *
+     * @param string $orderby Alias for the field to order by.
+     *  @param string $table The current table.
+     * @return string Value to use in the ORDER clause, if `$orderby` is valid.
+     */
+    protected function parse_orderby( $orderby, $table ) {
+
+        $_orderby = '';
+        if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+            $_orderby = "$table.`$orderby`";
+        } elseif ( 'id' === strtolower( $orderby ) ) {
+            $_orderby = "$table.id";
+        } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
+            $include     = wp_parse_id_list( $this->query_vars['include'] );
+            $include_sql = implode( ',', $include );
+            $_orderby    = "FIELD( $table.id, $include_sql )";
+        }
+
+        return $_orderby;
+    }
+
+    /**
+     * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
+     *
+     * @since 1.0.19
+     *
+     * @param string $order The 'order' query variable.
+     * @return string The sanitized 'order' query variable.
+     */
+    protected function parse_order( $order ) {
+        if ( ! is_string( $order ) || empty( $order ) ) {
+            return 'DESC';
+        }
+
+        if ( 'ASC' === strtoupper( $order ) ) {
+            return 'ASC';
+        } else {
+            return 'DESC';
+        }
+    }
 
 }

Spacing +108 added lines, -108 removed lines

@@ -97,9 +97,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if (!is_null($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -112,7 +112,7 @@ 
 	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'include'     => array(),
 			'exclude'     => array(),
@@ -126,16 +126,16 @@ 
 			's'           => '',
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$defaults[$field] = 'any';
 
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
+			if ('%f' === $type || '%d' === $type) {
+				$defaults[$field . '_min'] = '';
+				$defaults[$field . '_max'] = '';
 			}
 		}
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -145,45 +145,45 @@ 
 	 *
 	 * @see self::fill_query_vars() For allowede args and their defaults.
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || !empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
+			$this->query_vars  = $this->fill_query_vars($query);
 		}
 
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+		if (!empty($this->query_vars['fields']) && 'all' !== $this->query_vars['fields']) {
+			$this->query_vars['fields'] = wpinv_parse_list($this->query_vars['fields']);
 		}
 
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
+		do_action('getpaid_pre_get_customers', array(&$this));
 
 		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
 		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
+		$qv                = $this->fill_query_vars($qv);
 		$table             = $wpdb->prefix . 'getpaid_customers';
 		$this->query_from  = "FROM $table";
 
 		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
+		$this->prepare_query_fields($qv, $table);
 
 		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
+		$this->prepare_query_where($qv, $table);
 
 		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
+		$this->prepare_query_order($qv, $table);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+		do_action_ref_array('getpaid_after_customers_query', array(&$this));
 	}
 
 	/**
@@ -194,27 +194,27 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_fields( &$qv, $table ) {
+	protected function prepare_query_fields(&$qv, $table) {
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+		if (is_array($qv['fields'])) {
+			$qv['fields']   = array_unique($qv['fields']);
+			$allowed_fields = array_keys(GetPaid_Customer_Data_Store::get_database_fields());
 
 			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
+			foreach ($qv['fields'] as $field) {
+				if (!in_array($field, $allowed_fields)) {
 					continue;
 				}
 
-				$field          = sanitize_key( $field );
+				$field          = sanitize_key($field);
 				$query_fields[] = "$table.`$field`";
 			}
-			$this->query_fields = implode( ',', $query_fields );
+			$this->query_fields = implode(',', $query_fields);
 		} else {
 			$this->query_fields = "$table.*";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+		if (isset($qv['count_total']) && $qv['count_total']) {
 			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 		}
 
@@ -228,55 +228,55 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_where( &$qv, $table ) {
+	protected function prepare_query_where(&$qv, $table) {
 		global $wpdb;
 		$this->query_where = 'WHERE 1=1';
 
 		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			if ('any' !== $qv[$field]) {
 
 				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+				if (is_array($qv[$field])) {
+					$in                 = join(',', array_fill(0, count($qv[$field]), $type));
+					$this->query_where .= $wpdb->prepare(" AND $table.`status` IN ( $in )", $qv[$field]);
+				} elseif (!empty($qv[$field])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` = $type", $qv[$field]);
 				}
 			}
 
 			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
 				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+				if (is_numeric($qv[$field . '_min'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` >= $type", $qv[$field . '_min']);
 				}
 
 				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+				if (is_numeric($qv[$field . '_max'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` <= $type", $qv[$field . '_max']);
 				}
 			}
 		}
 
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+		if (!empty($qv['include'])) {
+			$include            = implode(',', wp_parse_id_list($qv['include']));
 			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif (!empty($qv['exclude'])) {
+			$exclude            = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
 		}
 
 		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+		if (!empty($qv['date_created_query']) && is_array($qv['date_created_query'])) {
+			$date_created_query = new WP_Date_Query($qv['date_created_query'], "$table.date_created");
 			$this->query_where .= $date_created_query->get_sql();
 		}
 
 		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
+		if (!empty($qv['s'])) {
+			$this->query_where .= $this->get_search_sql($qv['s']);
 		}
 	}
 
@@ -290,22 +290,22 @@ 
 	 * @param string $string The string to search for.
 	 * @return string
 	 */
-	protected function get_search_sql( $string ) {
+	protected function get_search_sql($string) {
 		global $wpdb;
 
 		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
+		$string   = trim($string, '%');
+		$like     = '%' . $wpdb->esc_like($string) . '%';
 
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		foreach (array_keys(GetPaid_Customer_Data_Store::get_database_fields()) as $col) {
+			if ('id' === $col || 'user_id' === $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			}
 		}
 
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
+		return ' AND (' . implode(' OR ', $searches) . ')';
 	}
 
 	/**
@@ -316,24 +316,24 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_order( &$qv, $table ) {
+	protected function prepare_query_order(&$qv, $table) {
 
 		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order       = $this->parse_order($qv['order']);
 
 		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
+		if (empty($qv['orderby'])) {
+			$qv['orderby'] = array('id');
 		}
 
 		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+		$ordersby      = array_filter(wpinv_parse_list($qv['orderby']));
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
+		foreach ($ordersby as $_key => $_value) {
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order   = $order;
@@ -343,19 +343,19 @@ 
 				$_order   = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby, $table );
+			$parsed = $this->parse_orderby($_orderby, $table);
 
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			if ($parsed) {
+				$orderby_array[] = $parsed . ' ' . $this->parse_order($_order);
 			}
 		}
 
 		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "id $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY ' . implode(', ', $orderby_array);
 
 	}
 
@@ -369,33 +369,33 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
 		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+		$this->results = apply_filters_ref_array('getpaid_customers_pre_query', array(null, &$this));
 
-		if ( null === $this->results ) {
+		if (null === $this->results) {
 			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
+			if ((is_array($qv['fields']) && 1 !== count($qv['fields'])) || 'all' === $qv['fields']) {
+				$this->results = $wpdb->get_results($this->request);
 			} else {
-				$this->results = $wpdb->get_col( $this->request );
+				$this->results = $wpdb->get_col($this->request);
 			}
 
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+			if (isset($qv['count_total']) && $qv['count_total']) {
+				$found_customers_query = apply_filters('getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this);
+				$this->total_customers = (int) $wpdb->get_var($found_customers_query);
 			}
 		}
 
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
+		if ('all' === $qv['fields']) {
+			foreach ($this->results as $key => $customer) {
+				$this->set_cache($customer->id, $customer, 'getpaid_customers');
+				$this->set_cache($customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id');
+				$this->set_cache($customer->email, $customer->id, 'getpaid_customer_ids_by_email');
+				$this->results[$key] = new GetPaid_Customer($customer);
 			}
 		}
 
@@ -410,13 +410,13 @@ 
 	 * @param integer $expire
 	 * @return boolean
 	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+	public function set_cache($key, $data, $group = '', $expire = 0) {
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		wp_cache_set( $key, $data, $group, $expire );
+		wp_cache_set($key, $data, $group, $expire);
 	}
 
 	/**
@@ -427,9 +427,9 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return null;
@@ -443,8 +443,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
+	public function set($query_var, $value) {
+		$this->query_vars[$query_var] = $value;
 	}
 
 	/**
@@ -478,16 +478,16 @@ 
 	 *  @param string $table The current table.
 	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby, $table ) {
+	protected function parse_orderby($orderby, $table) {
 
 		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+		if (in_array($orderby, array_keys(GetPaid_Customer_Data_Store::get_database_fields()), true)) {
 			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
+		} elseif ('id' === strtolower($orderby)) {
 			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && !empty($this->query_vars['include'])) {
+			$include     = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby    = "FIELD( $table.id, $include_sql )";
 		}
 
@@ -502,12 +502,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if (!is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

includes/admin/class-getpaid-installer.php

Indentation +468 added lines, -468 removed lines

@@ -20,402 +20,402 @@ 
  */
 class GetPaid_Installer {
 
-	/**
-	 * Upgrades the install.
-	 *
-	 * @param string $upgrade_from The current invoicing version.
-	 */
-	public function upgrade_db( $upgrade_from ) {
-
-		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
-
-		// Setup the invoice Custom Post Type.
-		GetPaid_Post_Types::register_post_types();
-
-		// Clear the permalinks
-		flush_rewrite_rules();
-
-		// Maybe create new/missing pages.
-		$this->create_pages();
-
-		// Maybe re(add) admin capabilities.
-		$this->add_capabilities();
-
-		// Maybe create the default payment form.
-		wpinv_get_default_payment_form();
-
-		// Create any missing database tables.
-		$method = "upgrade_from_$upgrade_from";
-
-		$installed = get_option( 'gepaid_installed_on' );
-
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
-		}
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-
-		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-	}
-
-	/**
-	 * Upgrade to 0.0.5
-	 *
-	 */
-	public function upgrade_from_004() {
-		global $wpdb;
-
-		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-
-			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
-			}
-		}
-
-		// Item meta key changes
-		$query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
-
-		if ( ! empty( $results ) ) {
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
-
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
-			}
-		}
-
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->migrate_old_invoices();
-		$this->upgrade_from_279();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_279() {
-		self::migrate_old_customers();
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Retreives GetPaid pages.
-	 *
-	 */
-	public static function get_pages() {
-
-		return apply_filters(
-			'wpinv_create_pages',
-			array(
-
-				// Checkout page.
-				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
-					'content' => '
+    /**
+     * Upgrades the install.
+     *
+     * @param string $upgrade_from The current invoicing version.
+     */
+    public function upgrade_db( $upgrade_from ) {
+
+        // Save the current invoicing version.
+        update_option( 'wpinv_version', WPINV_VERSION );
+
+        // Setup the invoice Custom Post Type.
+        GetPaid_Post_Types::register_post_types();
+
+        // Clear the permalinks
+        flush_rewrite_rules();
+
+        // Maybe create new/missing pages.
+        $this->create_pages();
+
+        // Maybe re(add) admin capabilities.
+        $this->add_capabilities();
+
+        // Maybe create the default payment form.
+        wpinv_get_default_payment_form();
+
+        // Create any missing database tables.
+        $method = "upgrade_from_$upgrade_from";
+
+        $installed = get_option( 'gepaid_installed_on' );
+
+        if ( empty( $installed ) ) {
+            update_option( 'gepaid_installed_on', time() );
+        }
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+
+        // Save default tax rates.
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+    }
+
+    /**
+     * Upgrade to 0.0.5
+     *
+     */
+    public function upgrade_from_004() {
+        global $wpdb;
+
+        // Invoices.
+        $results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+        if ( ! empty( $results ) ) {
+            $wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+
+            // Clean post cache
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->ID );
+            }
+        }
+
+        // Item meta key changes
+        $query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
+        $results = $wpdb->get_results( $query );
+
+        if ( ! empty( $results ) ) {
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->post_id );
+            }
+        }
+
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->migrate_old_invoices();
+        $this->upgrade_from_279();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_279() {
+        self::migrate_old_customers();
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Retreives GetPaid pages.
+     *
+     */
+    public static function get_pages() {
+
+        return apply_filters(
+            'wpinv_create_pages',
+            array(
+
+                // Checkout page.
+                'checkout_page'             => array(
+                    'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+                    'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
 						<!-- /wp:shortcode -->
 					',
-					'parent'  => '',
-				),
-
-				// Invoice history page.
-				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Invoice history page.
+                'invoice_history_page'      => array(
+                    'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-				// Success page content.
-				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Success page content.
+                'success_page'              => array(
+                    'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => 'gp-checkout',
-				),
-
-				// Failure page content.
-				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
-					'parent'  => 'gp-checkout',
-				),
-
-				// Subscriptions history page.
-				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Failure page content.
+                'failure_page'              => array(
+                    'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
+                    'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Subscriptions history page.
+                'invoice_subscription_page' => array(
+                    'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-			)
-		);
-
-	}
-
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
-
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
-		$invoices            = array_unique(
-			get_posts(
-				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
-					'posts_per_page' => -1,
-					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
-					'exclude'        => (array) $migrated,
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
-
-		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
-
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
-
-			if ( empty( $invoice->ID ) ) {
-				return;
-			}
-
-			$fields = array(
-				'post_id'            => $invoice->ID,
-				'number'             => $invoice->get_number(),
-				'key'                => $invoice->get_key(),
-				'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
-				'mode'               => $invoice->mode,
-				'user_ip'            => $invoice->get_ip(),
-				'first_name'         => $invoice->get_first_name(),
-				'last_name'          => $invoice->get_last_name(),
-				'address'            => $invoice->get_address(),
-				'city'               => $invoice->city,
-				'state'              => $invoice->state,
-				'country'            => $invoice->country,
-				'zip'                => $invoice->zip,
-				'adddress_confirmed' => (int) $invoice->adddress_confirmed,
-				'gateway'            => $invoice->get_gateway(),
-				'transaction_id'     => $invoice->get_transaction_id(),
-				'currency'           => $invoice->get_currency(),
-				'subtotal'           => $invoice->get_subtotal(),
-				'tax'                => $invoice->get_tax(),
-				'fees_total'         => $invoice->get_fees_total(),
-				'total'              => $invoice->get_total(),
-				'discount'           => $invoice->get_discount(),
-				'discount_code'      => $invoice->get_discount_code(),
-				'disable_taxes'      => $invoice->disable_taxes,
-				'due_date'           => $invoice->get_due_date(),
-				'completed_date'     => $invoice->get_completed_date(),
-				'company'            => $invoice->company,
-				'vat_number'         => $invoice->vat_number,
-				'vat_rate'           => $invoice->vat_rate,
-				'custom_meta'        => $invoice->payment_meta,
-			);
-
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
-					$val = '';
-				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
-			}
-
-			$fields = implode( ', ', $fields );
-			$invoice_rows[] = "($fields)";
-
-			$item_rows    = array();
-			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
-				$fields = array(
-					'post_id'          => $invoice->ID,
-					'item_id'          => $details['id'],
-					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
-					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
-					'tax'              => $details['tax'],
-					'item_price'       => $details['item_price'],
-					'custom_price'     => $details['custom_price'],
-					'quantity'         => $details['quantity'],
-					'discount'         => $details['discount'],
-					'subtotal'         => $details['subtotal'],
-					'price'            => $details['price'],
-					'meta'             => $details['meta'],
-					'fees'             => $details['fees'],
-				);
-
-				$item_columns = array_keys( $fields );
-
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
-						$val = '';
-					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
-				}
-
-				$fields = implode( ', ', $fields );
-				$item_rows[] = "($fields)";
-			}
-
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
-		}
-
-		if ( empty( $invoice_rows ) ) {
-			return;
-		}
-
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
-
-	}
-
-	/**
-	 * Migrates old customers to new table.
-	 *
-	 */
-	public static function migrate_old_customers() {
-		global $wpdb;
-
-		// Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
-		$invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
-
-		foreach ( $invoice_ids as $invoice_id ) {
-			$invoice = wpinv_get_invoice( $invoice_id );
-
-			if ( empty( $invoice ) ) {
-				continue;
-			}
-
-			// Fetch customer from the user ID.
-			$user_id = $invoice->get_user_id();
-
-			if ( empty( $user_id ) ) {
-				continue;
-			}
-
-			$customer = getpaid_get_customer_by_user_id( $user_id );
-
-			// Create if not exists.
-			if ( empty( $customer ) ) {
-				$customer = new GetPaid_Customer( 0 );
-				$customer->clone_user( $user_id );
-				$customer->save();
-			}
-
-			$invoice->set_customer_id( $customer->get_id() );
-			$invoice->save();
-		}
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public static function rename_gateways_label() {
-		global $wpdb;
-
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
-
-			$wpdb->update(
-				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
-				'%s',
-				'%s'
-			);
-
-		}
-	}
-
-	/**
-	 * Returns the DB schema.
-	 *
-	 */
-	public static function get_db_schema() {
-		global $wpdb;
-
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-		$charset_collate = $wpdb->get_charset_collate();
+                    'parent'  => '',
+                ),
+
+            )
+        );
+
+    }
+
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
+
+        foreach ( self::get_pages() as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+        $migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+        $invoices            = array_unique(
+            get_posts(
+                array(
+                    'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                    'posts_per_page' => -1,
+                    'fields'         => 'ids',
+                    'post_status'    => array_keys( get_post_stati() ),
+                    'exclude'        => (array) $migrated,
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
+
+        $invoice_rows = array();
+        foreach ( $invoices as $invoice ) {
+
+            $invoice = new WPInv_Legacy_Invoice( $invoice );
+
+            if ( empty( $invoice->ID ) ) {
+                return;
+            }
+
+            $fields = array(
+                'post_id'            => $invoice->ID,
+                'number'             => $invoice->get_number(),
+                'key'                => $invoice->get_key(),
+                'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
+                'mode'               => $invoice->mode,
+                'user_ip'            => $invoice->get_ip(),
+                'first_name'         => $invoice->get_first_name(),
+                'last_name'          => $invoice->get_last_name(),
+                'address'            => $invoice->get_address(),
+                'city'               => $invoice->city,
+                'state'              => $invoice->state,
+                'country'            => $invoice->country,
+                'zip'                => $invoice->zip,
+                'adddress_confirmed' => (int) $invoice->adddress_confirmed,
+                'gateway'            => $invoice->get_gateway(),
+                'transaction_id'     => $invoice->get_transaction_id(),
+                'currency'           => $invoice->get_currency(),
+                'subtotal'           => $invoice->get_subtotal(),
+                'tax'                => $invoice->get_tax(),
+                'fees_total'         => $invoice->get_fees_total(),
+                'total'              => $invoice->get_total(),
+                'discount'           => $invoice->get_discount(),
+                'discount_code'      => $invoice->get_discount_code(),
+                'disable_taxes'      => $invoice->disable_taxes,
+                'due_date'           => $invoice->get_due_date(),
+                'completed_date'     => $invoice->get_completed_date(),
+                'company'            => $invoice->company,
+                'vat_number'         => $invoice->vat_number,
+                'vat_rate'           => $invoice->vat_rate,
+                'custom_meta'        => $invoice->payment_meta,
+            );
+
+            foreach ( $fields as $key => $val ) {
+                if ( is_null( $val ) ) {
+                    $val = '';
+                }
+                $val = maybe_serialize( $val );
+                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            }
+
+            $fields = implode( ', ', $fields );
+            $invoice_rows[] = "($fields)";
+
+            $item_rows    = array();
+            $item_columns = array();
+            foreach ( $invoice->get_cart_details() as $details ) {
+                $fields = array(
+                    'post_id'          => $invoice->ID,
+                    'item_id'          => $details['id'],
+                    'item_name'        => $details['name'],
+                    'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                    'vat_rate'         => $details['vat_rate'],
+                    'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                    'tax'              => $details['tax'],
+                    'item_price'       => $details['item_price'],
+                    'custom_price'     => $details['custom_price'],
+                    'quantity'         => $details['quantity'],
+                    'discount'         => $details['discount'],
+                    'subtotal'         => $details['subtotal'],
+                    'price'            => $details['price'],
+                    'meta'             => $details['meta'],
+                    'fees'             => $details['fees'],
+                );
+
+                $item_columns = array_keys( $fields );
+
+                foreach ( $fields as $key => $val ) {
+                    if ( is_null( $val ) ) {
+                        $val = '';
+                    }
+                    $val = maybe_serialize( $val );
+                    $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                }
+
+                $fields = implode( ', ', $fields );
+                $item_rows[] = "($fields)";
+            }
+
+            $item_rows    = implode( ', ', $item_rows );
+            $item_columns = implode( ', ', $item_columns );
+            $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        }
+
+        if ( empty( $invoice_rows ) ) {
+            return;
+        }
+
+        $invoice_rows = implode( ', ', $invoice_rows );
+        $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+
+    }
+
+    /**
+     * Migrates old customers to new table.
+     *
+     */
+    public static function migrate_old_customers() {
+        global $wpdb;
+
+        // Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
+        $invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
+
+        foreach ( $invoice_ids as $invoice_id ) {
+            $invoice = wpinv_get_invoice( $invoice_id );
+
+            if ( empty( $invoice ) ) {
+                continue;
+            }
+
+            // Fetch customer from the user ID.
+            $user_id = $invoice->get_user_id();
+
+            if ( empty( $user_id ) ) {
+                continue;
+            }
+
+            $customer = getpaid_get_customer_by_user_id( $user_id );
+
+            // Create if not exists.
+            if ( empty( $customer ) ) {
+                $customer = new GetPaid_Customer( 0 );
+                $customer->clone_user( $user_id );
+                $customer->save();
+            }
+
+            $invoice->set_customer_id( $customer->get_id() );
+            $invoice->save();
+        }
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public static function rename_gateways_label() {
+        global $wpdb;
+
+        foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+
+            $wpdb->update(
+                $wpdb->prefix . 'getpaid_invoices',
+                array( 'gateway' => $gateway ),
+                array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+                '%s',
+                '%s'
+            );
+
+        }
+    }
+
+    /**
+     * Returns the DB schema.
+     *
+     */
+    public static function get_db_schema() {
+        global $wpdb;
+
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Subscriptions.
-		$schema = "CREATE TABLE {$wpdb->prefix}wpinv_subscriptions (
+        // Subscriptions.
+        $schema = "CREATE TABLE {$wpdb->prefix}wpinv_subscriptions (
 			id bigint(20) unsigned NOT NULL auto_increment,
 			customer_id bigint(20) NOT NULL,
 			frequency int(11) NOT NULL DEFAULT '1',
@@ -438,8 +438,8 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		// Invoices.
-		$schema .= "CREATE TABLE {$wpdb->prefix}getpaid_invoices (
+        // Invoices.
+        $schema .= "CREATE TABLE {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
 			customer_id BIGINT(20) NOT NULL DEFAULT 0,
             `number` VARCHAR(100),
@@ -476,8 +476,8 @@ 
 			KEY invoice_key (invoice_key)
 		  ) $charset_collate;";
 
-		// Invoice items.
-		$schema .= "CREATE TABLE {$wpdb->prefix}getpaid_invoice_items (
+        // Invoice items.
+        $schema .= "CREATE TABLE {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -499,8 +499,8 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		// Customers.
-		$schema .= "CREATE TABLE {$wpdb->prefix}getpaid_customers (
+        // Customers.
+        $schema .= "CREATE TABLE {$wpdb->prefix}getpaid_customers (
 			id BIGINT(20) NOT NULL AUTO_INCREMENT,
 			user_id BIGINT(20) NOT NULL,
 			email VARCHAR(100) NOT NULL,
@@ -510,38 +510,38 @@ 
 			purchase_count BIGINT(20) NOT NULL DEFAULT 0,
 			";
 
-		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-			// Skip id, user_id and email.
-			if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				continue;
-			}
-
-			$field   = sanitize_key( $field );
-			$length  = 100;
-			$default = '';
-
-			// Country.
-			if ( 'country' === $field ) {
-				$length  = 2;
-				$default = wpinv_get_default_country();
-			}
-
-			// State.
-			if ( 'state' === $field ) {
-				$default = wpinv_get_default_state();
-			}
-
-			// Phone, zip.
-			if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
-				$length = 20;
-			}
-
-			$schema .= "`$field` VARCHAR($length) NOT NULL DEFAULT '$default',
+        // Add address fields.
+        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+            // Skip id, user_id and email.
+            if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+                continue;
+            }
+
+            $field   = sanitize_key( $field );
+            $length  = 100;
+            $default = '';
+
+            // Country.
+            if ( 'country' === $field ) {
+                $length  = 2;
+                $default = wpinv_get_default_country();
+            }
+
+            // State.
+            if ( 'state' === $field ) {
+                $default = wpinv_get_default_state();
+            }
+
+            // Phone, zip.
+            if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
+                $length = 20;
+            }
+
+            $schema .= "`$field` VARCHAR($length) NOT NULL DEFAULT '$default',
 			";
-		}
+        }
 
-		$schema .= "date_created DATETIME NOT NULL,
+        $schema .= "date_created DATETIME NOT NULL,
 			date_modified DATETIME NOT NULL,
 			uuid VARCHAR(100) NOT NULL,
 			PRIMARY KEY  (id),
@@ -549,8 +549,8 @@ 
 			KEY email (email)
 		  ) $charset_collate;";
 
-		// Customer meta.
-		$schema .= "CREATE TABLE {$wpdb->prefix}getpaid_customer_meta (
+        // Customer meta.
+        $schema .= "CREATE TABLE {$wpdb->prefix}getpaid_customer_meta (
 			meta_id BIGINT(20) NOT NULL AUTO_INCREMENT,
 			customer_id BIGINT(20) NOT NULL,
 			meta_key VARCHAR(255) NOT NULL,
@@ -560,55 +560,55 @@ 
 			KEY meta_key (meta_key(191))
 		  ) $charset_collate;";
 
-		return $schema;
-	}
-
-	/**
-	 * Checks if the db schema is up to date.
-	 *
-	 * @return bool
-	 */
-	public static function is_db_schema_up_to_date() {
-		return md5( self::get_db_schema() ) === get_option( 'getpaid_db_schema' );
-	}
-
-	/**
-	 * Set up the database tables which the plugin needs to function.
-	 */
-	public static function create_db_tables() {
-		global $wpdb;
-
-		$wpdb->hide_errors();
-
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-		$schema = self::get_db_schema();
-
-		// If invoices table exists, rename key to invoice_key.
-		$invoices_table = "{$wpdb->prefix}getpaid_invoices";
-
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
-			$fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
-
-			foreach ( $fields as $field ) {
-				if ( 'key' === $field->Field ) {
-					$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
-					break;
-				}
-			}
-		}
-
-		dbDelta( $schema );
-		wp_cache_flush();
-		update_option( 'getpaid_db_schema', md5( $schema ) );
-	}
-
-	/**
-	 * Creates tables if schema is not up to date.
-	 */
-	public static function maybe_create_db_tables() {
-		if ( ! self::is_db_schema_up_to_date() ) {
-			self::create_db_tables();
-		}
-	}
+        return $schema;
+    }
+
+    /**
+     * Checks if the db schema is up to date.
+     *
+     * @return bool
+     */
+    public static function is_db_schema_up_to_date() {
+        return md5( self::get_db_schema() ) === get_option( 'getpaid_db_schema' );
+    }
+
+    /**
+     * Set up the database tables which the plugin needs to function.
+     */
+    public static function create_db_tables() {
+        global $wpdb;
+
+        $wpdb->hide_errors();
+
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+
+        $schema = self::get_db_schema();
+
+        // If invoices table exists, rename key to invoice_key.
+        $invoices_table = "{$wpdb->prefix}getpaid_invoices";
+
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
+            $fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
+
+            foreach ( $fields as $field ) {
+                if ( 'key' === $field->Field ) {
+                    $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
+                    break;
+                }
+            }
+        }
+
+        dbDelta( $schema );
+        wp_cache_flush();
+        update_option( 'getpaid_db_schema', md5( $schema ) );
+    }
+
+    /**
+     * Creates tables if schema is not up to date.
+     */
+    public static function maybe_create_db_tables() {
+        if ( ! self::is_db_schema_up_to_date() ) {
+            self::create_db_tables();
+        }
+    }
 }

Spacing +90 added lines, -90 removed lines

@@ -8,7 +8,7 @@ 
  * @since   2.0.2
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main installer/updater class.
@@ -25,10 +25,10 @@ 
 	 *
 	 * @param string $upgrade_from The current invoicing version.
 	 */
-	public function upgrade_db( $upgrade_from ) {
+	public function upgrade_db($upgrade_from) {
 
 		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
+		update_option('wpinv_version', WPINV_VERSION);
 
 		// Setup the invoice Custom Post Type.
 		GetPaid_Post_Types::register_post_types();
@@ -48,13 +48,13 @@ 
 		// Create any missing database tables.
 		$method = "upgrade_from_$upgrade_from";
 
-		$installed = get_option( 'gepaid_installed_on' );
+		$installed = get_option('gepaid_installed_on');
 
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
+		if (empty($installed)) {
+			update_option('gepaid_installed_on', time());
 		}
 
-		if ( method_exists( $this, $method ) ) {
+		if (method_exists($this, $method)) {
 			$this->$method();
 		}
 
@@ -67,7 +67,7 @@ 
 	public function upgrade_from_0() {
 
 		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
 	}
 
 	/**
@@ -78,27 +78,27 @@ 
 		global $wpdb;
 
 		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+		$results = $wpdb->get_results("SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+		if (!empty($results)) {
+			$wpdb->query("UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
 			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
+			foreach ($results as $row) {
+				clean_post_cache($row->ID);
 			}
 		}
 
 		// Item meta key changes
 		$query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
+		$results = $wpdb->get_results($query);
 
-		if ( ! empty( $results ) ) {
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+		if (!empty($results)) {
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
 
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
+			foreach ($results as $row) {
+				clean_post_cache($row->post_id);
 			}
 		}
 
@@ -127,7 +127,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 
 				// Checkout page.
 				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-checkout', 'Page slug', 'invoicing'),
+					'title'   => _x('Checkout', 'Page title', 'invoicing'),
 					'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
@@ -154,8 +154,8 @@ 
 
 				// Invoice history page.
 				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-invoices', 'Page slug', 'invoicing'),
+					'title'   => _x('My Invoices', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
@@ -166,8 +166,8 @@ 
 
 				// Success page content.
 				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-receipt', 'Page slug', 'invoicing'),
+					'title'   => _x('Payment Confirmation', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
@@ -178,16 +178,16 @@ 
 
 				// Failure page content.
 				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+					'name'    => _x('gp-transaction-failed', 'Page slug', 'invoicing'),
+					'title'   => _x('Transaction Failed', 'Page title', 'invoicing'),
+					'content' => __('Your transaction failed, please try again or contact site support.', 'invoicing'),
 					'parent'  => 'gp-checkout',
 				),
 
 				// Subscriptions history page.
 				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-subscriptions', 'Page slug', 'invoicing'),
+					'title'   => _x('My Subscriptions', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
@@ -207,8 +207,8 @@ 
 	 */
 	public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach (self::get_pages() as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -222,32 +222,32 @@ 
 
 		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
 		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+		$migrated            = $wpdb->get_col("SELECT post_id FROM $invoices_table");
 		$invoices            = array_unique(
 			get_posts(
 				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+					'post_type'      => array('wpi_invoice', 'wpi_quote'),
 					'posts_per_page' => -1,
 					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
+					'post_status'    => array_keys(get_post_stati()),
 					'exclude'        => (array) $migrated,
 				)
 			)
 		);
 
 		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
+		if (empty($invoices)) {
 			return;
 		}
 
 		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
 
 		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
+			$invoice = new WPInv_Legacy_Invoice($invoice);
 
-			if ( empty( $invoice->ID ) ) {
+			if (empty($invoice->ID)) {
 				return;
 			}
 
@@ -255,7 +255,7 @@ 
 				'post_id'            => $invoice->ID,
 				'number'             => $invoice->get_number(),
 				'key'                => $invoice->get_key(),
-				'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
+				'type'               => str_replace('wpi_', '', $invoice->post_type),
 				'mode'               => $invoice->mode,
 				'user_ip'            => $invoice->get_ip(),
 				'first_name'         => $invoice->get_first_name(),
@@ -284,27 +284,27 @@ 
 				'custom_meta'        => $invoice->payment_meta,
 			);
 
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
+			foreach ($fields as $key => $val) {
+				if (is_null($val)) {
 					$val = '';
 				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
+				$val = maybe_serialize($val);
+				$fields[$key] = $wpdb->prepare('%s', $val);
 			}
 
-			$fields = implode( ', ', $fields );
+			$fields = implode(', ', $fields);
 			$invoice_rows[] = "($fields)";
 
 			$item_rows    = array();
 			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
+			foreach ($invoice->get_cart_details() as $details) {
 				$fields = array(
 					'post_id'          => $invoice->ID,
 					'item_id'          => $details['id'],
 					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+					'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
 					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+					'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
 					'tax'              => $details['tax'],
 					'item_price'       => $details['item_price'],
 					'custom_price'     => $details['custom_price'],
@@ -316,31 +316,31 @@ 
 					'fees'             => $details['fees'],
 				);
 
-				$item_columns = array_keys( $fields );
+				$item_columns = array_keys($fields);
 
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
+				foreach ($fields as $key => $val) {
+					if (is_null($val)) {
 						$val = '';
 					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
+					$val = maybe_serialize($val);
+					$fields[$key] = $wpdb->prepare('%s', $val);
 				}
 
-				$fields = implode( ', ', $fields );
+				$fields = implode(', ', $fields);
 				$item_rows[] = "($fields)";
 			}
 
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+			$item_rows    = implode(', ', $item_rows);
+			$item_columns = implode(', ', $item_columns);
+			$wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
 		}
 
-		if ( empty( $invoice_rows ) ) {
+		if (empty($invoice_rows)) {
 			return;
 		}
 
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+		$invoice_rows = implode(', ', $invoice_rows);
+		$wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 	}
 
@@ -352,32 +352,32 @@ 
 		global $wpdb;
 
 		// Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
-		$invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
+		$invoice_ids = $wpdb->get_col("SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL");
 
-		foreach ( $invoice_ids as $invoice_id ) {
-			$invoice = wpinv_get_invoice( $invoice_id );
+		foreach ($invoice_ids as $invoice_id) {
+			$invoice = wpinv_get_invoice($invoice_id);
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				continue;
 			}
 
 			// Fetch customer from the user ID.
 			$user_id = $invoice->get_user_id();
 
-			if ( empty( $user_id ) ) {
+			if (empty($user_id)) {
 				continue;
 			}
 
-			$customer = getpaid_get_customer_by_user_id( $user_id );
+			$customer = getpaid_get_customer_by_user_id($user_id);
 
 			// Create if not exists.
-			if ( empty( $customer ) ) {
-				$customer = new GetPaid_Customer( 0 );
-				$customer->clone_user( $user_id );
+			if (empty($customer)) {
+				$customer = new GetPaid_Customer(0);
+				$customer->clone_user($user_id);
 				$customer->save();
 			}
 
-			$invoice->set_customer_id( $customer->get_id() );
+			$invoice->set_customer_id($customer->get_id());
 			$invoice->save();
 		}
 
@@ -390,12 +390,12 @@ 
 	public static function rename_gateways_label() {
 		global $wpdb;
 
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+		foreach (array_keys(wpinv_get_payment_gateways()) as $gateway) {
 
 			$wpdb->update(
 				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+				array('gateway' => $gateway),
+				array('gateway' => wpinv_get_gateway_admin_label($gateway)),
 				'%s',
 				'%s'
 			);
@@ -511,29 +511,29 @@ 
 			";
 
 		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields()) as $field) {
 			// Skip id, user_id and email.
-			if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+			if (in_array($field, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid'), true)) {
 				continue;
 			}
 
-			$field   = sanitize_key( $field );
+			$field   = sanitize_key($field);
 			$length  = 100;
 			$default = '';
 
 			// Country.
-			if ( 'country' === $field ) {
+			if ('country' === $field) {
 				$length  = 2;
 				$default = wpinv_get_default_country();
 			}
 
 			// State.
-			if ( 'state' === $field ) {
+			if ('state' === $field) {
 				$default = wpinv_get_default_state();
 			}
 
 			// Phone, zip.
-			if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
+			if (in_array($field, array('phone', 'zip'), true)) {
 				$length = 20;
 			}
 
@@ -569,7 +569,7 @@ 
 	 * @return bool
 	 */
 	public static function is_db_schema_up_to_date() {
-		return md5( self::get_db_schema() ) === get_option( 'getpaid_db_schema' );
+		return md5(self::get_db_schema()) === get_option('getpaid_db_schema');
 	}
 
 	/**
@@ -587,27 +587,27 @@ 
 		// If invoices table exists, rename key to invoice_key.
 		$invoices_table = "{$wpdb->prefix}getpaid_invoices";
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
-			$fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'") === $invoices_table) {
+			$fields = $wpdb->get_results("SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices");
 
-			foreach ( $fields as $field ) {
-				if ( 'key' === $field->Field ) {
-					$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
+			foreach ($fields as $field) {
+				if ('key' === $field->Field) {
+					$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)");
 					break;
 				}
 			}
 		}
 
-		dbDelta( $schema );
+		dbDelta($schema);
 		wp_cache_flush();
-		update_option( 'getpaid_db_schema', md5( $schema ) );
+		update_option('getpaid_db_schema', md5($schema));
 	}
 
 	/**
 	 * Creates tables if schema is not up to date.
 	 */
 	public static function maybe_create_db_tables() {
-		if ( ! self::is_db_schema_up_to_date() ) {
+		if (!self::is_db_schema_up_to_date()) {
 			self::create_db_tables();
 		}
 	}

includes/admin/class-wpinv-customers-table.php

Indentation +296 added lines, -296 removed lines

@@ -11,7 +11,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,303 +23,303 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 25;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total_count = 0;
-
-	public $query;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct(
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 25;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total_count = 0;
+
+    public $query;
+
+    /**
+     * 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,
+                '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 'customer';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return esc_html( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return esc_html( $state );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
-
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
-
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  GetPaid_Customer $customer customer.
-	 * @return string
-	 */
-	public function column_customer( $customer ) {
-
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
-
-		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
-		$row_actions = $view_url ? $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		) : '';
-
-		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-
-		// Prepare query args.
-		$query = array(
-			'number' => $this->per_page,
-			'paged'  => $this->get_paged(),
-		);
-
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-		}
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-			}
-		}
-
-		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
-		$this->total_count = $this->query->get_total();
-		$this->items       = $this->query->get_results();
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 */
-	public function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-		$this->prepare_query();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $this->total_count,
-				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
-			)
-		);
-	}
-
-	/**
-	 * Sortable table columns.
-	 *
-	 * @return array
-	 */
-	public function get_sortable_columns() {
-		$sortable = array(
-			'customer' => array( 'first_name', true ),
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
-		}
-
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
-	}
-
-	/**
-	 * Table columns
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
-		);
-
-		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
-
-			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
-			}
-		}
-
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
-
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
-	}
+    }
+
+    /**
+     * 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 'customer';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $customer, $column_name ) {
+        $value = esc_html( $customer->get( $column_name ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_country( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return esc_html( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_state( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        $state   = $customer->get( 'state' );
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return esc_html( $state );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_date_created( $customer ) {
+        return getpaid_format_date_value( $customer->get( 'date_created' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_value( $customer ) {
+        return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_count( $customer ) {
+        $value = $customer->get( 'purchase_count' );
+        $url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+
+        return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  GetPaid_Customer $customer customer.
+     * @return string
+     */
+    public function column_customer( $customer ) {
+
+        $first_name = $customer->get( 'first_name' );
+        $last_name  = $customer->get( 'last_name' );
+        $email      = $customer->get( 'email' );
+        $avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+
+        // Customer view URL.
+        $view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+        $row_actions = $view_url ? $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        ) : '';
+
+        // Customer's name.
+        $name   = esc_html( trim( "$first_name $last_name" ) );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+
+        // Prepare query args.
+        $query = array(
+            'number' => $this->per_page,
+            'paged'  => $this->get_paged(),
+        );
+
+        foreach ( array( 'orderby', 'order', 's' ) as $field ) {
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+        }
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            // Min max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+
+                if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+            }
+        }
+
+        // Prepare class properties.
+        $this->query       = getpaid_get_customers( $query, 'query' );
+        $this->total_count = $this->query->get_total();
+        $this->items       = $this->query->get_results();
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     */
+    public function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+        $this->prepare_query();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $this->total_count,
+                'per_page'    => $this->per_page,
+                'total_pages' => ceil( $this->total_count / $this->per_page ),
+            )
+        );
+    }
+
+    /**
+     * Sortable table columns.
+     *
+     * @return array
+     */
+    public function get_sortable_columns() {
+        $sortable = array(
+            'customer' => array( 'first_name', true ),
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $sortable[ $field ] = array( $field, true );
+        }
+
+        return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+    }
+
+    /**
+     * Table columns
+     *
+     * @return array
+     */
+    public function get_columns() {
+        $columns = array(
+            'customer' => __( 'Customer', 'invoicing' ),
+        );
+
+        // Add address fields.
+        foreach ( getpaid_user_address_fields() as $key => $value ) {
+
+            // Skip id, user_id and email.
+            if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
+                $columns[ $key ] = $value;
+            }
+        }
+
+        $columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
+        $columns['purchase_count'] = __( 'Invoices', 'invoicing' );
+        $columns['date_created']   = __( 'Date created', 'invoicing' );
+
+        return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+    }
 }

Spacing +61 added lines, -61 removed lines

@@ -5,12 +5,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+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';
 }
 
@@ -78,9 +78,9 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+	public function column_default($customer, $column_name) {
+		$value = esc_html($customer->get($column_name));
+		return apply_filters('wpinv_customers_table_column' . $column_name, $value, $customer);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
+	public function column_country($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		if ($country) {
+			$country = wpinv_country_name($country);
 		}
-		return esc_html( $country );
+		return esc_html($country);
 	}
 
 	/**
@@ -109,14 +109,14 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
+	public function column_state($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		$state   = $customer->get('state');
+		if ($state) {
+			$state = wpinv_state_name($state, $country);
 		}
 
-		return esc_html( $state );
+		return esc_html($state);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
+	public function column_date_created($customer) {
+		return getpaid_format_date_value($customer->get('date_created'));
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+	public function column_purchase_value($customer) {
+		return wpinv_price((float) $customer->get('purchase_value'));
 	}
 
 	/**
@@ -154,11 +154,11 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+	public function column_purchase_count($customer) {
+		$value = $customer->get('purchase_count');
+		$url   = $customer->get('user_id') ? add_query_arg(array('post_type' => 'wpi_invoice', 'author' => $customer->get('user_id'),), admin_url('edit.php')) : '';
 
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+		return (empty($value) || empty($url)) ? (int) $value : '<a href="' . esc_url($url) . '">' . absint($value) . '</a>';
 
 	}
 
@@ -168,25 +168,25 @@ 
 	 * @param  GetPaid_Customer $customer customer.
 	 * @return string
 	 */
-	public function column_customer( $customer ) {
+	public function column_customer($customer) {
 
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+		$first_name = $customer->get('first_name');
+		$last_name  = $customer->get('last_name');
+		$email      = $customer->get('email');
+		$avatar     = get_avatar($customer->get('user_id') ? $customer->get('user_id') : $email, 32);
 
 		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+		$view_url    = $customer->get('user_id') ? esc_url(add_query_arg('user_id', $customer->get('user_id'), admin_url('user-edit.php'))) : false;
 		$row_actions = $view_url ? $this->row_actions(
 			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __('Edit Details', 'invoicing') . '</a>',
 			)
 		) : '';
 
 		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
+		$name = esc_html(trim("$first_name $last_name"));
 
-		if ( ! empty( $name ) ) {
+		if (!empty($name)) {
 			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
 		}
 
@@ -203,7 +203,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;
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -227,33 +227,33 @@ 
 			'paged'  => $this->get_paged(),
 		);
 
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		foreach (array('orderby', 'order', 's') as $field) {
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 		}
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
 
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 
 			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_min'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_min'] = floatval($_GET[$field . '_min']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_max'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_max'] = floatval($_GET[$field . '_max']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 			}
 		}
 
 		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
+		$this->query       = getpaid_get_customers($query, 'query');
 		$this->total_count = $this->query->get_total();
 		$this->items       = $this->query->get_results();
 	}
@@ -269,13 +269,13 @@ 
 		$sortable = $this->get_sortable_columns();
 		$this->prepare_query();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->set_pagination_args(
 			array(
 				'total_items' => $this->total_count,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
+				'total_pages' => ceil($this->total_count / $this->per_page),
 			)
 		);
 	}
@@ -287,14 +287,14 @@ 
 	 */
 	public function get_sortable_columns() {
 		$sortable = array(
-			'customer' => array( 'first_name', true ),
+			'customer' => array('first_name', true),
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$sortable[$field] = array($field, true);
 		}
 
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+		return apply_filters('manage_getpaid_customers_sortable_table_columns', $sortable);
 	}
 
 	/**
@@ -304,22 +304,22 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
+			'customer' => __('Customer', 'invoicing'),
 		);
 
 		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
+		foreach (getpaid_user_address_fields() as $key => $value) {
 
 			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
+			if (!in_array($key, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name'), true)) {
+				$columns[$key] = $value;
 			}
 		}
 
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
+		$columns['purchase_value'] = __('Total Spend', 'invoicing');
+		$columns['purchase_count'] = __('Invoices', 'invoicing');
+		$columns['date_created']   = __('Date created', 'invoicing');
 
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+		return apply_filters('manage_getpaid_customers_table_columns', $columns);
 	}
 }

includes/admin/class-wpinv-admin-menus.php

Spacing +78 added lines, -78 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,14 +13,14 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_head', array( $this, 'set_admin_menu_class' ) );
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_customers_menu' ), 18 );
-        add_action( 'admin_menu', array( $this, 'add_subscriptions_menu' ), 40 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_head', array($this, 'set_admin_menu_class'));
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_subscriptions_menu'), 40);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     /**
@@ -29,7 +29,7 @@ 
 	public function set_admin_menu_class() {
 		global $current_screen, $parent_file, $submenu_file;
 
-        if ( ! empty( $current_screen->id ) && in_array( $current_screen->id, array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
+        if (!empty($current_screen->id) && in_array($current_screen->id, array('wpi_discount', 'wpi_payment_form', 'wpi_invoice'))) {
 			$parent_file = 'wpinv';
 			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
@@ -38,14 +38,14 @@ 
 
     public function admin_menu() {
 
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
         add_menu_page(
-            __( 'GetPaid', 'invoicing' ),
-            __( 'GetPaid', 'invoicing' ),
+            __('GetPaid', 'invoicing'),
+            __('GetPaid', 'invoicing'),
             $capability,
             'wpinv',
             null,
-            'data:image/svg+xml;base64,' . base64_encode( file_get_contents( WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg' ) ),
+            'data:image/svg+xml;base64,' . base64_encode(file_get_contents(WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg')),
             '54.123460'
         );
 
@@ -57,11 +57,11 @@ 
     public function add_customers_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Customers', 'invoicing' ),
-            __( 'Customers', 'invoicing' ),
+            __('Customers', 'invoicing'),
+            __('Customers', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-customers',
-            array( $this, 'customers_page' )
+            array($this, 'customers_page')
         );
     }
 
@@ -71,8 +71,8 @@ 
     public function add_subscriptions_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -94,13 +94,13 @@ 
                     width: 120px;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?>&nbsp;<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'download_customers' ), 'getpaid-nonce', 'getpaid-nonce' ) ); ?>" class="page-title-action"><?php esc_html_e( 'Export', 'invoicing' ); ?></a></h1>
-            <form method="get" style="overflow: auto; width: 100%" action=<?php echo esc_url( add_query_arg( array() ) ); ?>>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?>&nbsp;<a href="<?php echo esc_url(wp_nonce_url(add_query_arg('getpaid-admin-action', 'download_customers'), 'getpaid-nonce', 'getpaid-nonce')); ?>" class="page-title-action"><?php esc_html_e('Export', 'invoicing'); ?></a></h1>
+            <form method="get" style="overflow: auto; width: 100%" action=<?php echo esc_url(add_query_arg(array())); ?>>
                 <input type="hidden" name="page" value="wpinv-customers" />
                 <?php
                     $table = new WPInv_Customers_Table();
                     $table->prepare_items();
-                    $table->search_box( __( 'Search Customers', 'invoicing' ), 'search-customers' );
+                    $table->search_box(__('Search Customers', 'invoicing'), 'search-customers');
                     $table->display();
                 ?>
             </form>
@@ -114,26 +114,26 @@ 
     public function add_settings_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Invoice Settings', 'invoicing' ),
-            __( 'Settings', 'invoicing' ),
-            apply_filters( 'invoicing_capability', wpinv_get_capability() ),
+            __('Invoice Settings', 'invoicing'),
+            __('Settings', 'invoicing'),
+            apply_filters('invoicing_capability', wpinv_get_capability()),
             'wpinv-settings',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 
     public function add_addons_menu() {
-        if ( ! apply_filters( 'wpi_show_addons_page', true ) ) {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
         add_submenu_page(
             'wpinv',
-            __( 'Invoicing extensions', 'invoicing' ),
-            __( 'Extensions', 'invoicing' ),
+            __('Invoicing extensions', 'invoicing'),
+            __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
@@ -144,29 +144,29 @@ 
 
     function options_page() {
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
-        $settings_tabs = empty( $settings_tabs ) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
         add_thickbox();
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? sanitize_text_field( $_GET['section'] ) : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? sanitize_text_field($_GET['section']) : $key;
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach ( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
                     $tab_url = add_query_arg(
                         array(
 							'settings-updated' => false,
@@ -176,23 +176,23 @@ 
                     );
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . esc_attr( $active ) . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . esc_attr($active) . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach ( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
                     $tab_url = add_query_arg(
@@ -201,16 +201,16 @@ 
 							'tab'              => $active_tab,
 							'section'          => $section_id,
                         ),
-                        admin_url( 'admin.php?page=wpinv-settings' )
+                        admin_url('admin.php?page=wpinv-settings')
                     );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $tab_url ) . '">' . esc_html( $section_name ) . '</a>';
+                    echo '<a class="' . esc_attr($class) . '" href="' . esc_url($tab_url) . '">' . esc_html($section_name) . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -222,20 +222,20 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'getpaid_settings_tab_bottom', $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('getpaid_settings_tab_bottom', $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -247,7 +247,7 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
     /**
@@ -257,8 +257,8 @@ 
 
         add_meta_box(
             'wpinv_endpoints_nav_link',
-            __( 'GetPaid endpoints', 'invoicing' ),
-            array( $this, 'nav_menu_links' ),
+            __('GetPaid endpoints', 'invoicing'),
+            array($this, 'nav_menu_links'),
             'nav-menus',
             'side',
             'low'
@@ -273,12 +273,12 @@ 
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-            <?php if ( ! empty( $endpoints['pages'] ) ) : ?>
+            <?php if (!empty($endpoints['pages'])) : ?>
                 <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                     <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                         <?php
-                            $walker = new Walker_Nav_Menu_Checklist( array() );
-                            echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $endpoints['pages'] ), 0, (object) array( 'walker' => $walker ) );
+                            $walker = new Walker_Nav_Menu_Checklist(array());
+                            echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
                         ?>
                     </ul>
                 </div>
@@ -287,11 +287,11 @@ 
             <p class="button-controls wp-clearfix" data-items-type="invoicing-endpoints">
                 <span class="list-controls hide-if-no-js">
                     <input type="checkbox" id="invoicing-endpoints-tab" class="select-all">
-                    <label for="invoicing-endpoints-tab"><?php esc_html_e( 'Select all', 'invoicing' ); ?></label>
+                    <label for="invoicing-endpoints-tab"><?php esc_html_e('Select all', 'invoicing'); ?></label>
                 </span>
 
                 <span class="add-to-menu">
-                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
+                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
                     <span class="spinner"></span>
                 </span>
             </p>
@@ -309,18 +309,18 @@ 
 
         $pages = array(
             array(
-                'id'    => wpinv_get_option( 'invoice_history_page' ),
-                'label' => __( 'My Invoices', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_history_page'),
+                'label' => __('My Invoices', 'invoicing'),
             ),
             array(
-                'id'    => wpinv_get_option( 'invoice_subscription_page' ),
-                'label' => __( 'My Subscriptions', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_subscription_page'),
+                'label' => __('My Subscriptions', 'invoicing'),
             ),
         );
 
-        foreach ( apply_filters( 'getpaid_menu_pages', $pages ) as $page ) {
+        foreach (apply_filters('getpaid_menu_pages', $pages) as $page) {
 
-            if ( (int) $page['id'] > 0 ) {
+            if ((int) $page['id'] > 0) {
 
                 $item                   = new stdClass();
                 $item->object_id        = (int) $page['id'];
@@ -328,11 +328,11 @@ 
                 $item->object           = 'page';
                 $item->menu_item_parent = 0;
                 $item->type             = 'post_type';
-                $item->title            = esc_html( $page['label'] );
-                $item->url              = get_permalink( (int) $page['id'] );
+                $item->title            = esc_html($page['label']);
+                $item->url              = get_permalink((int) $page['id']);
                 $item->target           = '';
                 $item->attr_title       = '';
-                $item->classes          = array( 'wpinv-menu-item' );
+                $item->classes          = array('wpinv-menu-item');
                 $item->xfn              = '';
 
                 $items['pages'][]       = $item;
@@ -340,7 +340,7 @@ 
             }
 }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }