AyeCode / invoicing

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

Spacing +81 added lines, -81 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,25 +13,25 @@ 
      * 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_subscriptions_menu' ), 40 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_subscriptions_menu'), 40);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     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'
         );
 
@@ -43,11 +43,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')
         );
     }
 
@@ -57,8 +57,8 @@ 
     public function add_subscriptions_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -69,7 +69,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>
@@ -77,12 +77,12 @@ 
                     width: 30%;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?></h1>
             <form method="post">
             <?php
                 $table = new WPInv_Customers_Table();
                 $table->prepare_items();
-                $table->search_box( __( 'Search Customers', 'invoicing' ), 'search-customers' );
+                $table->search_box(__('Search Customers', 'invoicing'), 'search-customers');
                 $table->display();
             ?>
             </form>
@@ -96,16 +96,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;
         }
 
@@ -115,78 +115,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>';
@@ -198,20 +198,20 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'getpaid_settings_tab_bottom', $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('getpaid_settings_tab_bottom', $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -225,7 +225,7 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
     /**
@@ -235,8 +235,8 @@ 
 
         add_meta_box(
             'wpinv_endpoints_nav_link',
-            __( 'GetPaid endpoints', 'invoicing' ),
-            array( $this, 'nav_menu_links' ),
+            __('GetPaid endpoints', 'invoicing'),
+            array($this, 'nav_menu_links'),
             'nav-menus',
             'side',
             'low'
@@ -251,12 +251,12 @@ 
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-            <?php if ( ! empty( $endpoints['pages'] ) ) : ?>
+            <?php if (!empty($endpoints['pages'])) : ?>
                 <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                     <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                         <?php
-                            $walker = new Walker_Nav_Menu_Checklist( array() );
-                            echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $endpoints['pages'] ), 0, (object) array( 'walker' => $walker ) );
+                            $walker = new Walker_Nav_Menu_Checklist(array());
+                            echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
                         ?>
                     </ul>
                 </div>
@@ -265,11 +265,11 @@ 
             <p class="button-controls wp-clearfix" data-items-type="invoicing-endpoints">
                 <span class="list-controls hide-if-no-js">
                     <input type="checkbox" id="invoicing-endpoints-tab" class="select-all">
-                    <label for="invoicing-endpoints-tab"><?php _e( 'Select all', 'invoicing' ); ?></label>
+                    <label for="invoicing-endpoints-tab"><?php _e('Select all', 'invoicing'); ?></label>
                 </span>
 
                 <span class="add-to-menu">
-                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
+                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
                     <span class="spinner"></span>
                 </span>
             </p>
@@ -282,35 +282,35 @@ 
      *
      * @return array.
      */
-    public function get_menu_items(){
+    public function get_menu_items() {
         $items = array();
 
         $pages = array(
             array(
-                'id'    => wpinv_get_option( 'invoice_history_page' ),
-                'label' => __( 'My Invoices', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_history_page'),
+                'label' => __('My Invoices', 'invoicing'),
             ),
             array(
-                'id'    => wpinv_get_option( 'invoice_subscription_page' ),
-                'label' => __( 'My Subscriptions', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_subscription_page'),
+                'label' => __('My Subscriptions', 'invoicing'),
             )
         );
 
-        foreach ( apply_filters( 'getpaid_menu_pages', $pages ) as $page ) {
+        foreach (apply_filters('getpaid_menu_pages', $pages) as $page) {
 
-            if ( (int) $page['id'] > 0 ) {
+            if ((int) $page['id'] > 0) {
 
                 $item                   = new stdClass();
                 $item->object_id        = (int) $page['id'];
                 $item->db_id            = 0;
-                $item->object           =  'page';
+                $item->object           = 'page';
                 $item->menu_item_parent = 0;
                 $item->type             = 'post_type';
-                $item->title            = sanitize_text_field( $page['label'] );
-                $item->url              = get_permalink( (int) $page['id'] );
+                $item->title            = sanitize_text_field($page['label']);
+                $item->url              = get_permalink((int) $page['id']);
                 $item->target           = '';
                 $item->attr_title       = '';
-                $item->classes          = array( 'wpinv-menu-item' );
+                $item->classes          = array('wpinv-menu-item');
                 $item->xfn              = '';
 
                 $items['pages'][]       = $item;
@@ -319,7 +319,7 @@ 
 
         }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }

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

Indentation +351 added lines, -351 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,354 +21,354 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 10;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total = 0;
-
-	/**
-	 * 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 );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_signup( $user ) {
-		return getpaid_format_date_value( $user->user_registered );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_total( $user ) {
-
-		$args = array(
-			'data'             => array(
-
-				'total'        => array(
-					'type'     => 'invoice_data',
-					'function' => 'SUM',
-					'name'     => 'total_sales',
-				)
-
-			),
-			'where'            => array(
-
-				'author'       => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
-		);
-
-		return wpinv_price( (float) GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_invoices( $user ) {
-
-		$args = array(
-			'data'             => array(
-
-				'ID'           => array(
-					'type'     => 'post_data',
-					'function' => 'COUNT',
-					'name'     => 'count',
-					'distinct' => true,
-				),
-
-			),
-			'where'            => array(
-
-				'author'       => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
-		);
-
-		return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * 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' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', '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;
-
-		$post_types = '';
-
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
-		}
-
-		$post_types = rtrim( $post_types, ' OR' );
-
-		// Maybe search.
-		if ( ! empty( $_POST['s'] ) ) {
-			$users = get_users(
-				array(
-					'search'         => sanitize_text_field( urldecode( $_POST['s'] ) ),
-					'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
-					'fields'         => 'ID',
-				)
-			);
-
-			$users      = implode( ', ', $users );
-			$post_types = "($post_types) AND ( post_author IN ( $users ) )";
-		}
-
-		// Users with invoices.
-    	$customers = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
-				$this->get_paged() * 10 - 10,
-				$this->per_page
-			)
-		);
-
-		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
-
-	}
-
-	/**
-	 * 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();
-
-		$this->set_pagination_args(
-			array(
-			'total_items' => $this->total,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
-			)
-		);
-
-	}
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 10;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total = 0;
+
+    /**
+     * 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 );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_signup( $user ) {
+        return getpaid_format_date_value( $user->user_registered );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_total( $user ) {
+
+        $args = array(
+            'data'             => array(
+
+                'total'        => array(
+                    'type'     => 'invoice_data',
+                    'function' => 'SUM',
+                    'name'     => 'total_sales',
+                )
+
+            ),
+            'where'            => array(
+
+                'author'       => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+        );
+
+        return wpinv_price( (float) GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_invoices( $user ) {
+
+        $args = array(
+            'data'             => array(
+
+                'ID'           => array(
+                    'type'     => 'post_data',
+                    'function' => 'COUNT',
+                    'name'     => 'count',
+                    'distinct' => true,
+                ),
+
+            ),
+            'where'            => array(
+
+                'author'       => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+        );
+
+        return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * 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' ),
+            'invoices' => __( 'Invoices', 'invoicing' ),
+            'total'    => __( 'Total Spend', 'invoicing' ),
+            'signup'   => __( 'Date created', '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;
+
+        $post_types = '';
+
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
+        }
+
+        $post_types = rtrim( $post_types, ' OR' );
+
+        // Maybe search.
+        if ( ! empty( $_POST['s'] ) ) {
+            $users = get_users(
+                array(
+                    'search'         => sanitize_text_field( urldecode( $_POST['s'] ) ),
+                    'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+                    'fields'         => 'ID',
+                )
+            );
+
+            $users      = implode( ', ', $users );
+            $post_types = "($post_types) AND ( post_author IN ( $users ) )";
+        }
+
+        // Users with invoices.
+        $customers = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
+                $this->get_paged() * 10 - 10,
+                $this->per_page
+            )
+        );
+
+        $this->items = $customers;
+        $this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
+
+    }
+
+    /**
+     * 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();
+
+        $this->set_pagination_args(
+            array(
+            'total_items' => $this->total,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $this->total / $this->per_page )
+            )
+        );
+
+    }
 }

Spacing +63 added lines, -63 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';
 }
 
@@ -42,11 +42,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular' => 'id',
 			'plural'   => 'ids',
 			'ajax'     => false,
-		) );
+		));
 
 	}
 
@@ -72,9 +72,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);
 	}
 
 	/**
@@ -86,12 +86,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);
 	}
 
 	/**
@@ -103,14 +103,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);
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_signup( $user ) {
-		return getpaid_format_date_value( $user->user_registered );
+	public function column_signup($user) {
+		return getpaid_format_date_value($user->user_registered);
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_total( $user ) {
+	public function column_total($user) {
 
 		$args = array(
 			'data'             => array(
@@ -151,17 +151,17 @@ 
 
 				'author'       => array(
 					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
+					'value'    => absint($user->ID),
 					'key'      => 'posts.post_author',
 					'operator' => '=',
 				),
 
 			),
 			'query_type'     => 'get_var',
-			'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+			'invoice_status' => array('wpi-renewal', 'wpi-processing', 'publish'),
 		);
 
-		return wpinv_price( (float) GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+		return wpinv_price((float) GetPaid_Reports_Helper::get_invoice_report_data($args));
 
 	}
 
@@ -174,7 +174,7 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_invoices( $user ) {
+	public function column_invoices($user) {
 
 		$args = array(
 			'data'             => array(
@@ -191,17 +191,17 @@ 
 
 				'author'       => array(
 					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
+					'value'    => absint($user->ID),
 					'key'      => 'posts.post_author',
 					'operator' => '=',
 				),
 
 			),
 			'query_type'     => 'get_var',
-			'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+			'invoice_status' => array_keys(wpinv_get_invoice_statuses()),
 		);
 
-		return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+		return absint(GetPaid_Reports_Helper::get_invoice_report_data($args));
 
 	}
 
@@ -211,15 +211,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>';
 	}
 
@@ -229,30 +229,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>";
 		}
 
@@ -271,19 +271,19 @@ 
 	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' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', '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'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'total'    => __('Total Spend', 'invoicing'),
+			'signup'   => __('Date created', 'invoicing'),
 		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
+		return apply_filters('wpinv_customers_table_columns', $columns);
 
 	}
 
@@ -294,7 +294,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;
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -315,23 +315,23 @@ 
 
 		$post_types = '';
 
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$post_types .= $wpdb->prepare("post_type=%s OR ", $post_type);
 		}
 
-		$post_types = rtrim( $post_types, ' OR' );
+		$post_types = rtrim($post_types, ' OR');
 
 		// Maybe search.
-		if ( ! empty( $_POST['s'] ) ) {
+		if (!empty($_POST['s'])) {
 			$users = get_users(
 				array(
-					'search'         => sanitize_text_field( urldecode( $_POST['s'] ) ),
-					'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+					'search'         => sanitize_text_field(urldecode($_POST['s'])),
+					'search_columns' => array('user_login', 'user_email', 'display_name'),
 					'fields'         => 'ID',
 				)
 			);
 
-			$users      = implode( ', ', $users );
+			$users      = implode(', ', $users);
 			$post_types = "($post_types) AND ( post_author IN ( $users ) )";
 		}
 
@@ -345,7 +345,7 @@ 
 		);
 
 		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
+		$this->total = (int) $wpdb->get_var("SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types");
 
 	}
 
@@ -359,14 +359,14 @@ 
 		$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();
 
 		$this->set_pagination_args(
 			array(
 			'total_items' => $this->total,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
+			'total_pages' => ceil($this->total / $this->per_page)
 			)
 		);