AyeCode / invoicing

includes/admin/class-getpaid-admin.php

Indentation +603 added lines, -603 removed lines

@@ -14,91 +14,91 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_url;
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_url;
 	
-	/**
-	 * Reports components.
-	 *
-	 * @var GetPaid_Reports
-	 */
+    /**
+     * Reports components.
+     *
+     * @var GetPaid_Reports
+     */
     public $reports;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct(){
+     * Class constructor.
+     */
+    public function __construct(){
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
-		$this->reports     = new GetPaid_Reports();
+        $this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->reports     = new GetPaid_Reports();
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ), 9 );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect') );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
+        add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
+        add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
         add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
-		add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
-
-		// Setup/welcome
-		if ( ! empty( $_GET['page'] ) ) {
-			switch ( $_GET['page'] ) {
-				case 'gp-setup' :
-					include_once( dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php' );
-					break;
-			}
-		}
-
-    }
-
-    /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+        add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
+        add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
+        add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
+        add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
+        add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
+        add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
+        add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
+        add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
+
+        // Setup/welcome
+        if ( ! empty( $_GET['page'] ) ) {
+            switch ( $_GET['page'] ) {
+                case 'gp-setup' :
+                    include_once( dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php' );
+                    break;
+            }
+        }
+
+    }
+
+    /**
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -119,54 +119,54 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
-		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
-		);
+        $date_range = array(
+            'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
+        );
 
-		if ( $date_range['period'] == 'custom' ) {
+        if ( $date_range['period'] == 'custom' ) {
 			
-			if ( isset( $_GET['from'] ) ) {
-				$date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['from'] ) ) {
+                $date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+            }
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['to'] ) ) {
+                $date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+            }
 
-		}
+        }
 
         $i18n = array(
             'ajax_url'                  => admin_url( 'admin-ajax.php' ),
             'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
-			'date_range'                => $date_range,
+            'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
+            'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
+            'rest_root'                 => esc_url_raw( rest_url() ),
+            'date_range'                => $date_range,
             'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
             'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
             'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
             'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
-			'currency_symbol'           => wpinv_currency_symbol(),
-			'currency'                  => wpinv_get_currency(),
+            'currency_symbol'           => wpinv_currency_symbol(),
+            'currency'                  => wpinv_get_currency(),
             'currency_pos'              => wpinv_currency_position(),
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
@@ -186,119 +186,119 @@ 
             'item_description'          => __( 'Item Description', 'invoicing' ),
             'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
             'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
-			'graphs' => array_merge( ['refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax'], array_keys( wpinv_get_report_graphs() ) ),
+            'searching'                 => __( 'Searching', 'invoicing' ),
+            'loading'                   => __( 'Loading...', 'invoicing' ),
+            'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
+            'search_items'              => __( 'Enter item name', 'invoicing' ),
+            'graphs' => array_merge( ['refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax'], array_keys( wpinv_get_report_graphs() ) ),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$invoice              = new WPInv_Invoice( $post );
-			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $invoice              = new WPInv_Invoice( $post );
+            $i18n['save_invoice'] = sprintf(
+                __( 'Save %s', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $i18n['invoice_description'] = sprintf(
+                __( '%s Description', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-		}
-		return $i18n;
-	}
+        }
+        return $i18n;
+    }
 
-	/**
-	 * Change the admin footer text on GetPaid admin pages.
-	 *
-	 * @since  2.0.0
-	 * @param  string $footer_text
-	 * @return string
-	 */
-	public function admin_footer_text( $footer_text ) {
-		global $current_screen;
+    /**
+     * Change the admin footer text on GetPaid admin pages.
+     *
+     * @since  2.0.0
+     * @param  string $footer_text
+     * @return string
+     */
+    public function admin_footer_text( $footer_text ) {
+        global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
         if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
 
-			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
-
-				$rating_url  = esc_url(
-					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
-						'getpaid-nonce',
-						'getpaid-nonce'
-						)
-				);
-
-				$footer_text = sprintf(
-					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
-					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
-				);
-
-			} else {
-
-				$footer_text = sprintf(
-					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
-					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
-				);
-
-			}
-
-		}
-
-		return $footer_text;
-	}
-
-	/**
-	 * Redirects to wp.org to rate the plugin.
-	 *
-	 * @since  2.0.0
-	 */
-	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
-		exit;
-	}
-
-    /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+            // Change the footer text
+            if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+
+                $rating_url  = esc_url(
+                    wp_nonce_url(
+                        admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                        )
+                );
+
+                $footer_text = sprintf(
+                    /* translators: %s: five stars */
+                    __( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+                    "<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
+                );
+
+            } else {
+
+                $footer_text = sprintf(
+                    /* translators: %s: GetPaid */
+                    __( 'Thank you for using %s!', 'invoicing' ),
+                    "<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
+                );
+
+            }
+
+        }
+
+        return $footer_text;
+    }
+
+    /**
+     * Redirects to wp.org to rate the plugin.
+     *
+     * @since  2.0.0
+     */
+    public function redirect_to_wordpress_rating_page() {
+        update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
+        wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+        exit;
+    }
+
+    /**
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.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( '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', 'wp-hooks' ),  $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', 'wp-hooks' ),  $version );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -307,20 +307,20 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
 
         $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -329,68 +329,68 @@ 
 
         if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
             $classes .= ' wpinv-cpt wpinv';
-		}
+        }
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+        if ( getpaid_is_invoice_post_type( $page ) ) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper(){
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper(){
 
-		// Register with the deactivation survey class.
-		AyeCode_Deactivation_Survey::instance(array(
-			'slug'		        => 'invoicing',
-			'version'	        => WPINV_VERSION,
-			'support_url'       => 'https://wpgetpaid.com/support/',
-			'documentation_url' => 'https://docs.wpgetpaid.com/',
-			'activated'         => (int) get_option( 'gepaid_installed_on' ),
-		));
+        // Register with the deactivation survey class.
+        AyeCode_Deactivation_Survey::instance(array(
+            'slug'		        => 'invoicing',
+            'version'	        => WPINV_VERSION,
+            'support_url'       => 'https://wpgetpaid.com/support/',
+            'documentation_url' => 'https://docs.wpgetpaid.com/',
+            'activated'         => (int) get_option( 'gepaid_installed_on' ),
+        ));
 
         new AyeCode_Connect_Helper(
             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" ),
             ),
             array( 'wpi-addons' )
         );
 
     }
 
-	/**
-	 * Redirect users to settings on activation.
-	 *
-	 * @return void
-	 */
-	public function activation_redirect() {
+    /**
+     * Redirect users to settings on activation.
+     *
+     * @return void
+     */
+    public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+        $redirected = get_option( 'wpinv_redirected_to_settings' );
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
+        if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+        update_option( 'wpinv_redirected_to_settings', 1 );
 
         wp_safe_redirect( admin_url( 'index.php?page=gp-setup' ) );
         exit;
 
-	}
+    }
 
     /**
      * Fires an admin action after verifying that a user can fire them.
@@ -404,532 +404,532 @@ 
 
     }
 
-	/**
+    /**
      * Duplicate invoice.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function duplicate_invoice( $args ) {
 
-		if ( empty( $args['invoice_id'] ) ) {
-			return;
-		}
+        if ( empty( $args['invoice_id'] ) ) {
+            return;
+        }
 
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+        $invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
 
-		if ( ! $invoice->exists() ) {
-			return;
-		}
+        if ( ! $invoice->exists() ) {
+            return;
+        }
 
-		$new_invoice = getpaid_duplicate_invoice( $invoice );
-		$new_invoice->save();
+        $new_invoice = getpaid_duplicate_invoice( $invoice );
+        $new_invoice->save();
 
-		if ( $new_invoice->exists() ) {
+        if ( $new_invoice->exists() ) {
 
-			getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'newsletter-optin-box' ) );
+            getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'newsletter-optin-box' ) );
 
-			wp_safe_redirect(
-				add_query_arg(
-					array(
-						'action' => 'edit',
-						'post' => $new_invoice->get_id(),
-					),
-					admin_url( 'post.php' )
-				)
-			);
-			exit;
+            wp_safe_redirect(
+                add_query_arg(
+                    array(
+                        'action' => 'edit',
+                        'post' => $new_invoice->get_id(),
+                    ),
+                    admin_url( 'post.php' )
+                )
+            );
+            exit;
 
-		}
+        }
 
-		getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'newsletter-optin-box' ) );
+        getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'newsletter-optin-box' ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function duplicate_payment_form( $args ) {
 
-		if ( empty( $args['form_id'] ) ) {
-			return;
-		}
-
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+        if ( empty( $args['form_id'] ) ) {
+            return;
+        }
 
-		if ( ! $form->exists() ) {
-			return;
-		}
+        $form = new GetPaid_Payment_Form( (int) $args['form_id'] );
 
-		$new_form = new GetPaid_Payment_Form();
-		$new_form->set_author( $form->get_author( 'edit' ) );
-		$new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
-		$new_form->set_elements( $form->get_elements( 'edit' ) );
-		$new_form->set_items( $form->get_items( 'edit' ) );
-		$new_form->save();
+        if ( ! $form->exists() ) {
+            return;
+        }
 
-		if ( $new_form->exists() ) {
-			$this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
-			$url = get_edit_post_link( $new_form->get_id(), 'edit' );
-		} else {
-			$this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
-			$url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
-		}
+        $new_form = new GetPaid_Payment_Form();
+        $new_form->set_author( $form->get_author( 'edit' ) );
+        $new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
+        $new_form->set_elements( $form->get_elements( 'edit' ) );
+        $new_form->set_items( $form->get_items( 'edit' ) );
+        $new_form->save();
+
+        if ( $new_form->exists() ) {
+            $this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
+            $url = get_edit_post_link( $new_form->get_id(), 'edit' );
+        } else {
+            $this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
+            $url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
+        }
 
-		wp_redirect( $url );
-		exit;
-	}
+        wp_redirect( $url );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Resets tax rates.
-	 * 
+     * 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Resets admin pages.
-	 * 
+     * 
      */
     public function admin_create_missing_pages() {
-		$installer = new GetPaid_Installer();
-		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
-
-	/**
+        $installer = new GetPaid_Installer();
+        $installer->create_pages();
+        $this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
+
+    /**
      * Creates an missing admin tables.
-	 * 
+     * 
      */
     public function admin_create_missing_tables() {
-		global $wpdb;
-		$installer = new GetPaid_Installer();
+        global $wpdb;
+        $installer = new GetPaid_Installer();
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
-			$installer->create_subscriptions_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
+            $installer->create_subscriptions_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
-			$installer->create_invoices_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
+            $installer->create_invoices_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
-			$installer->create_invoice_items_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
+            $installer->create_invoice_items_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( ! $this->has_notices() ) {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
-		}
+        if ( ! $this->has_notices() ) {
+            $this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Migrates old invoices to the new database tables.
-	 * 
+     * 
      */
     public function admin_migrate_old_invoices() {
 
-		// Migrate the invoices.
-		$installer = new GetPaid_Installer();
-		$installer->migrate_old_invoices();
+        // Migrate the invoices.
+        $installer = new GetPaid_Installer();
+        $installer->migrate_old_invoices();
 
-		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Download customers.
-	 * 
+     * 
      */
     public function admin_download_customers() {
-		global $wpdb;
+        global $wpdb;
 
-		$output = fopen( 'php://output', 'w' ) or die( __( 'Unsupported server', 'invoicing' ) );
+        $output = fopen( 'php://output', 'w' ) or die( __( 'Unsupported server', 'invoicing' ) );
 
-		header( "Content-Type:text/csv" );
-		header( "Content-Disposition:attachment;filename=customers.csv" );
+        header( "Content-Type:text/csv" );
+        header( "Content-Disposition:attachment;filename=customers.csv" );
 
-		$post_types = '';
+        $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' );
 
-		$customers = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types"
-			)
-		);
+        $customers = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types"
+            )
+        );
 
-		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'email'    => __( 'Email', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'company_id'  => __( 'Company ID', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total_raw' => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
-		);
+        $columns = array(
+            'name'     => __( 'Name', 'invoicing' ),
+            'email'    => __( 'Email', 'invoicing' ),
+            'country'  => __( 'Country', 'invoicing' ),
+            'state'    => __( 'State', 'invoicing' ),
+            'city'     => __( 'City', 'invoicing' ),
+            'zip'      => __( 'ZIP', 'invoicing' ),
+            'address'  => __( 'Address', 'invoicing' ),
+            'phone'    => __( 'Phone', 'invoicing' ),
+            'company'  => __( 'Company', 'invoicing' ),
+            'company_id'  => __( 'Company ID', 'invoicing' ),
+            'invoices' => __( 'Invoices', 'invoicing' ),
+            'total_raw' => __( 'Total Spend', 'invoicing' ),
+            'signup'   => __( 'Date created', 'invoicing' ),
+        );
 
-		// Output the csv column headers.
-		fputcsv( $output, array_values( $columns ) );
+        // Output the csv column headers.
+        fputcsv( $output, array_values( $columns ) );
 
-		// Loop through
-		$table = new WPInv_Customers_Table();
-		foreach ( $customers as $customer_id ) {
+        // Loop through
+        $table = new WPInv_Customers_Table();
+        foreach ( $customers as $customer_id ) {
 
-			$user = get_user_by( 'id', $customer_id );
-			$row  = array();
-			if ( empty( $user ) ) {
-				continue;
-			}
+            $user = get_user_by( 'id', $customer_id );
+            $row  = array();
+            if ( empty( $user ) ) {
+                continue;
+            }
 
-			foreach ( array_keys( $columns ) as $column ) {
+            foreach ( array_keys( $columns ) as $column ) {
 
-				$method = 'column_' . $column;
+                $method = 'column_' . $column;
 
-				if ( 'name' == $column ) {
-					$value = esc_html( $user->display_name );
-				} else if( 'email' == $column ) {
-					$value = sanitize_email( $user->user_email );
-				} else if ( is_callable( array( $table, $method ) ) ) {
-					$value = strip_tags( $table->$method( $user ) );
-				}
+                if ( 'name' == $column ) {
+                    $value = esc_html( $user->display_name );
+                } else if( 'email' == $column ) {
+                    $value = sanitize_email( $user->user_email );
+                } else if ( is_callable( array( $table, $method ) ) ) {
+                    $value = strip_tags( $table->$method( $user ) );
+                }
 
-				if ( empty( $value ) ) {
-					$value = esc_html( get_user_meta( $user->ID, '_wpinv_' . $column, true ) );
-				}
+                if ( empty( $value ) ) {
+                    $value = esc_html( get_user_meta( $user->ID, '_wpinv_' . $column, true ) );
+                }
 
-				$row[] = $value;
+                $row[] = $value;
 
-			}
+            }
 
-			fputcsv( $output, $row );
-		}
+            fputcsv( $output, $row );
+        }
 
-		fclose( $output );
-		exit;
+        fclose( $output );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Installs a plugin.
-	 *
-	 * @param array $data
+     *
+     * @param array $data
      */
     public function admin_install_plugin( $data ) {
 
-		if ( ! empty( $data['plugins'] ) ) {
-			include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-			wp_cache_flush();
+        if ( ! empty( $data['plugins'] ) ) {
+            include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+            wp_cache_flush();
 
-			foreach ( $data['plugins'] as $slug => $file ) {
-				$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
-				$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-				$installed  = $upgrader->install( $plugin_zip );
+            foreach ( $data['plugins'] as $slug => $file ) {
+                $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
+                $upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+                $installed  = $upgrader->install( $plugin_zip );
 
-				if ( ! is_wp_error( $installed ) && $installed ) {
-					activate_plugin( $file, '', false, true );
-				} else {
-					wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
-				}
+                if ( ! is_wp_error( $installed ) && $installed ) {
+                    activate_plugin( $file, '', false, true );
+                } else {
+                    wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
+                }
 
-			}
+            }
 
-		}
+        }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
-		wp_safe_redirect( $redirect );
-		exit;
+        $redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
+        wp_safe_redirect( $redirect );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Connects a gateway.
-	 *
-	 * @param array $data
+     *
+     * @param array $data
      */
     public function admin_connect_gateway( $data ) {
 
-		if ( ! empty( $data['plugin'] ) ) {
+        if ( ! empty( $data['plugin'] ) ) {
 
-			$gateway     = sanitize_key( $data['plugin'] );
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+            $gateway     = sanitize_key( $data['plugin'] );
+            $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
 
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
-				exit;
-			}
+            if ( ! empty( $connect_url ) ) {
+                wp_redirect( $connect_url );
+                exit;
+            }
 
-			if ( 'stripe' == $data['plugin'] ) {
-				require_once ABSPATH . 'wp-admin/includes/plugin.php';
-				include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-				wp_cache_flush();
+            if ( 'stripe' == $data['plugin'] ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+                wp_cache_flush();
 
-				if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
-					$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
-					$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-					$upgrader->install( $plugin_zip );
-				}
+                if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
+                    $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
+                    $upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+                    $upgrader->install( $plugin_zip );
+                }
 
-				activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
-			}
+                activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
+            }
 
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
-				exit;
-			}
+            $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+            if ( ! empty( $connect_url ) ) {
+                wp_redirect( $connect_url );
+                exit;
+            }
 
-		}
+        }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
-		wp_safe_redirect( $redirect );
-		exit;
+        $redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
+        wp_safe_redirect( $redirect );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Recalculates discounts.
-	 * 
+     * 
      */
     public function admin_recalculate_discounts() {
-		global $wpdb;
+        global $wpdb;
 
-		// Fetch all invoices that have discount codes.
-		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+        // Fetch all invoices that have discount codes.
+        $table    = $wpdb->prefix . 'getpaid_invoices';
+        $invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+            $invoice = new WPInv_Invoice( $invoice );
 
-			if ( ! $invoice->exists() ) {
-				continue;
-			}
+            if ( ! $invoice->exists() ) {
+                continue;
+            }
 
-			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
-				continue;
-			}
+            // Abort if the discount does not exist or does not apply here.
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( ! $discount->exists() ) {
+                continue;
+            }
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			$invoice->recalculate_total();
+            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            $invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
-				$invoice->save();
-			}
+            if ( $invoice->get_total_discount() > 0 ) {
+                $invoice->save();
+            }
 
-		}
+        }
 
-		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
+    }
 
-	/**
-	 * Checks if we have any admin notices.
-	 *
-	 * @since       2.0.4
+    /**
+     * Checks if we have any admin notices.
+     *
+     * @since       2.0.4
      * @return array
-	 */
-	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+     */
+    public function has_notices() {
+        return count( $this->get_notices() ) > 0;
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
+            foreach ( $messages as $message ) {
                 $message = wp_kses_post( $message );
-				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+                echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
-
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = wp_nonce_url(
-					add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-					'getpaid-nonce',
-					'getpaid-nonce'
-				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
-				echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
-				break;
-			}
+        foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+
+            if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
+                $url     = wp_nonce_url(
+                    add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                    'getpaid-nonce',
+                    'getpaid-nonce'
+                );
+                $message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
+                $message2 = __( 'Generate Pages', 'invoicing' );
+                echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
+                break;
+            }
 
-		}
+        }
 
-	}
+    }
 
 }

Spacing +278 added lines, -278 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -37,13 +37,13 @@ 
     /**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path = plugin_dir_path(__FILE__);
+		$this->admin_url   = plugins_url('/', __FILE__);
 		$this->reports     = new GetPaid_Reports();
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -54,33 +54,33 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ), 9 );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect') );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-        add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
-		add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'), 9);
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_rate_plugin', array($this, 'redirect_to_wordpress_rating_page'));
+		add_action('getpaid_authenticated_admin_action_duplicate_form', array($this, 'duplicate_payment_form'));
+		add_action('getpaid_authenticated_admin_action_duplicate_invoice', array($this, 'duplicate_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+        add_action('getpaid_authenticated_admin_action_reset_tax_rates', array($this, 'admin_reset_tax_rates'));
+		add_action('getpaid_authenticated_admin_action_create_missing_pages', array($this, 'admin_create_missing_pages'));
+		add_action('getpaid_authenticated_admin_action_create_missing_tables', array($this, 'admin_create_missing_tables'));
+		add_action('getpaid_authenticated_admin_action_migrate_old_invoices', array($this, 'admin_migrate_old_invoices'));
+		add_action('getpaid_authenticated_admin_action_download_customers', array($this, 'admin_download_customers'));
+		add_action('getpaid_authenticated_admin_action_recalculate_discounts', array($this, 'admin_recalculate_discounts'));
+		add_action('getpaid_authenticated_admin_action_install_plugin', array($this, 'admin_install_plugin'));
+		add_action('getpaid_authenticated_admin_action_connect_gateway', array($this, 'admin_connect_gateway'));
+		add_filter('admin_footer_text', array($this, 'admin_footer_text'));
+		do_action('getpaid_init_admin_hooks', $this);
 
 		// Setup/welcome
-		if ( ! empty( $_GET['page'] ) ) {
-			switch ( $_GET['page'] ) {
+		if (!empty($_GET['page'])) {
+			switch ($_GET['page']) {
 				case 'gp-setup' :
-					include_once( dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php' );
+					include_once(dirname(__FILE__) . '/class-getpaid-admin-setup-wizard.php');
 					break;
 			}
 		}
@@ -94,37 +94,37 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page    = isset($_GET['page']) ? $_GET['page'] : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) || false !== stripos( $page, 'getpaid' ) || 'gp-setup' == $page || 'geodir-tickets' == $page ) {
+        if (false !== stripos($page, 'wpi') || false !== stripos($page, 'getpaid') || 'gp-setup' == $page || 'geodir-tickets' == $page) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
 
             // Scripts.
-            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'wp-color-picker', 'jquery-ui-tooltip' ),  $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'wp-color-picker', 'jquery-ui-tooltip'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -137,32 +137,32 @@ 
         global $post;
 
 		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
+			'period' => isset($_GET['date_range']) ? sanitize_text_field($_GET['date_range']) : '7_days'
 		);
 
-		if ( $date_range['period'] == 'custom' ) {
+		if ($date_range['period'] == 'custom') {
 			
-			if ( isset( $_GET['from'] ) ) {
-				$date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+			if (isset($_GET['from'])) {
+				$date_range['after'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['from']), current_time('timestamp')) - DAY_IN_SECONDS);
 			}
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+			if (isset($_GET['to'])) {
+				$date_range['before'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['to']), current_time('timestamp')) + DAY_IN_SECONDS);
 			}
 
 		}
 
         $i18n = array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+			'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+			'rest_nonce'                => wp_create_nonce('wp_rest'),
+			'rest_root'                 => esc_url_raw(rest_url()),
 			'date_range'                => $date_range,
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
 			'currency_symbol'           => wpinv_currency_symbol(),
@@ -171,39 +171,39 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            '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' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
-			'graphs' => array_merge( ['refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax'], array_keys( wpinv_get_report_graphs() ) ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            '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'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+			'searching'                 => __('Searching', 'invoicing'),
+			'loading'                   => __('Loading...', 'invoicing'),
+			'search_customers'          => __('Enter customer name or email', 'invoicing'),
+			'search_items'              => __('Enter item name', 'invoicing'),
+			'graphs' => array_merge(['refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax'], array_keys(wpinv_get_report_graphs())),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (!empty($post) && getpaid_is_invoice_post_type($post->post_type)) {
 
-			$invoice              = new WPInv_Invoice( $post );
+			$invoice              = new WPInv_Invoice($post);
 			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('Save %s', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('%s Description', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 		}
@@ -217,24 +217,24 @@ 
 	 * @param  string $footer_text
 	 * @return string
 	 */
-	public function admin_footer_text( $footer_text ) {
+	public function admin_footer_text($footer_text) {
 		global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
+        if (apply_filters('getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing()) && false !== stripos($page, 'wpi')) {
 
 			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+			if (!get_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', true)) {
 
-				$rating_url  = esc_url(
+				$rating_url = esc_url(
 					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+						admin_url('admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin'),
 						'getpaid-nonce',
 						'getpaid-nonce'
 						)
@@ -242,7 +242,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+					__('If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing'),
 					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
 				);
 
@@ -250,7 +250,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
+					__('Thank you for using %s!', 'invoicing'),
 					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
 				);
 
@@ -267,8 +267,8 @@ 
 	 * @since  2.0.0
 	 */
 	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+		update_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', 1);
+		wp_redirect('https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post');
 		exit;
 	}
 
@@ -279,30 +279,30 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.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.min.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', 'wp-hooks' ),  $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', 'wp-hooks'), $version);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -313,25 +313,25 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
 
-        $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
 		}
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+		if (getpaid_is_invoice_post_type($page)) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
@@ -341,7 +341,7 @@ 
     /**
 	 * Maybe show the AyeCode Connect Notice.
 	 */
-	public function init_ayecode_connect_helper(){
+	public function init_ayecode_connect_helper() {
 
 		// Register with the deactivation survey class.
 		AyeCode_Deactivation_Survey::instance(array(
@@ -349,20 +349,20 @@ 
 			'version'	        => WPINV_VERSION,
 			'support_url'       => 'https://wpgetpaid.com/support/',
 			'documentation_url' => 'https://docs.wpgetpaid.com/',
-			'activated'         => (int) get_option( 'gepaid_installed_on' ),
+			'activated'         => (int) get_option('gepaid_installed_on'),
 		));
 
         new AyeCode_Connect_Helper(
             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"),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -374,20 +374,20 @@ 
 	 */
 	public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+		$redirected = get_option('wpinv_redirected_to_settings');
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+		if (!empty($redirected) || wp_doing_ajax() || !current_user_can('manage_options')) {
 			return;
 		}
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+	    update_option('wpinv_redirected_to_settings', 1);
 
-        wp_safe_redirect( admin_url( 'index.php?page=gp-setup' ) );
+        wp_safe_redirect(admin_url('index.php?page=gp-setup'));
         exit;
 
 	}
@@ -397,9 +397,9 @@ 
      */
     public function maybe_do_admin_action() {
 
-        if ( wpinv_current_user_can_manage_invoicing() && isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+        if (wpinv_current_user_can_manage_invoicing() && isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
 
     }
@@ -409,24 +409,24 @@ 
 	 * 
 	 * @param array $args
      */
-    public function duplicate_invoice( $args ) {
+    public function duplicate_invoice($args) {
 
-		if ( empty( $args['invoice_id'] ) ) {
+		if (empty($args['invoice_id'])) {
 			return;
 		}
 
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+		$invoice = new WPInv_Invoice((int) $args['invoice_id']);
 
-		if ( ! $invoice->exists() ) {
+		if (!$invoice->exists()) {
 			return;
 		}
 
-		$new_invoice = getpaid_duplicate_invoice( $invoice );
+		$new_invoice = getpaid_duplicate_invoice($invoice);
 		$new_invoice->save();
 
-		if ( $new_invoice->exists() ) {
+		if ($new_invoice->exists()) {
 
-			getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'newsletter-optin-box' ) );
+			getpaid_admin()->show_success(__('Invoice duplicated successfully.', 'newsletter-optin-box'));
 
 			wp_safe_redirect(
 				add_query_arg(
@@ -434,14 +434,14 @@ 
 						'action' => 'edit',
 						'post' => $new_invoice->get_id(),
 					),
-					admin_url( 'post.php' )
+					admin_url('post.php')
 				)
 			);
 			exit;
 
 		}
 
-		getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'newsletter-optin-box' ) );
+		getpaid_admin()->show_error(__('There was an error duplicating this invoice. Please try again.', 'newsletter-optin-box'));
 
 	}
 
@@ -450,34 +450,34 @@ 
 	 * 
 	 * @param array $args
      */
-    public function duplicate_payment_form( $args ) {
+    public function duplicate_payment_form($args) {
 
-		if ( empty( $args['form_id'] ) ) {
+		if (empty($args['form_id'])) {
 			return;
 		}
 
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+		$form = new GetPaid_Payment_Form((int) $args['form_id']);
 
-		if ( ! $form->exists() ) {
+		if (!$form->exists()) {
 			return;
 		}
 
 		$new_form = new GetPaid_Payment_Form();
-		$new_form->set_author( $form->get_author( 'edit' ) );
-		$new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
-		$new_form->set_elements( $form->get_elements( 'edit' ) );
-		$new_form->set_items( $form->get_items( 'edit' ) );
+		$new_form->set_author($form->get_author('edit'));
+		$new_form->set_name($form->get_name('edit') . __('(copy)', 'invoicing'));
+		$new_form->set_elements($form->get_elements('edit'));
+		$new_form->set_items($form->get_items('edit'));
 		$new_form->save();
 
-		if ( $new_form->exists() ) {
-			$this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
-			$url = get_edit_post_link( $new_form->get_id(), 'edit' );
+		if ($new_form->exists()) {
+			$this->show_success(__('Form duplicated successfully', 'invoicing'));
+			$url = get_edit_post_link($new_form->get_id(), 'edit');
 		} else {
-			$this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
-			$url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
+			$this->show_error(__('Unable to duplicate form', 'invoicing'));
+			$url = remove_query_arg(array('getpaid-admin-action', 'form_id', 'getpaid-nonce'));
 		}
 
-		wp_redirect( $url );
+		wp_redirect($url);
 		exit;
 	}
 
@@ -486,9 +486,9 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+    public function send_customer_invoice($args) {
+		getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']), true);
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -497,16 +497,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -516,8 +516,8 @@ 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -529,8 +529,8 @@ 
     public function admin_create_missing_pages() {
 		$installer = new GetPaid_Installer();
 		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		$this->show_success(__('GetPaid pages updated.', 'invoicing'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -542,35 +542,35 @@ 
 		global $wpdb;
 		$installer = new GetPaid_Installer();
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'") != $wpdb->prefix . 'wpinv_subscriptions') {
 			$installer->create_subscriptions_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'") != $wpdb->prefix . 'getpaid_invoices') {
 			$installer->create_invoices_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'") != $wpdb->prefix . 'getpaid_invoice_items') {
 			$installer->create_invoice_items_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( ! $this->has_notices() ) {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+		if (!$this->has_notices()) {
+			$this->show_success(__('Your GetPaid tables have been updated.', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -585,10 +585,10 @@ 
 		$installer->migrate_old_invoices();
 
 		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+		$this->show_success(__('Your invoices have been migrated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -600,18 +600,18 @@ 
     public function admin_download_customers() {
 		global $wpdb;
 
-		$output = fopen( 'php://output', 'w' ) or die( __( 'Unsupported server', 'invoicing' ) );
+		$output = fopen('php://output', 'w') or die(__('Unsupported server', 'invoicing'));
 
-		header( "Content-Type:text/csv" );
-		header( "Content-Disposition:attachment;filename=customers.csv" );
+		header("Content-Type:text/csv");
+		header("Content-Disposition:attachment;filename=customers.csv");
 
 		$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');
 
 		$customers = $wpdb->get_col(
 			$wpdb->prepare(
@@ -620,58 +620,58 @@ 
 		);
 
 		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'email'    => __( 'Email', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'company_id'  => __( 'Company ID', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total_raw' => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
+			'name'     => __('Name', 'invoicing'),
+			'email'    => __('Email', 'invoicing'),
+			'country'  => __('Country', 'invoicing'),
+			'state'    => __('State', 'invoicing'),
+			'city'     => __('City', 'invoicing'),
+			'zip'      => __('ZIP', 'invoicing'),
+			'address'  => __('Address', 'invoicing'),
+			'phone'    => __('Phone', 'invoicing'),
+			'company'  => __('Company', 'invoicing'),
+			'company_id'  => __('Company ID', 'invoicing'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'total_raw' => __('Total Spend', 'invoicing'),
+			'signup'   => __('Date created', 'invoicing'),
 		);
 
 		// Output the csv column headers.
-		fputcsv( $output, array_values( $columns ) );
+		fputcsv($output, array_values($columns));
 
 		// Loop through
 		$table = new WPInv_Customers_Table();
-		foreach ( $customers as $customer_id ) {
+		foreach ($customers as $customer_id) {
 
-			$user = get_user_by( 'id', $customer_id );
+			$user = get_user_by('id', $customer_id);
 			$row  = array();
-			if ( empty( $user ) ) {
+			if (empty($user)) {
 				continue;
 			}
 
-			foreach ( array_keys( $columns ) as $column ) {
+			foreach (array_keys($columns) as $column) {
 
 				$method = 'column_' . $column;
 
-				if ( 'name' == $column ) {
-					$value = esc_html( $user->display_name );
-				} else if( 'email' == $column ) {
-					$value = sanitize_email( $user->user_email );
-				} else if ( is_callable( array( $table, $method ) ) ) {
-					$value = strip_tags( $table->$method( $user ) );
+				if ('name' == $column) {
+					$value = esc_html($user->display_name);
+				} else if ('email' == $column) {
+					$value = sanitize_email($user->user_email);
+				} else if (is_callable(array($table, $method))) {
+					$value = strip_tags($table->$method($user));
 				}
 
-				if ( empty( $value ) ) {
-					$value = esc_html( get_user_meta( $user->ID, '_wpinv_' . $column, true ) );
+				if (empty($value)) {
+					$value = esc_html(get_user_meta($user->ID, '_wpinv_' . $column, true));
 				}
 
 				$row[] = $value;
 
 			}
 
-			fputcsv( $output, $row );
+			fputcsv($output, $row);
 		}
 
-		fclose( $output );
+		fclose($output);
 		exit;
 
 	}
@@ -681,29 +681,29 @@ 
 	 *
 	 * @param array $data
      */
-    public function admin_install_plugin( $data ) {
+    public function admin_install_plugin($data) {
 
-		if ( ! empty( $data['plugins'] ) ) {
+		if (!empty($data['plugins'])) {
 			include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 			wp_cache_flush();
 
-			foreach ( $data['plugins'] as $slug => $file ) {
-				$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
-				$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-				$installed  = $upgrader->install( $plugin_zip );
+			foreach ($data['plugins'] as $slug => $file) {
+				$plugin_zip = esc_url('https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip');
+				$upgrader   = new Plugin_Upgrader(new Automatic_Upgrader_Skin());
+				$installed  = $upgrader->install($plugin_zip);
 
-				if ( ! is_wp_error( $installed ) && $installed ) {
-					activate_plugin( $file, '', false, true );
+				if (!is_wp_error($installed) && $installed) {
+					activate_plugin($file, '', false, true);
 				} else {
-					wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
+					wpinv_error_log($upgrader->skin->get_upgrade_messages(), false);
 				}
 
 			}
 
 		}
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
-		wp_safe_redirect( $redirect );
+		$redirect = isset($data['redirect']) ? esc_url_raw($data['redirect']) : admin_url('plugins.php');
+		wp_safe_redirect($redirect);
 		exit;
 
 	}
@@ -713,42 +713,42 @@ 
 	 *
 	 * @param array $data
      */
-    public function admin_connect_gateway( $data ) {
+    public function admin_connect_gateway($data) {
 
-		if ( ! empty( $data['plugin'] ) ) {
+		if (!empty($data['plugin'])) {
 
-			$gateway     = sanitize_key( $data['plugin'] );
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+			$gateway     = sanitize_key($data['plugin']);
+			$connect_url = apply_filters("getpaid_get_{$gateway}_connect_url", false, $data);
 
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
+			if (!empty($connect_url)) {
+				wp_redirect($connect_url);
 				exit;
 			}
 
-			if ( 'stripe' == $data['plugin'] ) {
+			if ('stripe' == $data['plugin']) {
 				require_once ABSPATH . 'wp-admin/includes/plugin.php';
 				include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 				wp_cache_flush();
 
-				if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
-					$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
-					$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-					$upgrader->install( $plugin_zip );
+				if (!array_key_exists('getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins())) {
+					$plugin_zip = esc_url('https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip');
+					$upgrader   = new Plugin_Upgrader(new Automatic_Upgrader_Skin());
+					$upgrader->install($plugin_zip);
 				}
 
-				activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
+				activate_plugin('getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true);
 			}
 
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
+			$connect_url = apply_filters("getpaid_get_{$gateway}_connect_url", false, $data);
+			if (!empty($connect_url)) {
+				wp_redirect($connect_url);
 				exit;
 			}
 
 		}
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
-		wp_safe_redirect( $redirect );
+		$redirect = isset($data['redirect']) ? esc_url_raw(urldecode($data['redirect'])) : admin_url('admin.php?page=wpinv-settings&tab=gateways');
+		wp_safe_redirect($redirect);
 		exit;
 
 	}
@@ -762,36 +762,36 @@ 
 
 		// Fetch all invoices that have discount codes.
 		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+		$invoices = $wpdb->get_col("SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+			$invoice = new WPInv_Invoice($invoice);
 
-			if ( ! $invoice->exists() ) {
+			if (!$invoice->exists()) {
 				continue;
 			}
 
 			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if (!$discount->exists()) {
 				continue;
 			}
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			$invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
+			if ($invoice->get_total_discount() > 0) {
 				$invoice->save();
 			}
 
 		}
 
 		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+		$this->show_success(__('Discounts have been recalculated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -803,8 +803,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -814,7 +814,7 @@ 
      * @return array
 	 */
 	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
+		return count($this->get_notices()) > 0;
 	}
 
 	/**
@@ -824,7 +824,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -833,16 +833,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -852,8 +852,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -863,8 +863,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -874,8 +874,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -885,8 +885,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -900,30 +900,30 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
-                $message = wp_kses_post( $message );
+            $type = sanitize_key($type);
+			foreach ($messages as $message) {
+                $message = wp_kses_post($message);
 				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+		foreach (array('checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page') as $page) {
 
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = wp_nonce_url(
-					add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+			if (!is_numeric(wpinv_get_option($page, false))) {
+				$url = wp_nonce_url(
+					add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 					'getpaid-nonce',
 					'getpaid-nonce'
 				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
+				$message  = __('Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing');
+				$message2 = __('Generate Pages', 'invoicing');
 				echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
 				break;
 			}

includes/api/class-getpaid-rest-report-sales-controller.php

Indentation +686 added lines, -686 removed lines

@@ -18,691 +18,691 @@
  */
 class GetPaid_REST_Report_Sales_Controller extends GetPaid_REST_Date_Based_Controller {
 
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'reports/sales';
-
-	/**
-	 * The report data.
-	 *
-	 * @var stdClass
-	 */
-	public $report_data;
-
-	/**
-	 * The report range.
-	 *
-	 * @var array
-	 */
-	public $report_range;
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		// Get sales report.
-		register_rest_route(
-			$namespace,
-			$this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-					'args'                => $this->get_collection_params(),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Makes sure the current user has access to READ the report APIs.
-	 *
-	 * @since  2.0.0
-	 * @param WP_REST_Request $request Full data about the request.
-	 * @return WP_Error|boolean
-	 */
-	public function get_items_permissions_check( $request ) {
-
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get sales reports.
-	 *
-	 * @param WP_REST_Request $request
-	 * @return array|WP_Error
-	 */
-	public function get_items( $request ) {
-		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
-
-		return rest_ensure_response( $data );
-	}
-
-	/**
-	 * Prepare a report sales object for serialization.
-	 *
-	 * @param null $_
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $_, $request ) {
-
-		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
-
-		$report_data     = $this->get_report_data();
-		$period_totals   = array();
-
-		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS;
-
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( date( 'Y-m-01', $start_date ) );
-		}
-
-		for ( $i = 0; $i < $this->interval; $i++ ) {
-
-			switch ( $this->groupby ) {
-				case 'day' :
-					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
-					break;
-				default :
-					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
-					break;
-			}
-
-			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
-				'invoices'          => 0,
-				'items'             => 0,
-				'refunded_items'    => 0,
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
-			);
-
-			foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
-				if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
-				}
-			}
-
-		}
-
-		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
-
-		}
-
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
-
-		}
-
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
-			}
-
-		}
-
-		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : date( 'Y-m', strtotime( $invoice_item->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
-			}
-
-		}
-
-		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
-			}
-
-		}
-
-		// Extra fields.
-		foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
-
-			// Abort unprepared.
-			if ( ! isset( $report_data->$key ) ) {
-				continue;
-			}
-
-			// Abort defaults.
-			if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
-				continue;
-			}
-
-			// Set values.
-			foreach ( $report_data->$key as $item ) {
-				$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $item->date ) ) : date( 'Y-m', strtotime( $item->date ) );
-
-				if ( isset( $period_totals[ $time ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
-				}
-			}
-
-			unset( $report_data->$key );
-		}
-
-		$report_data->totals            = $period_totals;
-		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
-		$report_data->currency          = wpinv_get_currency();
-		$report_data->currency_symbol   = wpinv_currency_symbol();
-		$report_data->currency_position = wpinv_currency_position();
-		$report_data->decimal_places    = wpinv_decimals();
-		$report_data->thousands_sep     = wpinv_thousands_separator();
-		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS );
-		$report_data->end_date          = date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS );
-		$report_data->start_date_locale = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS ) );
-		$report_data->end_date_locale   = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS ) );
-		$report_data->decimals_sep      = wpinv_decimal_separator();
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links( array(
-			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
-			),
-		) );
-
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
-	}
-
-	/**
-	 * Get report data.
-	 *
-	 * @return stdClass
-	 */
-	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
-			$this->query_report_data();
-		}
-		return $this->report_data;
-	}
-
-	/**
-	 * Get all data needed for this report and store in the class.
-	 */
-	protected function query_report_data() {
-
-		// Prepare reports.
-		$this->report_data = (object) array(
-			'invoice_counts' => $this->query_invoice_counts(),//count, post_date
-			'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
-			'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
-			'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
-			'invoices'       => $this->query_invoice_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
-			'refunds'        => $this->query_refunded_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
-			'previous_range' => $this->previous_range,
-		);
-
-		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
-
-
-		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
-
-		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
-
-		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
-
-		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
-	}
-
-	/**
-	 * Prepares invoice counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_invoice_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'ID'        => array(
-						'type'     => 'post_data',
-						'function' => 'COUNT',
-						'name'     => 'count',
-						'distinct' => true,
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares coupon counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_coupon_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'discount' => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'discount_amount',
-					),
-					'post_date'       => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares item counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_item_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'quantity'      => array(
-						'type'            => 'invoice_item',
-						'function'        => 'SUM',
-						'name'            => 'invoice_item_count',
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares refunded item counts.
-	 *
-	 * @return array.
-	 */
-	protected function count_refunded_items() {
-
-		return (int) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'quantity'      => array(
-						'type'            => 'invoice_item',
-						'function'        => 'SUM',
-						'name'            => 'invoice_item_count',
-					),
-				),
-				'query_type'     => 'get_var',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares daily invoice totals.
-	 *
-	 * @return array.
-	 */
-	protected function query_invoice_totals() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'total'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_sales',
-					),
-					'tax'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_tax',
-					),
-					'discount'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_discount',
-					),
-					'fees_total'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_fees',
-					),
-					'subtotal'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'subtotal',
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares daily invoice totals.
-	 *
-	 * @return array.
-	 */
-	protected function query_refunded_totals() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'total'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_sales',
-					),
-					'tax'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_tax',
-					),
-					'discount'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_discount',
-					),
-					'fees_total'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'total_fees',
-					),
-					'subtotal'      => array(
-						'type'            => 'invoice_data',
-						'function'        => 'SUM',
-						'name'            => 'subtotal',
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Get the Report's schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_item_schema() {
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'sales_report',
-			'type'       => 'object',
-			'properties' => array(
-				'total_sales' => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'net_sales' => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'average_sales' => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_invoices'  => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_items' => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'refunded_items' => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_tax' => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_refunded_tax' => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_fees' => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_refunds' => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'net_refunds' => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_discount' => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'totals' => array(
-					'description' => __( 'Totals.', 'invoicing' ),
-					'type'        => 'array',
-					'items'       => array(
-						'type'    => 'array',
-					),
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'interval' => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'previous_range'  => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
-					'type'        => 'array',
-					'items'       => array(
-						'type'    => 'string',
-					),
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'grouped_by' => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
-					'readonly'    => true,
-				),
-				'currency' => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'currency_symbol' => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'currency_position' => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'decimal_places' => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'thousands_sep' => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'decimals_sep' => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		return $this->add_additional_fields_schema( $schema );
-
-	}
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'reports/sales';
+
+    /**
+     * The report data.
+     *
+     * @var stdClass
+     */
+    public $report_data;
+
+    /**
+     * The report range.
+     *
+     * @var array
+     */
+    public $report_range;
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 2.0.0
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        // Get sales report.
+        register_rest_route(
+            $namespace,
+            $this->rest_base,
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
+            )
+        );
+
+    }
+
+    /**
+     * Makes sure the current user has access to READ the report APIs.
+     *
+     * @since  2.0.0
+     * @param WP_REST_Request $request Full data about the request.
+     * @return WP_Error|boolean
+     */
+    public function get_items_permissions_check( $request ) {
+
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Get sales reports.
+     *
+     * @param WP_REST_Request $request
+     * @return array|WP_Error
+     */
+    public function get_items( $request ) {
+        $data   = array();
+        $item   = $this->prepare_item_for_response( null, $request );
+        $data[] = $this->prepare_response_for_collection( $item );
+
+        return rest_ensure_response( $data );
+    }
+
+    /**
+     * Prepare a report sales object for serialization.
+     *
+     * @param null $_
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $_, $request ) {
+
+        // Set report range.
+        $this->report_range = $this->get_date_range( $request );
+
+        $report_data     = $this->get_report_data();
+        $period_totals   = array();
+
+        // Setup period totals by ensuring each period in the interval has data.
+        $start_date      = strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS;
+
+        if ( 'month' === $this->groupby ) {
+            $start_date      = strtotime( date( 'Y-m-01', $start_date ) );
+        }
+
+        for ( $i = 0; $i < $this->interval; $i++ ) {
+
+            switch ( $this->groupby ) {
+                case 'day' :
+                    $time = date( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+                    break;
+                default :
+                    $time = date( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+                    break;
+            }
+
+            // Set the defaults for each period.
+            $period_totals[ $time ] = array(
+                'invoices'          => 0,
+                'items'             => 0,
+                'refunded_items'    => 0,
+                'refunded_tax'      => wpinv_round_amount( 0.00 ),
+                'subtotal'          => wpinv_round_amount( 0.00 ),
+                'refunded_subtotal' => wpinv_round_amount( 0.00 ),
+                'refunded_fees'     => wpinv_round_amount( 0.00 ),
+                'discount'          => wpinv_round_amount( 0.00 ),
+            );
+
+            foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
+                if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
+                    $period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
+                }
+            }
+
+        }
+
+        // add total sales, total invoice count, total tax for each period
+        $date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
+        foreach ( $report_data->invoices as $invoice ) {
+            $time = date( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( ! isset( $period_totals[ $time ] ) ) {
+                continue;
+            }
+
+            $period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
+            $period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
+            $period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
+            $period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+
+        }
+
+        foreach ( $report_data->refunds as $invoice ) {
+            $time = date( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( ! isset( $period_totals[ $time ] ) ) {
+                continue;
+            }
+
+            $period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
+            $period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
+            $period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
+            $period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+
+        }
+
+        foreach ( $report_data->invoice_counts as $invoice ) {
+            $time = date( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['invoices']   = (int) $invoice->count;
+            }
+
+        }
+
+        // Add total invoice items for each period.
+        foreach ( $report_data->invoice_items as $invoice_item ) {
+            $time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : date( 'Y-m', strtotime( $invoice_item->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+            }
+
+        }
+
+        // Add total discount for each period.
+        foreach ( $report_data->coupons as $discount ) {
+            $time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+            }
+
+        }
+
+        // Extra fields.
+        foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
+
+            // Abort unprepared.
+            if ( ! isset( $report_data->$key ) ) {
+                continue;
+            }
+
+            // Abort defaults.
+            if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
+                continue;
+            }
+
+            // Set values.
+            foreach ( $report_data->$key as $item ) {
+                $time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $item->date ) ) : date( 'Y-m', strtotime( $item->date ) );
+
+                if ( isset( $period_totals[ $time ] ) ) {
+                    $period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
+                }
+            }
+
+            unset( $report_data->$key );
+        }
+
+        $report_data->totals            = $period_totals;
+        $report_data->grouped_by        = $this->groupby;
+        $report_data->interval          = max( $this->interval, 1 );
+        $report_data->currency          = wpinv_get_currency();
+        $report_data->currency_symbol   = wpinv_currency_symbol();
+        $report_data->currency_position = wpinv_currency_position();
+        $report_data->decimal_places    = wpinv_decimals();
+        $report_data->thousands_sep     = wpinv_thousands_separator();
+        $report_data->decimals_sep      = wpinv_decimal_separator();
+        $report_data->start_date        = date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS );
+        $report_data->end_date          = date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS );
+        $report_data->start_date_locale = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS ) );
+        $report_data->end_date_locale   = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS ) );
+        $report_data->decimals_sep      = wpinv_decimal_separator();
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $report_data;
+        unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
+        $data    = $this->add_additional_fields_to_object( (array) $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+        $response->add_links( array(
+            'about' => array(
+                'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+            ),
+        ) );
+
+        return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+    }
+
+    /**
+     * Get report data.
+     *
+     * @return stdClass
+     */
+    public function get_report_data() {
+        if ( empty( $this->report_data ) ) {
+            $this->query_report_data();
+        }
+        return $this->report_data;
+    }
+
+    /**
+     * Get all data needed for this report and store in the class.
+     */
+    protected function query_report_data() {
+
+        // Prepare reports.
+        $this->report_data = (object) array(
+            'invoice_counts' => $this->query_invoice_counts(),//count, post_date
+            'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
+            'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
+            'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
+            'invoices'       => $this->query_invoice_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
+            'refunds'        => $this->query_refunded_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
+            'previous_range' => $this->previous_range,
+        );
+
+        // Calculated totals.
+        $this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
+        $this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
+        $this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
+        $this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
+        $this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
+        $this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
+        $this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
+        $this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
+        $this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
+        $this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
+        $this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
+        $this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+
+
+        // Calculate average based on net.
+        $this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
+        $this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+
+        // Total invoices in this period, even if refunded.
+        $this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+
+        // Items invoiced in this period, even if refunded.
+        $this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+
+        // 3rd party filtering of report data
+        $this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
+    }
+
+    /**
+     * Prepares invoice counts.
+     *
+     * @return array.
+     */
+    protected function query_invoice_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'ID'        => array(
+                        'type'     => 'post_data',
+                        'function' => 'COUNT',
+                        'name'     => 'count',
+                        'distinct' => true,
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares coupon counts.
+     *
+     * @return array.
+     */
+    protected function query_coupon_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'discount' => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'discount_amount',
+                    ),
+                    'post_date'       => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares item counts.
+     *
+     * @return array.
+     */
+    protected function query_item_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'quantity'      => array(
+                        'type'            => 'invoice_item',
+                        'function'        => 'SUM',
+                        'name'            => 'invoice_item_count',
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares refunded item counts.
+     *
+     * @return array.
+     */
+    protected function count_refunded_items() {
+
+        return (int) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'quantity'      => array(
+                        'type'            => 'invoice_item',
+                        'function'        => 'SUM',
+                        'name'            => 'invoice_item_count',
+                    ),
+                ),
+                'query_type'     => 'get_var',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'wpi-refunded' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares daily invoice totals.
+     *
+     * @return array.
+     */
+    protected function query_invoice_totals() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'total'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_sales',
+                    ),
+                    'tax'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_tax',
+                    ),
+                    'discount'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_discount',
+                    ),
+                    'fees_total'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_fees',
+                    ),
+                    'subtotal'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'subtotal',
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares daily invoice totals.
+     *
+     * @return array.
+     */
+    protected function query_refunded_totals() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'total'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_sales',
+                    ),
+                    'tax'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_tax',
+                    ),
+                    'discount'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_discount',
+                    ),
+                    'fees_total'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'total_fees',
+                    ),
+                    'subtotal'      => array(
+                        'type'            => 'invoice_data',
+                        'function'        => 'SUM',
+                        'name'            => 'subtotal',
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'wpi-refunded' ),
+            )
+        );
+
+    }
+
+    /**
+     * Get the Report's schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_item_schema() {
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'sales_report',
+            'type'       => 'object',
+            'properties' => array(
+                'total_sales' => array(
+                    'description' => __( 'Gross sales in the period.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'net_sales' => array(
+                    'description' => __( 'Net sales in the period.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'average_sales' => array(
+                    'description' => __( 'Average net daily sales.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'average_total_sales' => array(
+                    'description' => __( 'Average gross daily sales.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_invoices'  => array(
+                    'description' => __( 'Number of paid invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_items' => array(
+                    'description' => __( 'Number of items purchased.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'refunded_items' => array(
+                    'description' => __( 'Number of items refunded.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_tax' => array(
+                    'description' => __( 'Total charged for taxes.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_refunded_tax' => array(
+                    'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_fees' => array(
+                    'description' => __( 'Total fees charged.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_refunds' => array(
+                    'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'net_refunds' => array(
+                    'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_discount' => array(
+                    'description' => __( 'Total of discounts used.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'totals' => array(
+                    'description' => __( 'Totals.', 'invoicing' ),
+                    'type'        => 'array',
+                    'items'       => array(
+                        'type'    => 'array',
+                    ),
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'interval' => array(
+                    'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'previous_range'  => array(
+                    'description' => __( 'The previous report period.', 'invoicing' ),
+                    'type'        => 'array',
+                    'items'       => array(
+                        'type'    => 'string',
+                    ),
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'grouped_by' => array(
+                    'description' => __( 'The period used to group the totals.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'enum'        => array( 'day', 'month' ),
+                    'readonly'    => true,
+                ),
+                'currency' => array(
+                    'description' => __( 'The default store currency.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'currency_symbol' => array(
+                    'description' => __( 'The default store currency symbol.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'currency_position' => array(
+                    'description' => __( 'The default store currency position.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'decimal_places' => array(
+                    'description' => __( 'The default store decimal places.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'thousands_sep' => array(
+                    'description' => __( 'The default store thousands separator.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'decimals_sep' => array(
+                    'description' => __( 'The default store decimals separator.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        return $this->add_additional_fields_schema( $schema );
+
+    }
 
 }

Spacing +157 added lines, -157 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST reports controller class.
@@ -46,7 +46,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// Get sales report.
 		register_rest_route(
@@ -55,11 +55,11 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_items'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => $this->get_collection_params(),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		);
 
@@ -72,10 +72,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_view', __('Sorry, you cannot list resources.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -87,12 +87,12 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
+		$item   = $this->prepare_item_for_response(null, $request);
+		$data[] = $this->prepare_response_for_collection($item);
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 	}
 
 	/**
@@ -102,166 +102,166 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $_, $request ) {
+	public function prepare_item_for_response($_, $request) {
 
 		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 
 		$report_data     = $this->get_report_data();
 		$period_totals   = array();
 
 		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS;
+		$start_date      = strtotime($this->report_range['after']) + DAY_IN_SECONDS;
 
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( date( 'Y-m-01', $start_date ) );
+		if ('month' === $this->groupby) {
+			$start_date = strtotime(date('Y-m-01', $start_date));
 		}
 
-		for ( $i = 0; $i < $this->interval; $i++ ) {
+		for ($i = 0; $i < $this->interval; $i++) {
 
-			switch ( $this->groupby ) {
+			switch ($this->groupby) {
 				case 'day' :
-					$time = date( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+					$time = date('Y-m-d', strtotime("+{$i} DAY", $start_date));
 					break;
 				default :
-					$time = date( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+					$time = date('Y-m', strtotime("+{$i} MONTH", $start_date));
 					break;
 			}
 
 			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
+			$period_totals[$time] = array(
 				'invoices'          => 0,
 				'items'             => 0,
 				'refunded_items'    => 0,
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
+				'refunded_tax'      => wpinv_round_amount(0.00),
+				'subtotal'          => wpinv_round_amount(0.00),
+				'refunded_subtotal' => wpinv_round_amount(0.00),
+				'refunded_fees'     => wpinv_round_amount(0.00),
+				'discount'          => wpinv_round_amount(0.00),
 			);
 
-			foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
-				if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
+			foreach (array_keys(wpinv_get_report_graphs()) as $key) {
+				if (!isset($period_totals[$time][$key])) {
+					$period_totals[$time][$key] = wpinv_round_amount(0.00);
 				}
 			}
 
 		}
 
 		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		$date_format = ('day' === $this->groupby) ? 'Y-m-d' : 'Y-m';
+		foreach ($report_data->invoices as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['sales']    = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->refunds as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['refunds']           = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['refunded_tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['refunded_subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['refunded_fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = date( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->invoice_counts as $invoice) {
+			$time = date($date_format, strtotime($invoice->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['invoices'] = (int) $invoice->count;
 			}
 
 		}
 
 		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : date( 'Y-m', strtotime( $invoice_item->post_date ) );
+		foreach ($report_data->invoice_items as $invoice_item) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($invoice_item->post_date)) : date('Y-m', strtotime($invoice_item->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['items'] = (int) $invoice_item->invoice_item_count;
 			}
 
 		}
 
 		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $discount->post_date ) ) : date( 'Y-m', strtotime( $discount->post_date ) );
+		foreach ($report_data->coupons as $discount) {
+			$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($discount->post_date)) : date('Y-m', strtotime($discount->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['discount'] = wpinv_round_amount($discount->discount_amount);
 			}
 
 		}
 
 		// Extra fields.
-		foreach( array_keys( wpinv_get_report_graphs() ) as $key ) {
+		foreach (array_keys(wpinv_get_report_graphs()) as $key) {
 
 			// Abort unprepared.
-			if ( ! isset( $report_data->$key ) ) {
+			if (!isset($report_data->$key)) {
 				continue;
 			}
 
 			// Abort defaults.
-			if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
+			if (in_array($key, array('sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items'))) {
 				continue;
 			}
 
 			// Set values.
-			foreach ( $report_data->$key as $item ) {
-				$time = ( 'day' === $this->groupby ) ? date( 'Y-m-d', strtotime( $item->date ) ) : date( 'Y-m', strtotime( $item->date ) );
+			foreach ($report_data->$key as $item) {
+				$time = ('day' === $this->groupby) ? date('Y-m-d', strtotime($item->date)) : date('Y-m', strtotime($item->date));
 
-				if ( isset( $period_totals[ $time ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
+				if (isset($period_totals[$time])) {
+					$period_totals[$time][$key] = wpinv_round_amount($item->val);
 				}
 			}
 
-			unset( $report_data->$key );
+			unset($report_data->$key);
 		}
 
 		$report_data->totals            = $period_totals;
 		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
+		$report_data->interval          = max($this->interval, 1);
 		$report_data->currency          = wpinv_get_currency();
 		$report_data->currency_symbol   = wpinv_currency_symbol();
 		$report_data->currency_position = wpinv_currency_position();
 		$report_data->decimal_places    = wpinv_decimals();
 		$report_data->thousands_sep     = wpinv_thousands_separator();
 		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS );
-		$report_data->end_date          = date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS );
-		$report_data->start_date_locale = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['after'] ) + DAY_IN_SECONDS ) );
-		$report_data->end_date_locale   = getpaid_format_date( date( 'Y-m-d', strtotime( $this->report_range['before'] ) - DAY_IN_SECONDS ) );
+		$report_data->start_date        = date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS);
+		$report_data->end_date          = date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS);
+		$report_data->start_date_locale = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['after']) + DAY_IN_SECONDS));
+		$report_data->end_date_locale   = getpaid_format_date(date('Y-m-d', strtotime($this->report_range['before']) - DAY_IN_SECONDS));
 		$report_data->decimals_sep      = wpinv_decimal_separator();
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = !empty($request['context']) ? $request['context'] : 'view';
 		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		unset($data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items);
+		$data    = $this->add_additional_fields_to_object((array) $data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links( array(
+		$response = rest_ensure_response($data);
+		$response->add_links(array(
 			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+				'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 			),
-		) );
+		));
 
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+		return apply_filters('getpaid_rest_prepare_report_sales', $response, $report_data, $request);
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 * @return stdClass
 	 */
 	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
+		if (empty($this->report_data)) {
 			$this->query_report_data();
 		}
 		return $this->report_data;
@@ -283,7 +283,7 @@ 
 
 		// Prepare reports.
 		$this->report_data = (object) array(
-			'invoice_counts' => $this->query_invoice_counts(),//count, post_date
+			'invoice_counts' => $this->query_invoice_counts(), //count, post_date
 			'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
 			'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
 			'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
@@ -293,32 +293,32 @@ 
 		);
 
 		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+		$this->report_data->total_tax          = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_tax')));
+		$this->report_data->total_sales        = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_sales')));
+		$this->report_data->total_discount     = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_discount')));
+		$this->report_data->total_fees         = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_fees')));
+		$this->report_data->subtotal           = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'subtotal')));
+		$this->report_data->net_sales          = wpinv_round_amount($this->report_data->total_sales - max(0, $this->report_data->total_tax));
+		$this->report_data->total_refunded_tax = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_tax')));
+		$this->report_data->total_refunds      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_sales')));
+		$this->report_data->refunded_discount  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_discount')));
+		$this->report_data->refunded_fees      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_fees')));
+		$this->report_data->refunded_subtotal  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'subtotal')));
+		$this->report_data->net_refunds        = wpinv_round_amount($this->report_data->total_refunds + max(0, $this->report_data->total_refunded_tax));
 
 
 		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+		$this->report_data->average_sales       = wpinv_round_amount($this->report_data->net_sales / max($this->interval, 1), 2);
+		$this->report_data->average_total_sales = wpinv_round_amount($this->report_data->total_sales / max($this->interval, 1), 2);
 
 		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+		$this->report_data->total_invoices = absint(array_sum(wp_list_pluck($this->report_data->invoice_counts, 'count')));
 
 		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+		$this->report_data->total_items = absint(array_sum(wp_list_pluck($this->report_data->invoice_items, 'invoice_item_count')));
 
 		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
+		$this->report_data = apply_filters('getpaid_rest_api_filter_report_data', $this->report_data, $this);
 	}
 
 	/**
@@ -343,11 +343,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -374,11 +374,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -405,11 +405,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -433,7 +433,7 @@ 
 				),
 				'query_type'     => 'get_var',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -480,11 +480,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal'),
 			)
 		);
 
@@ -531,11 +531,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -554,154 +554,154 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'total_sales' => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
+					'description' => __('Gross sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_sales' => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
+					'description' => __('Net sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_sales' => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
+					'description' => __('Average net daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
+					'description' => __('Average gross daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_invoices'  => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
+					'description' => __('Number of paid invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_items' => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
+					'description' => __('Number of items purchased.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'refunded_items' => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
+					'description' => __('Number of items refunded.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_tax' => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
+					'description' => __('Total charged for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunded_tax' => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+					'description' => __('Total refunded for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_fees' => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
+					'description' => __('Total fees charged.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunds' => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+					'description' => __('Total of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_refunds' => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+					'description' => __('Net of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_discount' => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
+					'description' => __('Total of discounts used.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'totals' => array(
-					'description' => __( 'Totals.', 'invoicing' ),
+					'description' => __('Totals.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'array',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'interval' => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+					'description' => __('Number of months/days in the report period.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'previous_range'  => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
+					'description' => __('The previous report period.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type'    => 'string',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'grouped_by' => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
+					'description' => __('The period used to group the totals.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
+					'context'     => array('view'),
+					'enum'        => array('day', 'month'),
 					'readonly'    => true,
 				),
 				'currency' => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
+					'description' => __('The default store currency.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_symbol' => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
+					'description' => __('The default store currency symbol.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_position' => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
+					'description' => __('The default store currency position.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimal_places' => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
+					'description' => __('The default store decimal places.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'thousands_sep' => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
+					'description' => __('The default store thousands separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimals_sep' => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
+					'description' => __('The default store decimals separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 
 	}
 

includes/wpinv-general-functions.php

Spacing +156 added lines, -156 removed lines

@@ -7,40 +7,40 @@ 
  */
  
 // 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__));
 }
 
 function wpinv_is_checkout() {
     global $wp_query;
 
-    $is_object_set    = isset( $wp_query->queried_object );
-    $is_object_id_set = isset( $wp_query->queried_object_id );
-    $checkout_page    = wpinv_get_option( 'checkout_page' );
-    $is_checkout      = ! empty( $checkout_page ) && is_page( $checkout_page );
+    $is_object_set    = isset($wp_query->queried_object);
+    $is_object_id_set = isset($wp_query->queried_object_id);
+    $checkout_page    = wpinv_get_option('checkout_page');
+    $is_checkout      = !empty($checkout_page) && is_page($checkout_page);
 
-    if ( !$is_object_set ) {
-        unset( $wp_query->queried_object );
+    if (!$is_object_set) {
+        unset($wp_query->queried_object);
     }
 
-    if ( !$is_object_id_set ) {
-        unset( $wp_query->queried_object_id );
+    if (!$is_object_id_set) {
+        unset($wp_query->queried_object_id);
     }
 
-    return apply_filters( 'wpinv_is_checkout', $is_checkout );
+    return apply_filters('wpinv_is_checkout', $is_checkout);
 }
 
 function wpinv_can_checkout() {
 	$can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+	return (bool) apply_filters('wpinv_can_checkout', $can_checkout);
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('success_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_success_page_uri', get_permalink($page_id));
 }
 
 /**
@@ -49,139 +49,139 @@ 
  * @param string $post_type The post type or invoice type.
  * @return string The history page URL.
  */
-function wpinv_get_history_page_uri( $post_type = 'wpi_invoice' ) {
-    $post_type = sanitize_key( str_replace( 'wpi_', '', $post_type ) );
-	$page_id   = wpinv_get_option( "{$post_type}_history_page", 0 );
-	$page_id   = absint( $page_id );
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ), $post_type );
+function wpinv_get_history_page_uri($post_type = 'wpi_invoice') {
+    $post_type = sanitize_key(str_replace('wpi_', '', $post_type));
+	$page_id   = wpinv_get_option("{$post_type}_history_page", 0);
+	$page_id   = absint($page_id);
+	return apply_filters('wpinv_get_history_page_uri', get_permalink($page_id), $post_type);
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = ! empty( $is_success_page ) ? is_page( $is_success_page ) : false;
+	$is_success_page = wpinv_get_option('success_page', false);
+	$is_success_page = !empty($is_success_page) ? is_page($is_success_page) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+	return apply_filters('wpinv_is_success_page', $is_success_page);
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+	$ret = wpinv_get_option('invoice_history_page', false);
+	$ret = $ret ? is_page($ret) : false;
+	return apply_filters('wpinv_is_invoice_history_page', $ret);
 }
 
 function wpinv_is_subscriptions_history_page() {
-    $ret = wpinv_get_option( 'invoice_subscription_page', false );
-    $ret = $ret ? is_page( $ret ) : false;
-    return apply_filters( 'wpinv_is_subscriptions_history_page', $ret );
+    $ret = wpinv_get_option('invoice_subscription_page', false);
+    $ret = $ret ? is_page($ret) : false;
+    return apply_filters('wpinv_is_subscriptions_history_page', $ret);
 }
 
 /**
  * Redirects a user the success page.
  */
-function wpinv_send_to_success_page( $args = array() ) {
+function wpinv_send_to_success_page($args = array()) {
 
     $redirect = add_query_arg(
-        wp_parse_args( $args ),
+        wp_parse_args($args),
         wpinv_get_success_page_uri()
     );
 
-    $redirect = apply_filters( 'wpinv_send_to_success_page_url', $redirect, $args );
+    $redirect = apply_filters('wpinv_send_to_success_page_url', $redirect, $args);
 
-    wp_redirect( $redirect );
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_send_to_failed_page( $args = null ) {
+function wpinv_send_to_failed_page($args = null) {
 	$redirect = wpinv_get_failed_transaction_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_failed_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_failed_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+function wpinv_get_checkout_uri($args = array()) {
+	$uri = wpinv_get_option('checkout_page', false);
+	$uri = isset($uri) ? get_permalink($uri) : NULL;
 
-	if ( !empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$uri = add_query_arg( $args, $uri );
+		$uri = add_query_arg($args, $uri);
 	}
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url = admin_url('admin-ajax.php', $scheme);
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
+	if ((!preg_match('/^https/', $uri) && preg_match('/^https/', $ajax_url)) || wpinv_is_ssl_enforced()) {
+		$uri = preg_replace('/^http:/', 'https:', $uri);
 	}
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+	return apply_filters('wpinv_get_checkout_uri', $uri);
 }
 
-function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+function wpinv_get_success_page_url($query_string = null) {
+	$success_page = wpinv_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string )
+	if ($query_string)
 		$success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+	return apply_filters('wpinv_success_page_url', $success_page);
 }
 
-function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+function wpinv_get_failed_transaction_uri($extras = false) {
+	$uri = wpinv_get_option('failure_page', '');
+	$uri = !empty($uri) ? trailingslashit(get_permalink($uri)) : home_url();
 
-	if ( $extras )
+	if ($extras)
 		$uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+	return apply_filters('wpinv_get_failed_transaction_uri', $uri);
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+	$ret = wpinv_get_option('failure_page', false);
+	$ret = isset($ret) ? is_page($ret) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+	return apply_filters('wpinv_is_failure_page', $ret);
 }
 
-function wpinv_transaction_query( $type = 'start' ) {
+function wpinv_transaction_query($type = 'start') {
     global $wpdb;
 
     $wpdb->hide_errors();
 
-    if ( ! defined( 'WPINV_USE_TRANSACTIONS' ) ) {
-        define( 'WPINV_USE_TRANSACTIONS', true );
+    if (!defined('WPINV_USE_TRANSACTIONS')) {
+        define('WPINV_USE_TRANSACTIONS', true);
     }
 
-    if ( WPINV_USE_TRANSACTIONS ) {
-        switch ( $type ) {
+    if (WPINV_USE_TRANSACTIONS) {
+        switch ($type) {
             case 'commit' :
-                $wpdb->query( 'COMMIT' );
+                $wpdb->query('COMMIT');
                 break;
             case 'rollback' :
-                $wpdb->query( 'ROLLBACK' );
+                $wpdb->query('ROLLBACK');
                 break;
             default :
-                $wpdb->query( 'START TRANSACTION' );
+                $wpdb->query('START TRANSACTION');
             break;
         }
     }
@@ -190,146 +190,146 @@ 
 function wpinv_get_prefix() {
     $invoice_prefix = 'INV-';
     
-    return apply_filters( 'wpinv_get_prefix', $invoice_prefix );
+    return apply_filters('wpinv_get_prefix', $invoice_prefix);
 }
 
 function wpinv_get_business_logo() {
-    $business_logo = wpinv_get_option( 'logo' );
-    return apply_filters( 'wpinv_get_business_logo', $business_logo );
+    $business_logo = wpinv_get_option('logo');
+    return apply_filters('wpinv_get_business_logo', $business_logo);
 }
 
 function wpinv_get_business_name() {
-    $name = wpinv_get_option( 'store_name', wpinv_get_blogname() );
+    $name = wpinv_get_option('store_name', wpinv_get_blogname());
 
-    if ( empty( $name ) ) {
+    if (empty($name)) {
         $name = wpinv_get_blogname();
     }
 
-    return apply_filters( 'wpinv_get_business_name', $name );
+    return apply_filters('wpinv_get_business_name', $name);
 }
 
 function wpinv_get_blogname() {
-    return wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    return wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 }
 
 function wpinv_get_admin_email() {
-    $admin_email = wpinv_get_option( 'admin_email', get_option( 'admin_email' ) );
-    return apply_filters( 'wpinv_admin_email', $admin_email );
+    $admin_email = wpinv_get_option('admin_email', get_option('admin_email'));
+    return apply_filters('wpinv_admin_email', $admin_email);
 }
 
 function wpinv_get_business_website() {
-    $business_website = home_url( '/' );
-    return apply_filters( 'wpinv_get_business_website', $business_website );
+    $business_website = home_url('/');
+    return apply_filters('wpinv_get_business_website', $business_website);
 }
 
-function wpinv_get_terms_text( $invoice_id = 0 ) {
+function wpinv_get_terms_text($invoice_id = 0) {
     $terms_text = '';
-    return apply_filters( 'wpinv_get_terms_text', $terms_text, $invoice_id );
+    return apply_filters('wpinv_get_terms_text', $terms_text, $invoice_id);
 }
 
 function wpinv_get_business_footer() {
-    $site_link = '<a target="_blank" href="' . esc_url( wpinv_get_business_website() ) . '">' . esc_html( wpinv_get_business_name() ) . '</a>';
-    $business_footer = wp_sprintf( __( 'Thanks for using %s', 'invoicing' ), $site_link );
-    return apply_filters( 'wpinv_get_business_footer', $business_footer );
+    $site_link = '<a target="_blank" href="' . esc_url(wpinv_get_business_website()) . '">' . esc_html(wpinv_get_business_name()) . '</a>';
+    $business_footer = wp_sprintf(__('Thanks for using %s', 'invoicing'), $site_link);
+    return apply_filters('wpinv_get_business_footer', $business_footer);
 }
 
 function wpinv_checkout_required_fields() {
     $required_fields = array();
     
     // Let payment gateways and other extensions determine if address fields should be required
-    $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
+    $require_billing_details = apply_filters('wpinv_checkout_required_billing_details', wpinv_use_taxes());
     
-    if ( $require_billing_details ) {
-		if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
+    if ($require_billing_details) {
+		if ((bool) wpinv_get_option('fname_mandatory')) {
 			$required_fields['first_name'] = array(
 				'error_id' => 'invalid_first_name',
-				'error_message' => __( 'Please enter your first name', 'invoicing' )
+				'error_message' => __('Please enter your first name', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
+		if ((bool) wpinv_get_option('address_mandatory')) {
 			$required_fields['address'] = array(
 				'error_id' => 'invalid_address',
-				'error_message' => __( 'Please enter your address', 'invoicing' )
+				'error_message' => __('Please enter your address', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
+		if ((bool) wpinv_get_option('city_mandatory')) {
 			$required_fields['city'] = array(
 				'error_id' => 'invalid_city',
-				'error_message' => __( 'Please enter your billing city', 'invoicing' )
+				'error_message' => __('Please enter your billing city', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
+		if ((bool) wpinv_get_option('state_mandatory')) {
 			$required_fields['state'] = array(
 				'error_id' => 'invalid_state',
-				'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+				'error_message' => __('Please enter billing state / province', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
+		if ((bool) wpinv_get_option('country_mandatory')) {
 			$required_fields['country'] = array(
 				'error_id' => 'invalid_country',
-				'error_message' => __( 'Please select your billing country', 'invoicing' )
+				'error_message' => __('Please select your billing country', 'invoicing')
 			);
 		}
     }
 
-    return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
+    return apply_filters('wpinv_checkout_required_fields', $required_fields);
 }
 
 function wpinv_is_ssl_enforced() {
-    $ssl_enforced = wpinv_get_option( 'enforce_ssl', false );
-    return (bool) apply_filters( 'wpinv_is_ssl_enforced', $ssl_enforced );
+    $ssl_enforced = wpinv_get_option('enforce_ssl', false);
+    return (bool) apply_filters('wpinv_is_ssl_enforced', $ssl_enforced);
 }
 
 function wpinv_schedule_event_twicedaily() {
     wpinv_email_payment_reminders();
 }
-add_action( 'wpinv_register_schedule_event_daily', 'wpinv_schedule_event_twicedaily' );
+add_action('wpinv_register_schedule_event_daily', 'wpinv_schedule_event_twicedaily');
 
 function wpinv_require_login_to_checkout() {
-    $return = wpinv_get_option( 'login_to_checkout', false );
-    return (bool) apply_filters( 'wpinv_require_login_to_checkout', $return );
+    $return = wpinv_get_option('login_to_checkout', false);
+    return (bool) apply_filters('wpinv_require_login_to_checkout', $return);
 }
 
-function wpinv_sequential_number_active( $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_check_sequential_number_active', null, $type );
-    if ( null !== $check ) {
+function wpinv_sequential_number_active($type = '') {
+    $check = apply_filters('wpinv_pre_check_sequential_number_active', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    return wpinv_get_option( 'sequential_invoice_number' );
+    return wpinv_get_option('sequential_invoice_number');
 }
 
-function wpinv_switch_to_locale( $locale = NULL ) {
+function wpinv_switch_to_locale($locale = NULL) {
     global $invoicing, $wpi_switch_locale;
 
-    if ( ! empty( $invoicing ) && function_exists( 'switch_to_locale' ) ) {
-        $locale = empty( $locale ) ? get_locale() : $locale;
+    if (!empty($invoicing) && function_exists('switch_to_locale')) {
+        $locale = empty($locale) ? get_locale() : $locale;
 
-        switch_to_locale( $locale );
+        switch_to_locale($locale);
 
         $wpi_switch_locale = $locale;
 
-        add_filter( 'plugin_locale', 'get_locale' );
+        add_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_switch_to_locale', $locale );
+        do_action('wpinv_switch_to_locale', $locale);
     }
 }
 
 function wpinv_restore_locale() {
     global $invoicing, $wpi_switch_locale;
     
-    if ( ! empty( $invoicing ) && function_exists( 'restore_previous_locale' ) && $wpi_switch_locale ) {
+    if (!empty($invoicing) && function_exists('restore_previous_locale') && $wpi_switch_locale) {
         restore_previous_locale();
 
         $wpi_switch_locale = NULL;
 
-        remove_filter( 'plugin_locale', 'get_locale' );
+        remove_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_restore_locale' );
+        do_action('wpinv_restore_locale');
     }
 }
 
@@ -337,26 +337,26 @@ 
  * Returns the default form's id.
  */
 function wpinv_get_default_payment_form() {
-    $form = get_option( 'wpinv_default_payment_form' );
+    $form = get_option('wpinv_default_payment_form');
 
-    if ( empty( $form ) || 'publish' != get_post_status( $form ) ) {
+    if (empty($form) || 'publish' != get_post_status($form)) {
         $form = wp_insert_post(
             array(
                 'post_type'   => 'wpi_payment_form',
-                'post_title'  => __( 'Checkout (default)', 'invoicing' ),
+                'post_title'  => __('Checkout (default)', 'invoicing'),
                 'post_status' => 'publish',
                 'meta_input'  => array(
-                    'wpinv_form_elements' => wpinv_get_data( 'default-payment-form' ),
+                    'wpinv_form_elements' => wpinv_get_data('default-payment-form'),
                     'wpinv_form_items'    => array(),
                 )
             )
         );
 
-        update_option( 'wpinv_default_payment_form', $form );
+        update_option('wpinv_default_payment_form', $form);
     }
 
     // WPML support.
-    $form = apply_filters( 'wpml_object_id', $form, 'wpi_payment_form', TRUE  );
+    $form = apply_filters('wpml_object_id', $form, 'wpi_payment_form', TRUE);
     return $form;
 }
 
@@ -365,19 +365,19 @@ 
  * 
  * @param int $payment_form
  */
-function getpaid_get_payment_form_elements( $payment_form ) {
+function getpaid_get_payment_form_elements($payment_form) {
 
-    if ( empty( $payment_form ) ) {
-        return wpinv_get_data( 'sample-payment-form' );
+    if (empty($payment_form)) {
+        return wpinv_get_data('sample-payment-form');
     }
 
-    $form_elements = get_post_meta( $payment_form, 'wpinv_form_elements', true );
+    $form_elements = get_post_meta($payment_form, 'wpinv_form_elements', true);
 
-    if ( is_array( $form_elements ) ) {
+    if (is_array($form_elements)) {
         return $form_elements;
     }
 
-    return wpinv_get_data( 'sample-payment-form' );
+    return wpinv_get_data('sample-payment-form');
 
 }
 
@@ -386,42 +386,42 @@ 
  * 
  * @param int $payment_form
  */
-function gepaid_get_form_items( $id ) {
-    $form = new GetPaid_Payment_Form( $id );
+function gepaid_get_form_items($id) {
+    $form = new GetPaid_Payment_Form($id);
 
     // Is this a default form?
-    if ( $form->is_default() ) {
+    if ($form->is_default()) {
         return array();
     }
 
-    return $form->get_items( 'view', 'arrays' );
+    return $form->get_items('view', 'arrays');
 }
 
 /**
  * Trims each line in a paragraph.
  * 
  */
-function gepaid_trim_lines( $content ) {
-    return implode( "\n", array_map( 'trim', explode( "\n", $content ) ) );
+function gepaid_trim_lines($content) {
+    return implode("\n", array_map('trim', explode("\n", $content)));
 }
 
 
-function wpinv_add_elementor_widget_categories( $elements_manager ) {
+function wpinv_add_elementor_widget_categories($elements_manager) {
     $elements_manager->add_category(
         'getpaid',
         [
-            'title' => esc_html__( 'GetPaid', 'invoicing' ),
+            'title' => esc_html__('GetPaid', 'invoicing'),
             'icon' => 'fa fa-plug',
         ]
     );
 }
-add_filter( 'elementor/elements/categories_registered', 'wpinv_add_elementor_widget_categories'  );
+add_filter('elementor/elements/categories_registered', 'wpinv_add_elementor_widget_categories');
 
-function wpinv_alter_elementor_widget_config( $config ){
+function wpinv_alter_elementor_widget_config($config) {
 
-    if ( ! empty( $config['initial_document']['widgets'] ) ) {
-        foreach( $config['initial_document']['widgets'] as $key => $widget){
-            if(substr( $key, 0, 16 ) === "wp-widget-wpinv_" || $key === "wp-widget-getpaid"){
+    if (!empty($config['initial_document']['widgets'])) {
+        foreach ($config['initial_document']['widgets'] as $key => $widget) {
+            if (substr($key, 0, 16) === "wp-widget-wpinv_" || $key === "wp-widget-getpaid") {
                 $config['initial_document']['widgets'][$key]['categories'][] = 'getpaid';
                 $config['initial_document']['widgets'][$key]['hide_on_search'] = false;
                 $config['initial_document']['widgets'][$key]['icon'] = 'eicon-globe'; //@todo if no icons use on page then font-awesome is not loaded, wif we can fifure out how to force load we can use icons. <i class="fas fa-globe-americas"></i><i class="fa-solid fa-earth-americas"></i>
@@ -431,20 +431,20 @@ 
 
     return $config;
 }
-add_filter( 'elementor/editor/localize_settings', 'wpinv_alter_elementor_widget_config'  );
+add_filter('elementor/editor/localize_settings', 'wpinv_alter_elementor_widget_config');
 
 function wpinv_get_report_graphs() {
 
     return apply_filters(
         'getpaid_report_graphs',
         array(
-            'sales'    => __( 'Earnings', 'invoicing' ),
-            'refunds'  => __( 'Refunds', 'invoicing' ),
-            'tax'      => __( 'Taxes', 'invoicing' ),
-            'fees'     => __( 'Fees', 'invoicing' ),
-            'discount' => __( 'Discounts', 'invoicing' ),
-            'invoices' => __( 'Invoices', 'invoicing' ),
-            'items'    => __( 'Purchased Items', 'invoicing' ),
+            'sales'    => __('Earnings', 'invoicing'),
+            'refunds'  => __('Refunds', 'invoicing'),
+            'tax'      => __('Taxes', 'invoicing'),
+            'fees'     => __('Fees', 'invoicing'),
+            'discount' => __('Discounts', 'invoicing'),
+            'invoices' => __('Invoices', 'invoicing'),
+            'items'    => __('Purchased Items', 'invoicing'),
         )
     );
 

includes/reports/class-getpaid-reports-report.php

Indentation +179 added lines, -179 removed lines

@@ -12,88 +12,88 @@ 
  */
 class GetPaid_Reports_Report {
 
-	/**
-	 * @var array
-	 */
-	public $views;
+    /**
+     * @var array
+     */
+    public $views;
 
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
 
-		$this->views        = array(
+        $this->views        = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Items',
-			),
+                'label' => __( 'Items', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Items',
+            ),
 
-			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Gateways',
-			),
+            'gateways'  => array(
+                'label' => __( 'Payment Methods', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Gateways',
+            ),
 
-			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Discounts',
-			),
+            'discounts'  => array(
+                'label' => __( 'Discount Codes', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Discounts',
+            ),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
-
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	public function get_range() {
-		$valid_ranges = $this->get_periods();
-
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
-
-		$range = $this->get_range();
-		?>
+        $this->views        = apply_filters( 'wpinv_report_views', $this->views );
+
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    public function get_range() {
+        $valid_ranges = $this->get_periods();
+
+        if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
+            return sanitize_key( $_GET['date_range'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
+            'today'        => __( 'Today', 'invoicing' ),
+            'yesterday'    => __( 'Yesterday', 'invoicing' ),
+            'week'         => __( 'This week', 'invoicing' ),
+            'last_week'    => __( 'Last week', 'invoicing' ),
+            '7_days'       => __( 'Last 7 days', 'invoicing' ),
+            'month'        => __( 'This month', 'invoicing' ),
+            'last_month'   => __( 'Last month', 'invoicing' ),
+            '30_days'      => __( 'Last 30 days', 'invoicing' ),
+            'quarter'      => __( 'This Quarter', 'invoicing' ),
+            'last_quarter' => __( 'Last Quarter', 'invoicing' ),
+            'year'         => __( 'This year', 'invoicing' ),
+            'last_year'    => __( 'Last Year', 'invoicing' ),
+            'custom'       => __( 'Custom Date Range', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
+
+        $range = $this->get_range();
+        ?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
 				<?php getpaid_hidden_field( 'page', 'wpinv-reports' );  ?>
@@ -115,14 +115,14 @@ 
 			</form>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+        ?>
 
 		<div class="mt-4" style="max-width: 1200px;">
 
@@ -202,16 +202,16 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the left side.
-	 *
-	 */
-	public function display_left() {
-		$graphs = wpinv_get_report_graphs();
+    /**
+     * Displays the left side.
+     *
+     */
+    public function display_left() {
+        $graphs = wpinv_get_report_graphs();
 
-		?>
+        ?>
 
 			<?php foreach ( $graphs as $key => $graph ) : ?>
 				<div class="row mb-4">
@@ -230,35 +230,35 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $graph, $file_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $graph, $file_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'download_graph',
+                    'file_type'            => urlencode( $file_type ),
+                    'graph'                => urlencode( $graph ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
 
-	}
+    }
 
-	/**
-	 * Displays the right side.
-	 *
-	 */
-	public function display_right() {
+    /**
+     * Displays the right side.
+     *
+     */
+    public function display_right() {
 
-		?>
+        ?>
 
 			<?php foreach ( $this->views as $key => $view ) : ?>
 				<div class="row mb-4">
@@ -287,10 +287,10 @@ 
 							</div>
 							<div class="card-body">
 								<?php
-									$class = $view['class'];
-									$class = new $class();
-									$class->display_stats();
-								?>
+                                    $class = $view['class'];
+                                    $class = new $class();
+                                    $class->display_stats();
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -299,67 +299,67 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Returns a list of report cards.
-	 *
-	 */
-	public function get_cards() {
-
-		$cards = array(
-			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
-			),
-			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
-			),
-			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
-			),
-			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
-			),
-			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
-			),
-			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
-			),
-			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
-			),
-			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
-			),
-			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
-			),
-			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
-			),
-			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
-			),
-			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
-			),
-		);
-
-		return apply_filters( 'wpinv_report_cards', $cards );
-	}
+    }
+
+    /**
+     * Returns a list of report cards.
+     *
+     */
+    public function get_cards() {
+
+        $cards = array(
+            'total_sales' => array(
+                'description' => __( 'Gross sales in the period.', 'invoicing' ),
+                'label'       => __( 'Gross Revenue', 'invoicing' ),
+            ),
+            'net_sales' => array(
+                'description' => __( 'Net sales in the period.', 'invoicing' ),
+                'label'       => __( 'Net Revenue', 'invoicing' ),
+            ),
+            'average_sales' => array(
+                'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
+                'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+            ),
+            'average_total_sales' => array(
+                'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
+                'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+            ),
+            'total_invoices'  => array(
+                'description' => __( 'Number of paid invoices.', 'invoicing' ),
+                'label'       => __( 'Paid Invoices', 'invoicing' ),
+            ),
+            'total_items' => array(
+                'description' => __( 'Number of items purchased.', 'invoicing' ),
+                'label'       => __( 'Purchased Items', 'invoicing' ),
+            ),
+            'refunded_items' => array(
+                'description' => __( 'Number of items refunded.', 'invoicing' ),
+                'label'       => __( 'Refunded Items', 'invoicing' ),
+            ),
+            'total_tax' => array(
+                'description' => __( 'Total charged for taxes.', 'invoicing' ),
+                'label'       => __( 'Tax', 'invoicing' ),
+            ),
+            'total_refunded_tax' => array(
+                'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+                'label'       => __( 'Refunded Tax', 'invoicing' ),
+            ),
+            'total_fees' => array(
+                'description' => __( 'Total fees charged.', 'invoicing' ),
+                'label'       => __( 'Fees', 'invoicing' ),
+            ),
+            'total_refunds' => array(
+                'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+                'label'       => __( 'Refunded', 'invoicing' ),
+            ),
+            'total_discount'  => array(
+                'description' => __( 'Total of discounts used.', 'invoicing' ),
+                'label'       => __( 'Discounted', 'invoicing' ),
+            ),
+        );
+
+        return apply_filters( 'wpinv_report_cards', $cards );
+    }
 
 	
 

Spacing +74 added lines, -74 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report Class.
@@ -23,26 +23,26 @@ 
 	 */
 	public function __construct() {
 
-		$this->views        = array(
+		$this->views = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
+				'label' => __('Items', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Items',
 			),
 
 			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
+				'label' => __('Payment Methods', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Gateways',
 			),
 
 			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
+				'label' => __('Discount Codes', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Discounts',
 			),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
+		$this->views = apply_filters('wpinv_report_views', $this->views);
 
 	}
 
@@ -53,8 +53,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -68,22 +68,22 @@ 
 	public function get_periods() {
 
 		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
+			'today'        => __('Today', 'invoicing'),
+			'yesterday'    => __('Yesterday', 'invoicing'),
+			'week'         => __('This week', 'invoicing'),
+			'last_week'    => __('Last week', 'invoicing'),
+			'7_days'       => __('Last 7 days', 'invoicing'),
+			'month'        => __('This month', 'invoicing'),
+			'last_month'   => __('Last month', 'invoicing'),
+			'30_days'      => __('Last 30 days', 'invoicing'),
+			'quarter'      => __('This Quarter', 'invoicing'),
+			'last_quarter' => __('Last Quarter', 'invoicing'),
+			'year'         => __('This year', 'invoicing'),
+			'last_year'    => __('Last Year', 'invoicing'),
+			'custom'       => __('Custom Date Range', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
@@ -96,21 +96,21 @@ 
 		?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
-				<?php getpaid_hidden_field( 'page', 'wpinv-reports' );  ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' );  ?>
+				<?php getpaid_hidden_field('page', 'wpinv-reports'); ?>
+				<?php getpaid_hidden_field('tab', 'reports'); ?>
 				<select name='date_range'>
-					<?php foreach( $this->get_periods() as $key => $label ) :?>
-						<option value="<?php echo sanitize_key( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo sanitize_text_field( $label ); ?></option>
-					<?php endforeach;?>
+					<?php foreach ($this->get_periods() as $key => $label) :?>
+						<option value="<?php echo sanitize_key($key); ?>" <?php selected($key, $range); ?>><?php echo sanitize_text_field($label); ?></option>
+					<?php endforeach; ?>
 				</select>
 				<span class="getpaid-date-range-picker <?php echo 'custom' == $range ? '' : 'd-none'; ?>">
 					<input type="text" name="from" class="getpaid-from align-middle" />
-						<?php _e( 'to', 'invoicing' ); ?>
+						<?php _e('to', 'invoicing'); ?>
 					<input type="text" name="to" class="getpaid-to align-middle" />
 				</span>
 				<button type="submit" class="button button-primary">
 					<i class="fa fa-chevron-right fa-lg"></i>
-					<span class="screen-reader-text"><?php _e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php _e('View Reports', 'invoicing'); ?></span>
 				</button>
 			</form>
 
@@ -159,17 +159,17 @@ 
 
 				<div class="col-12 col-md-4">
 					<div class="row getpaid-report-cards">
-						<?php foreach( $this->get_cards() as $key => $card ) : ?>
+						<?php foreach ($this->get_cards() as $key => $card) : ?>
 							<div class="col-12 mb-4">
 
-								<!-- <?php echo sanitize_text_field(  $card['label']  ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class( $key ); ?>">
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo sanitize_text_field( $card['label']  ); ?></strong>
-											<span title="<?php echo esc_attr( $card['description'] ); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
+											<strong><?php echo sanitize_text_field($card['label']); ?></strong>
+											<span title="<?php echo esc_attr($card['description']); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
 										</p>
 										<h5 class="font-weight-bold mb-0">
 											<span class="getpaid-report-card-value">
@@ -180,7 +180,7 @@ 
 
 										<hr>
 
-										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e('Previous Period', 'invoicing'); ?></strong></p>
 										<h5 class="getpaid-report-card-previous-value font-weight-bold text-muted mb-0">
 											<span class="spinner is-active float-none"></span>
 										</h5>
@@ -188,7 +188,7 @@ 
 									</div>
 
 								</div>
-								<!-- <?php echo sanitize_text_field( $card['label'] ); ?> Card -->
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -213,15 +213,15 @@ 
 
 		?>
 
-			<?php foreach ( $graphs as $key => $graph ) : ?>
+			<?php foreach ($graphs as $key => $graph) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0 single-report-card" style="max-width:100%">
 							<div class="card-header">
-								<strong><?php echo wpinv_clean( $graph ); ?></strong>
+								<strong><?php echo wpinv_clean($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo sanitize_key( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo sanitize_key($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -236,14 +236,14 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $graph, $file_type ) {
+	public function get_download_url($graph, $file_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
+					'file_type'            => urlencode($file_type),
+					'graph'                => urlencode($graph),
 				)
 			),
 			'getpaid-nonce',
@@ -260,7 +260,7 @@ 
 
 		?>
 
-			<?php foreach ( $this->views as $key => $view ) : ?>
+			<?php foreach ($this->views as $key => $view) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
@@ -270,17 +270,17 @@ 
 										<strong><?php echo $view['label']; ?></strong>
 									</div>
 									<div class="col-3">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+										<a title="<?php esc_attr_e('Download JSON', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'json')); ?>">
 											<i class="fa fa-download text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download JSON', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download CSV', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'csv' ) ); ?>">
+										<a title="<?php esc_attr_e('Download CSV', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'csv')); ?>">
 											<i class="fa fa-file-csv text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download CSV', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download XML', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'xml' ) ); ?>">
+										<a title="<?php esc_attr_e('Download XML', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'xml')); ?>">
 											<i class="fa fa-file-code text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -309,56 +309,56 @@ 
 
 		$cards = array(
 			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
+				'description' => __('Gross sales in the period.', 'invoicing'),
+				'label'       => __('Gross Revenue', 'invoicing'),
 			),
 			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
+				'description' => __('Net sales in the period.', 'invoicing'),
+				'label'       => __('Net Revenue', 'invoicing'),
 			),
 			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+				'description' => __('Average net daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Net Sales', 'invoicing'),
 			),
 			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+				'description' => __('Average gross daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Gross Sales', 'invoicing'),
 			),
 			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
+				'description' => __('Number of paid invoices.', 'invoicing'),
+				'label'       => __('Paid Invoices', 'invoicing'),
 			),
 			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
+				'description' => __('Number of items purchased.', 'invoicing'),
+				'label'       => __('Purchased Items', 'invoicing'),
 			),
 			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
+				'description' => __('Number of items refunded.', 'invoicing'),
+				'label'       => __('Refunded Items', 'invoicing'),
 			),
 			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
+				'description' => __('Total charged for taxes.', 'invoicing'),
+				'label'       => __('Tax', 'invoicing'),
 			),
 			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
+				'description' => __('Total refunded for taxes.', 'invoicing'),
+				'label'       => __('Refunded Tax', 'invoicing'),
 			),
 			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
+				'description' => __('Total fees charged.', 'invoicing'),
+				'label'       => __('Fees', 'invoicing'),
 			),
 			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
+				'description' => __('Total of refunded invoices.', 'invoicing'),
+				'label'       => __('Refunded', 'invoicing'),
 			),
 			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
+				'description' => __('Total of discounts used.', 'invoicing'),
+				'label'       => __('Discounted', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'wpinv_report_cards', $cards );
+		return apply_filters('wpinv_report_cards', $cards);
 	}