AyeCode / invoicing

includes/data-stores/class-getpaid-data.php

Indentation +860 added lines, -860 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,356 +21,356 @@ 
  */
 abstract class GetPaid_Data {
 
-	/**
-	 * ID for this object.
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	protected $id = 0;
-
-	/**
-	 * Core data for this object. Name value pairs (name + default value).
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Core data changes for this object.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $changes = array();
-
-	/**
-	 * This is false until the object is read from the DB.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $object_read = false;
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $object_type = 'data';
-
-	/**
-	 * Extra data for this object. Name value pairs (name + default value).
-	 * Used as a standard way for sub classes (like item types) to add
-	 * additional information to an inherited class.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $extra_data = array();
-
-	/**
-	 * Set to _data on construct so we can track and reset data if needed.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $default_data = array();
-
-	/**
-	 * Contains a reference to the data store for this class.
-	 *
-	 * @since 1.0.19
-	 * @var GetPaid_Data_Store
-	 */
-	protected $data_store;
-
-	/**
-	 * Stores meta in cache for future reads.
-	 * A group must be set to to enable caching.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $cache_group = '';
-
-	/**
-	 * Stores the last error.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $last_error = '';
-
-	/**
-	 * Stores additional meta data.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $meta_data = null;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
-	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
-		$this->default_data = $this->data;
-	}
-
-	/**
-	 * Only store the object ID to avoid serializing the data object instance.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-		return array( 'id' );
-	}
-
-	/**
-	 * Re-run the constructor with the object ID.
-	 *
-	 * If the object no longer exists, remove the ID.
-	 */
-	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
-
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
-		}
-
-	}
-
-	/**
-	 * When the object is cloned, make sure meta is duplicated correctly.
-	 *
-	 * @since 1.0.19
-	 */
-	public function __clone() {
-		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the data store.
-	 *
-	 * @since  1.0.19
-	 * @return object
-	 */
-	public function get_data_store() {
-		return $this->data_store;
-	}
-
-	/**
-	 * Get the object type.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_object_type() {
-		return $this->object_type;
-	}
-
-	/**
-	 * Returns the unique ID for this object.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function get_id() {
-		return $this->id;
-	}
-
-	/**
-	 * Get form status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-    }
-
-	/**
-	 * Delete an object, set the ID to 0, and return result.
-	 *
-	 * @since  1.0.19
-	 * @param  bool $force_delete Should the data be deleted permanently.
-	 * @return bool result
-	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Save should create or update based on object existence.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function save() {
-		if ( ! $this->data_store ) {
-			return $this->get_id();
-		}
-
-		/**
-		 * Trigger action before saving to the DB. Allows you to adjust object props before save.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
-		} else {
-			$this->data_store->create( $this );
-		}
-
-		/**
-		 * Trigger action after saving to the DB.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Change data to JSON format.
-	 *
-	 * @since  1.0.19
-	 * @return string Data in JSON format.
-	 */
-	public function __toString() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Returns all data for this object.
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
-	}
-
-	/**
-	 * Returns array of expected data keys for this object.
-	 *
-	 * @since   1.0.19
-	 * @return array
-	 */
-	public function get_data_keys() {
-		return array_keys( $this->data );
-	}
-
-	/**
-	 * Returns all "extra" data keys for an object (for sub objects like item types).
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
-	}
-
-	/**
-	 * Filter null meta values from array.
-	 *
-	 * @since  1.0.19
-	 * @param mixed $meta Meta value to check.
-	 * @return bool
-	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
-	}
-
-	/**
-	 * Get All Meta Data.
-	 *
-	 * @since 1.0.19
-	 * @return array of objects.
-	 */
-	public function get_meta_data() {
-		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
-	}
-
-	/**
-	 * Check if the key is an internal one.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Key to check.
-	 * @return bool   true if it's an internal key, false otherwise
-	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
-
-		if ( ! $internal_meta_key ) {
-			return false;
-		}
-
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
-
-		if ( ! $has_setter_or_getter ) {
-			return false;
-		}
-
-		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-		return true;
-	}
-
-	/**
-	 * Magic method for setting data fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.19
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
-
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
-		}
-
-		if ( method_exists( $this, "set_$key") ) {
-
-			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->set_prop( $key, $value );
-		}
-
-	}
-
-	/**
+    /**
+     * ID for this object.
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    protected $id = 0;
+
+    /**
+     * Core data for this object. Name value pairs (name + default value).
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Core data changes for this object.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $changes = array();
+
+    /**
+     * This is false until the object is read from the DB.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $object_read = false;
+
+    /**
+     * This is the name of this object type.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $object_type = 'data';
+
+    /**
+     * Extra data for this object. Name value pairs (name + default value).
+     * Used as a standard way for sub classes (like item types) to add
+     * additional information to an inherited class.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $extra_data = array();
+
+    /**
+     * Set to _data on construct so we can track and reset data if needed.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $default_data = array();
+
+    /**
+     * Contains a reference to the data store for this class.
+     *
+     * @since 1.0.19
+     * @var GetPaid_Data_Store
+     */
+    protected $data_store;
+
+    /**
+     * Stores meta in cache for future reads.
+     * A group must be set to to enable caching.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $cache_group = '';
+
+    /**
+     * Stores the last error.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $last_error = '';
+
+    /**
+     * Stores additional meta data.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $meta_data = null;
+
+    /**
+     * Default constructor.
+     *
+     * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
+     */
+    public function __construct( $read = 0 ) {
+        $this->data         = array_merge( $this->data, $this->extra_data );
+        $this->default_data = $this->data;
+    }
+
+    /**
+     * Only store the object ID to avoid serializing the data object instance.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        return array( 'id' );
+    }
+
+    /**
+     * Re-run the constructor with the object ID.
+     *
+     * If the object no longer exists, remove the ID.
+     */
+    public function __wakeup() {
+        $this->__construct( absint( $this->id ) );
+
+        if ( ! empty( $this->last_error ) ) {
+            $this->set_id( 0 );
+        }
+
+    }
+
+    /**
+     * When the object is cloned, make sure meta is duplicated correctly.
+     *
+     * @since 1.0.19
+     */
+    public function __clone() {
+        $this->maybe_read_meta_data();
+        if ( ! empty( $this->meta_data ) ) {
+            foreach ( $this->meta_data as $array_key => $meta ) {
+                $this->meta_data[ $array_key ] = clone $meta;
+                if ( ! empty( $meta->id ) ) {
+                    $this->meta_data[ $array_key ]->id = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the data store.
+     *
+     * @since  1.0.19
+     * @return object
+     */
+    public function get_data_store() {
+        return $this->data_store;
+    }
+
+    /**
+     * Get the object type.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_object_type() {
+        return $this->object_type;
+    }
+
+    /**
+     * Returns the unique ID for this object.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Get form status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Delete an object, set the ID to 0, and return result.
+     *
+     * @since  1.0.19
+     * @param  bool $force_delete Should the data be deleted permanently.
+     * @return bool result
+     */
+    public function delete( $force_delete = false ) {
+        if ( $this->data_store && $this->exists() ) {
+            $this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
+            $this->set_id( 0 );
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save should create or update based on object existence.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function save() {
+        if ( ! $this->data_store ) {
+            return $this->get_id();
+        }
+
+        /**
+         * Trigger action before saving to the DB. Allows you to adjust object props before save.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        if ( $this->get_id() ) {
+            $this->data_store->update( $this );
+        } else {
+            $this->data_store->create( $this );
+        }
+
+        /**
+         * Trigger action after saving to the DB.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Change data to JSON format.
+     *
+     * @since  1.0.19
+     * @return string Data in JSON format.
+     */
+    public function __toString() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Returns all data for this object.
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+    }
+
+    /**
+     * Returns array of expected data keys for this object.
+     *
+     * @since   1.0.19
+     * @return array
+     */
+    public function get_data_keys() {
+        return array_keys( $this->data );
+    }
+
+    /**
+     * Returns all "extra" data keys for an object (for sub objects like item types).
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_extra_data_keys() {
+        return array_keys( $this->extra_data );
+    }
+
+    /**
+     * Filter null meta values from array.
+     *
+     * @since  1.0.19
+     * @param mixed $meta Meta value to check.
+     * @return bool
+     */
+    protected function filter_null_meta( $meta ) {
+        return ! is_null( $meta->value );
+    }
+
+    /**
+     * Get All Meta Data.
+     *
+     * @since 1.0.19
+     * @return array of objects.
+     */
+    public function get_meta_data() {
+        $this->maybe_read_meta_data();
+        return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+    }
+
+    /**
+     * Check if the key is an internal one.
+     *
+     * @since  1.0.19
+     * @param  string $key Key to check.
+     * @return bool   true if it's an internal key, false otherwise
+     */
+    protected function is_internal_meta_key( $key ) {
+        $internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+
+        if ( ! $internal_meta_key ) {
+            return false;
+        }
+
+        $has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+
+        if ( ! $has_setter_or_getter ) {
+            return false;
+        }
+
+        /* translators: %s: $key Key to check */
+        getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+        return true;
+    }
+
+    /**
+     * Magic method for setting data fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.19
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
+
+        if ( 'id' == strtolower( $key ) ) {
+            return $this->set_id( $value );
+        }
+
+        if ( method_exists( $this, "set_$key") ) {
+
+            /* translators: %s: $key Key to set */
+            getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->set_prop( $key, $value );
+        }
+
+    }
+
+    /**
      * Margic method for retrieving a property.
      */
     public function __get( $key ) {
@@ -378,10 +378,10 @@ 
         // Check if we have a helper method for that.
         if ( method_exists( $this, 'get_' . $key ) ) {
 
-			if ( 'post_type' != $key ) {
-				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-			}
+            if ( 'post_type' != $key ) {
+                /* translators: %s: $key Key to set */
+                getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+            }
 
             return call_user_func( array( $this, 'get_' . $key ) );
         }
@@ -391,512 +391,512 @@ 
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
-
-    }
-
-	/**
-	 * Get Meta Data by Key.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @param  bool   $single return first found meta with key, or all with $key.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
-
-		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $_key ) ) {
-			$function = 'get_' . $_key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}();
-			}
-		}
-
-		// Read the meta data if not yet read.
-		$this->maybe_read_meta_data();
-		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
-		$value      = $single ? '' : array();
-
-		if ( ! empty( $array_keys ) ) {
-			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
-			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
-			}
-		}
-
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * See if meta data exists, since get_meta always returns a '' or array().
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @return boolean
-	 */
-	public function meta_exists( $key = '' ) {
-		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
-	}
-
-	/**
-	 * Set all meta data from array.
-	 *
-	 * @since 1.0.19
-	 * @param array $data Key/Value pairs.
-	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
-			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
-				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
-					$this->meta_data[] = new GetPaid_Meta_Data(
-						array(
-							'id'    => $meta['id'],
-							'key'   => $meta['key'],
-							'value' => $meta['value'],
-						)
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add meta data.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string       $key Meta key.
-	 * @param string|array $value Meta value.
-	 * @param bool         $unique Should this be a unique key?.
-	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
-		}
-		$this->meta_data[] = new GetPaid_Meta_Data(
-			array(
-				'key'   => $key,
-				'value' => $value,
-			)
-		);
-	}
-
-	/**
-	 * Update meta data by key or ID, if provided.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param  string       $key Meta key.
-	 * @param  string|array $value Meta value.
-	 * @param  int          $meta_id Meta ID.
-	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-
-		$array_key = false;
-
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
-		} else {
-			// Find matches by key.
-			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
-					$matches[] = $meta_data_array_key;
-				}
-			}
-
-			if ( ! empty( $matches ) ) {
-				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
-				}
-				$array_key = current( $matches );
-			}
-		}
-
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
-			$meta->key   = $key;
-			$meta->value = $value;
-		} else {
-			$this->add_meta_data( $key, $value, true );
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param string $key Meta key.
-	 */
-	public function delete_meta_data( $key ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param int $mid Meta ID.
-	 */
-	public function delete_meta_data_by_mid( $mid ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Read meta data if null.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
-			$this->read_meta_data();
-		}
-	}
-
-	/**
-	 * Read Meta Data from the database. Ignore any internal properties.
-	 * Uses it's own caches because get_metadata does not provide meta_ids.
-	 *
-	 * @since 1.0.19
-	 * @param bool $force_read True to force a new DB read (and update cache).
-	 */
-	public function read_meta_data( $force_read = false ) {
-
-		// Reset meta data.
-		$this->meta_data = array();
-
-		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
-			return;
-		}
-
-		// Only read from cache if the cache key is set.
-		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
-		}
-
-		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
-
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
-			}
-
-		}
-
-		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
-
-			foreach ( $raw_meta_data as $meta ) {
-				$this->meta_data[] = new GetPaid_Meta_Data(
-					array(
-						'id'    => (int) $meta->meta_id,
-						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
-					)
-				);
-			}
-
-		}
-
-	}
-
-	/**
-	 * Update Meta Data in the database.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
-			return;
-		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
-				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
-				$meta->apply_changes();
-			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
-					$meta->apply_changes();
-				}
-			}
-		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
-		}
-	}
-
-	/**
-	 * Set ID.
-	 *
-	 * @since 1.0.19
-	 * @param int $id ID.
-	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
-	}
-
-	/**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+        return $this->get_prop( $key );
+
+    }
+
+    /**
+     * Get Meta Data by Key.
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @param  bool   $single return first found meta with key, or all with $key.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    public function get_meta( $key = '', $single = true, $context = 'view' ) {
+
+        // Check if this is an internal meta key.
+        $_key = str_replace( '_wpinv', '', $key );
+        $_key = str_replace( 'wpinv', '', $_key );
+        if ( $this->is_internal_meta_key( $_key ) ) {
+            $function = 'get_' . $_key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}();
+            }
+        }
+
+        // Read the meta data if not yet read.
+        $this->maybe_read_meta_data();
+        $meta_data  = $this->get_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+        $value      = $single ? '' : array();
+
+        if ( ! empty( $array_keys ) ) {
+            // We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
+            if ( $single ) {
+                $value = $meta_data[ current( $array_keys ) ]->value;
+            } else {
+                $value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+            }
+        }
+
+        if ( 'view' === $context ) {
+            $value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+        }
+
+        return $value;
+    }
+
+    /**
+     * See if meta data exists, since get_meta always returns a '' or array().
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @return boolean
+     */
+    public function meta_exists( $key = '' ) {
+        $this->maybe_read_meta_data();
+        $array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
+        return in_array( $key, $array_keys, true );
+    }
+
+    /**
+     * Set all meta data from array.
+     *
+     * @since 1.0.19
+     * @param array $data Key/Value pairs.
+     */
+    public function set_meta_data( $data ) {
+        if ( ! empty( $data ) && is_array( $data ) ) {
+            $this->maybe_read_meta_data();
+            foreach ( $data as $meta ) {
+                $meta = (array) $meta;
+                if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+                    $this->meta_data[] = new GetPaid_Meta_Data(
+                        array(
+                            'id'    => $meta['id'],
+                            'key'   => $meta['key'],
+                            'value' => $meta['value'],
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Add meta data.
+     *
+     * @since 1.0.19
+     *
+     * @param string       $key Meta key.
+     * @param string|array $value Meta value.
+     * @param bool         $unique Should this be a unique key?.
+     */
+    public function add_meta_data( $key, $value, $unique = false ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+        if ( $unique ) {
+            $this->delete_meta_data( $key );
+        }
+        $this->meta_data[] = new GetPaid_Meta_Data(
+            array(
+                'key'   => $key,
+                'value' => $value,
+            )
+        );
+    }
+
+    /**
+     * Update meta data by key or ID, if provided.
+     *
+     * @since  1.0.19
+     *
+     * @param  string       $key Meta key.
+     * @param  string|array $value Meta value.
+     * @param  int          $meta_id Meta ID.
+     */
+    public function update_meta_data( $key, $value, $meta_id = 0 ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+
+        $array_key = false;
+
+        if ( $meta_id ) {
+            $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
+            $array_key  = $array_keys ? current( $array_keys ) : false;
+        } else {
+            // Find matches by key.
+            $matches = array();
+            foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
+                if ( $meta->key === $key ) {
+                    $matches[] = $meta_data_array_key;
+                }
+            }
+
+            if ( ! empty( $matches ) ) {
+                // Set matches to null so only one key gets the new value.
+                foreach ( $matches as $meta_data_array_key ) {
+                    $this->meta_data[ $meta_data_array_key ]->value = null;
+                }
+                $array_key = current( $matches );
+            }
+        }
+
+        if ( false !== $array_key ) {
+            $meta        = $this->meta_data[ $array_key ];
+            $meta->key   = $key;
+            $meta->value = $value;
+        } else {
+            $this->add_meta_data( $key, $value, true );
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param string $key Meta key.
+     */
+    public function delete_meta_data( $key ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param int $mid Meta ID.
+     */
+    public function delete_meta_data_by_mid( $mid ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Read meta data if null.
+     *
+     * @since 1.0.19
+     */
+    protected function maybe_read_meta_data() {
+        if ( is_null( $this->meta_data ) ) {
+            $this->read_meta_data();
+        }
+    }
+
+    /**
+     * Read Meta Data from the database. Ignore any internal properties.
+     * Uses it's own caches because get_metadata does not provide meta_ids.
+     *
+     * @since 1.0.19
+     * @param bool $force_read True to force a new DB read (and update cache).
+     */
+    public function read_meta_data( $force_read = false ) {
+
+        // Reset meta data.
+        $this->meta_data = array();
+
+        // Maybe abort early.
+        if ( ! $this->get_id() || ! $this->data_store ) {
+            return;
+        }
+
+        // Only read from cache if the cache key is set.
+        $cache_key = null;
+        if ( ! $force_read && ! empty( $this->cache_group ) ) {
+            $cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            $raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+        }
+
+        // Should we force read?
+        if ( empty( $raw_meta_data ) ) {
+            $raw_meta_data = $this->data_store->read_meta( $this );
+
+            if ( ! empty( $cache_key ) ) {
+                wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+            }
+
+        }
+
+        // Set meta data.
+        if ( is_array( $raw_meta_data ) ) {
+
+            foreach ( $raw_meta_data as $meta ) {
+                $this->meta_data[] = new GetPaid_Meta_Data(
+                    array(
+                        'id'    => (int) $meta->meta_id,
+                        'key'   => $meta->meta_key,
+                        'value' => maybe_unserialize( $meta->meta_value ),
+                    )
+                );
+            }
+
+        }
+
+    }
+
+    /**
+     * Update Meta Data in the database.
+     *
+     * @since 1.0.19
+     */
+    public function save_meta_data() {
+        if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+            return;
+        }
+        foreach ( $this->meta_data as $array_key => $meta ) {
+            if ( is_null( $meta->value ) ) {
+                if ( ! empty( $meta->id ) ) {
+                    $this->data_store->delete_meta( $this, $meta );
+                    unset( $this->meta_data[ $array_key ] );
+                }
+            } elseif ( empty( $meta->id ) ) {
+                $meta->id = $this->data_store->add_meta( $this, $meta );
+                $meta->apply_changes();
+            } else {
+                if ( $meta->get_changes() ) {
+                    $this->data_store->update_meta( $this, $meta );
+                    $meta->apply_changes();
+                }
+            }
+        }
+        if ( ! empty( $this->cache_group ) ) {
+            $cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            wp_cache_delete( $cache_key, $this->cache_group );
+        }
+    }
+
+    /**
+     * Set ID.
+     *
+     * @since 1.0.19
+     * @param int $id ID.
+     */
+    public function set_id( $id ) {
+        $this->id = absint( $id );
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
-
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
-    }
-
-	/**
-	 * Set all props to default values.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_defaults() {
-		$this->data    = $this->default_data;
-		$this->changes = array();
-		$this->set_object_read( false );
-	}
-
-	/**
-	 * Set object read property.
-	 *
-	 * @since 1.0.19
-	 * @param boolean $read Should read?.
-	 */
-	public function set_object_read( $read = true ) {
-		$this->object_read = (bool) $read;
-	}
-
-	/**
-	 * Get object read property.
-	 *
-	 * @since  1.0.19
-	 * @return boolean
-	 */
-	public function get_object_read() {
-		return (bool) $this->object_read;
-	}
-
-	/**
-	 * Set a collection of props in one go, collect any errors, and return the result.
-	 * Only sets using public methods.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
-	 * @param string $context In what context to run this.
-	 *
-	 * @return bool|WP_Error
-	 */
-	public function set_props( $props, $context = 'set' ) {
-		$errors = false;
-
-		foreach ( $props as $prop => $value ) {
-			try {
-				/**
-				 * Checks if the prop being set is allowed, and the value is not null.
-				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
-					continue;
-				}
-				$setter = "set_$prop";
-
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
-				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
-					$errors = new WP_Error();
-				}
-				$errors->add( $e->getCode(), $e->getMessage() );
-				$this->last_error = $e->getMessage();
-			}
-		}
-
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
-	}
-
-	/**
-	 * Sets a prop for a setter method.
-	 *
-	 * This stores changes in a special array so we can track what needs saving
-	 * the the DB later.
-	 *
-	 * @since 1.0.19
-	 * @param string $prop Name of prop to set.
-	 * @param mixed  $value Value of the prop.
-	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
-				}
-			} else {
-				$this->data[ $prop ] = $value;
-			}
-		}
-	}
-
-	/**
-	 * Return data changes only.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_changes() {
-		return $this->changes;
-	}
-
-	/**
-	 * Merge changes with data and clear.
-	 *
-	 * @since 1.0.19
-	 */
-	public function apply_changes() {
-		$this->data    = array_replace_recursive( $this->data, $this->changes );
-		$this->changes = array();
-	}
-
-	/**
-	 * Prefix for action and filter hooks on data.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	protected function get_hook_prefix() {
-		return 'wpinv_get_' . $this->object_type . '_';
-	}
-
-	/**
-	 * Gets a prop for a getter method.
-	 *
-	 * Gets the value from either current pending changes, or the data itself.
-	 * Context controls what happens to the value before it's returned.
-	 *
-	 * @since  1.0.19
-	 * @param  string $prop Name of prop to get.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	protected function get_prop( $prop, $context = 'view' ) {
-		$value = null;
-
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
-
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Sets a date prop whilst handling formatting and datetime objects.
-	 *
-	 * @since 1.0.19
-	 * @param string         $prop Name of prop to set.
-	 * @param string|integer $value Value of the prop.
-	 */
-	protected function set_date_prop( $prop, $value ) {
-
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
-			return;
-		}
-		$this->set_prop( $prop, $value );
-
-	}
-
-	/**
-	 * When invalid data is found, throw an exception unless reading from the DB.
-	 *
-	 * @since 1.0.19
-	 * @param string $code             Error code.
-	 * @param string $message          Error message.
-	 */
-	protected function error( $code, $message ) {
-		$this->last_error = $message;
-	}
-
-	/**
-	 * Checks if the object is saved in the database
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function exists() {
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
+        $this->set_prop( 'status', $status );
+
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
+    }
+
+    /**
+     * Set all props to default values.
+     *
+     * @since 1.0.19
+     */
+    public function set_defaults() {
+        $this->data    = $this->default_data;
+        $this->changes = array();
+        $this->set_object_read( false );
+    }
+
+    /**
+     * Set object read property.
+     *
+     * @since 1.0.19
+     * @param boolean $read Should read?.
+     */
+    public function set_object_read( $read = true ) {
+        $this->object_read = (bool) $read;
+    }
+
+    /**
+     * Get object read property.
+     *
+     * @since  1.0.19
+     * @return boolean
+     */
+    public function get_object_read() {
+        return (bool) $this->object_read;
+    }
+
+    /**
+     * Set a collection of props in one go, collect any errors, and return the result.
+     * Only sets using public methods.
+     *
+     * @since  1.0.19
+     *
+     * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
+     * @param string $context In what context to run this.
+     *
+     * @return bool|WP_Error
+     */
+    public function set_props( $props, $context = 'set' ) {
+        $errors = false;
+
+        foreach ( $props as $prop => $value ) {
+            try {
+                /**
+                 * Checks if the prop being set is allowed, and the value is not null.
+                 */
+                if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+                    continue;
+                }
+                $setter = "set_$prop";
+
+                if ( is_callable( array( $this, $setter ) ) ) {
+                    $this->{$setter}( $value );
+                }
+            } catch ( Exception $e ) {
+                if ( ! $errors ) {
+                    $errors = new WP_Error();
+                }
+                $errors->add( $e->getCode(), $e->getMessage() );
+                $this->last_error = $e->getMessage();
+            }
+        }
+
+        return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+    }
+
+    /**
+     * Sets a prop for a setter method.
+     *
+     * This stores changes in a special array so we can track what needs saving
+     * the the DB later.
+     *
+     * @since 1.0.19
+     * @param string $prop Name of prop to set.
+     * @param mixed  $value Value of the prop.
+     */
+    protected function set_prop( $prop, $value ) {
+        if ( array_key_exists( $prop, $this->data ) ) {
+            if ( true === $this->object_read ) {
+                if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
+                    $this->changes[ $prop ] = $value;
+                }
+            } else {
+                $this->data[ $prop ] = $value;
+            }
+        }
+    }
+
+    /**
+     * Return data changes only.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_changes() {
+        return $this->changes;
+    }
+
+    /**
+     * Merge changes with data and clear.
+     *
+     * @since 1.0.19
+     */
+    public function apply_changes() {
+        $this->data    = array_replace_recursive( $this->data, $this->changes );
+        $this->changes = array();
+    }
+
+    /**
+     * Prefix for action and filter hooks on data.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    protected function get_hook_prefix() {
+        return 'wpinv_get_' . $this->object_type . '_';
+    }
+
+    /**
+     * Gets a prop for a getter method.
+     *
+     * Gets the value from either current pending changes, or the data itself.
+     * Context controls what happens to the value before it's returned.
+     *
+     * @since  1.0.19
+     * @param  string $prop Name of prop to get.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    protected function get_prop( $prop, $context = 'view' ) {
+        $value = null;
+
+        if ( array_key_exists( $prop, $this->data ) ) {
+            $value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+
+            if ( 'view' === $context ) {
+                $value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sets a date prop whilst handling formatting and datetime objects.
+     *
+     * @since 1.0.19
+     * @param string         $prop Name of prop to set.
+     * @param string|integer $value Value of the prop.
+     */
+    protected function set_date_prop( $prop, $value ) {
+
+        if ( empty( $value ) ) {
+            $this->set_prop( $prop, null );
+            return;
+        }
+        $this->set_prop( $prop, $value );
+
+    }
+
+    /**
+     * When invalid data is found, throw an exception unless reading from the DB.
+     *
+     * @since 1.0.19
+     * @param string $code             Error code.
+     * @param string $message          Error message.
+     */
+    protected function error( $code, $message ) {
+        $this->last_error = $message;
+    }
+
+    /**
+     * Checks if the object is saved in the database
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function exists() {
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
 
 }

Spacing +161 added lines, -161 removed lines

@@ -8,7 +8,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -117,8 +117,8 @@ 
 	 *
 	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
 	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
+	public function __construct($read = 0) {
+		$this->data         = array_merge($this->data, $this->extra_data);
 		$this->default_data = $this->data;
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		return array( 'id' );
+		return array('id');
 	}
 
 	/**
@@ -137,10 +137,10 @@ 
 	 * If the object no longer exists, remove the ID.
 	 */
 	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
+		$this->__construct(absint($this->id));
 
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
+		if (!empty($this->last_error)) {
+			$this->set_id(0);
 		}
 
 	}
@@ -152,11 +152,11 @@ 
 	 */
 	public function __clone() {
 		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
+		if (!empty($this->meta_data)) {
+			foreach ($this->meta_data as $array_key => $meta) {
+				$this->meta_data[$array_key] = clone $meta;
+				if (!empty($meta->id)) {
+					$this->meta_data[$array_key]->id = null;
 				}
 			}
 		}
@@ -199,8 +199,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
     }
 
 	/**
@@ -210,10 +210,10 @@ 
 	 * @param  bool $force_delete Should the data be deleted permanently.
 	 * @return bool result
 	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
+	public function delete($force_delete = false) {
+		if ($this->data_store && $this->exists()) {
+			$this->data_store->delete($this, array('force_delete' => $force_delete));
+			$this->set_id(0);
 			return true;
 		}
 		return false;
@@ -226,7 +226,7 @@ 
 	 * @return int
 	 */
 	public function save() {
-		if ( ! $this->data_store ) {
+		if (!$this->data_store) {
 			return $this->get_id();
 		}
 
@@ -236,12 +236,12 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store);
 
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
+		if ($this->get_id()) {
+			$this->data_store->update($this);
 		} else {
-			$this->data_store->create( $this );
+			$this->data_store->create($this);
 		}
 
 		/**
@@ -250,7 +250,7 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store);
 
 		return $this->get_id();
 	}
@@ -262,7 +262,7 @@ 
 	 * @return string Data in JSON format.
 	 */
 	public function __toString() {
-		return wp_json_encode( $this->get_data() );
+		return wp_json_encode($this->get_data());
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 * @return array
 	 */
 	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+		return array_merge(array('id' => $this->get_id()), $this->data, array('meta_data' => $this->get_meta_data()));
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 * @return array
 	 */
 	public function get_data_keys() {
-		return array_keys( $this->data );
+		return array_keys($this->data);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 * @return array
 	 */
 	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
+		return array_keys($this->extra_data);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 * @param mixed $meta Meta value to check.
 	 * @return bool
 	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
+	protected function filter_null_meta($meta) {
+		return !is_null($meta->value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	public function get_meta_data() {
 		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+		return array_values(array_filter($this->meta_data, array($this, 'filter_null_meta')));
 	}
 
 	/**
@@ -324,21 +324,21 @@ 
 	 * @param  string $key Key to check.
 	 * @return bool   true if it's an internal key, false otherwise
 	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+	protected function is_internal_meta_key($key) {
+		$internal_meta_key = !empty($key) && $this->data_store && in_array($key, $this->data_store->get_internal_meta_keys(), true);
 
-		if ( ! $internal_meta_key ) {
+		if (!$internal_meta_key) {
 			return false;
 		}
 
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+		$has_setter_or_getter = is_callable(array($this, 'set_' . $key)) || is_callable(array($this, 'get_' . $key));
 
-		if ( ! $has_setter_or_getter ) {
+		if (!$has_setter_or_getter) {
 			return false;
 		}
 
 		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+		getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
 		return true;
 	}
@@ -352,20 +352,20 @@ 
 	 * @access public
 	 *
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
+		if ('id' == strtolower($key)) {
+			return $this->set_id($value);
 		}
 
-		if ( method_exists( $this, "set_$key") ) {
+		if (method_exists($this, "set_$key")) {
 
 			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+			getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
-			call_user_func( array( $this, "set_$key" ), $value );
+			call_user_func(array($this, "set_$key"), $value);
 		} else {
-			$this->set_prop( $key, $value );
+			$this->set_prop($key, $value);
 		}
 
 	}
@@ -373,25 +373,25 @@ 
 	/**
      * Margic method for retrieving a property.
      */
-    public function __get( $key ) {
+    public function __get($key) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
+        if (method_exists($this, 'get_' . $key)) {
 
-			if ( 'post_type' != $key ) {
+			if ('post_type' != $key) {
 				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+				getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 			}
 
-            return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func(array($this, 'get_' . $key));
         }
 
         // Check if the key is in the associated $post object.
-        if ( ! empty( $this->post ) && isset( $this->post->$key ) ) {
+        if (!empty($this->post) && isset($this->post->$key)) {
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
+		return $this->get_prop($key);
 
     }
 
@@ -404,15 +404,15 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
+	public function get_meta($key = '', $single = true, $context = 'view') {
 
 		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $_key ) ) {
+		$_key = str_replace('_wpinv', '', $key);
+		$_key = str_replace('wpinv', '', $_key);
+		if ($this->is_internal_meta_key($_key)) {
 			$function = 'get_' . $_key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
+			if (is_callable(array($this, $function))) {
 				return $this->{$function}();
 			}
 		}
@@ -420,20 +420,20 @@ 
 		// Read the meta data if not yet read.
 		$this->maybe_read_meta_data();
 		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($meta_data, 'key'), $key, true);
 		$value      = $single ? '' : array();
 
-		if ( ! empty( $array_keys ) ) {
+		if (!empty($array_keys)) {
 			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
+			if ($single) {
+				$value = $meta_data[current($array_keys)]->value;
 			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+				$value = array_intersect_key($meta_data, array_flip($array_keys));
 			}
 		}
 
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+		if ('view' === $context) {
+			$value = apply_filters($this->get_hook_prefix() . $key, $value, $this);
 		}
 
 		return $value;
@@ -446,10 +446,10 @@ 
 	 * @param  string $key Meta Key.
 	 * @return boolean
 	 */
-	public function meta_exists( $key = '' ) {
+	public function meta_exists($key = '') {
 		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
+		$array_keys = wp_list_pluck($this->get_meta_data(), 'key');
+		return in_array($key, $array_keys, true);
 	}
 
 	/**
@@ -458,12 +458,12 @@ 
 	 * @since 1.0.19
 	 * @param array $data Key/Value pairs.
 	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
+	public function set_meta_data($data) {
+		if (!empty($data) && is_array($data)) {
 			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
+			foreach ($data as $meta) {
 				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+				if (isset($meta['key'], $meta['value'], $meta['id'])) {
 					$this->meta_data[] = new GetPaid_Meta_Data(
 						array(
 							'id'    => $meta['id'],
@@ -485,18 +485,18 @@ 
 	 * @param string|array $value Meta value.
 	 * @param bool         $unique Should this be a unique key?.
 	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function add_meta_data($key, $value, $unique = false) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
 		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
+		if ($unique) {
+			$this->delete_meta_data($key);
 		}
 		$this->meta_data[] = new GetPaid_Meta_Data(
 			array(
@@ -515,12 +515,12 @@ 
 	 * @param  string|array $value Meta value.
 	 * @param  int          $meta_id Meta ID.
 	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function update_meta_data($key, $value, $meta_id = 0) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
@@ -528,33 +528,33 @@ 
 
 		$array_key = false;
 
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
+		if ($meta_id) {
+			$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), $meta_id, true);
+			$array_key  = $array_keys ? current($array_keys) : false;
 		} else {
 			// Find matches by key.
 			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
+			foreach ($this->meta_data as $meta_data_array_key => $meta) {
+				if ($meta->key === $key) {
 					$matches[] = $meta_data_array_key;
 				}
 			}
 
-			if ( ! empty( $matches ) ) {
+			if (!empty($matches)) {
 				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
+				foreach ($matches as $meta_data_array_key) {
+					$this->meta_data[$meta_data_array_key]->value = null;
 				}
-				$array_key = current( $matches );
+				$array_key = current($matches);
 			}
 		}
 
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
+		if (false !== $array_key) {
+			$meta        = $this->meta_data[$array_key];
 			$meta->key   = $key;
 			$meta->value = $value;
 		} else {
-			$this->add_meta_data( $key, $value, true );
+			$this->add_meta_data($key, $value, true);
 		}
 	}
 
@@ -564,13 +564,13 @@ 
 	 * @since 1.0.19
 	 * @param string $key Meta key.
 	 */
-	public function delete_meta_data( $key ) {
+	public function delete_meta_data($key) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'key'), $key, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -581,13 +581,13 @@ 
 	 * @since 1.0.19
 	 * @param int $mid Meta ID.
 	 */
-	public function delete_meta_data_by_mid( $mid ) {
+	public function delete_meta_data_by_mid($mid) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), (int) $mid, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -598,7 +598,7 @@ 
 	 * @since 1.0.19
 	 */
 	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
+		if (is_null($this->meta_data)) {
 			$this->read_meta_data();
 		}
 	}
@@ -610,42 +610,42 @@ 
 	 * @since 1.0.19
 	 * @param bool $force_read True to force a new DB read (and update cache).
 	 */
-	public function read_meta_data( $force_read = false ) {
+	public function read_meta_data($force_read = false) {
 
 		// Reset meta data.
 		$this->meta_data = array();
 
 		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
+		if (!$this->get_id() || !$this->data_store) {
 			return;
 		}
 
 		// Only read from cache if the cache key is set.
 		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+		if (!$force_read && !empty($this->cache_group)) {
+			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			$raw_meta_data = wp_cache_get($cache_key, $this->cache_group);
 		}
 
 		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
+		if (empty($raw_meta_data)) {
+			$raw_meta_data = $this->data_store->read_meta($this);
 
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+			if (!empty($cache_key)) {
+				wp_cache_set($cache_key, $raw_meta_data, $this->cache_group);
 			}
 
 		}
 
 		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
+		if (is_array($raw_meta_data)) {
 
-			foreach ( $raw_meta_data as $meta ) {
+			foreach ($raw_meta_data as $meta) {
 				$this->meta_data[] = new GetPaid_Meta_Data(
 					array(
 						'id'    => (int) $meta->meta_id,
 						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
+						'value' => maybe_unserialize($meta->meta_value),
 					)
 				);
 			}
@@ -660,28 +660,28 @@ 
 	 * @since 1.0.19
 	 */
 	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+		if (!$this->data_store || is_null($this->meta_data)) {
 			return;
 		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
+		foreach ($this->meta_data as $array_key => $meta) {
+			if (is_null($meta->value)) {
+				if (!empty($meta->id)) {
+					$this->data_store->delete_meta($this, $meta);
+					unset($this->meta_data[$array_key]);
 				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
+			} elseif (empty($meta->id)) {
+				$meta->id = $this->data_store->add_meta($this, $meta);
 				$meta->apply_changes();
 			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
+				if ($meta->get_changes()) {
+					$this->data_store->update_meta($this, $meta);
 					$meta->apply_changes();
 				}
 			}
 		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
+		if (!empty($this->cache_group)) {
+			$cache_key = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			wp_cache_delete($cache_key, $this->cache_group);
 		}
 	}
 
@@ -691,8 +691,8 @@ 
 	 * @since 1.0.19
 	 * @param int $id ID.
 	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
+	public function set_id($id) {
+		$this->id = absint($id);
 	}
 
 	/**
@@ -702,10 +702,10 @@ 
 	 * @param string $status New status.
 	 * @return array details of change.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
+		$this->set_prop('status', $status);
 
 		return array(
 			'from' => $old_status,
@@ -721,7 +721,7 @@ 
 	public function set_defaults() {
 		$this->data    = $this->default_data;
 		$this->changes = array();
-		$this->set_object_read( false );
+		$this->set_object_read(false);
 	}
 
 	/**
@@ -730,7 +730,7 @@ 
 	 * @since 1.0.19
 	 * @param boolean $read Should read?.
 	 */
-	public function set_object_read( $read = true ) {
+	public function set_object_read($read = true) {
 		$this->object_read = (bool) $read;
 	}
 
@@ -755,32 +755,32 @@ 
 	 *
 	 * @return bool|WP_Error
 	 */
-	public function set_props( $props, $context = 'set' ) {
+	public function set_props($props, $context = 'set') {
 		$errors = false;
 
-		foreach ( $props as $prop => $value ) {
+		foreach ($props as $prop => $value) {
 			try {
 				/**
 				 * Checks if the prop being set is allowed, and the value is not null.
 				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+				if (is_null($value) || in_array($prop, array('prop', 'date_prop', 'meta_data'), true)) {
 					continue;
 				}
 				$setter = "set_$prop";
 
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
+				if (is_callable(array($this, $setter))) {
+					$this->{$setter}($value);
 				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
+			} catch (Exception $e) {
+				if (!$errors) {
 					$errors = new WP_Error();
 				}
-				$errors->add( $e->getCode(), $e->getMessage() );
+				$errors->add($e->getCode(), $e->getMessage());
 				$this->last_error = $e->getMessage();
 			}
 		}
 
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+		return $errors && count($errors->get_error_codes()) ? $errors : true;
 	}
 
 	/**
@@ -793,14 +793,14 @@ 
 	 * @param string $prop Name of prop to set.
 	 * @param mixed  $value Value of the prop.
 	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
+	protected function set_prop($prop, $value) {
+		if (array_key_exists($prop, $this->data)) {
+			if (true === $this->object_read) {
+				if ($value !== $this->data[$prop] || array_key_exists($prop, $this->changes)) {
+					$this->changes[$prop] = $value;
 				}
 			} else {
-				$this->data[ $prop ] = $value;
+				$this->data[$prop] = $value;
 			}
 		}
 	}
@@ -821,7 +821,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function apply_changes() {
-		$this->data    = array_replace_recursive( $this->data, $this->changes );
+		$this->data    = array_replace_recursive($this->data, $this->changes);
 		$this->changes = array();
 	}
 
@@ -846,14 +846,14 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	protected function get_prop( $prop, $context = 'view' ) {
+	protected function get_prop($prop, $context = 'view') {
 		$value = null;
 
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+		if (array_key_exists($prop, $this->data)) {
+			$value = array_key_exists($prop, $this->changes) ? $this->changes[$prop] : $this->data[$prop];
 
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			if ('view' === $context) {
+				$value = apply_filters($this->get_hook_prefix() . $prop, $value, $this);
 			}
 		}
 
@@ -867,13 +867,13 @@ 
 	 * @param string         $prop Name of prop to set.
 	 * @param string|integer $value Value of the prop.
 	 */
-	protected function set_date_prop( $prop, $value ) {
+	protected function set_date_prop($prop, $value) {
 
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
+		if (empty($value)) {
+			$this->set_prop($prop, null);
 			return;
 		}
-		$this->set_prop( $prop, $value );
+		$this->set_prop($prop, $value);
 
 	}
 
@@ -884,7 +884,7 @@ 
 	 * @param string $code             Error code.
 	 * @param string $message          Error message.
 	 */
-	protected function error( $code, $message ) {
+	protected function error($code, $message) {
 		$this->last_error = $message;
 	}
 
@@ -896,7 +896,7 @@ 
 	 */
 	public function exists() {
 		$id = $this->get_id();
-		return ! empty( $id );
+		return !empty($id);
 	}
 
 }

includes/reports/class-getpaid-reports.php

Indentation +115 added lines, -115 removed lines

@@ -12,49 +12,49 @@ 
  */
 class GetPaid_Reports {
 
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
-
-	}
-
-	/**
-	 * Registers the reports page.
-	 *
-	 */
-	public function register_reports_page() {
-
-		add_submenu_page(
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
+        add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
+        add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
+        add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
+        add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+
+    }
+
+    /**
+     * Registers the reports page.
+     *
+     */
+    public function register_reports_page() {
+
+        add_submenu_page(
             'wpinv',
             __( 'Reports', 'invoicing' ),
             __( 'Reports', 'invoicing' ),
             wpinv_get_capability(),
             'wpinv-reports',
             array( $this, 'display_reports_page' )
-		);
+        );
 
-	}
+    }
 
-	/**
-	 * Displays the reports page.
-	 *
-	 */
-	public function display_reports_page() {
+    /**
+     * Displays the reports page.
+     *
+     */
+    public function display_reports_page() {
 
-		// Prepare variables.
-		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+        // Prepare variables.
+        $tabs        = $this->get_tabs();
+        $current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
+        $current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
 
-		// Display the current tab.
-		?>
+        // Display the current tab.
+        ?>
 
         <div class="wrap">
 
@@ -63,19 +63,19 @@ 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+                    foreach( $tabs as $key => $label ) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
-						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
-						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
-						);
+                        $key   = sanitize_text_field( $key );
+                        $label = sanitize_text_field( $label );
+                        $class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
+                        $url   = esc_url(
+                            add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+                        );
 
-						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
+                        echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
 
-					}
-				?>
+                    }
+                ?>
 
 			</nav>
 
@@ -86,77 +86,77 @@ 
         </div>
 		<?php
 
-			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
-
-	}
-
-	/**
-	 * Retrieves reports page tabs.
-	 *
-	 * @return array
-	 */
-	public function get_tabs() {
-
-		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_report_tabs', $tabs );
-	}
-
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display_reports_tab() {
-
-		$reports = new GetPaid_Reports_Report();
-		$reports->display();
-
-	}
-
-	/**
-	 * Displays the exports tab.
-	 *
-	 */
-	public function display_exports_tab() {
-
-		$exports = new GetPaid_Reports_Export();
-		$exports->display();
-
-	}
-
-	/**
-	 * Donwnloads a graph.
-	 *
-	 * @param array $args
-	 */
-	public function download_graph( $args ) {
-
-		if ( ! empty( $args['graph'] ) ) {
-			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
-		}
-
-	}
-
-	/**
-	 * Exports invoices.
-	 *
-	 * @param array $args
-	 */
-	public function export_invoices( $args ) {
-
-		if ( ! empty( $args['post_type'] ) ) {
-			$downloader = new GetPaid_Invoice_Exporter();
-			$downloader->export( $args['post_type'], $args );
-		}
-
-	}
+            // Wordfence loads an unsupported version of chart js on our page.
+            wp_deregister_style( 'chart-js' );
+            wp_deregister_script( 'chart-js' );
+            wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
+            wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+
+    }
+
+    /**
+     * Retrieves reports page tabs.
+     *
+     * @return array
+     */
+    public function get_tabs() {
+
+        $tabs = array(
+            'reports' => __( 'Reports', 'invoicing' ),
+            'export'  => __( 'Export', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_report_tabs', $tabs );
+    }
+
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display_reports_tab() {
+
+        $reports = new GetPaid_Reports_Report();
+        $reports->display();
+
+    }
+
+    /**
+     * Displays the exports tab.
+     *
+     */
+    public function display_exports_tab() {
+
+        $exports = new GetPaid_Reports_Export();
+        $exports->display();
+
+    }
+
+    /**
+     * Donwnloads a graph.
+     *
+     * @param array $args
+     */
+    public function download_graph( $args ) {
+
+        if ( ! empty( $args['graph'] ) ) {
+            $downloader = new GetPaid_Graph_Downloader();
+            $downloader->download( $args['graph'] );
+        }
+
+    }
+
+    /**
+     * Exports invoices.
+     *
+     * @param array $args
+     */
+    public function export_invoices( $args ) {
+
+        if ( ! empty( $args['post_type'] ) ) {
+            $downloader = new GetPaid_Invoice_Exporter();
+            $downloader->export( $args['post_type'], $args );
+        }
+
+    }
 
 }

Spacing +31 added lines, -31 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports Class.
@@ -17,11 +17,11 @@ 
 	 *
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+		add_action('admin_menu', array($this, 'register_reports_page'), 20);
+		add_action('wpinv_reports_tab_reports', array($this, 'display_reports_tab'));
+		add_action('wpinv_reports_tab_export', array($this, 'display_exports_tab'));
+		add_action('getpaid_authenticated_admin_action_download_graph', array($this, 'download_graph'));
+		add_action('getpaid_authenticated_admin_action_export_invoices', array($this, 'export_invoices'));
 
 	}
 
@@ -33,11 +33,11 @@ 
 
 		add_submenu_page(
             'wpinv',
-            __( 'Reports', 'invoicing' ),
-            __( 'Reports', 'invoicing' ),
+            __('Reports', 'invoicing'),
+            __('Reports', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-reports',
-            array( $this, 'display_reports_page' )
+            array($this, 'display_reports_page')
 		);
 
 	}
@@ -50,26 +50,26 @@ 
 
 		// Prepare variables.
 		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+		$current_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
+		$current_tab = array_key_exists($current_tab, $tabs) ? $current_tab : 'reports';
 
 		// Display the current tab.
 		?>
 
         <div class="wrap">
 
-			<h1><?php echo sanitize_text_field( $tabs[ $current_tab ] ); ?></h1>
+			<h1><?php echo sanitize_text_field($tabs[$current_tab]); ?></h1>
 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+					foreach ($tabs as $key => $label) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
+						$key   = sanitize_text_field($key);
+						$label = sanitize_text_field($label);
 						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
 						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+							add_query_arg('tab', $key, admin_url('admin.php?page=wpinv-reports'))
 						);
 
 						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
@@ -79,18 +79,18 @@ 
 
 			</nav>
 
-			<div class="bsui <?php echo esc_attr( $current_tab ); ?>">
-				<?php do_action( "wpinv_reports_tab_{$current_tab}" ); ?>
+			<div class="bsui <?php echo esc_attr($current_tab); ?>">
+				<?php do_action("wpinv_reports_tab_{$current_tab}"); ?>
 			</div>
 
         </div>
 		<?php
 
 			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+			wp_deregister_style('chart-js');
+			wp_deregister_script('chart-js');
+			wp_enqueue_script('chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array('jquery'), '2.9.4', true);
+			wp_enqueue_style('chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4');
 
 	}
 
@@ -102,11 +102,11 @@ 
 	public function get_tabs() {
 
 		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
+			'reports' => __('Reports', 'invoicing'),
+			'export'  => __('Export', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_report_tabs', $tabs );
+		return apply_filters('getpaid_report_tabs', $tabs);
 	}
 
 	/**
@@ -136,11 +136,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function download_graph( $args ) {
+	public function download_graph($args) {
 
-		if ( ! empty( $args['graph'] ) ) {
+		if (!empty($args['graph'])) {
 			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
+			$downloader->download($args['graph']);
 		}
 
 	}
@@ -150,11 +150,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function export_invoices( $args ) {
+	public function export_invoices($args) {
 
-		if ( ! empty( $args['post_type'] ) ) {
+		if (!empty($args['post_type'])) {
 			$downloader = new GetPaid_Invoice_Exporter();
-			$downloader->export( $args['post_type'], $args );
+			$downloader->export($args['post_type'], $args);
 		}
 
 	}

includes/admin/class-getpaid-installer.php

Spacing +65 added lines, -65 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();
@@ -45,7 +45,7 @@ 
 		// Create any missing database tables.
 		$method = "upgrade_from_$upgrade_from";
 
-		if ( method_exists( $this, $method ) ) {
+		if (method_exists($this, $method)) {
 			$this->$method();
 		}
 
@@ -69,28 +69,28 @@ 
 		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);
 			}
 
 		}
@@ -122,7 +122,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -137,8 +137,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]
@@ -149,8 +149,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]
@@ -161,8 +161,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]
@@ -173,16 +173,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]
@@ -194,8 +194,8 @@ 
 			)
 		);
 
-		foreach ( $pages as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach ($pages as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -208,7 +208,7 @@ 
 
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -235,7 +235,7 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -246,7 +246,7 @@ 
 	public function create_invoices_table() {
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -286,7 +286,7 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -297,7 +297,7 @@ 
 	public function create_invoice_items_table() {
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -323,7 +323,7 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -337,38 +337,38 @@ 
 		$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()),
 				)
 			)
 		);
 
 		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
+		if (empty($invoices)) {
 			return;
 		}
 
 		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
 		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+		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;
 			}
 
-			$fields = array (
+			$fields = array(
 				'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(),
@@ -397,27 +397,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'],
@@ -429,31 +429,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");
 
 	}
 

Indentation +330 added lines, -330 removed lines

@@ -20,202 +20,202 @@ 
  */
 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";
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-		$this->create_subscriptions_table();
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-	}
-
-	/**
-	 * 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_102();
-	}
-
-	/**
-	 * Upgrade to 1.0.3
-	 *
-	 */
-	public function upgrade_from_102() {
-		$this->create_subscriptions_table();
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-		$this->migrate_old_invoices();
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
-
-		$pages = 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";
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+        $this->create_subscriptions_table();
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+    }
+
+    /**
+     * 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_102();
+    }
+
+    /**
+     * Upgrade to 1.0.3
+     *
+     */
+    public function upgrade_from_102() {
+        $this->create_subscriptions_table();
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+        $this->migrate_old_invoices();
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
+
+        $pages = 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' => '',
-				),
+                    'parent' => '',
+                ),
 
-			)
-		);
+            )
+        );
 
-		foreach ( $pages as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
+        foreach ( $pages as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Create subscriptions table.
-	 *
-	 */
-	public function create_subscriptions_table() {
+    /**
+     * Create subscriptions table.
+     *
+     */
+    public function create_subscriptions_table() {
 
-		global $wpdb;
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$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',
@@ -238,22 +238,22 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoices table.
-	 *
-	 */
-	public function create_invoices_table() {
-		global $wpdb;
+    /**
+     * Create invoices table.
+     *
+     */
+    public function create_invoices_table() {
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
             `number` VARCHAR(100),
             `key` VARCHAR(100),
@@ -289,22 +289,22 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoice items table.
-	 *
-	 */
-	public function create_invoice_items_table() {
-		global $wpdb;
+    /**
+     * Create invoice items table.
+     *
+     */
+    public function create_invoice_items_table() {
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -326,138 +326,138 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$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() ),
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-
-		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" );
-
-	}
+        dbDelta( $sql );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $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() ),
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+
+        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" );
+
+    }
 
 }

includes/admin/register-settings.php

Braces +5 added lines, -4 removed lines

@@ -628,10 +628,11 @@
 	foreach ( $args['options'] as $key => $option ) :
 		$sanitize_key = wpinv_sanitize_key( $key );
         
-        if ( is_array( $gateways ) && isset( $gateways[ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+        if ( is_array( $gateways ) && isset( $gateways[ $key ] ) ) {
+        			$enabled = '1';
+        } else {
+					$enabled = null;
+		}
 
 		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
 		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';

Indentation +312 added lines, -312 removed lines

@@ -196,11 +196,11 @@ 
     $cb      = "wpinv_{$option['type']}_callback";
     $section = "wpinv_settings_{$tab}_$section";
 
-	if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -227,8 +227,8 @@ 
             'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
             'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
             'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
+            'class'       => isset( $option['class'] )     ? $option['class']         : '',
+            'style'       => isset( $option['style'] )     ? $option['style']         : '',
             'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -242,7 +242,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -289,10 +289,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -348,14 +348,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -373,11 +373,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -415,14 +415,14 @@ 
         ) ),
         'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
             'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
+            'rates' => __( 'Tax Rates', 'invoicing' ),
+            'vat'   => __( 'EU VAT Settings', 'invoicing' )
         ) ),
         'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
             'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
+        ) ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
             'main' => __( 'Privacy policy', 'invoicing' ),
@@ -442,51 +442,51 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -494,12 +494,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<fieldset>
 			<label>
 				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
@@ -511,77 +511,77 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 	
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( in_array( $sanitize_key, $value ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -589,9 +589,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach( $args['options'] as $key => $option ) : ?>
@@ -605,7 +605,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -613,50 +613,50 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
-		echo "<p class='description'>$description</p>";
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = wp_kses_post( $args['desc'] );
+        echo "<p class='description'>$description</p>";
+    }
 
 }
 
 function wpinv_gateways_callback( $args ) {
 
-	$gateways    = wpinv_get_option( 'gateways', array( 'manual' => 1 ) );
+    $gateways    = wpinv_get_option( 'gateways', array( 'manual' => 1 ) );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ( $args['options'] as $key => $option ) :
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         if ( is_array( $gateways ) && isset( $gateways[ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+            $enabled = '1';
+        else
+            $enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+    endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -667,29 +667,29 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+    $value        = isset( $args['std'] ) ? $args['std'] : '';
+    $id           = esc_attr( $args['id'] );
+    $placeholder  = esc_attr( $args['placeholder'] );
 
-	if ( ! empty( $args['faux'] ) ) {
-		$args['readonly'] = true;
-		$name             = '';
-	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
-		$name   = "wpinv_settings[$id]";
-	}
+    if ( ! empty( $args['faux'] ) ) {
+        $args['readonly'] = true;
+        $name             = '';
+    } else {
+        $value  = wpinv_get_option( $args['id'], $value );
+        $name   = "wpinv_settings[$id]";
+    }
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+    $value    = is_scalar( $value ) ? esc_attr( $value ) : '';
+    $class    = esc_attr( $args['class'] );
+    $style    = esc_attr( $args['style'] );
+    $readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
 
-	$onchange = '';
+    $onchange = '';
     if ( ! empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
-	}
+    }
 
-	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
+    return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
 }
 
 /**
@@ -697,11 +697,11 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -715,14 +715,14 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
+    $max  = intval( $args['max'] );
+    $min  = intval( $args['min'] );
+    $step = floatval( $args['step'] );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo $step; ?>" max="<?php echo $max; ?>" min="<?php echo $min; ?>" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -732,48 +732,48 @@ 
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 /**
@@ -781,13 +781,13 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr   = wpinv_settings_attrs_helper( $args );
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?>>
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -801,123 +801,123 @@ 
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html .= ob_get_clean();
-	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    $html = '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html .= ob_get_clean();
+    } else {
+        $html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -925,7 +925,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 	
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -940,17 +940,17 @@ 
  * Displays a tax rate' edit row.
  */
 function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
-	ob_start();
+    ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
-		echo ob_get_clean();
-	} else {
-		return ob_get_clean(); 
-	}
+    if ( $echo ) {
+        echo ob_get_clean();
+    } else {
+        return ob_get_clean(); 
+    }
 
 }
 
@@ -977,14 +977,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -994,14 +994,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -1011,14 +1011,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<?php do_action( 'wpinv_tools_row' ); ?>
@@ -1030,19 +1030,19 @@ 
 }
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo $args['desc'];
+    echo $args['desc'];
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 

Spacing +381 added lines, -381 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 
@@ -43,12 +43,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( ! is_array( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (!is_array($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -62,13 +62,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -77,11 +77,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -96,24 +96,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -123,18 +123,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -148,14 +148,14 @@ 
 function wpinv_register_settings() {
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -168,9 +168,9 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 
@@ -178,9 +178,9 @@ 
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -190,47 +190,47 @@ 
  * @param string $option
  * 
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name    = isset( $option['name'] ) ? $option['name'] : '';
+    $name    = isset($option['name']) ? $option['name'] : '';
     $cb      = "wpinv_{$option['type']}_callback";
     $section = "wpinv_settings_{$tab}_$section";
 
-	if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && !empty($option['help-tip'])) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'     => $section,
-            'id'          => isset( $option['id'] )          ? $option['id']          : uniqid( 'wpinv-' ),
-            'desc'        => isset( $option['desc'] )        ? $option['desc']        : '',
+            'id'          => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'        => isset($option['desc']) ? $option['desc'] : '',
             'name'        => $name,
-            'size'        => isset( $option['size'] )        ? $option['size']        : null,
-            'options'     => isset( $option['options'] )     ? $option['options']     : '',
-            'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-            'std'         => isset( $option['std'] )         ? $option['std']         : '',
-            'min'         => isset( $option['min'] )         ? $option['min']         : 0,
-            'max'         => isset( $option['max'] )         ? $option['max']         : 999999,
-            'step'        => isset( $option['step'] )        ? $option['step']        : 1,
-            'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-            'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-            'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
-            'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
-            'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'        => isset($option['size']) ? $option['size'] : null,
+            'options'     => isset($option['options']) ? $option['options'] : '',
+            'selected'    => isset($option['selected']) ? $option['selected'] : null,
+            'std'         => isset($option['std']) ? $option['std'] : '',
+            'min'         => isset($option['min']) ? $option['min'] : 0,
+            'max'         => isset($option['max']) ? $option['max'] : 999999,
+            'step'        => isset($option['step']) ? $option['step'] : 1,
+            'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'        => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'    => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'      => isset($option['custom']) ? $option['custom'] : '',
+			'class'       => isset($option['class']) ? $option['class'] : '',
+			'style'       => isset($option['style']) ? $option['style'] : '',
+            'cols'        => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'        => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -242,7 +242,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -251,7 +251,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -259,139 +259,139 @@ 
  * 
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
     $wpinv_options = wpinv_get_options();
 
-    if ( empty( wp_get_raw_referer() ) ) {
+    if (empty(wp_get_raw_referer())) {
         return $input;
     }
 
-    wp_parse_str( wp_get_raw_referer(), $referrer );
+    wp_parse_str(wp_get_raw_referer(), $referrer);
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][$section][ $key ]['type'] ) ? $settings[ $tab ][$section][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( 'wpinv_settings_sanitize_' . $type, $value, $key );
+            $input[$key] = apply_filters('wpinv_settings_sanitize_' . $type, $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = $section == 'main' ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = $section == 'main' ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings = array_merge( $main_settings, $section_settings );
+    $found_settings = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
 
-function wpinv_settings_sanitize_misc_accounting( $input ) {
+function wpinv_settings_sanitize_misc_accounting($input) {
 
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    if( ! empty( $input['enable_sequential'] ) && !wpinv_get_option( 'enable_sequential' ) ) {
+    if (!empty($input['enable_sequential']) && !wpinv_get_option('enable_sequential')) {
         // Shows an admin notice about upgrading previous order numbers
-        getpaid_session()->set( 'upgrade_sequential', '1' );
+        getpaid_session()->set('upgrade_sequential', '1');
     }
 
     return $input;
 }
-add_filter( 'wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting' );
+add_filter('wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? array_values( $_POST['tax_rates'] ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? array_values($_POST['tax_rates']) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_sanitize_text_field( $input ) {
-    return trim( $input );
+function wpinv_sanitize_text_field($input) {
+    return trim($input);
 }
-add_filter( 'wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field' );
+add_filter('wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -400,91 +400,91 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
-
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
-
-        'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
-            'main' => __( 'Privacy policy', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'custom-css' => __( 'Custom CSS', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main'  => __('Tax Settings', 'invoicing'),
+			'rates' => __('Tax Rates', 'invoicing'),
+			'vat'   => __('EU VAT Settings', 'invoicing')
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+		)),
+
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
+
+        'privacy' => apply_filters('wpinv_settings_sections_privacy', array(
+            'main' => __('Privacy policy', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'custom-css' => __('Custom CSS', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $args['desc'];
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 	global $wpinv_options;
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	} elseif (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
@@ -492,61 +492,61 @@ 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<fieldset>
 			<label>
-				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
-				<?php echo wp_kses_post( $args['desc'] ); ?>
+				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox">
+				<?php echo wp_kses_post($args['desc']); ?>
 			</label>
 		</fieldset>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 	
 	global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : $std;
 
 		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
-        foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
+        foreach ($args['options'] as $key => $option):
+			$sanitize_key = wpinv_sanitize_key($key);
+			if (in_array($sanitize_key, $value)) { 
 				$enabled = $sanitize_key;
 			} else { 
 				$enabled = NULL; 
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
 		echo '<p class="description">' . $args['desc'] . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
+			if (isset($wpinv_options[$args['id']][$key])) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -554,109 +554,109 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
+	if (!empty($args['desc'])) {
+		$description = wp_kses_post($args['desc']);
 		echo "<p class='description'>$description</p>";
 	}
 
 }
 
-function wpinv_gateways_callback( $args ) {
+function wpinv_gateways_callback($args) {
 
-	$gateways    = wpinv_get_option( 'gateways', array( 'manual' => 1 ) );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$gateways = wpinv_get_option('gateways', array('manual' => 1));
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+	foreach ($args['options'] as $key => $option) :
+		$sanitize_key = wpinv_sanitize_key($key);
         
-        if ( is_array( $gateways ) && isset( $gateways[ $key ] ) )
+        if (is_array($gateways) && isset($gateways[$key]))
 			$enabled = '1';
 		else
 			$enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+		echo '<input name="wpinv_settings[' . esc_attr($args['id']) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html($option['admin_label']) . '</label><br/>';
 	endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="' . $class . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
+            $selected = isset($wpinv_options[$args['id']]) ? selected($key, $wpinv_options[$args['id']], false) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -665,28 +665,28 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+	$value        = isset($args['std']) ? $args['std'] : '';
+	$id           = esc_attr($args['id']);
+	$placeholder  = esc_attr($args['placeholder']);
 
-	if ( ! empty( $args['faux'] ) ) {
+	if (!empty($args['faux'])) {
 		$args['readonly'] = true;
 		$name             = '';
 	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
+		$value  = wpinv_get_option($args['id'], $value);
 		$name   = "wpinv_settings[$id]";
 	}
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+	$value    = is_scalar($value) ? esc_attr($value) : '';
+	$class    = esc_attr($args['class']);
+	$style    = esc_attr($args['style']);
+	$readonly = empty($args['readonly']) ? '' : 'readonly onclick="this.select()"';
 
 	$onchange = '';
-    if ( ! empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
 	}
 
 	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
@@ -695,11 +695,11 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
 
 	?>
 		<label style="width: 100%;">
@@ -713,14 +713,14 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
+	$max  = intval($args['max']);
+	$min  = intval($args['min']);
+	$step = floatval($args['step']);
 
 	?>
 		<label style="width: 100%;">
@@ -731,47 +731,47 @@ 
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<textarea class="' . sanitize_html_class($class) . ' txtarea-' . sanitize_html_class($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -779,20 +779,20 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr   = wpinv_settings_attrs_helper($args);
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
 
 	?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?>>
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( is_array( $value ) ? in_array( "$option", $value, true ) : "$option" === $value ); ?>><?php echo wpinv_clean( $name ); ?></option>
-				<?php endforeach;?>
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected(is_array($value) ? in_array("$option", $value, true) : "$option" === $value); ?>><?php echo wpinv_clean($name); ?></option>
+				<?php endforeach; ?>
 			</select>
 			<?php echo $desc; ?>
 		</label>
@@ -800,95 +800,95 @@ 
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wpinv_options, $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
+		if (empty($args['allow_blank']) && empty($value)) {
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows), 'media_buttons' => false));
 		$html .= ob_get_clean();
 	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+	if (isset($wpinv_options[$args['id']])) {
 		$value = $wpinv_options[$args['id']];
 	} else {
 		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __('Upload File', 'invoicing') . '"/></span>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+	$default = isset($args['std']) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($default) . '" />';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -896,9 +896,9 @@ 
 function wpinv_country_states_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -906,16 +906,16 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"' . $class . 'data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		$selected = isset($wpinv_options[$args['id']]) ? selected($option, $wpinv_options[$args['id']], false) : '';
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -930,7 +930,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -939,14 +939,14 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
+function wpinv_tax_rate_callback($tax_rate, $key, $echo = true) {
 	ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo ob_get_clean();
 	} else {
 		return ob_get_clean(); 
@@ -958,133 +958,133 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php _e( 'Check Pages', 'invoicing' );?></td>
+                <td><?php _e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php _e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Create Database Tables', 'invoicing' );?></td>
+                <td><?php _e('Create Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php _e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Migrate old invoices', 'invoicing' );?></td>
+                <td><?php _e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php _e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
+function wpinv_raw_html_callback($args) {
 	echo $args['desc'];
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
-function wpinv_settings_sanitize_input( $value, $key ) {
+function wpinv_settings_sanitize_input($value, $key) {
 
-    if ( $key == 'tax_rate' ) {
-        $value = wpinv_sanitize_amount( $value );
+    if ($key == 'tax_rate') {
+        $value = wpinv_sanitize_amount($value);
         $value = $value >= 100 ? 99 : $value;
     }
 
     return $value;
 }
-add_filter( 'wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2 );
+add_filter('wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2);
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
-add_action( 'wpinv_settings_tab_bottom_emails_new_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_cancelled_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_failed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_onhold_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_processing_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_completed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_refunded_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_user_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_user_note', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_overdue', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-
-function wpinv_settings_tab_bottom_emails( $active_tab, $section ) {
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
+add_action('wpinv_settings_tab_bottom_emails_new_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_cancelled_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_failed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_onhold_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_processing_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_completed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_refunded_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_user_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_user_note', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_overdue', 'wpinv_settings_tab_bottom_emails', 10, 2);
+
+function wpinv_settings_tab_bottom_emails($active_tab, $section) {
     ?>
     <div class="wpinv-email-wc-row ">
         <div class="wpinv-email-wc-td">
-            <h3 class="wpinv-email-wc-title"><?php echo apply_filters( 'wpinv_settings_email_wildcards_title', __( 'Wildcards For Emails', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-email-wc-title"><?php echo apply_filters('wpinv_settings_email_wildcards_title', __('Wildcards For Emails', 'invoicing')); ?></h3>
             <p class="wpinv-email-wc-description">
                 <?php
-                $description = __( 'The following wildcards can be used in email subjects, heading and content:<br>
+                $description = __('The following wildcards can be used in email subjects, heading and content:<br>
                     <strong>{site_title} :</strong> Site Title<br>
                     <strong>{name} :</strong> Customer\'s full name<br>
                     <strong>{first_name} :</strong> Customer\'s first name<br>
@@ -1098,7 +1098,7 @@ 
                     <strong>{invoice_due_date} :</strong> The date the invoice is due<br>
                     <strong>{date} :</strong> Today\'s date.<br>
                     <strong>{is_was} :</strong> If due date of invoice is past, displays "was" otherwise displays "is"<br>
-                    <strong>{invoice_label} :</strong> Invoices/quotes singular name. Ex: Invoice/Quote<br>', 'invoicing' );
+                    <strong>{invoice_label} :</strong> Invoices/quotes singular name. Ex: Invoice/Quote<br>', 'invoicing');
                 echo apply_filters('wpinv_settings_email_wildcards_description', $description, $active_tab, $section);
                 ?>
             </p>

includes/class-getpaid-post-types.php

Indentation +294 added lines, -294 removed lines

@@ -15,319 +15,319 @@
 class GetPaid_Post_Types {
 
     /**
-	 * Hook in methods.
-	 */
-	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
-	}
+     * Hook in methods.
+     */
+    public function __construct() {
+        add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
+        add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
+        add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+    }
 
-	/**
-	 * Register core post types.
-	 */
-	public static function register_post_types() {
+    /**
+     * Register core post types.
+     */
+    public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
-			return;
-		}
+        if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+            return;
+        }
 
-		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+        // Fires before registering post types.
+        do_action( 'getpaid_register_post_types' );
 
-		// Register item post type.
-		register_post_type(
-			'wpi_item',
-			apply_filters(
-				'wpinv_register_post_type_invoice_item',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
-					),
-					'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
-					'public'                => false,
-					'has_archive'           => false,
-					'_builtin'              => false,
-					'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
-					'rewrite'               => false,
-					'query_var'             => false,
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-				)
-			)
-		);
+        // Register item post type.
+        register_post_type(
+            'wpi_item',
+            apply_filters(
+                'wpinv_register_post_type_invoice_item',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
+                        'new_item'           => __( 'New Item', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Item', 'invoicing' ),
+                        'view_item'          => __( 'View Item', 'invoicing' ),
+                        'all_items'          => __( 'Items', 'invoicing' ),
+                        'search_items'       => __( 'Search items', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
+                        'not_found'          => __( 'No items found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+                    ),
+                    'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+                    'public'                => false,
+                    'has_archive'           => false,
+                    '_builtin'              => false,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
+                    'rewrite'               => false,
+                    'query_var'             => false,
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                )
+            )
+        );
 
-		// Register payment form post type.
-		register_post_type(
-			'wpi_payment_form',
-			apply_filters(
-				'wpinv_register_post_type_payment_form',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
-					),
-					'description'        => __( 'Add new payment forms.', 'invoicing' ),
-					'public'             => false,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
-					'show_in_nav_menus'  => false,
-					'query_var'          => false,
-					'rewrite'            => true,
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'menu_position'      => null,
-					'supports'           => array( 'title' ),
-					'menu_icon'          => 'dashicons-media-form',
-				)
-			)
-		);
+        // Register payment form post type.
+        register_post_type(
+            'wpi_payment_form',
+            apply_filters(
+                'wpinv_register_post_type_payment_form',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
+                        'new_item'           => __( 'New Payment Form', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
+                        'view_item'          => __( 'View Payment Form', 'invoicing' ),
+                        'all_items'          => __( 'Payment Forms', 'invoicing' ),
+                        'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
+                        'not_found'          => __( 'No payment forms found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+                    ),
+                    'description'        => __( 'Add new payment forms.', 'invoicing' ),
+                    'public'             => false,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
+                    'show_in_nav_menus'  => false,
+                    'query_var'          => false,
+                    'rewrite'            => true,
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'menu_position'      => null,
+                    'supports'           => array( 'title' ),
+                    'menu_icon'          => 'dashicons-media-form',
+                )
+            )
+        );
 
-		// Register invoice post type.
-		register_post_type(
-			'wpi_invoice',
-			apply_filters(
-				'wpinv_register_post_type_invoice',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
-					),
-					'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
-					'public'                => true,
-					'has_archive'           => false,
-					'publicly_queryable'    => true,
-        			'exclude_from_search'   => true,
-        			'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'author', 'excerpt'  ),
-					'rewrite'               => array(
-						'slug'              => 'invoice',
-						'with_front'        => false,
-					),
-					'query_var'             => false,
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-					'hierarchical'          => false,
-					'menu_position'         => null,
-					'menu_icon'             => 'dashicons-media-spreadsheet',
-				)
-			)
-		);
+        // Register invoice post type.
+        register_post_type(
+            'wpi_invoice',
+            apply_filters(
+                'wpinv_register_post_type_invoice',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Invoices', 'invoicing' ),
+                        'singular_name'         => __( 'Invoice', 'invoicing' ),
+                        'all_items'             => __( 'Invoices', 'invoicing' ),
+                        'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit invoice', 'invoicing' ),
+                        'new_item'              => __( 'New invoice', 'invoicing' ),
+                        'view_item'             => __( 'View invoice', 'invoicing' ),
+                        'view_items'            => __( 'View Invoices', 'invoicing' ),
+                        'search_items'          => __( 'Search invoices', 'invoicing' ),
+                        'not_found'             => __( 'No invoices found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent invoice', 'invoicing' ),
+                        'featured_image'        => __( 'Invoice image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
+                        'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
+                        'items_list'            => __( 'Invoices list', 'invoicing' ),
+                    ),
+                    'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
+                    'public'                => true,
+                    'has_archive'           => false,
+                    'publicly_queryable'    => true,
+                    'exclude_from_search'   => true,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'author', 'excerpt'  ),
+                    'rewrite'               => array(
+                        'slug'              => 'invoice',
+                        'with_front'        => false,
+                    ),
+                    'query_var'             => false,
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                    'hierarchical'          => false,
+                    'menu_position'         => null,
+                    'menu_icon'             => 'dashicons-media-spreadsheet',
+                )
+            )
+        );
 
-		// Register discount post type.
-		register_post_type(
-			'wpi_discount',
-			apply_filters(
-				'wpinv_register_post_type_discount',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
-					),
-					'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
-					'public'             => false,
-					'can_export'         => true,
-					'_builtin'           => false,
-					'publicly_queryable' => false,
-					'exclude_from_search'=> true,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'query_var'          => false,
-					'rewrite'            => false,
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'supports'           => array( 'title', 'excerpt' ),
-					'show_in_nav_menus'  => false,
-					'show_in_admin_bar'  => true,
-					'menu_position'      => null,
-				)
-			)
-		);
+        // Register discount post type.
+        register_post_type(
+            'wpi_discount',
+            apply_filters(
+                'wpinv_register_post_type_discount',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Discounts', 'invoicing' ),
+                        'singular_name'         => __( 'Discount', 'invoicing' ),
+                        'all_items'             => __( 'Discounts', 'invoicing' ),
+                        'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new discount', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit discount', 'invoicing' ),
+                        'new_item'              => __( 'New discount', 'invoicing' ),
+                        'view_item'             => __( 'View discount', 'invoicing' ),
+                        'view_items'            => __( 'View Discounts', 'invoicing' ),
+                        'search_items'          => __( 'Search discounts', 'invoicing' ),
+                        'not_found'             => __( 'No discounts found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent discount', 'invoicing' ),
+                        'featured_image'        => __( 'Discount image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
+                        'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
+                        'items_list'            => __( 'Discounts list', 'invoicing' ),
+                    ),
+                    'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+                    'public'             => false,
+                    'can_export'         => true,
+                    '_builtin'           => false,
+                    'publicly_queryable' => false,
+                    'exclude_from_search'=> true,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'query_var'          => false,
+                    'rewrite'            => false,
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'supports'           => array( 'title', 'excerpt' ),
+                    'show_in_nav_menus'  => false,
+                    'show_in_admin_bar'  => true,
+                    'menu_position'      => null,
+                )
+            )
+        );
 
-		do_action( 'getpaid_after_register_post_types' );
-	}
+        do_action( 'getpaid_after_register_post_types' );
+    }
 
-	/**
-	 * Register our custom post statuses.
-	 */
-	public static function register_post_status() {
+    /**
+     * Register our custom post statuses.
+     */
+    public static function register_post_status() {
 
-		$invoice_statuses = apply_filters(
-			'getpaid_register_invoice_post_statuses',
-			array(
+        $invoice_statuses = apply_filters(
+            'getpaid_register_invoice_post_statuses',
+            array(
 
-				'wpi-pending' => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-pending' => array(
+                    'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-processing' => array(
+                    'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-onhold' => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-onhold' => array(
+                    'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-cancelled' => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-cancelled' => array(
+                    'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-refunded' => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-refunded' => array(
+                    'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-failed' => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-failed' => array(
+                    'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-renewal' => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-				)
-			)
-		);
+                'wpi-renewal' => array(
+                    'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
+                )
+            )
+        );
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
-		}
-	}
+        foreach ( $invoice_statuses as $invoice_statuse => $args ) {
+            register_post_status( $invoice_statuse, $args );
+        }
+    }
 
-	/**
-	 * Flush rewrite rules.
-	 */
-	public static function flush_rewrite_rules() {
-		flush_rewrite_rules();
-	}
+    /**
+     * Flush rewrite rules.
+     */
+    public static function flush_rewrite_rules() {
+        flush_rewrite_rules();
+    }
 
-	/**
-	 * Flush rules to prevent 404.
-	 *
-	 */
-	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
-			self::flush_rewrite_rules();
-		}
-	}
+    /**
+     * Flush rules to prevent 404.
+     *
+     */
+    public static function maybe_flush_rewrite_rules() {
+        if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
+            update_option( 'getpaid_flushed_rewrite_rules', '1' );
+            self::flush_rewrite_rules();
+        }
+    }
 
 }

Spacing +110 added lines, -110 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Class
@@ -18,10 +18,10 @@ 
 	 * Hook in methods.
 	 */
 	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+		add_action('init', array(__CLASS__, 'register_post_types'), 1);
+		add_action('init', array(__CLASS__, 'register_post_status'), 4);
+		add_action('getpaid_flush_rewrite_rules', array(__CLASS__, 'flush_rewrite_rules'));
+		add_action('getpaid_after_register_post_types', array(__CLASS__, 'maybe_flush_rewrite_rules'));
 	}
 
 	/**
@@ -29,12 +29,12 @@ 
 	 */
 	public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+		if (!is_blog_installed() || post_type_exists('wpi_item')) {
 			return;
 		}
 
 		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+		do_action('getpaid_register_post_types');
 
 		// Register item post type.
 		register_post_type(
@@ -43,29 +43,29 @@ 
 				'wpinv_register_post_type_invoice_item',
 				array(
 					'labels'             => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+						'name'               => _x('Items', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Item', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Item', 'invoicing'),
+						'add_new_item'       => __('Add New Item', 'invoicing'),
+						'new_item'           => __('New Item', 'invoicing'),
+						'edit_item'          => __('Edit Item', 'invoicing'),
+						'view_item'          => __('View Item', 'invoicing'),
+						'all_items'          => __('Items', 'invoicing'),
+						'search_items'       => __('Search items', 'invoicing'),
+						'parent_item_colon'  => __('Parent item:', 'invoicing'),
+						'not_found'          => __('No items found.', 'invoicing'),
+						'not_found_in_trash' => __('No items found in trash.', 'invoicing')
 					),
-					'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+					'description'           => __('This is where you can add new invoice items.', 'invoicing'),
 					'public'                => false,
 					'has_archive'           => false,
 					'_builtin'              => false,
 					'show_ui'               => true,
 					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
 					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
+					'supports'              => array('title', 'excerpt', 'thumbnail'),
 					'rewrite'               => false,
 					'query_var'             => false,
 					'map_meta_cap'          => true,
@@ -82,22 +82,22 @@ 
 				'wpinv_register_post_type_payment_form',
 				array(
 					'labels'             => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+						'name'               => _x('Payment Forms', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Payment Form', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Payment Forms', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Payment Form', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Payment Form', 'invoicing'),
+						'add_new_item'       => __('Add New Payment Form', 'invoicing'),
+						'new_item'           => __('New Payment Form', 'invoicing'),
+						'edit_item'          => __('Edit Payment Form', 'invoicing'),
+						'view_item'          => __('View Payment Form', 'invoicing'),
+						'all_items'          => __('Payment Forms', 'invoicing'),
+						'search_items'       => __('Search Payment Forms', 'invoicing'),
+						'parent_item_colon'  => __('Parent Payment Forms:', 'invoicing'),
+						'not_found'          => __('No payment forms found.', 'invoicing'),
+						'not_found_in_trash' => __('No payment forms found in trash.', 'invoicing')
 					),
-					'description'        => __( 'Add new payment forms.', 'invoicing' ),
+					'description'        => __('Add new payment forms.', 'invoicing'),
 					'public'             => false,
 					'show_ui'            => true,
 					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
@@ -108,7 +108,7 @@ 
 					'has_archive'        => false,
 					'hierarchical'       => false,
 					'menu_position'      => null,
-					'supports'           => array( 'title' ),
+					'supports'           => array('title'),
 					'menu_icon'          => 'dashicons-media-form',
 				)
 			)
@@ -121,32 +121,32 @@ 
 				'wpinv_register_post_type_invoice',
 				array(
 					'labels'                 => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
+						'name'                  => __('Invoices', 'invoicing'),
+						'singular_name'         => __('Invoice', 'invoicing'),
+						'all_items'             => __('Invoices', 'invoicing'),
+						'menu_name'             => _x('Invoices', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new invoice', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit invoice', 'invoicing'),
+						'new_item'              => __('New invoice', 'invoicing'),
+						'view_item'             => __('View invoice', 'invoicing'),
+						'view_items'            => __('View Invoices', 'invoicing'),
+						'search_items'          => __('Search invoices', 'invoicing'),
+						'not_found'             => __('No invoices found', 'invoicing'),
+						'not_found_in_trash'    => __('No invoices found in trash', 'invoicing'),
+						'parent'                => __('Parent invoice', 'invoicing'),
+						'featured_image'        => __('Invoice image', 'invoicing'),
+						'set_featured_image'    => __('Set invoice image', 'invoicing'),
+						'remove_featured_image' => __('Remove invoice image', 'invoicing'),
+						'use_featured_image'    => __('Use as invoice image', 'invoicing'),
+						'insert_into_item'      => __('Insert into invoice', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this invoice', 'invoicing'),
+						'filter_items_list'     => __('Filter invoices', 'invoicing'),
+						'items_list_navigation' => __('Invoices navigation', 'invoicing'),
+						'items_list'            => __('Invoices list', 'invoicing'),
 					),
-					'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
+					'description'           => __('This is where invoices are stored.', 'invoicing'),
 					'public'                => true,
 					'has_archive'           => false,
 					'publicly_queryable'    => true,
@@ -154,7 +154,7 @@ 
         			'show_ui'               => true,
 					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
 					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'author', 'excerpt'  ),
+					'supports'              => array('title', 'author', 'excerpt'),
 					'rewrite'               => array(
 						'slug'              => 'invoice',
 						'with_front'        => false,
@@ -177,32 +177,32 @@ 
 				'wpinv_register_post_type_discount',
 				array(
 					'labels'                 => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
+						'name'                  => __('Discounts', 'invoicing'),
+						'singular_name'         => __('Discount', 'invoicing'),
+						'all_items'             => __('Discounts', 'invoicing'),
+						'menu_name'             => _x('Discounts', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new discount', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit discount', 'invoicing'),
+						'new_item'              => __('New discount', 'invoicing'),
+						'view_item'             => __('View discount', 'invoicing'),
+						'view_items'            => __('View Discounts', 'invoicing'),
+						'search_items'          => __('Search discounts', 'invoicing'),
+						'not_found'             => __('No discounts found', 'invoicing'),
+						'not_found_in_trash'    => __('No discounts found in trash', 'invoicing'),
+						'parent'                => __('Parent discount', 'invoicing'),
+						'featured_image'        => __('Discount image', 'invoicing'),
+						'set_featured_image'    => __('Set discount image', 'invoicing'),
+						'remove_featured_image' => __('Remove discount image', 'invoicing'),
+						'use_featured_image'    => __('Use as discount image', 'invoicing'),
+						'insert_into_item'      => __('Insert into discount', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this discount', 'invoicing'),
+						'filter_items_list'     => __('Filter discounts', 'invoicing'),
+						'items_list_navigation' => __('Discount navigation', 'invoicing'),
+						'items_list'            => __('Discounts list', 'invoicing'),
 					),
-					'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+					'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
 					'public'             => false,
 					'can_export'         => true,
 					'_builtin'           => false,
@@ -215,7 +215,7 @@ 
 					'map_meta_cap'       => true,
 					'has_archive'        => false,
 					'hierarchical'       => false,
-					'supports'           => array( 'title', 'excerpt' ),
+					'supports'           => array('title', 'excerpt'),
 					'show_in_nav_menus'  => false,
 					'show_in_admin_bar'  => true,
 					'menu_position'      => null,
@@ -223,7 +223,7 @@ 
 			)
 		);
 
-		do_action( 'getpaid_after_register_post_types' );
+		do_action('getpaid_after_register_post_types');
 	}
 
 	/**
@@ -236,79 +236,79 @@ 
 			array(
 
 				'wpi-pending' => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Pending Payment', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-onhold' => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-cancelled' => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-refunded' => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-failed' => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-renewal' => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
 				)
 			)
 		);
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
+		foreach ($invoice_statuses as $invoice_statuse => $args) {
+			register_post_status($invoice_statuse, $args);
 		}
 	}
 
@@ -324,8 +324,8 @@ 
 	 *
 	 */
 	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
+		if (!get_option('getpaid_flushed_rewrite_rules')) {
+			update_option('getpaid_flushed_rewrite_rules', '1');
 			self::flush_rewrite_rules();
 		}
 	}

templates/emails/wpinv-email-footer.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-$email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
-$email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';
+$email_footer = apply_filters('wpinv_email_footer_text', wpinv_get_option('email_footer_text', get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing')));
+$email_footer = $email_footer ? wpautop(wp_kses_post(wptexturize($email_footer))) : '';
 ?>
                                                             </div>
                                                         </td>

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 $email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
 $email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';

includes/class-wpinv.php

Indentation +479 added lines, -479 removed lines

@@ -14,521 +14,521 @@ 
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @param array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 * 
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
-		}
-
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load the translation of the plugin.
-	 *
-	 * @since 1.0
-	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
-		}
-
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
-
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
-
-		/**
-		 * Define language constants.
-		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
-
-		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
-
-		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
-			// load the user class only on the users.php page
-			global $pagenow;
-			if($pagenow=='users.php'){
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
-
-		}
-
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Maybe upgrade.
-		$this->maybe_upgrade_database();
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-		$suffix  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
-
-		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ), true );
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @param array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     * 
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+
+        if ( class_exists( 'BuddyPress' ) ) {
+            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        }
+
+        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
+        add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
+        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load the translation of the plugin.
+     *
+     * @since 1.0
+     */
+    public function load_textdomain( $locale = NULL ) {
+        if ( empty( $locale ) ) {
+            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+        }
+
+        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+
+        unload_textdomain( 'invoicing' );
+        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
+        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+
+        /**
+         * Define language constants.
+         */
+        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+
+        // Packages/libraries.
+        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+
+        // Load functions.
+        require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+            // load the user class only on the users.php page
+            global $pagenow;
+            if($pagenow=='users.php'){
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
 
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		wp_enqueue_script( 'jquery-blockui' );
-
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
-
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script' ),  $version, true );
-	}
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
 
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-	}
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
 
-	/**
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Maybe upgrade.
+        $this->maybe_upgrade_database();
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = wpinv_clean( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+        $suffix  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
+        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
+        wp_enqueue_style( 'wpinv_front_style' );
+
+        // Register scripts
+        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ), true );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        wp_enqueue_script( 'jquery-blockui' );
+
+        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+
+        wp_enqueue_script( 'wpinv-front-script' );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script' ),  $version, true );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+            do_action( "getpaid_unauthenticated_action_$key", $data );
 
-		}
+        }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		$widgets = apply_filters(
-			'getpaid_widget_classes',
-			array(
-				'WPInv_Checkout_Widget',
-				'WPInv_History_Widget',
-				'WPInv_Receipt_Widget',
-				'WPInv_Subscriptions_Widget',
-				'WPInv_Buy_Item_Widget',
-				'WPInv_Messages_Widget',
-				'WPInv_GetPaid_Widget'
-			)
-		);
-
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
-		}
+    public function pre_get_posts( $wp_query ) {
+
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    public function bp_invoicing_init() {
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        $widgets = apply_filters(
+            'getpaid_widget_classes',
+            array(
+                'WPInv_Checkout_Widget',
+                'WPInv_History_Widget',
+                'WPInv_Receipt_Widget',
+                'WPInv_Subscriptions_Widget',
+                'WPInv_Buy_Item_Widget',
+                'WPInv_Messages_Widget',
+                'WPInv_GetPaid_Widget'
+            )
+        );
+
+        foreach ( $widgets as $widget ) {
+            register_widget( $widget );
+        }
 		
-	}
+    }
 
-	/**
-	 * Upgrades the database.
-	 *
-	 * @since 2.0.2
-	 */
-	public function maybe_upgrade_database() {
+    /**
+     * Upgrades the database.
+     *
+     * @since 2.0.2
+     */
+    public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+        $wpi_version = get_option( 'wpinv_version', 0 );
 
-		if ( $wpi_version == WPINV_VERSION ) {
-			return;
-		}
+        if ( $wpi_version == WPINV_VERSION ) {
+            return;
+        }
 
-		$installer = new GetPaid_Installer();
+        $installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
-		}
+        if ( empty( $wpi_version ) ) {
+            return $installer->upgrade_db( 0 );
+        }
 
-		$upgrades  = array(
-			'0.0.5' => '004',
-			'1.0.3' => '102',
-			'2.0.0' => '118',
-		);
+        $upgrades  = array(
+            '0.0.5' => '004',
+            '1.0.3' => '102',
+            '2.0.0' => '118',
+        );
 
-		foreach ( $upgrades as $key => $method ) {
+        foreach ( $upgrades as $key => $method ) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
-			}
+            if ( version_compare( $wpi_version, $key, '<' ) ) {
+                return $installer->upgrade_db( $method );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
 
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
 
-		// Prepare our pages.
-		$our_pages = array();
+        // Prepare our pages.
+        $our_pages = array();
 
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
 
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
 
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
 
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-	}
+    }
 
-	public function wp_footer() {
-		echo '
+    public function wp_footer() {
+        echo '
 			<div class="bsui">
 				<div  id="getpaid-payment-modal" class="modal" tabindex="-1" role="dialog">
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
@@ -544,6 +544,6 @@ 
 				</div>
 			</div>
 		';
-	}
+    }
 
 }

Spacing +168 added lines, -168 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,23 +81,23 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('session', new WPInv_Session_Handler());
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -105,8 +105,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -117,27 +117,27 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
 
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+		if (class_exists('BuddyPress')) {
+			add_action('bp_include', array(&$this, 'bp_invoicing_init'));
 		}
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array(&$this, 'wp_footer'));
+		add_action('widgets_init', array(&$this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -145,10 +145,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -158,21 +158,21 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+	public function load_textdomain($locale = NULL) {
+		if (empty($locale)) {
+			$locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
 		}
 
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+		$locale = apply_filters('plugin_locale', $locale, 'invoicing');
 
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+		unload_textdomain('invoicing');
+		load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+		load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
 
 		/**
 		 * Define language constants.
 		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
+		require_once(WPINV_PLUGIN_DIR . 'language.php');
 	}
 
 	/**
@@ -181,78 +181,78 @@ 
 	public function includes() {
 
 		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
 
 		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+		require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+		require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
 		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/subscription-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/user-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/error-functions.php');
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
+
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
 			// load the user class only on the users.php page
 			global $pagenow;
-			if($pagenow=='users.php'){
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+		if (defined('WP_CLI') && WP_CLI) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
 	}
@@ -265,21 +265,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -294,10 +294,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 
@@ -311,7 +311,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -328,12 +328,12 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -343,55 +343,55 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
+		$gateway = wpinv_clean($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
 
 	public function enqueue_scripts() {
-		$suffix  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix  = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css');
+		wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version);
+		wp_enqueue_style('wpinv_front_style');
 
 		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ), true );
+		wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+		wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), filemtime(WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js'), true);
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
-		wp_enqueue_script( 'jquery-blockui' );
+		wp_enqueue_script('jquery-blockui');
 
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+		wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all');
+		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		wp_enqueue_script('wpinv-front-script');
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script' ),  $version, true );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('wpinv-front-script'), $version, true);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 	}
 
@@ -403,31 +403,31 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
 	}
 
 	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
 	}
 
 	/**
@@ -448,8 +448,8 @@ 
 			)
 		);
 
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
+		foreach ($widgets as $widget) {
+			register_widget($widget);
 		}
 		
 	}
@@ -461,28 +461,28 @@ 
 	 */
 	public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5' => '004',
 			'1.0.3' => '102',
 			'2.0.0' => '118',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
+		foreach ($upgrades as $key => $method) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 
 		}
@@ -495,10 +495,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -506,24 +506,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -534,7 +534,7 @@ 
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 						<div class="modal-content">
 							<div class="modal-body">
-								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__( 'Close', 'invoicing' ) . '">
+								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__('Close', 'invoicing') . '">
 									<i class="fa fa-times" aria-hidden="true"></i>
 								</button>
 								<div class="modal-body-wrapper"></div>

includes/payments/class-getpaid-payment-form-submission-refresh-prices.php

Indentation +187 added lines, -187 removed lines

@@ -12,227 +12,227 @@
  */
 class GetPaid_Payment_Form_Submission_Refresh_Prices {
 
-	/**
-	 * Contains the response for refreshing prices.
-	 * @var array
-	 */
-	public $response = array();
+    /**
+     * Contains the response for refreshing prices.
+     * @var array
+     */
+    public $response = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$this->response = array(
-			'submission_id' => $submission->id,
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $this->response = array(
+            'submission_id' => $submission->id,
             'has_recurring' => $submission->has_recurring,
             'is_free'       => ! $submission->should_collect_payment_details(),
-		);
-
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-
-	}
-
-	/**
-	 * Adds totals to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_totals( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-
-				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
-				),
-
-				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
-				),
-
-				'initial_amt'   => wpinv_round_amount( $submission->get_total(), null, true ),
-				'currency'      => $submission->get_currency(),
-
-			)
-		);
-
-	}
-
-	/**
-	 * Adds texts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_texts( $submission ) {
-
-		$payable = $submission->format_amount( $submission->get_total() );
-
-		if ( $submission->has_recurring != 0 ) {
-
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
-				$payable = "$payable / $period";
-			} else {
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)'),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-			}
-
-		}
-
-		$texts = array(
-			'.getpaid-checkout-total-payable' => $payable,
-		);
-
-		foreach ( $submission->get_items() as $item_id => $item ) {
-			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
-			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
-		}
-
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
-
-	}
-
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
-
-		// Add items.
-		$items = array();
+        );
+
+        $this->add_totals( $submission );
+        $this->add_texts( $submission );
+        $this->add_items( $submission );
+        $this->add_fees( $submission );
+        $this->add_discounts( $submission );
+        $this->add_taxes( $submission );
+        $this->add_gateways( $submission );
+
+    }
+
+    /**
+     * Adds totals to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_totals( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+
+                'totals'        => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_total() ),
+                    'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+                ),
+
+                'recurring'     => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+                ),
+
+                'initial_amt'   => wpinv_round_amount( $submission->get_total(), null, true ),
+                'currency'      => $submission->get_currency(),
+
+            )
+        );
+
+    }
+
+    /**
+     * Adds texts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_texts( $submission ) {
+
+        $payable = $submission->format_amount( $submission->get_total() );
+
+        if ( $submission->has_recurring != 0 ) {
+
+            $recurring = new WPInv_Item( $submission->has_recurring );
+            $period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+
+            if ( $submission->get_total() == $submission->get_recurring_total() ) {
+                $payable = "$payable / $period";
+            } else {
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)'),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+            }
+
+        }
+
+        $texts = array(
+            '.getpaid-checkout-total-payable' => $payable,
+        );
 
         foreach ( $submission->get_items() as $item_id => $item ) {
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
-		}
+            $texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
+            $texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'items' => $items )
-		);
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-	}
+    }
 
-	/**
-	 * Adds fees to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_fees( $submission ) {
+    /**
+     * Adds items to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_items( $submission ) {
+
+        // Add items.
+        $items = array();
+
+        foreach ( $submission->get_items() as $item_id => $item ) {
+            $items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+        }
+
+        $this->response = array_merge(
+            $this->response,
+            array( 'items' => $items )
+        );
+
+    }
 
-		$fees = array();
+    /**
+     * Adds fees to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_fees( $submission ) {
+
+        $fees = array();
 
         foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
-		}
+            $fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'fees' => $fees )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'fees' => $fees )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds discounts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_discounts( $submission ) {
+    /**
+     * Adds discounts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_discounts( $submission ) {
 
-		$discounts = array();
+        $discounts = array();
 
         foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
-		}
+            $discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'discounts' => $discounts )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'discounts' => $discounts )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds taxes to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_taxes( $submission ) {
-
-		$taxes  = array();
-		$markup = '';
+    /**
+     * Adds taxes to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_taxes( $submission ) {
+
+        $taxes  = array();
+        $markup = '';
         foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
-			$taxes[$name]  = $amount;
-			$markup       .= "<small class='form-text'>$name : $amount</small>";
-		}
+            $name          = sanitize_text_field( $name );
+            $amount        = $submission->format_amount( $data['initial_tax'] );
+            $taxes[$name]  = $amount;
+            $markup       .= "<small class='form-text'>$name : $amount</small>";
+        }
 
-		if ( wpinv_display_individual_tax_rates() ) {
-			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
-		}
+        if ( wpinv_display_individual_tax_rates() ) {
+            $this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'taxes' => $taxes )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'taxes' => $taxes )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds gateways to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_gateways( $submission ) {
+    /**
+     * Adds gateways to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_gateways( $submission ) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
 
-		if ( $this->response['has_recurring'] ) {
+        if ( $this->response['has_recurring'] ) {
 
-			foreach ( $gateways as $i => $gateway ) {
+            foreach ( $gateways as $i => $gateway ) {
 
-				if ( ! wpinv_gateway_support_subscription( $gateway ) ) {
-					unset( $gateways[ $i ] );
-				}
+                if ( ! wpinv_gateway_support_subscription( $gateway ) ) {
+                    unset( $gateways[ $i ] );
+                }
 
-			}
+            }
 
-		}
+        }
 
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
-		$this->response = array_merge(
-			$this->response,
-			array( 'gateways' => $gateways )
-		);
+        $gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+        $this->response = array_merge(
+            $this->response,
+            array( 'gateways' => $gateways )
+        );
 
-	}
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,21 +23,21 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id' => $submission->id,
             'has_recurring' => $submission->has_recurring,
-            'is_free'       => ! $submission->should_collect_payment_details(),
+            'is_free'       => !$submission->should_collect_payment_details(),
 		);
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
+		$this->add_gateways($submission);
 
 	}
 
@@ -46,30 +46,30 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
+					'raw_total' => html_entity_decode(sanitize_text_field($submission->format_amount($submission->get_total())), ENT_QUOTES),
 				),
 
 				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal'  => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'      => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'       => $submission->format_amount($submission->get_recurring_tax()),
+					'total'     => $submission->format_amount($submission->get_recurring_total()),
 				),
 
-				'initial_amt'   => wpinv_round_amount( $submission->get_total(), null, true ),
+				'initial_amt'   => wpinv_round_amount($submission->get_total(), null, true),
 				'currency'      => $submission->get_currency(),
 
 			)
@@ -82,22 +82,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
+		$payable = $submission->format_amount($submission->get_total());
 
-		if ( $submission->has_recurring != 0 ) {
+		if ($submission->has_recurring != 0) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)'),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -108,12 +108,12 @@ 
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item_id => $item ) {
-			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
-			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
+		foreach ($submission->get_items() as $item_id => $item) {
+			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount($item->get_sub_total());
+			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount($item->get_recurring_sub_total());
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -122,18 +122,18 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items = array();
 
-        foreach ( $submission->get_items() as $item_id => $item ) {
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+        foreach ($submission->get_items() as $item_id => $item) {
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -143,17 +143,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -163,17 +163,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -183,24 +183,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes  = array();
 		$markup = '';
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
+        foreach ($submission->get_taxes() as $name => $data) {
+			$name          = sanitize_text_field($name);
+			$amount        = $submission->format_amount($data['initial_tax']);
 			$taxes[$name]  = $amount;
 			$markup       .= "<small class='form-text'>$name : $amount</small>";
 		}
 
-		if ( wpinv_display_individual_tax_rates() ) {
+		if (wpinv_display_individual_tax_rates()) {
 			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -210,16 +210,16 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_gateways( $submission ) {
+	public function add_gateways($submission) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+		$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
-		if ( $this->response['has_recurring'] ) {
+		if ($this->response['has_recurring']) {
 
-			foreach ( $gateways as $i => $gateway ) {
+			foreach ($gateways as $i => $gateway) {
 
-				if ( ! wpinv_gateway_support_subscription( $gateway ) ) {
-					unset( $gateways[ $i ] );
+				if (!wpinv_gateway_support_subscription($gateway)) {
+					unset($gateways[$i]);
 				}
 
 			}
@@ -227,10 +227,10 @@ 
 		}
 
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+		$gateways = apply_filters('getpaid_submission_gateways', $gateways, $submission);
 		$this->response = array_merge(
 			$this->response,
-			array( 'gateways' => $gateways )
+			array('gateways' => $gateways)
 		);
 
 	}

templates/payment-forms/elements/billing_email.php

Spacing +13 added lines, -13 removed lines

@@ -7,35 +7,35 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $value = '';
 $class = '';
 
-if ( ! empty( $form->invoice ) ) {
-    $value   = sanitize_email( $form->invoice->get_email() );
-} else if ( is_user_logged_in() ) {
+if (!empty($form->invoice)) {
+    $value = sanitize_email($form->invoice->get_email());
+} else if (is_user_logged_in()) {
     $user  = wp_get_current_user();
-    $value = sanitize_email( $user->user_email );
+    $value = sanitize_email($user->user_email);
 }
 
-if ( ! empty( $value ) && ! empty( $hide_billing_email ) ) {
+if (!empty($value) && !empty($hide_billing_email)) {
     $class = 'd-none';
 }
 
-do_action( 'getpaid_before_payment_form_billing_email', $form );
+do_action('getpaid_before_payment_form_billing_email', $form);
 
 echo "<span class='$class'>";
 
 echo aui()->input(
     array(
         'name'       => 'billing_email',
-        'id'         => esc_attr( $id ) . uniqid( '_' ),
-        'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-        'required'   => ! empty( $required ),
-        'label'      => empty( $label ) ? '' : wp_kses_post( $label ) . '<span class="text-danger"> *</span>',
+        'id'         => esc_attr($id) . uniqid('_'),
+        'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
+        'required'   => !empty($required),
+        'label'      => empty($label) ? '' : wp_kses_post($label) . '<span class="text-danger"> *</span>',
         'label_type' => 'vertical',
-        'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+        'help_text'  => empty($description) ? '' : wp_kses_post($description),
         'type'       => 'email',
         'value'      => $value,
         'class'      => 'wpinv_billing_email',
@@ -47,4 +47,4 @@ 
 
 echo '</span>';
 
-do_action( 'getpaid_after_payment_form_billing_email', $form );
+do_action('getpaid_after_payment_form_billing_email', $form);