AyeCode / invoicing

includes/class-wpinv-reports.php

Indentation +13 added lines, -13 removed lines

@@ -116,7 +116,7 @@ 
         $current = 'earnings';
 
         if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) )
-		$current = $_GET['view'];
+        $current = $_GET['view'];
 
         ?>
 	        <form id="wpinv-reports-filter" method="get" class="tablenav">
@@ -134,7 +134,7 @@ 
 	        </form>
         <?php
 
-	    do_action( 'wpinv_reports_view_' . $current );
+        do_action( 'wpinv_reports_view_' . $current );
 
     }
 
@@ -224,13 +224,13 @@ 
             $is_writeable   = $is_dir && is_writeable( $this->export_dir );
 
             if ( $is_dir && $is_writeable ) {
-               return true;
+                return true;
             } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
-               }
+                if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
+                    return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+                }
 
-               return true;
+                return true;
             } else {
                 if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
                     return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
@@ -325,12 +325,12 @@ 
         $output  = fopen( 'php://output', 'w' ) or die( 'Unsupported server' );
 
         // Let the browser know what content we're streaming and how it should save the content.
-		$name = time();
-		header( "Content-Type:application/csv" );
+        $name = time();
+        header( "Content-Type:application/csv" );
         header( "Content-Disposition:attachment;filename=noptin-subscribers-$name.csv" );
 
         // Output the csv column headers.
-		fputcsv(
+        fputcsv(
             $output,
             array(
                 __( 'Discount Id', 'invoicing' ),
@@ -698,12 +698,12 @@ 
         $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
         $first_day_month  	  = date( 'Y-m-1', current_time( 'timestamp' ) );
         $last_day_month  	  = date( 'Y-m-t', current_time( 'timestamp' ) );
-		$first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
+        $first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
         $last_day_last_month  = date( 'Y-m-d', strtotime( 'last day of last month', current_time( 'timestamp' ) ) );
         $first_day_year  	  = date( 'Y-1-1', current_time( 'timestamp' ) );
         $last_day_year  	  = date( 'Y-12-31', current_time( 'timestamp' ) );
-		$first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
-		$last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
+        $first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
+        $last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 

Spacing +334 added lines, -334 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
 
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
 
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
 
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
 
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 20 );
-            add_action( 'wpinv_reports_tab_reports', array( $this, 'reports' ) );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_discount_use_export', array( $this, 'discount_use_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 20);
+            add_action('wpinv_reports_tab_reports', array($this, 'reports'));
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
+            add_action('wp_ajax_wpinv_ajax_discount_use_export', array($this, 'discount_use_export'));
 
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
 
             // Reports.
-            add_action( 'wpinv_reports_view_earnings', array( $this, 'earnings_report' ) );
-            add_action( 'wpinv_reports_view_gateways', array( $this, 'gateways_report' ) );
-            add_action( 'wpinv_reports_view_items', array( $this, 'items_report' ) );
-            add_action( 'wpinv_reports_view_taxes', array( $this, 'tax_report' ) );
+            add_action('wpinv_reports_view_earnings', array($this, 'earnings_report'));
+            add_action('wpinv_reports_view_gateways', array($this, 'gateways_report'));
+            add_action('wpinv_reports_view_items', array($this, 'items_report'));
+            add_action('wpinv_reports_view_taxes', array($this, 'tax_report'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
 
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), wpinv_get_capability(), 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), wpinv_get_capability(), 'wpinv-reports', array($this, 'reports_page'));
     }
 
     public function reports_page() {
 
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
 
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo add_query_arg( array( 'tab' => 'reports', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'invoicing' ); ?></a>
-                <a href="<?php echo add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo add_query_arg(array('tab' => 'reports', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'invoicing'); ?></a>
+                <a href="<?php echo add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
-            <div class="wpi-reports-content wpi-reports-<?php echo esc_attr( $active_tab ); ?>">
+            <div class="wpi-reports-content wpi-reports-<?php echo esc_attr($active_tab); ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
             </div>
         </div>
@@ -106,139 +106,139 @@ 
     public function reports() {
 
         $views = array(
-            'earnings'   => __( 'Earnings', 'invoicing' ),
-            'items'      => __( 'Items', 'invoicing' ),
-            'gateways'   => __( 'Payment Methods', 'invoicing' ),
-            'taxes'      => __( 'Taxes', 'invoicing' ),
+            'earnings'   => __('Earnings', 'invoicing'),
+            'items'      => __('Items', 'invoicing'),
+            'gateways'   => __('Payment Methods', 'invoicing'),
+            'taxes'      => __('Taxes', 'invoicing'),
         );
 
-        $views   = apply_filters( 'wpinv_report_views', $views );
+        $views   = apply_filters('wpinv_report_views', $views);
         $current = 'earnings';
 
-        if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) )
+        if (isset($_GET['view']) && array_key_exists($_GET['view'], $views))
 		$current = $_GET['view'];
 
         ?>
 	        <form id="wpinv-reports-filter" method="get" class="tablenav">
 		        <select id="wpinv-reports-view" name="view">
-			        <option value="-1" disabled><?php _e( 'Report Type', 'invoicing' ); ?></option>
-			            <?php foreach ( $views as $view_id => $label ) : ?>
-				            <option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current ); ?>><?php echo $label; ?></option>
+			        <option value="-1" disabled><?php _e('Report Type', 'invoicing'); ?></option>
+			            <?php foreach ($views as $view_id => $label) : ?>
+				            <option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current); ?>><?php echo $label; ?></option>
 			            <?php endforeach; ?>
 		        </select>
 
-		        <?php do_action( 'wpinv_report_view_actions' ); ?>
+		        <?php do_action('wpinv_report_view_actions'); ?>
 
 		        <input type="hidden" name="page" value="wpinv-reports"/>
-		        <?php submit_button( __( 'Show', 'invoicing' ), 'secondary', 'submit', false ); ?>
+		        <?php submit_button(__('Show', 'invoicing'), 'secondary', 'submit', false); ?>
 	        </form>
         <?php
 
-	    do_action( 'wpinv_reports_view_' . $current );
+	    do_action('wpinv_reports_view_' . $current);
 
     }
 
     public function export() {
-        $statuses = wpinv_get_invoice_statuses( true );
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = wpinv_get_invoice_statuses(true);
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
 
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array(
+                                <?php echo wpinv_html_date_field(array(
                                     'id' => 'wpi_export_from_date',
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array(
+                                <?php echo wpinv_html_date_field(array(
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => 'wpi_select2',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
 
                     <div class="postbox wpi-export-discount-uses">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Discount Use','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Discount Use', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of discount uses.', 'invoicing' ); ?></p>
-                            <a class="button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-ajax.php?action=wpinv_ajax_discount_use_export' ), 'wpi_discount_ajax_export', 'wpi_discount_ajax_export' ) ); ?>"><?php _e( 'Generate CSV', 'invoicing' ); ?></a>
+                            <p><?php _e('Download a CSV of discount uses.', 'invoicing'); ?></p>
+                            <a class="button-primary" href="<?php echo esc_url(wp_nonce_url(admin_url('admin-ajax.php?action=wpinv_ajax_discount_use_export'), 'wpi_discount_ajax_export', 'wpi_discount_ajax_export')); ?>"><?php _e('Generate CSV', 'invoicing'); ?></a>
                         </div>
                     </div>
 
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
 
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
 
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
 
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
 
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
 
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
 
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -246,59 +246,59 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
 
-        if ( empty( $_POST['data'] ) || ! wpinv_current_user_can_manage_invoicing() ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !wpinv_current_user_can_manage_invoicing()) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
 
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
-        $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        $_REQUEST = (array) $data;
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
 
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
 
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
 
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
 
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
 
             $response['success']    = true;
             $response['msg']        = '';
 
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
 
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     /**
@@ -306,7 +306,7 @@ 
      */
     public function discount_use_export() {
 
-        if ( ! wp_verify_nonce( $_GET['wpi_discount_ajax_export'], 'wpi_discount_ajax_export' ) || ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wp_verify_nonce($_GET['wpi_discount_ajax_export'], 'wpi_discount_ajax_export') || !wpinv_current_user_can_manage_invoicing()) {
             wp_die( -1, 403 );
         }
 
@@ -316,115 +316,115 @@ 
             'posts_per_page' => -1,
         );
 
-        $discounts = get_posts( $args );
+        $discounts = get_posts($args);
 
-        if ( empty( $discounts ) ) {
-            die ( __( 'You have not set up any discounts', 'invoicing' ) );
+        if (empty($discounts)) {
+            die (__('You have not set up any discounts', 'invoicing'));
         }
 
-        $output  = fopen( 'php://output', 'w' ) or die( 'Unsupported server' );
+        $output = fopen('php://output', 'w') or die('Unsupported server');
 
         // Let the browser know what content we're streaming and how it should save the content.
 		$name = time();
-		header( "Content-Type:application/csv" );
-        header( "Content-Disposition:attachment;filename=noptin-subscribers-$name.csv" );
+		header("Content-Type:application/csv");
+        header("Content-Disposition:attachment;filename=noptin-subscribers-$name.csv");
 
         // Output the csv column headers.
 		fputcsv(
             $output,
             array(
-                __( 'Discount Id', 'invoicing' ),
-                __( 'Discount Code', 'invoicing' ),
-                __( 'Discount Type', 'invoicing' ),
-                __( 'Discount Amount', 'invoicing' ),
-                __( 'Uses', 'invoicing' ),
+                __('Discount Id', 'invoicing'),
+                __('Discount Code', 'invoicing'),
+                __('Discount Type', 'invoicing'),
+                __('Discount Amount', 'invoicing'),
+                __('Uses', 'invoicing'),
             )
         );
 
-        foreach ( $discounts as $discount ) {
+        foreach ($discounts as $discount) {
 
             $discount = (int) $discount;
             $row      = array(
                 $discount,
-                get_post_meta( $discount, '_wpi_discount_code', true ),
-                get_post_meta( $discount, '_wpi_discount_type', true ),
-                get_post_meta( $discount, '_wpi_discount_amount', true ),
-                (int) get_post_meta( $discount, '_wpi_discount_uses', true )
+                get_post_meta($discount, '_wpi_discount_code', true),
+                get_post_meta($discount, '_wpi_discount_type', true),
+                get_post_meta($discount, '_wpi_discount_amount', true),
+                (int) get_post_meta($discount, '_wpi_discount_uses', true)
             );
-            fputcsv( $output, $row );
+            fputcsv($output, $row);
         }
 
-        fclose( $output );
+        fclose($output);
         exit;
 
     }
 
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
 
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
 
     public function get_columns() {
         $columns = array();
 
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
 
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
 
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
 
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
 
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
 
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            /** @scrutinizer ignore-unhandled */ @unlink( $this->file );
+        if ($this->step < 2) {
+            /** @scrutinizer ignore-unhandled */ @unlink($this->file);
             $this->print_columns();
         }
 
         $return = $this->print_rows();
 
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -433,14 +433,14 @@ 
 
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
 
     public function get_export_data() {
         $data = array();
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -450,20 +450,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -472,48 +472,48 @@ 
     }
 
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publish';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publish';
     }
 
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
-            'completed_date'=> __( 'Payment Done Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'items'        => __( 'Items', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
+            'completed_date'=> __('Payment Done Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'items'        => __('Items', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
         );
 
         return $columns;
     }
 
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -521,42 +521,42 @@ 
             'orderby'  => 'date',
         );
 
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         } else {
-            $args['status'] = array_keys( wpinv_get_invoice_statuses( true ) );
+            $args['status'] = array_keys(wpinv_get_invoice_statuses(true));
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
 
         $data = array();
 
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $items = $this->get_invoice_items($invoice);
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'due_date'      => $invoice->get_due_date( false ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'due_date'      => $invoice->get_due_date(false),
                     'completed_date'=> $invoice->get_completed_date(),
-                    'amount'        => wpinv_round_amount( $invoice->get_total() ),
+                    'amount'        => wpinv_round_amount($invoice->get_total()),
                     'currency'      => $invoice->get_currency(),
                     'items'         => $items,
-                    'status_nicename' => $invoice->get_status( true ),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount( $invoice->get_tax() ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount( $invoice->get_discount() ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount($invoice->get_tax()) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount($invoice->get_discount()) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -575,7 +575,7 @@ 
                     'transaction_id'=> $invoice->gateway ? $invoice->get_transaction_id() : '',
                 );
 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -591,44 +591,44 @@ 
             'return'   => 'ids',
         );
 
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         } else {
-            $args['status'] = array_keys( wpinv_get_invoice_statuses( true ) );
+            $args['status'] = array_keys(wpinv_get_invoice_statuses(true));
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 
         return $status;
     }
 
-    public function get_invoice_items($invoice){
-        if(!$invoice){
+    public function get_invoice_items($invoice) {
+        if (!$invoice) {
             return '';
         }
 
         $cart_details = $invoice->get_cart_details();
-        if(!empty($cart_details)){
+        if (!empty($cart_details)) {
             $cart_details = maybe_serialize($cart_details);
         } else {
             $cart_details = '';
@@ -640,14 +640,14 @@ 
     /**
      * Returns the periods filter.
      */
-    public function period_filter( $args = array() ) {
+    public function period_filter($args = array()) {
 
         ob_start();
 
         echo '<form id="wpinv-graphs-filter" method="get" style="margin-bottom: 10px;" class="tablenav">';
         echo '<input type="hidden" name="page" value="wpinv-reports">';
 
-        foreach ( $args as $key => $val ) {
+        foreach ($args as $key => $val) {
             $key = esc_attr($key);
             $val = esc_attr($val);
             echo "<input type='hidden' name='$key' value='$val'>";
@@ -656,21 +656,21 @@ 
         echo '<select id="wpinv-graphs-date-options" name="range" style="min-width: 200px;" onChange="this.form.submit()">';
 
         $ranges = array(
-            'today'        => __( 'Today', 'invoicing' ),
-            'yesterday'    => __( 'Yesterday', 'invoicing' ),
-            'this_week'    => __( 'This Week', 'invoicing' ),
-            'last_week'    => __( 'Last Week', 'invoicing' ),
-            '7_days_ago'   => __( 'Last 7 Days', 'invoicing' ),
-            '30_days_ago'  => __( 'Last 30 Days', 'invoicing' ),
-            'this_month'   => __( 'This Month', 'invoicing' ),
-            'this_year'    => __( 'This Year', 'invoicing' ),
-            'last_year'    => __( 'Last Year', 'invoicing' ),
+            'today'        => __('Today', 'invoicing'),
+            'yesterday'    => __('Yesterday', 'invoicing'),
+            'this_week'    => __('This Week', 'invoicing'),
+            'last_week'    => __('Last Week', 'invoicing'),
+            '7_days_ago'   => __('Last 7 Days', 'invoicing'),
+            '30_days_ago'  => __('Last 30 Days', 'invoicing'),
+            'this_month'   => __('This Month', 'invoicing'),
+            'this_year'    => __('This Year', 'invoicing'),
+            'last_year'    => __('Last Year', 'invoicing'),
         );
 
-        $range = isset( $_GET['range'] ) && isset( $ranges[ $_GET['range'] ] ) ? $_GET['range'] : '7_days_ago';
+        $range = isset($_GET['range']) && isset($ranges[$_GET['range']]) ? $_GET['range'] : '7_days_ago';
 
-        foreach ( $ranges as $val => $label ) {
-            $selected = selected( $range, $val, false );
+        foreach ($ranges as $val => $label) {
+            $selected = selected($range, $val, false);
             echo "<option value='$val' $selected>$label</option>";
         }
 
@@ -682,28 +682,28 @@ 
     /**
      * Returns the the current date range.
      */
-    public function get_sql_clauses( $range ) {
+    public function get_sql_clauses($range) {
 
         $date     = 'CAST(meta.completed_date AS DATE)';
         $datetime = 'meta.completed_date';
 
         // Prepare durations.
-        $today                = current_time( 'Y-m-d' );
-        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-        $sunday               = date( 'Y-m-d', strtotime( 'sunday this week', current_time( 'timestamp' ) ) );
-        $monday               = date( 'Y-m-d', strtotime( 'monday this week', current_time( 'timestamp' ) ) );
-        $last_sunday          = date( 'Y-m-d', strtotime( 'sunday last week', current_time( 'timestamp' ) ) );
-        $last_monday          = date( 'Y-m-d', strtotime( 'monday last week', current_time( 'timestamp' ) ) );
-        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-        $first_day_month  	  = date( 'Y-m-1', current_time( 'timestamp' ) );
-        $last_day_month  	  = date( 'Y-m-t', current_time( 'timestamp' ) );
-		$first_day_last_month = date( 'Y-m-d', strtotime( 'first day of last month', current_time( 'timestamp' ) ) );
-        $last_day_last_month  = date( 'Y-m-d', strtotime( 'last day of last month', current_time( 'timestamp' ) ) );
-        $first_day_year  	  = date( 'Y-1-1', current_time( 'timestamp' ) );
-        $last_day_year  	  = date( 'Y-12-31', current_time( 'timestamp' ) );
-		$first_day_last_year  = date( 'Y-m-d', strtotime( 'first day of last year', current_time( 'timestamp' ) ) );
-		$last_day_last_year   = date( 'Y-m-d', strtotime( 'last day of last year', current_time( 'timestamp' ) ) );
+        $today                = current_time('Y-m-d');
+        $yesterday            = date('Y-m-d', strtotime('-1 day', current_time('timestamp')));
+        $sunday               = date('Y-m-d', strtotime('sunday this week', current_time('timestamp')));
+        $monday               = date('Y-m-d', strtotime('monday this week', current_time('timestamp')));
+        $last_sunday          = date('Y-m-d', strtotime('sunday last week', current_time('timestamp')));
+        $last_monday          = date('Y-m-d', strtotime('monday last week', current_time('timestamp')));
+        $seven_days_ago       = date('Y-m-d', strtotime('-7 days', current_time('timestamp')));
+        $thirty_days_ago      = date('Y-m-d', strtotime('-30 days', current_time('timestamp')));
+        $first_day_month = date('Y-m-1', current_time('timestamp'));
+        $last_day_month  	  = date('Y-m-t', current_time('timestamp'));
+		$first_day_last_month = date('Y-m-d', strtotime('first day of last month', current_time('timestamp')));
+        $last_day_last_month = date('Y-m-d', strtotime('last day of last month', current_time('timestamp')));
+        $first_day_year  	  = date('Y-1-1', current_time('timestamp'));
+        $last_day_year = date('Y-12-31', current_time('timestamp'));
+		$first_day_last_year  = date('Y-m-d', strtotime('first day of last year', current_time('timestamp')));
+		$last_day_last_year   = date('Y-m-d', strtotime('last day of last year', current_time('timestamp')));
 
         $ranges = array(
 
@@ -759,21 +759,21 @@ 
 
         );
 
-        if ( ! isset( $ranges[ $range ] ) ) {
+        if (!isset($ranges[$range])) {
             return $ranges['7_days_ago'];
         }
-        return $ranges[ $range ];
+        return $ranges[$range];
 
     }
 
     /**
      * Returns the the current date ranges results.
      */
-    public function get_report_results( $range ) {
+    public function get_report_results($range) {
         global $wpdb;
 
         $table   = $wpdb->prefix . 'getpaid_invoices';
-        $clauses = $this->get_sql_clauses( $range );
+        $clauses = $this->get_sql_clauses($range);
         $sql     = "SELECT
                 {$clauses[0]} AS completed_date,
                 SUM( meta.total ) AS total,
@@ -789,30 +789,30 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-        return $wpdb->get_results( $sql );
+        return $wpdb->get_results($sql);
     }
 
     /**
      * Fill nulls.
      */
-    public function fill_nulls( $data, $range ) {
+    public function fill_nulls($data, $range) {
 
         $return = array();
         $time   = current_time('timestamp');
 
-        switch ( $range ) {
+        switch ($range) {
             case 'today' :
             case 'yesterday' :
-                $hour  = 0;
+                $hour = 0;
 
-                while ( $hour < 23 ) {
+                while ($hour < 23) {
                     $amount = 0;
-                    if ( isset( $data[$hour] ) ) {
-                        $amount = floatval( $data[$hour] );
+                    if (isset($data[$hour])) {
+                        $amount = floatval($data[$hour]);
                     }
 
-                    $time = strtotime( "$range $hour:00:00" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$range $hour:00:00") * 1000;
+                    $return[] = array($time, $amount);
                     $hour++;
                 }
 
@@ -820,9 +820,9 @@ 
 
             case 'this_month' :
             case 'last_month' :
-                $_range = str_replace( '_', ' ', $range );
-                $month  = date( 'n', strtotime( $_range, $time ) );
-                $year   = date( 'Y', strtotime( $_range, $time ) );
+                $_range = str_replace('_', ' ', $range);
+                $month  = date('n', strtotime($_range, $time));
+                $year   = date('Y', strtotime($_range, $time));
                 $days   = cal_days_in_month(
                     CAL_GREGORIAN,
                     $month,
@@ -830,14 +830,14 @@ 
                 );
 
                 $day = 1;
-                while ( $days != $day ) {
+                while ($days != $day) {
                     $amount = 0;
-                    if ( isset( $data[$day] ) ) {
-                        $amount = floatval( $data[$day] );
+                    if (isset($data[$day])) {
+                        $amount = floatval($data[$day]);
                     }
 
-                    $time = strtotime( "$year-$month-$day" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$year-$month-$day") * 1000;
+                    $return[] = array($time, $amount);
                     $day++;
                 }
 
@@ -845,52 +845,52 @@ 
 
             case 'this_week' :
             case 'last_week' :
-                $_range = str_replace( '_', ' ', $range );
-                $days   = array( 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday' );
+                $_range = str_replace('_', ' ', $range);
+                $days   = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
 
-                foreach ( $days as $day ) {
+                foreach ($days as $day) {
 
                     $amount = 0;
-                    if ( isset( $data[ ucfirst( $day ) ] ) ) {
-                        $amount = floatval( $data[ ucfirst( $day ) ] );
+                    if (isset($data[ucfirst($day)])) {
+                        $amount = floatval($data[ucfirst($day)]);
                     }
 
-                    $time = strtotime( "$_range $day" ) * 1000;
-                    $return[] = array( $time, $amount );
+                    $time = strtotime("$_range $day") * 1000;
+                    $return[] = array($time, $amount);
                 }
 
                 break;
 
             case 'this_year' :
             case 'last_year' :
-                $_range = str_replace( '_', ' ', $range );
-                $year   = date( 'Y', strtotime( $_range, $time ) );
-                $months = array( '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' );
+                $_range = str_replace('_', ' ', $range);
+                $year   = date('Y', strtotime($_range, $time));
+                $months = array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12');
 
-                foreach ( $months as $month ) {
+                foreach ($months as $month) {
 
                     $amount = 0;
-                    if ( isset( $data[$month] ) ) {
-                        $amount = floatval( $data[$month] );
+                    if (isset($data[$month])) {
+                        $amount = floatval($data[$month]);
                     }
 
-                    $_time     = strtotime("$year-$month-01") * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("$year-$month-01") * 1000;
+                    $return[] = array($_time, $amount);
                 }
 
                 break;
             case '30_days_ago' :
                 $days = 30;
 
-                while ( $days > 1 ) {
+                while ($days > 1) {
                     $amount = 0;
-                    $date   = date( 'j', strtotime( "-$days days", $time ) );
-                    if ( isset( $data[$date] ) ) {
-                        $amount = floatval( $data[$date] );
+                    $date   = date('j', strtotime("-$days days", $time));
+                    if (isset($data[$date])) {
+                        $amount = floatval($data[$date]);
                     }
 
-                    $_time = strtotime( "-$days days", $time ) * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("-$days days", $time) * 1000;
+                    $return[] = array($_time, $amount);
                     $days--;
                 }
 
@@ -899,15 +899,15 @@ 
             default:
                 $days = 7;
 
-                while ( $days > 1 ) {
+                while ($days > 1) {
                     $amount = 0;
-                    $date   = date( 'j', strtotime( "-$days days", $time ) );
-                    if ( isset( $data[$date] ) ) {
-                        $amount = floatval( $data[$date] );
+                    $date   = date('j', strtotime("-$days days", $time));
+                    if (isset($data[$date])) {
+                        $amount = floatval($data[$date]);
                     }
 
-                    $_time = strtotime( "-$days days", $time ) * 1000;
-                    $return[] = array( $_time, $amount );
+                    $_time = strtotime("-$days days", $time) * 1000;
+                    $return[] = array($_time, $amount);
                     $days--;
                 }
 
@@ -922,33 +922,33 @@ 
      * Retrieves the stats.
      */
     public function get_stats() {
-        $range     = isset( $_GET['range'] ) ? $_GET['range'] : '7_days_ago';
-        $results   = $this->get_report_results( $range );
-        $earnings  = wp_list_pluck( $results, 'total', 'completed_date' );
-        $taxes     = wp_list_pluck( $results, 'tax', 'completed_date' );
-        $discounts = wp_list_pluck( $results, 'discount', 'completed_date' );
-        $fees      = wp_list_pluck( $results, 'fees_total', 'completed_date' );
+        $range     = isset($_GET['range']) ? $_GET['range'] : '7_days_ago';
+        $results   = $this->get_report_results($range);
+        $earnings  = wp_list_pluck($results, 'total', 'completed_date');
+        $taxes     = wp_list_pluck($results, 'tax', 'completed_date');
+        $discounts = wp_list_pluck($results, 'discount', 'completed_date');
+        $fees      = wp_list_pluck($results, 'fees_total', 'completed_date');
 
         return array(
 
             array(
-                'label' => __( 'Earnings', 'invoicing' ),
-                'data'  => $this->fill_nulls( $earnings, $range ),
+                'label' => __('Earnings', 'invoicing'),
+                'data'  => $this->fill_nulls($earnings, $range),
             ),
 
             array(
-                'label' => __( 'Taxes', 'invoicing' ),
-                'data'  => $this->fill_nulls( $taxes, $range ),
+                'label' => __('Taxes', 'invoicing'),
+                'data'  => $this->fill_nulls($taxes, $range),
             ),
 
             array(
-                'label' => __( 'Discounts', 'invoicing' ),
-                'data'  => $this->fill_nulls( $discounts, $range ),
+                'label' => __('Discounts', 'invoicing'),
+                'data'  => $this->fill_nulls($discounts, $range),
             ),
 
             array(
-                'label' => __( 'Fees', 'invoicing' ),
-                'data'  => $this->fill_nulls( $fees, $range ),
+                'label' => __('Fees', 'invoicing'),
+                'data'  => $this->fill_nulls($fees, $range),
             )
         );
 
@@ -958,34 +958,34 @@ 
      * Retrieves the time format for stats.
      */
     public function get_time_format() {
-        $range    = isset( $_GET['range'] ) ? $_GET['range'] : '7_days_ago';
+        $range = isset($_GET['range']) ? $_GET['range'] : '7_days_ago';
 
-        switch ( $range ) {
+        switch ($range) {
             case 'today' :
             case 'yesterday' :
-                return array( 'hour', '%h %p' );
+                return array('hour', '%h %p');
                 break;
 
             case 'this_month' :
             case 'last_month' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             case 'this_week' :
             case 'last_week' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             case 'this_year' :
             case 'last_year' :
-                return array( 'month', '%b' );
+                return array('month', '%b');
                 break;
             case '30_days_ago' :
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
             default:
-                return array( 'day', '%b %d' );
+                return array('day', '%b %d');
                 break;
 
         }
@@ -996,11 +996,11 @@ 
      */
     public function earnings_report() {
 
-        $data        = wp_json_encode( $this->get_stats() );
+        $data        = wp_json_encode($this->get_stats());
         $time_format = $this->get_time_format();
         echo '
             <div class="wpinv-report-container">
-                <h3><span>' . __( 'Earnings Over Time', 'invoicing' ) .'</span></h3>
+                <h3><span>' . __('Earnings Over Time', 'invoicing') . '</span></h3>
                 ' . $this->period_filter() . '
                 <div id="wpinv_report_graph" style="height: 450px;"></div>
             </div>
@@ -1009,12 +1009,12 @@ 
                 jQuery(document).ready( function() {
                     jQuery.plot(
                         jQuery("#wpinv_report_graph"),
-                        ' . $data .',
+                        ' . $data . ',
                         {
                             xaxis:{
                                 mode: "time",
-                                timeformat: "' . $time_format[1] .'",
-                                minTickSize: [0.5, "' . $time_format[0] .'"]
+                                timeformat: "' . $time_format[1] . '",
+                                minTickSize: [0.5, "' . $time_format[0] . '"]
                             },
 
                             yaxis: {
@@ -1042,7 +1042,7 @@ 
      * Displays the gateways report.
      */
     public function gateways_report() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-gateways-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-gateways-report-table.php');
 
         $table = new WPInv_Gateways_Report_Table();
         $table->prepare_items();
@@ -1053,12 +1053,12 @@ 
      * Displays the items report.
      */
     public function items_report() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-items-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-items-report-table.php');
 
         $table = new WPInv_Items_Report_Table();
         $table->prepare_items();
         $table->display();
-        echo __( '* Items with no sales not shown.', 'invoicing' );
+        echo __('* Items with no sales not shown.', 'invoicing');
     }
 
     /**
@@ -1068,27 +1068,27 @@ 
      */
     public function tax_report() {
 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-taxes-report-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-taxes-report-table.php');
         $table = new WPInv_Taxes_Reports_Table();
         $table->prepare_items();
-        $year = isset( $_GET['year'] ) ? absint( $_GET['year'] ) : date( 'Y' );
+        $year = isset($_GET['year']) ? absint($_GET['year']) : date('Y');
         ?>
 
         <div class="metabox-holder" style="padding-top: 0;">
             <div class="postbox">
-                <h3><span><?php _e('Tax Report','invoicing' ); ?></span></h3>
+                <h3><span><?php _e('Tax Report', 'invoicing'); ?></span></h3>
                 <div class="inside">
-                    <p><?php _e( 'This report shows the total amount collected in sales tax for the given year.', 'invoicing' ); ?></p>
+                    <p><?php _e('This report shows the total amount collected in sales tax for the given year.', 'invoicing'); ?></p>
                     <form method="get">
-                        <span><?php echo $year; ?></span>: <strong><?php echo wpinv_sales_tax_for_year( $year ); ?></strong>&nbsp;&mdash;&nbsp;
+                        <span><?php echo $year; ?></span>: <strong><?php echo wpinv_sales_tax_for_year($year); ?></strong>&nbsp;&mdash;&nbsp;
                         <select name="year">
-                            <?php for ( $i = 2014; $i <= date( 'Y' ); $i++ ) : ?>
-                            <option value="<?php echo $i; ?>"<?php selected( $year, $i ); ?>><?php echo $i; ?></option>
+                            <?php for ($i = 2014; $i <= date('Y'); $i++) : ?>
+                            <option value="<?php echo $i; ?>"<?php selected($year, $i); ?>><?php echo $i; ?></option>
                             <?php endfor; ?>
                         </select>
                         <input type="hidden" name="view" value="taxes" />
                         <input type="hidden" name="page" value="wpinv-reports"/>
-                        <?php submit_button( __( 'Submit', 'invoicing' ), 'secondary', 'submit', false ); ?>
+                        <?php submit_button(__('Submit', 'invoicing'), 'secondary', 'submit', false); ?>
                     </form>
                 </div><!-- .inside -->
             </div><!-- .postbox -->

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

Spacing +95 added lines, -95 removed lines

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

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

Indentation +181 added lines, -181 removed lines

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

Spacing +31 added lines, -31 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {