AyeCode / invoicing

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

Indentation +220 added lines, -220 removed lines

@@ -9,7 +9,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -21,223 +21,223 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 10;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular' => 'id',
-			'plural'   => 'ids',
-			'ajax'     => false,
-		) );
-
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'name';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $item
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		$value = sanitize_text_field( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return sanitize_text_field( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		$state   = $user->_wpinv_state;
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return sanitize_text_field( $state );
-	}
-
-	/**
-	 * Generates content for a single row of the table
-	 * @since 1.0.19
-	 *
-	 * @param int $item The user id.
-	 */
-	public function single_row( $item ) {
-		$item = get_user_by( 'id', $item );
-
-		if ( empty( $item ) ) {
-			return;
-		}
-
-		echo '<tr>';
-		$this->single_row_columns( $item );
-		echo '</tr>';
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  WP_User $customer customer.
-	 * @return string
-	 */
-	public function column_name( $customer ) {
-
-		// Customer view URL.
-		$view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
-		$row_actions = $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		);
-
-		// Get user's address.
-		$address = wpinv_get_user_address( $customer->ID );
-
-		// Customer email address.
-		$email       = sanitize_email( $customer->user_email );
-
-		// Customer's avatar.
-		$avatar = esc_url( get_avatar_url( $email ) );
-		$avatar = "<img src='$avatar' height='32' width='32'/>";
-
-		// Customer's name.
-		$name   = sanitize_text_field( "{$address['first_name']} {$address['last_name']}" );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-		global $wpdb;
-
-		// Users with invoices.
-    	$customers = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE post_type=%s LIMIT %d,%d",
-				'wpi_invoice',
-				$this->get_paged() * 10 - 10,
-				$this->per_page
-			)
-		);
-
-		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE post_type=%s", 'wpi_invoice' ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->prepare_query();
-	}
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 10;
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular' => 'id',
+            'plural'   => 'ids',
+            'ajax'     => false,
+        ) );
+
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'name';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $item
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        $value = sanitize_text_field( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_country( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return sanitize_text_field( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_state( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        $state   = $user->_wpinv_state;
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return sanitize_text_field( $state );
+    }
+
+    /**
+     * Generates content for a single row of the table
+     * @since 1.0.19
+     *
+     * @param int $item The user id.
+     */
+    public function single_row( $item ) {
+        $item = get_user_by( 'id', $item );
+
+        if ( empty( $item ) ) {
+            return;
+        }
+
+        echo '<tr>';
+        $this->single_row_columns( $item );
+        echo '</tr>';
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  WP_User $customer customer.
+     * @return string
+     */
+    public function column_name( $customer ) {
+
+        // Customer view URL.
+        $view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
+        $row_actions = $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        );
+
+        // Get user's address.
+        $address = wpinv_get_user_address( $customer->ID );
+
+        // Customer email address.
+        $email       = sanitize_email( $customer->user_email );
+
+        // Customer's avatar.
+        $avatar = esc_url( get_avatar_url( $email ) );
+        $avatar = "<img src='$avatar' height='32' width='32'/>";
+
+        // Customer's name.
+        $name   = sanitize_text_field( "{$address['first_name']} {$address['last_name']}" );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        $columns = array(
+            'name'     => __( 'Name', 'invoicing' ),
+            'country'  => __( 'Country', 'invoicing' ),
+            'state'    => __( 'State', 'invoicing' ),
+            'city'     => __( 'City', 'invoicing' ),
+            'zip'      => __( 'ZIP', 'invoicing' ),
+            'address'  => __( 'Address', 'invoicing' ),
+            'phone'    => __( 'Phone', 'invoicing' ),
+            'company'  => __( 'Company', 'invoicing' ),
+        );
+        return apply_filters( 'wpinv_customers_table_columns', $columns );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+        global $wpdb;
+
+        // Users with invoices.
+        $customers = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE post_type=%s LIMIT %d,%d",
+                'wpi_invoice',
+                $this->get_paged() * 10 - 10,
+                $this->per_page
+            )
+        );
+
+        $this->items = $customers;
+        $this->total = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE post_type=%s", 'wpi_invoice' ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->prepare_query();
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -5,10 +5,10 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -36,11 +36,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular' => 'id',
 			'plural'   => 'ids',
 			'ajax'     => false,
-		) );
+		));
 
 	}
 
@@ -66,9 +66,9 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		$value = sanitize_text_field( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
+	public function column_default($item, $column_name) {
+		$value = sanitize_text_field(get_user_meta($item->ID, '_wpinv_' . $column_name, true));
+		return apply_filters('wpinv_customers_table_column' . $column_name, $value, $item);
 	}
 
 	/**
@@ -80,12 +80,12 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_country( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
+	public function column_country($user) {
+		$country = wpinv_sanitize_country($user->_wpinv_country);
+		if ($country) {
+			$country = wpinv_country_name($country);
 		}
-		return sanitize_text_field( $country );
+		return sanitize_text_field($country);
 	}
 
 	/**
@@ -97,14 +97,14 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_state( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
+	public function column_state($user) {
+		$country = wpinv_sanitize_country($user->_wpinv_country);
 		$state   = $user->_wpinv_state;
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
+		if ($state) {
+			$state = wpinv_state_name($state, $country);
 		}
 
-		return sanitize_text_field( $state );
+		return sanitize_text_field($state);
 	}
 
 	/**
@@ -113,15 +113,15 @@ 
 	 *
 	 * @param int $item The user id.
 	 */
-	public function single_row( $item ) {
-		$item = get_user_by( 'id', $item );
+	public function single_row($item) {
+		$item = get_user_by('id', $item);
 
-		if ( empty( $item ) ) {
+		if (empty($item)) {
 			return;
 		}
 
 		echo '<tr>';
-		$this->single_row_columns( $item );
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -131,30 +131,30 @@ 
 	 * @param  WP_User $customer customer.
 	 * @return string
 	 */
-	public function column_name( $customer ) {
+	public function column_name($customer) {
 
 		// Customer view URL.
-		$view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
+		$view_url    = esc_url(add_query_arg('user_id', $customer->ID, admin_url('user-edit.php')));
 		$row_actions = $this->row_actions(
 			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __('Edit Details', 'invoicing') . '</a>',
 			)
 		);
 
 		// Get user's address.
-		$address = wpinv_get_user_address( $customer->ID );
+		$address = wpinv_get_user_address($customer->ID);
 
 		// Customer email address.
-		$email       = sanitize_email( $customer->user_email );
+		$email = sanitize_email($customer->user_email);
 
 		// Customer's avatar.
-		$avatar = esc_url( get_avatar_url( $email ) );
+		$avatar = esc_url(get_avatar_url($email));
 		$avatar = "<img src='$avatar' height='32' width='32'/>";
 
 		// Customer's name.
-		$name   = sanitize_text_field( "{$address['first_name']} {$address['last_name']}" );
+		$name   = sanitize_text_field("{$address['first_name']} {$address['last_name']}");
 
-		if ( ! empty( $name ) ) {
+		if (!empty($name)) {
 			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
 		}
 
@@ -173,16 +173,16 @@ 
 	public function get_columns() {
 
 		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
+			'name'     => __('Name', 'invoicing'),
+			'country'  => __('Country', 'invoicing'),
+			'state'    => __('State', 'invoicing'),
+			'city'     => __('City', 'invoicing'),
+			'zip'      => __('ZIP', 'invoicing'),
+			'address'  => __('Address', 'invoicing'),
+			'phone'    => __('Phone', 'invoicing'),
+			'company'  => __('Company', 'invoicing'),
 		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
+		return apply_filters('wpinv_customers_table_columns', $columns);
 
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -223,7 +223,7 @@ 
 		);
 
 		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE post_type=%s", 'wpi_invoice' ) );
+		$this->total = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE post_type=%s", 'wpi_invoice'));
 
 	}
 
@@ -237,7 +237,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->prepare_query();
 	}
 }

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

Spacing +95 added lines, -95 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,24 +13,24 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_customers_menu' ), 18 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     public function admin_menu() {
 
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
         add_menu_page(
-            __( 'GetPaid', 'invoicing' ),
-            __( 'GetPaid', 'invoicing' ),
+            __('GetPaid', 'invoicing'),
+            __('GetPaid', 'invoicing'),
             $capability,
             'wpinv',
             null,
-            'data:image/svg+xml;base64,' . base64_encode( file_get_contents( WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg' ) ),
+            'data:image/svg+xml;base64,' . base64_encode(file_get_contents(WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg')),
             '54.123460'
         );
 
@@ -42,11 +42,11 @@ 
     public function add_customers_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Customers', 'invoicing' ),
-            __( 'Customers', 'invoicing' ),
+            __('Customers', 'invoicing'),
+            __('Customers', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-customers',
-            array( $this, 'customers_page' )
+            array($this, 'customers_page')
         );
     }
 
@@ -54,7 +54,7 @@ 
      * Displays the customers page.
      */
     public function customers_page() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php');
         ?>
         <div class="wrap wpi-customers-wrap">
             <style>
@@ -62,7 +62,7 @@ 
                     width: 30%;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?></h1>
             <?php
                 $table = new WPInv_Customers_Table();
                 $table->prepare_items();
@@ -78,16 +78,16 @@ 
     public function add_settings_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Invoice Settings', 'invoicing' ),
-            __( 'Settings', 'invoicing' ),
-            apply_filters( 'invoicing_capability', wpinv_get_capability() ),
+            __('Invoice Settings', 'invoicing'),
+            __('Settings', 'invoicing'),
+            apply_filters('invoicing_capability', wpinv_get_capability()),
             'wpinv-settings',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 
-    public function add_addons_menu(){
-        if ( !apply_filters( 'wpi_show_addons_page', true ) ) {
+    public function add_addons_menu() {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
@@ -97,78 +97,78 @@ 
             __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
-    public function addons_page(){
+    public function addons_page() {
         $addon_obj = new WPInv_Admin_Addons();
         $addon_obj->output();
     }
 
     function options_page() {
-        $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        if ( $page !== 'wpinv-settings' ) {
+        if ($page !== 'wpinv-settings') {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
         $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
         ob_start();
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                    $tab_url = add_query_arg( array(
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $tab_id,
-                    ) );
+                    ));
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
-                    $tab_url = add_query_arg( array(
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $active_tab,
                         'section' => $section_id
-                    ) );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    ));
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                    echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -180,19 +180,19 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -206,18 +206,18 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
-    public function add_nav_menu_meta_boxes(){
-        add_meta_box( 'wpinv_endpoints_nav_link', __( 'Invoicing Pages', 'invoicing' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
+    public function add_nav_menu_meta_boxes() {
+        add_meta_box('wpinv_endpoints_nav_link', __('Invoicing Pages', 'invoicing'), array($this, 'nav_menu_links'), 'nav-menus', 'side', 'low');
     }
 
-    public function nav_menu_links(){
+    public function nav_menu_links() {
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-        <?php if(!empty($endpoints['pages'])){ ?>
+        <?php if (!empty($endpoints['pages'])) { ?>
             <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                 <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                     <?php
@@ -229,29 +229,29 @@ 
         <?php } ?>
         <p class="button-controls">
         <span class="list-controls">
-            <a href="<?php echo admin_url( 'nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints' ); ?>" class="select-all"><?php _e( 'Select all', 'invoicing' ); ?></a>
+            <a href="<?php echo admin_url('nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints'); ?>" class="select-all"><?php _e('Select all', 'invoicing'); ?></a>
         </span>
             <span class="add-to-menu">
-            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
+            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
             <span class="spinner"></span>
         </span>
         </p>
         <?php
     }
 
-    public function get_menu_items(){
+    public function get_menu_items() {
         $items = array();
 
-        $wpinv_history_page_id = (int)wpinv_get_option( 'invoice_history_page' );
-        if($wpinv_history_page_id > 0){
+        $wpinv_history_page_id = (int) wpinv_get_option('invoice_history_page');
+        if ($wpinv_history_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_history_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Invoice History Page','invoicing');
-            $item->url = get_permalink( $wpinv_history_page_id );
+            $item->title = __('Invoice History Page', 'invoicing');
+            $item->url = get_permalink($wpinv_history_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -260,16 +260,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_sub_history_page_id = (int)wpinv_get_option( 'invoice_subscription_page' );
-        if($wpinv_sub_history_page_id > 0){
+        $wpinv_sub_history_page_id = (int) wpinv_get_option('invoice_subscription_page');
+        if ($wpinv_sub_history_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_sub_history_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Invoice Subscriptions Page','invoicing');
-            $item->url = get_permalink( $wpinv_sub_history_page_id );
+            $item->title = __('Invoice Subscriptions Page', 'invoicing');
+            $item->url = get_permalink($wpinv_sub_history_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -278,16 +278,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_checkout_page_id = (int)wpinv_get_option( 'checkout_page' );
-        if($wpinv_checkout_page_id > 0){
+        $wpinv_checkout_page_id = (int) wpinv_get_option('checkout_page');
+        if ($wpinv_checkout_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_checkout_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Checkout Page','invoicing');
-            $item->url = get_permalink( $wpinv_checkout_page_id );
+            $item->title = __('Checkout Page', 'invoicing');
+            $item->url = get_permalink($wpinv_checkout_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -296,16 +296,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_tandc_page_id = (int)wpinv_get_option( 'tandc_page' );
-        if($wpinv_tandc_page_id > 0){
+        $wpinv_tandc_page_id = (int) wpinv_get_option('tandc_page');
+        if ($wpinv_tandc_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_tandc_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Terms & Conditions','invoicing');
-            $item->url = get_permalink( $wpinv_tandc_page_id );
+            $item->title = __('Terms & Conditions', 'invoicing');
+            $item->url = get_permalink($wpinv_tandc_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -314,16 +314,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_success_page_id = (int)wpinv_get_option( 'success_page' );
-        if($wpinv_success_page_id > 0){
+        $wpinv_success_page_id = (int) wpinv_get_option('success_page');
+        if ($wpinv_success_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_success_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Success Page','invoicing');
-            $item->url = get_permalink( $wpinv_success_page_id );
+            $item->title = __('Success Page', 'invoicing');
+            $item->url = get_permalink($wpinv_success_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -332,16 +332,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_failure_page_id = (int)wpinv_get_option( 'failure_page' );
-        if($wpinv_failure_page_id > 0){
+        $wpinv_failure_page_id = (int) wpinv_get_option('failure_page');
+        if ($wpinv_failure_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_failure_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Failed Transaction Page','invoicing');
-            $item->url = get_permalink( $wpinv_failure_page_id );
+            $item->title = __('Failed Transaction Page', 'invoicing');
+            $item->url = get_permalink($wpinv_failure_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -350,7 +350,7 @@ 
             $items['pages'][] = $item;
         }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }

includes/admin/class-getpaid-admin-profile.php

Indentation +145 added lines, -145 removed lines

@@ -5,106 +5,106 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 if ( ! class_exists( 'GetPaid_Admin_Profile', false ) ) :
 
-	/**
-	 * GetPaid_Admin_Profile Class.
-	 */
-	class GetPaid_Admin_Profile {
-
-		/**
-		 * Hook in tabs.
-		 */
-		public function __construct() {
-			add_action( 'show_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
-			add_action( 'edit_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
-
-			add_action( 'personal_options_update', array( $this, 'save_customer_meta_fields' ) );
-			add_action( 'edit_user_profile_update', array( $this, 'save_customer_meta_fields' ) );
-		}
-
-		/**
-		 * Get Address Fields for the edit user pages.
-		 *
-		 * @return array Fields to display which are filtered through invoicing_customer_meta_fields before being returned
-		 */
-		public function get_customer_meta_fields() {
-
-			$show_fields = apply_filters(
-				'getpaid_customer_meta_fields',
-				array(
-					'billing'  => array(
-						'title'  => __( 'Billing Details (GetPaid)', 'invoicing' ),
-						'fields' => array(
-							'_wpinv_first_name' => array(
-								'label'       => __( 'First name', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_last_name'  => array(
-								'label'       => __( 'Last name', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_company'    => array(
-								'label'       => __( 'Company', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_address'  => array(
-								'label'       => __( 'Address', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_city'       => array(
-								'label'       => __( 'City', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_zip'   => array(
-								'label'       => __( 'Postcode / ZIP', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_country'    => array(
-								'label'       => __( 'Country / Region', 'invoicing' ),
-								'description' => '',
-								'class'       => 'getpaid_js_field-country',
-								'type'        => 'select',
-								'options'     => array( '' => __( 'Select a country / region…', 'invoicing' ) ) + wpinv_get_country_list(),
-							),
-							'_wpinv_state'      => array(
-								'label'       => __( 'State / County', 'invoicing' ),
-								'description' => __( 'State / County or state code', 'invoicing' ),
-								'class'       => 'getpaid_js_field-state regular-text',
-							),
-							'_wpinv_phone'      => array(
-								'label'       => __( 'Phone', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_vat_number'      => array(
-								'label'       => __( 'VAT Number', 'invoicing' ),
-								'description' => '',
-							),
-						),
-					),
-				)
-			);
-			return $show_fields;
-		}
-
-		/**
-		 * Show Address Fields on edit user pages.
-		 *
-		 * @param WP_User $user
-		 */
-		public function add_customer_meta_fields( $user ) {
-
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user->ID ) ) {
-				return;
-			}
-
-			$show_fields = $this->get_customer_meta_fields();
-
-			foreach ( $show_fields as $fieldset_key => $fieldset ) :
-				?>
+    /**
+     * GetPaid_Admin_Profile Class.
+     */
+    class GetPaid_Admin_Profile {
+
+        /**
+         * Hook in tabs.
+         */
+        public function __construct() {
+            add_action( 'show_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
+            add_action( 'edit_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
+
+            add_action( 'personal_options_update', array( $this, 'save_customer_meta_fields' ) );
+            add_action( 'edit_user_profile_update', array( $this, 'save_customer_meta_fields' ) );
+        }
+
+        /**
+         * Get Address Fields for the edit user pages.
+         *
+         * @return array Fields to display which are filtered through invoicing_customer_meta_fields before being returned
+         */
+        public function get_customer_meta_fields() {
+
+            $show_fields = apply_filters(
+                'getpaid_customer_meta_fields',
+                array(
+                    'billing'  => array(
+                        'title'  => __( 'Billing Details (GetPaid)', 'invoicing' ),
+                        'fields' => array(
+                            '_wpinv_first_name' => array(
+                                'label'       => __( 'First name', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_last_name'  => array(
+                                'label'       => __( 'Last name', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_company'    => array(
+                                'label'       => __( 'Company', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_address'  => array(
+                                'label'       => __( 'Address', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_city'       => array(
+                                'label'       => __( 'City', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_zip'   => array(
+                                'label'       => __( 'Postcode / ZIP', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_country'    => array(
+                                'label'       => __( 'Country / Region', 'invoicing' ),
+                                'description' => '',
+                                'class'       => 'getpaid_js_field-country',
+                                'type'        => 'select',
+                                'options'     => array( '' => __( 'Select a country / region…', 'invoicing' ) ) + wpinv_get_country_list(),
+                            ),
+                            '_wpinv_state'      => array(
+                                'label'       => __( 'State / County', 'invoicing' ),
+                                'description' => __( 'State / County or state code', 'invoicing' ),
+                                'class'       => 'getpaid_js_field-state regular-text',
+                            ),
+                            '_wpinv_phone'      => array(
+                                'label'       => __( 'Phone', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_vat_number'      => array(
+                                'label'       => __( 'VAT Number', 'invoicing' ),
+                                'description' => '',
+                            ),
+                        ),
+                    ),
+                )
+            );
+            return $show_fields;
+        }
+
+        /**
+         * Show Address Fields on edit user pages.
+         *
+         * @param WP_User $user
+         */
+        public function add_customer_meta_fields( $user ) {
+
+            if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user->ID ) ) {
+                return;
+            }
+
+            $show_fields = $this->get_customer_meta_fields();
+
+            foreach ( $show_fields as $fieldset_key => $fieldset ) :
+                ?>
 				<h2><?php echo $fieldset['title']; ?></h2>
 				<table class="form-table" id="<?php echo esc_attr( 'getpaid-fieldset-' . $fieldset_key ); ?>">
 					<?php foreach ( $fieldset['fields'] as $key => $field ) : ?>
@@ -116,9 +116,9 @@ 
 								<?php if ( ! empty( $field['type'] ) && 'select' === $field['type'] ) : ?>
 									<select name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" class="<?php echo esc_attr( $field['class'] ); ?> wpi_select2" style="width: 25em;">
 										<?php
-											$selected = esc_attr( get_user_meta( $user->ID, $key, true ) );
-										foreach ( $field['options'] as $option_key => $option_value ) :
-											?>
+                                            $selected = esc_attr( get_user_meta( $user->ID, $key, true ) );
+                                        foreach ( $field['options'] as $option_key => $option_value ) :
+                                            ?>
 											<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $selected, $option_key, true ); ?>><?php echo esc_html( $option_value ); ?></option>
 										<?php endforeach; ?>
 									</select>
@@ -133,52 +133,52 @@ 
 					<?php endforeach; ?>
 				</table>
 				<?php
-			endforeach;
-		}
-
-		/**
-		 * Save Address Fields on edit user pages.
-		 *
-		 * @param int $user_id User ID of the user being saved
-		 */
-		public function save_customer_meta_fields( $user_id ) {
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user_id ) ) {
-				return;
-			}
-
-			$save_fields = $this->get_customer_meta_fields();
-
-			foreach ( $save_fields as $fieldset ) {
-
-				foreach ( $fieldset['fields'] as $key => $field ) {
-
-					if ( isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
-						update_user_meta( $user_id, $key, isset( $_POST[ $key ] ) );
-					} elseif ( isset( $_POST[ $key ] ) ) {
-						update_user_meta( $user_id, $key, wpinv_clean( $_POST[ $key ] ) );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get user meta for a given key, with fallbacks to core user info for pre-existing fields.
-		 *
-		 * @since 3.1.0
-		 * @param int    $user_id User ID of the user being edited
-		 * @param string $key     Key for user meta field
-		 * @return string
-		 */
-		protected function get_user_meta( $user_id, $key ) {
-			$value           = get_user_meta( $user_id, $key, true );
-			$existing_fields = array( '_wpinv_first_name', '_wpinv_last_name' );
-			if ( ! $value && in_array( $key, $existing_fields ) ) {
-				$value = get_user_meta( $user_id, str_replace( '_wpinv_', '', $key ), true );
-			}
-
-			return $value;
-		}
-	}
+            endforeach;
+        }
+
+        /**
+         * Save Address Fields on edit user pages.
+         *
+         * @param int $user_id User ID of the user being saved
+         */
+        public function save_customer_meta_fields( $user_id ) {
+            if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user_id ) ) {
+                return;
+            }
+
+            $save_fields = $this->get_customer_meta_fields();
+
+            foreach ( $save_fields as $fieldset ) {
+
+                foreach ( $fieldset['fields'] as $key => $field ) {
+
+                    if ( isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
+                        update_user_meta( $user_id, $key, isset( $_POST[ $key ] ) );
+                    } elseif ( isset( $_POST[ $key ] ) ) {
+                        update_user_meta( $user_id, $key, wpinv_clean( $_POST[ $key ] ) );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Get user meta for a given key, with fallbacks to core user info for pre-existing fields.
+         *
+         * @since 3.1.0
+         * @param int    $user_id User ID of the user being edited
+         * @param string $key     Key for user meta field
+         * @return string
+         */
+        protected function get_user_meta( $user_id, $key ) {
+            $value           = get_user_meta( $user_id, $key, true );
+            $existing_fields = array( '_wpinv_first_name', '_wpinv_last_name' );
+            if ( ! $value && in_array( $key, $existing_fields ) ) {
+                $value = get_user_meta( $user_id, str_replace( '_wpinv_', '', $key ), true );
+            }
+
+            return $value;
+        }
+    }
 
 endif;
 

Spacing +47 added lines, -47 removed lines

@@ -4,11 +4,11 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'GetPaid_Admin_Profile', false ) ) :
+if (!class_exists('GetPaid_Admin_Profile', false)) :
 
 	/**
 	 * GetPaid_Admin_Profile Class.
@@ -19,11 +19,11 @@ 
 		 * Hook in tabs.
 		 */
 		public function __construct() {
-			add_action( 'show_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
-			add_action( 'edit_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
+			add_action('show_user_profile', array($this, 'add_customer_meta_fields'), 100);
+			add_action('edit_user_profile', array($this, 'add_customer_meta_fields'), 100);
 
-			add_action( 'personal_options_update', array( $this, 'save_customer_meta_fields' ) );
-			add_action( 'edit_user_profile_update', array( $this, 'save_customer_meta_fields' ) );
+			add_action('personal_options_update', array($this, 'save_customer_meta_fields'));
+			add_action('edit_user_profile_update', array($this, 'save_customer_meta_fields'));
 		}
 
 		/**
@@ -37,50 +37,50 @@ 
 				'getpaid_customer_meta_fields',
 				array(
 					'billing'  => array(
-						'title'  => __( 'Billing Details (GetPaid)', 'invoicing' ),
+						'title'  => __('Billing Details (GetPaid)', 'invoicing'),
 						'fields' => array(
 							'_wpinv_first_name' => array(
-								'label'       => __( 'First name', 'invoicing' ),
+								'label'       => __('First name', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_last_name'  => array(
-								'label'       => __( 'Last name', 'invoicing' ),
+								'label'       => __('Last name', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_company'    => array(
-								'label'       => __( 'Company', 'invoicing' ),
+								'label'       => __('Company', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_address'  => array(
-								'label'       => __( 'Address', 'invoicing' ),
+								'label'       => __('Address', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_city'       => array(
-								'label'       => __( 'City', 'invoicing' ),
+								'label'       => __('City', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_zip'   => array(
-								'label'       => __( 'Postcode / ZIP', 'invoicing' ),
+								'label'       => __('Postcode / ZIP', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_country'    => array(
-								'label'       => __( 'Country / Region', 'invoicing' ),
+								'label'       => __('Country / Region', 'invoicing'),
 								'description' => '',
 								'class'       => 'getpaid_js_field-country',
 								'type'        => 'select',
-								'options'     => array( '' => __( 'Select a country / region…', 'invoicing' ) ) + wpinv_get_country_list(),
+								'options'     => array('' => __('Select a country / region…', 'invoicing')) + wpinv_get_country_list(),
 							),
 							'_wpinv_state'      => array(
-								'label'       => __( 'State / County', 'invoicing' ),
-								'description' => __( 'State / County or state code', 'invoicing' ),
+								'label'       => __('State / County', 'invoicing'),
+								'description' => __('State / County or state code', 'invoicing'),
 								'class'       => 'getpaid_js_field-state regular-text',
 							),
 							'_wpinv_phone'      => array(
-								'label'       => __( 'Phone', 'invoicing' ),
+								'label'       => __('Phone', 'invoicing'),
 								'description' => '',
 							),
 							'_wpinv_vat_number'      => array(
-								'label'       => __( 'VAT Number', 'invoicing' ),
+								'label'       => __('VAT Number', 'invoicing'),
 								'description' => '',
 							),
 						),
@@ -95,39 +95,39 @@ 
 		 *
 		 * @param WP_User $user
 		 */
-		public function add_customer_meta_fields( $user ) {
+		public function add_customer_meta_fields($user) {
 
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user->ID ) ) {
+			if (!apply_filters('getpaid_current_user_can_edit_customer_meta_fields', current_user_can('manage_options'), $user->ID)) {
 				return;
 			}
 
 			$show_fields = $this->get_customer_meta_fields();
 
-			foreach ( $show_fields as $fieldset_key => $fieldset ) :
+			foreach ($show_fields as $fieldset_key => $fieldset) :
 				?>
 				<h2><?php echo $fieldset['title']; ?></h2>
-				<table class="form-table" id="<?php echo esc_attr( 'getpaid-fieldset-' . $fieldset_key ); ?>">
-					<?php foreach ( $fieldset['fields'] as $key => $field ) : ?>
+				<table class="form-table" id="<?php echo esc_attr('getpaid-fieldset-' . $fieldset_key); ?>">
+					<?php foreach ($fieldset['fields'] as $key => $field) : ?>
 						<tr>
 							<th>
-								<label for="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $field['label'] ); ?></label>
+								<label for="<?php echo esc_attr($key); ?>"><?php echo esc_html($field['label']); ?></label>
 							</th>
 							<td>
-								<?php if ( ! empty( $field['type'] ) && 'select' === $field['type'] ) : ?>
-									<select name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" class="<?php echo esc_attr( $field['class'] ); ?> wpi_select2" style="width: 25em;">
+								<?php if (!empty($field['type']) && 'select' === $field['type']) : ?>
+									<select name="<?php echo esc_attr($key); ?>" id="<?php echo esc_attr($key); ?>" class="<?php echo esc_attr($field['class']); ?> wpi_select2" style="width: 25em;">
 										<?php
-											$selected = esc_attr( get_user_meta( $user->ID, $key, true ) );
-										foreach ( $field['options'] as $option_key => $option_value ) :
+											$selected = esc_attr(get_user_meta($user->ID, $key, true));
+										foreach ($field['options'] as $option_key => $option_value) :
 											?>
-											<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $selected, $option_key, true ); ?>><?php echo esc_html( $option_value ); ?></option>
+											<option value="<?php echo esc_attr($option_key); ?>" <?php selected($selected, $option_key, true); ?>><?php echo esc_html($option_value); ?></option>
 										<?php endforeach; ?>
 									</select>
-								<?php elseif ( ! empty( $field['type'] ) && 'checkbox' === $field['type'] ) : ?>
-									<input type="checkbox" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="1" class="<?php echo esc_attr( $field['class'] ); ?>" <?php checked( (int) get_user_meta( $user->ID, $key, true ), 1, true ); ?> />
+								<?php elseif (!empty($field['type']) && 'checkbox' === $field['type']) : ?>
+									<input type="checkbox" name="<?php echo esc_attr($key); ?>" id="<?php echo esc_attr($key); ?>" value="1" class="<?php echo esc_attr($field['class']); ?>" <?php checked((int) get_user_meta($user->ID, $key, true), 1, true); ?> />
 								<?php else : ?>
-									<input type="text" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $this->get_user_meta( $user->ID, $key ) ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? esc_attr( $field['class'] ) : 'regular-text' ); ?>" />
+									<input type="text" name="<?php echo esc_attr($key); ?>" id="<?php echo esc_attr($key); ?>" value="<?php echo esc_attr($this->get_user_meta($user->ID, $key)); ?>" class="<?php echo (!empty($field['class']) ? esc_attr($field['class']) : 'regular-text'); ?>" />
 								<?php endif; ?>
-								<p class="description"><?php echo wp_kses_post( $field['description'] ); ?></p>
+								<p class="description"><?php echo wp_kses_post($field['description']); ?></p>
 							</td>
 						</tr>
 					<?php endforeach; ?>
@@ -141,21 +141,21 @@ 
 		 *
 		 * @param int $user_id User ID of the user being saved
 		 */
-		public function save_customer_meta_fields( $user_id ) {
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user_id ) ) {
+		public function save_customer_meta_fields($user_id) {
+			if (!apply_filters('getpaid_current_user_can_edit_customer_meta_fields', current_user_can('manage_options'), $user_id)) {
 				return;
 			}
 
 			$save_fields = $this->get_customer_meta_fields();
 
-			foreach ( $save_fields as $fieldset ) {
+			foreach ($save_fields as $fieldset) {
 
-				foreach ( $fieldset['fields'] as $key => $field ) {
+				foreach ($fieldset['fields'] as $key => $field) {
 
-					if ( isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
-						update_user_meta( $user_id, $key, isset( $_POST[ $key ] ) );
-					} elseif ( isset( $_POST[ $key ] ) ) {
-						update_user_meta( $user_id, $key, wpinv_clean( $_POST[ $key ] ) );
+					if (isset($field['type']) && 'checkbox' === $field['type']) {
+						update_user_meta($user_id, $key, isset($_POST[$key]));
+					} elseif (isset($_POST[$key])) {
+						update_user_meta($user_id, $key, wpinv_clean($_POST[$key]));
 					}
 				}
 			}
@@ -169,11 +169,11 @@ 
 		 * @param string $key     Key for user meta field
 		 * @return string
 		 */
-		protected function get_user_meta( $user_id, $key ) {
-			$value           = get_user_meta( $user_id, $key, true );
-			$existing_fields = array( '_wpinv_first_name', '_wpinv_last_name' );
-			if ( ! $value && in_array( $key, $existing_fields ) ) {
-				$value = get_user_meta( $user_id, str_replace( '_wpinv_', '', $key ), true );
+		protected function get_user_meta($user_id, $key) {
+			$value           = get_user_meta($user_id, $key, true);
+			$existing_fields = array('_wpinv_first_name', '_wpinv_last_name');
+			if (!$value && in_array($key, $existing_fields)) {
+				$value = get_user_meta($user_id, str_replace('_wpinv_', '', $key), true);
 			}
 
 			return $value;

Braces +5 added lines, -2 removed lines

@@ -124,8 +124,11 @@
 									</select>
 								<?php elseif ( ! empty( $field['type'] ) && 'checkbox' === $field['type'] ) : ?>
 									<input type="checkbox" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="1" class="<?php echo esc_attr( $field['class'] ); ?>" <?php checked( (int) get_user_meta( $user->ID, $key, true ), 1, true ); ?> />
-								<?php else : ?>
-									<input type="text" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $this->get_user_meta( $user->ID, $key ) ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? esc_attr( $field['class'] ) : 'regular-text' ); ?>" />
+								<?php else {
+    : ?>
+									<input type="text" name="<?php echo esc_attr( $key );
+}
+?>" id="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $this->get_user_meta( $user->ID, $key ) ); ?>" class="<?php echo ( ! empty( $field['class'] ) ? esc_attr( $field['class'] ) : 'regular-text' ); ?>" />
 								<?php endif; ?>
 								<p class="description"><?php echo wp_kses_post( $field['description'] ); ?></p>
 							</td>

includes/class-wpinv.php

Spacing +254 added lines, -254 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -33,35 +33,35 @@ 
     }
     
     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));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        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' ) );
-        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_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        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'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_filter( 'admin_body_class', array( &$this, 'admin_body_class' ) );
-            add_action( 'admin_init', array( &$this, 'init_ayecode_connect_helper' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_filter('admin_body_class', array(&$this, 'admin_body_class'));
+            add_action('admin_init', array(&$this, 'init_ayecode_connect_helper'));
 
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -71,28 +71,28 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
 
     /**
      * Maybe show the AyeCode Connect Notice.
      */
-    public function init_ayecode_connect_helper(){
+    public function init_ayecode_connect_helper() {
         // AyeCode Connect notice
-        if ( is_admin() ){
+        if (is_admin()) {
             // set the strings so they can be translated
             $strings = array(
-                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-                'connect_button'    => __("Connect Site","invoicing"),
-                'connecting_button'    => __("Connecting...","invoicing"),
-                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+                'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+                'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+                'connect_button'    => __("Connect Site", "invoicing"),
+                'connecting_button'    => __("Connecting...", "invoicing"),
+                'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+                'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             );
-            new AyeCode_Connect_Helper($strings,array('wpi-addons'));
+            new AyeCode_Connect_Helper($strings, array('wpi-addons'));
         }
     }
     
@@ -100,10 +100,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();
         }
     }
@@ -113,128 +113,128 @@ 
      *
      * @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');
     }
 
     public function includes() {
         global $wpinv_options;
 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.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/wpinv-invoice-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/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        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-reports.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/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.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' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php' );
-
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.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/wpinv-invoice-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/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        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-reports.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/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.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');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php');
+
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.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/meta-boxes/class-mb-invoice-address.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/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.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/meta-boxes/class-mb-invoice-address.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/subscriptions.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');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
@@ -242,114 +242,114 @@ 
     
     public function admin_init() {
         self::$instance->default_payment_form = wpinv_get_default_payment_form();
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_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' ) );
+        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'));
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['txtComplete']          = __('Continue', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $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');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.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.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', 'wp-hooks' ),  $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', 'wp-hooks'), $version, true);
     }
 
-    public function admin_enqueue_scripts( $hook ) {
+    public function admin_enqueue_scripts($hook) {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
-            wp_deregister_style( 'yoast-seo-select2' );
-	        wp_deregister_style( 'yoast-seo-monorepo' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
+            wp_deregister_style('yoast-seo-select2');
+	        wp_deregister_style('yoast-seo-monorepo');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version );
-        wp_enqueue_style( 'wpinv_admin_style' );
-
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
-            wp_deregister_style( 'yoast-seo-select2' );
-	        wp_deregister_style( 'yoast-seo-monorepo' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version);
+        wp_enqueue_style('wpinv_admin_style');
+
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
+            wp_deregister_style('yoast-seo-select2');
+	        wp_deregister_style('yoast-seo-monorepo');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -360,21 +360,21 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.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.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  $version );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), $version);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -382,100 +382,100 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
 
         // Load payment form scripts on our admin pages only.
-        if ( ( $hook == 'post-new.php' || $hook == 'post.php' ) && 'wpi_payment_form' === $post->post_type ) {
+        if (($hook == 'post-new.php' || $hook == 'post.php') && 'wpi_payment_form' === $post->post_type) {
 
-            wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+            wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+            wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+            wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-            wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+            wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
         
-            wp_localize_script( 'wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
+            wp_localize_script('wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
                 'elements'      => $this->form_elements->get_elements(),
-                'form_elements' => $this->form_elements->get_form_elements( $post->ID ),
+                'form_elements' => $this->form_elements->get_form_elements($post->ID),
                 'all_items'     => $this->form_elements->get_published_items(),
                 'currency'      => wpinv_currency_symbol(),
                 'position'      => wpinv_currency_position(),
                 'decimals'      => (int) wpinv_decimals(),
                 'thousands_sep' => wpinv_thousands_separator(),
                 'decimals_sep'  => wpinv_decimal_separator(),
-                'form_items'    => $this->form_elements->get_form_items( $post->ID ),
+                'form_items'    => $this->form_elements->get_form_items($post->ID),
                 'is_default'    => $post->ID == $this->default_payment_form,
-            ) );
+            ));
 
-            wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+            wp_enqueue_script('wpinv-admin-payment-form-script');
         }
 
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
 
-        if ( $page == 'wpinv-reports' ) {
-            wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+        if ($page == 'wpinv-reports') {
+            wp_enqueue_script('jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array('jquery'), '0.7');
         }
 
     }
 
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -487,21 +487,21 @@ 
     }
     
     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);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         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');
     }
 
 	/**
@@ -509,13 +509,13 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-        register_widget( "WPInv_Messages_Widget" );
-        register_widget( 'WPInv_GetPaid_Widget' );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+        register_widget("WPInv_Messages_Widget");
+        register_widget('WPInv_GetPaid_Widget');
 	}
     
     /**
@@ -524,10 +524,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();
         }
 
@@ -535,24 +535,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);
 
     }